Master to 3.x

.github/workflows/pull-request.yml

@@ -3,7 +3,7 @@ run-name: Pull to ${{ github.base_ref }} by ${{ github.actor }}
 
 on:
   pull_request:
-    branches: [master, develop]
+    branches: [master, develop, 3.x]
 
 jobs:
   Unit-Tests:
@@ -22,18 +22,17 @@ jobs:
           mysql-version: '5.6'
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Setup CakePHP
-        uses: ./.github/actions/setup-cakephp
-      - name: Setup database
-        uses: ./.github/actions/setup-database
-      - name: Install PHPUnit
+      - name: Install Dependencies
         run: |
-          cd ./cakephp
-          composer require 'phpunit/phpunit=5.7'
-          cd ../
+          composer remove --dev phpstan/phpstan cakephp/cakephp-codesniffer overtrue/phplint --no-update
+          composer require 'cakephp/cakephp=3.10.5' 'phpunit/phpunit=5.7.0' --with-all-dependencies
+        shell: bash
+      - name: Create test database
+        run: mysql -u root -e "CREATE DATABASE cakephp_test"
+        shell: bash
 
       - name: Unit Tests
-        run: ./cakephp/lib/Cake/Console/cake test Filter All --stderr -app ./cakephp/app
+        run: ./vendor/bin/phpunit ./tests
 
   PHP-Lint:
     runs-on: ubuntu-latest
@@ -58,13 +57,24 @@ jobs:
           php-version: 7.4
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Setup CakePHP
-        uses: ./.github/actions/setup-cakephp
-      - name: Install PHPUnit
-        run: composer require 'phpunit/phpunit=7.0'
-      - name: Install PHPStan
-        run: |
-          composer require --dev phpstan/phpstan
-          composer require --dev phpstan/phpstan-phpunit
+      - name: Install Dependencies
+        run: composer require 'cakephp/cakephp=3.10.5' 'phpunit/phpunit=7.0' phpstan/phpstan phpstan/phpstan-phpunit --with-all-dependencies
       - name: PHPStan
-        run: vendor/bin/phpstan analyse --level=8 ./cakephp/plugins/Filter
+        run: vendor/bin/phpstan analyse --level=8 ./src ./tests
+
+  PHP-Code-Sniffer:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 5.6
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Install PHPCS
+        run: | 
+          composer remove --dev phpstan/phpstan phpunit/phpunit overtrue/phplint --no-update
+          composer require cakephp/cakephp-codesniffer
+          vendor/bin/phpcs --config-set installed_paths /home/runner/work/cakephp-filter-plugin/cakephp-filter-plugin/vendor/cakephp/cakephp-codesniffer
+      - name: Run PHPCS
+        run: vendor/bin/phpcs --colors --parallel=16 -p --standard=CakePHP --extensions=php,ctp src/ tests/

.gitignore

@@ -1,3 +1,6 @@
 /.settings/
 /.buildpath
 /.project
+/.phplint-cache
+/composer.lock
+/vendor/