Merge branch 'master' of github.com:mixerapi/mixerapi-dev

Author: cnizzardini

.github/workflows/build.yml

@@ -0,0 +1,88 @@
+name: Pull Request
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        operating-system: [ ubuntu-20.04 ]
+        php-versions: ['8.0', '8.1']
+
+    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, intl, sqlite3, xml, simplexml, mysqli
+          tools: composer:v2
+          coverage: xdebug
+
+      - name: Matrix PHP Version
+        run: |
+          echo ${{ matrix.php-versions }}
+          php -v
+
+      - name: Composer Check
+        run: composer validate
+
+      - name: Install
+        run: |
+          composer install --prefer-dist --no-interaction --no-progress
+          cp config/.env.example config/.env
+          cp config/app_local.example.php config/app_local.php
+
+      - name: Test Suite + Static Analysis (PHP 8.0)
+        if: ${{ matrix.php-versions == '8.0' }}
+        run: |
+          composer analyze
+
+      - name: Upload coverage results to Coveralls (PHP 8.0)
+        if: ${{ matrix.php-versions == '8.0' }}
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer global require php-coveralls/php-coveralls
+          export CODECOVERAGE=1 && vendor/bin/phpunit --verbose --coverage-clover=clover.xml
+          php-coveralls --coverage_clover=clover.xml -v
+
+      - name: Test Suite (PHP 8.1)
+        if: ${{ matrix.php-versions == '8.1' }}
+        run: |
+          composer test
+
+  #
+  # CakePHP version compatability
+  #
+  compatibility:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: ['~4.2.0', '~4.3.0']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: mbstring, intl, sqlite3, xml, simplexml, mysqli
+
+      - name: PHP Version
+        run: php -v
+
+      - name: CakePHP ${{matrix.version}} Compatability
+        run: |
+          cp config/.env.example config/.env
+          composer self-update
+          rm -rf composer.lock
+          composer require cakephp/cakephp:${{matrix.version}} --no-update
+          composer install --prefer-dist --no-progress
+          composer test

.github/workflows/pull-request.yml

@@ -1,27 +1,23 @@
-<h1 align="center">
-  MixerAPI
-</h1>
+![Logo](./assets/mixerapi.svg#gh-light-mode-only)
+
 <p align="center">
-  <a href="http://mixerapi.com/">
-    <img alt="MixerAPI" src="https://mixerapi.com/assets/logo.png" />
-  </a>
+    Dev/Mono Repo for MixerAPI &mdash; A CakePHP Plugin for RESTful API Development
 </p>
-
 <p align="center">
-    <a href="LICENSE.txt" target="_blank">
-        <img alt="Software License" src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square">
-    </a>
     <a href="https://github.com/mixerapi/mixerapi-dev/actions?query=workflow%3ABuild" target="_blank">
         <img alt="Build Status" src="https://github.com/mixerapi/mixerapi-dev/workflows/Build/badge.svg?branch=master">
     </a>
     <a href="https://coveralls.io/github/mixerapi/mixerapi-dev?branch=master" target="_blank">
         <img alt="Coverage Status" src="https://coveralls.io/repos/github/mixerapi/mixerapi-dev/badge.svg?branch=master">
     </a>
     <a href="https://book.cakephp.org/4/en/index.html">
-        <img alt="CakePHP ^4.0" src="https://img.shields.io/badge/cakephp-^4.0-red?logo=cakephp">
+        <img alt="CakePHP ^4.2" src="https://img.shields.io/badge/cakephp-^4.2-red?logo=cakephp">
     </a>
     <a href="https://php.net/" target="_blank">
-        <img alt="PHP >= 7.2" src="https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg?logo=php">
+        <img alt="PHP ^8.0" src="https://img.shields.io/badge/php-^8.0-8892BF.svg?logo=php">
+    </a>
+    <a href="LICENSE.txt" target="_blank">
+        <img alt="Software License" src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square">
     </a>
 </p>
 
@@ -115,4 +111,4 @@ To build:
 ```console
 composer mkdocs-build
 ```
- 
+

README.md

@@ -5,34 +5,34 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
+        "php": "^8.0",
         "ext-json": "*",
         "ext-simplexml": "*",
         "ext-xml": "*",
         "adbario/php-dot-notation": "^2.2",
-        "cakephp/cakephp": "^4.0",
+        "cakephp/cakephp": "^4.2",
         "cakephp/migrations": "^3.0",
         "cakephp/plugin-installer": "^1.3",
-        "cnizzardini/cakephp-swagger-bake": "^1.6",
+        "cnizzardini/cakephp-swagger-bake": "^2.1",
         "friendsofcake/search": "^6.0",
         "mobiledetect/mobiledetectlib": "^2.8"
     },
     "require-dev": {
         "ext-mysqli": "*",
         "ext-sqlite3": "*",
         "cakephp/bake": "^2.0.3",
-        "cakephp/cakephp-codesniffer": "~4.2.0",
+        "cakephp/cakephp-codesniffer": "^4.2",
         "cakephp/debug_kit": "^4.1",
         "dereuromark/cakephp-ide-helper": "^1.10",
         "josegonzalez/dotenv": "^3.2",
-        "phpmd/phpmd": "^2.9",
+        "phpmd/phpmd": "^2.10",
         "phpro/grumphp": "^1.3",
         "phpstan/phpstan": "^0.12.64",
-        "phpunit/phpunit": "~8.5.0",
+        "phpunit/phpunit": "^9.0",
         "psy/psysh": "@stable"
     },
     "replace": {
-        "mixerapi/core": "^0.2"
+        "mixerapi/core": "^1.0"
     },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
@@ -58,7 +58,7 @@
             "App\\Test\\": "tests/",
             "Cake\\Test\\": "vendor/cakephp/cakephp/tests/",
             "MixerApi\\Bake\\Test\\": "plugins/bake/tests/",
-            "MixerApi\\Bake\\Test\\App\\": "plugins/bake/tests/test_app/App/",
+            "MixerApi\\Bake\\Test\\App\\": "plugins/bake/tests/test_app/src/",
             "MixerApi\\CollectionView\\Test\\": "plugins/collection-view/tests/",
             "MixerApi\\CollectionView\\Test\\App\\": "plugins/collection-view/tests/test_app/src/",
             "MixerApi\\Core\\Test\\": "plugins/core/tests/",
@@ -74,7 +74,7 @@
             "MixerApi\\Test\\": "plugins/mixerapi/tests/",
             "MixerApi\\Test\\App\\": "plugins/mixerapi/tests/test_app/src/",
             "MixerApi\\Rest\\Test\\": "plugins/rest/tests/",
-            "MixerApi\\Rest\\Test\\App\\": "plugins/rest/tests/test_app/App/",
+            "MixerApi\\Rest\\Test\\App\\": "plugins/rest/tests/test_app/src/",
             "MixerApi\\Rest\\Test\\MyPlugin\\": "plugins/rest/tests/plugins/MyPlugin/"
         }
     },
@@ -85,7 +85,7 @@
             "@phpstan",
             "@phpmd"
         ],
-        "test": "phpunit --colors=always",
+        "test": "vendor/bin/phpunit",
         "phpcs": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP plugins/*/src",
         "phpcbf": "phpcbf --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP plugins/*/src",
         "phpstan": "phpstan analyse plugins/*/src",