composer deps, other fixes

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.31.1
+        uses: shivammathur/setup-php@2.32.0
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring

composer.json

@@ -11,9 +11,9 @@
     "prefer-stable": true,
     "require": {
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
-        "diablomedia/zendframework1-exception": "^1.1.1",
-        "diablomedia/zendframework1-xml": "^1.0.5",
-        "diablomedia/zendframework1-server": "^1.0.5"
+        "diablomedia/zendframework1-exception": "dev-master as 1.1.1",
+        "diablomedia/zendframework1-xml": "dev-php84 as 1.0.5",
+        "diablomedia/zendframework1-server": "dev-php84 as 1.0.5"
     },
     "autoload": {
         "psr-0": {
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6.19 || ^10.5.18",
-        "phpstan/phpstan": "1.12.7",
+        "phpstan/phpstan": "2.1.1",
         "friendsofphp/php-cs-fixer": "3.66.2",
         "maglnet/composer-require-checker": "^3.0.0",
         "phpro/grumphp-shim": "^2.0.0"

grumphp.yml.dist

@@ -1,5 +1,8 @@
 # grumphp.yml
 grumphp:
+    environment:
+        variables:
+            PHP_CS_FIXER_IGNORE_ENV: "true"
     tasks:
         composer:
             strict: true

phpstan.neon

@@ -1,5 +1,6 @@
 parameters:
     level: 4
+    treatPhpDocTypesAsCertain: false
     paths:
         - ./
     excludePaths:
@@ -8,11 +9,8 @@ parameters:
     ignoreErrors:
         # Method will exit if $method isn't defined (via a $found boolean in a loop)
         - '#Variable \$method might not be defined\.#'
-        # I think most of these null checks are unnecessary, but the return types may need null added if the property is never initialized
-        - '#Strict comparison using === between null and Zend_Json_Server_Request will always evaluate to false\.#'
-        - '#Strict comparison using === between null and Zend_Json_Server_Response will always evaluate to false\.#'
-        - '#Strict comparison using === between null and string will always evaluate to false\.#'
-        # Defensive coding where these can't be enforced by php type-hints
         -
-            message: '#Result of && is always false\.#'
-            path: %currentWorkingDirectory%/src/Zend/Json/Server.php
+            message: '#^Parameter &\$value by\-ref type of method Zend_Json\:\:_recursiveJsonExprFinder\(\) expects iterable\|Zend_Json_Expr, string given\.$#'
+            identifier: parameterByRef.type
+            count: 1
+            path: src/Zend/Json.php