PHP 8.4

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ["8.0", "8.1", "8.2", "8.3"]
+        php-versions: ["8.0", "8.1", "8.2", "8.3", "8.4"]
         composer-args: ["", "--prefer-lowest"]
     runs-on: ${{ matrix.operating-system }}
     services:
@@ -27,7 +27,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.30.3
+        uses: shivammathur/setup-php@2.32.0
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, apcu, memcached, memcache
@@ -57,7 +57,7 @@ jobs:
       - name: Test
         run: composer test-with-coverage
       - name: Upload Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           files: ./clover.xml
           verbose: true

composer.json

@@ -10,7 +10,7 @@
     "license": "BSD-3-Clause",
     "prefer-stable": true,
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "diablomedia/zendframework1-exception": "^1.1.1",
         "diablomedia/zendframework1-config": "^2.0.5",
         "diablomedia/zendframework1-loader": "^1.0.5",
@@ -31,8 +31,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6.19 || ^10.5.18",
-        "phpstan/phpstan": "1.10.67",
-        "friendsofphp/php-cs-fixer": "3.54.0",
+        "phpstan/phpstan": "2.1.1",
+        "friendsofphp/php-cs-fixer": "3.67.0",
         "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

@@ -8,6 +8,7 @@ parameters:
         - %rootDir%/../../../tests/*
         - %rootDir%/../../../vendor/*
     inferPrivatePropertyTypeFromConstructor: true
+    treatPhpDocTypesAsCertain: false
     ignoreErrors:
         -
             message: '#Method Zend_Cache_Backend_Interface::save\(\) invoked with 5 parameters, 2-4 required\.#'
@@ -50,13 +51,6 @@ parameters:
             path: %currentWorkingDirectory%/src/Zend/Cache/Core.php
 
         - '#Method Zend_Cache::factory\(\) should return Zend_Cache_Core but empty return statement found\.#'
-        - '#Strict comparison using === between int and null will always evaluate to false\.#'
-        - '#Strict comparison using === between string and null will always evaluate to false\.#'
-        # Defensive coding, type is defined in docblock, can't be enforced by php type-hints since it can be multiple
-        # types (string|Zend_Cache_Core)
-        -
-            message: '#Else branch is unreachable because previous condition is always true\.#'
-            path: %currentWorkingDirectory%/src/Zend/Cache.php
         # Comes from XCache extension, was in our branched phpstorm repo, but removed that
         -
             message: '#Constant XC_TYPE_VAR not found\.#'

src/Zend/Cache.php

@@ -239,7 +239,7 @@ public static function _makeFrontend(
      * @throws Zend_Cache_Exception
      * @return void
      */
-    public static function throwException($msg, Exception $e = null)
+    public static function throwException($msg, Exception|null $e = null)
     {
         // For perfs reasons, we use this dynamic inclusion
         throw new Zend_Cache_Exception($msg, 0, $e);

src/Zend/Cache/Backend/BlackHole.php

@@ -164,7 +164,6 @@ public function getIdsMatchingAnyTags($tags = array())
      * Return the filling percentage of the backend storage
      *
      * @return int integer between 0 and 100
-     * @throws Zend_Cache_Exception
      */
     public function getFillingPercentage()
     {