Merge branch '2.x' into 2.0-pre-autoload-dump

Author: markstory

.github/workflows/ci.yml

@@ -14,8 +14,42 @@ permissions:
 
 jobs:
   testsuite:
-    uses: cakephp/.github/.github/workflows/testsuite-without-db.yml@5.x
-    secrets: inherit
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.1']
+        dependencies: ['highest']
+        include:
+          - php-version: '8.1'
+            dependencies: 'lowest'
+          - php-version: '8.2'
+            dependencies: 'highest'
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, intl
+          ini-values: zend.assertions=1
+          coverage: pcov
+
+      - name: Composer install
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
+          composer-options: ${{ matrix.composer-options }}
+
+      - name: Run PHPUnit
+        run: |
+          if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.dependencies }} == 'highest' ]]; then
+            vendor/bin/phpunit --display-incomplete --display-skipped
+          else
+            vendor/bin/phpunit
+          fi
 
   cs-stan:
     uses: cakephp/.github/.github/workflows/cs-stan.yml@5.x

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 /composer.lock
+/tools
 .phpunit.result.cache

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-    <phar name="phpstan" version="1.10.13" installed="1.10.13" location="./tools/phpstan" copy="false"/>
-    <phar name="psalm" version="5.9.0" installed="5.9.0" location="./tools/psalm" copy="false"/>
-</phive>
+    <phar name="phpstan" version="1.10.14" installed="1.10.14" location="./tools/phpstan" copy="false"/>
+    <phar name="psalm" version="5.10.0" installed="5.10.0" location="./tools/psalm" copy="false"/>
+</phive>

composer.json

@@ -16,7 +16,7 @@
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^5.0",
         "composer/composer": "^2.0",
-        "phpunit/phpunit": "^9.5.19"
+        "phpunit/phpunit": "^10.1.0"
     },
     "autoload": {
         "psr-4": {
@@ -37,5 +37,23 @@
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
-    "prefer-stable": true
+    "prefer-stable": true,
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs --colors --parallel=16 -p src/ tests/",
+        "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
+        "phpstan": "tools/phpstan analyse",
+        "psalm": "tools/psalm --show-info=false",
+        "stan": [
+            "@phpstan",
+            "@psalm"
+        ],
+        "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon",
+        "stan-baseline": "phpstan.phar --generate-baseline",
+        "stan-setup": "phive install",
+        "test": "phpunit"
+    }
 }

phpunit.xml.dist

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-    colors="true"
-    bootstrap="vendor/autoload.php"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <testsuites>
         <testsuite name="plugin-installer">
             <directory>tests/TestCase/</directory>

psalm-baseline.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.x-dev@">
+  <file src="src/Plugin.php">
+    <InvalidArgument occurrences="1">
+      <code>$pathMap</code>
+    </InvalidArgument>
+  </file>
+</files>

psalm.xml

@@ -2,6 +2,9 @@
 <psalm
     errorLevel="2"
     resolveFromConfigFile="true"
+    findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"