PHP 8.4 (#293)

* PHP 8.4 * removing dev-master
diablomedia · Jan 10, 2025 · 3fd7e52 · 3fd7e52
1 parent aa82021
commit 3fd7e52
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,14 +13,14 @@ 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 }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.30.2
+        uses: shivammathur/setup-php@2.32.0
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -49,7 +49,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
diff --git a/composer.json b/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"
     },
     "autoload": {
@@ -25,8 +25,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"
     },

diff --git a/grumphp.yml.dist b/grumphp.yml.dist
@@ -1,5 +1,8 @@
 # grumphp.yml
 grumphp:
+    environment:
+        variables:
+            PHP_CS_FIXER_IGNORE_ENV: "true"
     tasks:
         composer:
             strict: true

diff --git a/phpstan.neon b/phpstan.neon
@@ -3,16 +3,17 @@ includes:
 parameters:
     level: 8
     inferPrivatePropertyTypeFromConstructor: true
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
+    treatPhpDocTypesAsCertain: false
     paths:
         - ./
     excludePaths:
         - %rootDir%/../../../tests/*
         - %rootDir%/../../../vendor/*
     ignoreErrors:
-        # ZF seems to believe that the getName method on ReflectionFunction may return "null", doesn't seem to unless given parameters
-        - '#Strict comparison using === between null and string will always evaluate to false\.#'
+        -
+            identifier: missingType.iterableValue
+        -
+            identifier: missingType.generics
         # This might be a bug, I didn't look at all of the code above it, but $_reflection could be ReflectionFunction or ReflectionMethod
         # only ReflectionMethod has this method on it
         - '#Call to an undefined method ReflectionFunction\|ReflectionMethod::getDeclaringClass\(\)\.#'
@@ -29,8 +30,7 @@ parameters:
             message: '#Parameter \#1 \$(function|callback) of function call_user_func_array expects callable\(\): .+ given\.#'
             path: %currentWorkingDirectory%/src/Zend/Server/Reflection/Parameter.php
         # Defensive coding, can't be enforced by PHP typehints
-        - '#Result of && is always false\.#'
-        - '#Strict comparison using !== between null and null will always evaluate to false\.#'
+        - '#Strict comparison using !== between null and mixed will always evaluate to true\.#'
         - '#Parameter \#1 \$(argument|objectOrClass) of class ReflectionClass constructor expects class-string<T of object>\|T of object, .+ given\.#'
         -
             message: '#Parameter \#3 \$argv of class Zend_Server_Reflection_Function constructor expects array, array\|false\|null given\.#'

diff --git a/src/Zend/Server/Reflection/Node.php b/src/Zend/Server/Reflection/Node.php
@@ -52,10 +52,10 @@ class Zend_Server_Reflection_Node
      * Constructor
      *
      * @param mixed $value
-     * @param Zend_Server_Reflection_Node $parent Optional
+     * @param Zend_Server_Reflection_Node|null $parent Optional
      * @return void
      */
-    public function __construct($value, Zend_Server_Reflection_Node $parent = null)
+    public function __construct($value, Zend_Server_Reflection_Node|null $parent = null)
     {
         $this->_value = $value;
         if (null !== $parent) {