Merge pull request #33 from tyrsson/switch-to-phpstan

Drop Psalm support in favor of PhpStan

Author: tyrsson

.ci/mysql_fixtures.sh

@@ -31,13 +31,11 @@ jobs:
           job: ${{ matrix.job }}
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
-          MYSQL_ROOT_PASSWORD: 'password'
           MYSQL_ROOT_HOST: '%'
-          MYSQL_USER: 'gha'
-          MYSQL_PASSWORD: 'password'
-          MYSQL_DATABASE: 'laminasdb_test'
+          MYSQL_DATABASE: 'phpdb_test'
+          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval 10s

.github/workflows/continuous-integration.yml

@@ -1,4 +1,6 @@
 /.phpcs-cache
+/.phpstan-cache
+/phpstan.neon
 /.phpunit.cache
 /.phpunit.result.cache
 /phpunit.xml

.gitignore

@@ -1,16 +1,12 @@
 {
-    "ignore_php_platform_requirements": {
-        "8.4": true
-    },
-    "exclude": [
+    "additional_checks": [
         {
-            "name": "PHPUnit",
-            "php": "8.1"
-        },
-        {
-            "name": "PHPUnit",
-            "php": "8.4",
-            "dependencies": "lowest"
+            "name": "PhpStan",
+            "job": {
+                "php": "8.2",
+                "dependencies": "latest",
+                "command": "composer require --dev phpstan/phpstan && vendor/bin/phpstan analyse"
+            }
         }
     ]
 }

.laminas-ci.json

@@ -19,10 +19,8 @@ services:
     ports:
       - "3306:3306"
     environment:
-      - MYSQL_DATABASE=${MYSQL_DATABASE:-laminasdb_test}
-      - MYSQL_USER=${MYSQL_USER:-user}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
-      - MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD:-yes}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-phpdb_test}
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - ./test/integration/TestFixtures/mysql.sql:/docker-entrypoint-initdb.d/mysql.sql
     healthcheck:

.laminas-ci/mysql_permissions.sql

@@ -33,15 +33,15 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
-        "php-db/phpdb": "^0.1.1"
+        "php-db/phpdb": "^0.2.1"
     },
     "require-dev": {
         "ext-mysqli": "*",
         "ext-pdo_mysql": "*",
         "laminas/laminas-coding-standard": "^3.0.1",
-        "phpunit/phpunit": "^11.5.15",
-        "psalm/plugin-phpunit": "^0.19.2",
-        "vimeo/psalm": "^6.8.8"
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpunit/phpunit": "^11.5.42"
     },
     "suggest": {
         "ext-mysqli": "Required for MySQLi support",
@@ -71,9 +71,8 @@
         "test": "phpunit --colors=always --testsuite \"unit test\"",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "test-integration": "phpunit --colors=always --testsuite \"integration test\"",
-        "static-analysis": "psalm --shepherd --stats",
-        "sa-set-baseline": "psalm --set-baseline",
-        "sa-no-baseline": "psalm --shepherd --stats --ignore-baseline",
+        "static-analysis": "vendor/bin/phpstan analyse --memory-limit=256M",
+        "sa-generate-baseline": "vendor/bin/phpstan analyse --memory-limit=256M --generate-baseline",
         "upload-coverage": "coveralls -v"
     }
 }