Merge branch 'master' into 5.x

cakephp · May 21, 2022 · 972f776 · 972f776
2 parents 4bca0b8 + 8012553
commit 972f776
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,9 +55,9 @@ jobs:
           composer install
         fi
 
-    - name: Configure PHPUnit matcher
+    - name: Setup problem matchers for PHPUnit
       if: matrix.php-version == '7.4'
-      uses: mheap/phpunit-matcher-action@v1
+      run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Run PHPUnit
       run: |

diff --git a/CakePHP/ruleset.xml b/CakePHP/ruleset.xml
@@ -23,6 +23,7 @@
     <!-- Relax rules from PSR12 -->
     <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
         <exclude-pattern>*/config/Migrations/*</exclude-pattern>
+        <exclude-pattern>*/config/Seeds/*</exclude-pattern>
     </rule>
     <rule ref="PSR1.Files.SideEffects">
         <exclude-pattern>*/config/*</exclude-pattern>

diff --git a/composer.json b/composer.json
@@ -30,6 +30,11 @@
             "CakePHP\\": "CakePHP/"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "scripts": {
         "add-standard" : "phpcs --config-set installed_paths $(pwd)",
         "test": [