PHP 8.4 (#294)

* PHP 8.4 * removing dev package versions
diablomedia · Jan 10, 2025 · e0e9f37 · e0e9f37
1 parent 7e3e4a8
commit e0e9f37
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 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.3
+        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",
         "diablomedia/zendframework1-config": "^2.0.5",
         "diablomedia/zendframework1-loader": "^1.0.5"
@@ -30,8 +30,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6.19 || ^10.5.18",
-        "phpstan/phpstan": "1.10.67",
-        "friendsofphp/php-cs-fixer": "3.58.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
@@ -1,5 +1,5 @@
 parameters:
-    checkMissingIterableValueType: false
+    treatPhpDocTypesAsCertain: false
     level: 8
     paths:
         - ./
@@ -9,6 +9,8 @@ parameters:
     bootstrapFiles:
         - ./phpstan-bootstrap.php
     ignoreErrors:
+        -
+            identifier: missingType.iterableValue
         # call_user_func does accept an array as the callable
         -
             message: '#Parameter \#1 \$(function|callback) of function call_user_func expects callable\(\): mixed, array{string, .factory.} given\.#'
@@ -24,9 +26,6 @@ parameters:
             path: './src/Zend/Log/Writer/Stream.php'
         # All of these are defensive coding in case an object isn't returned from _constructFromConfig (which is
         # possible, since it's a call_user_func return)
-        -
-            message: '#Else branch is unreachable because ternary operator condition is always true.#'
-            path: './src/Zend/Log.php'
         -
             message: '#Parameter \#1 \$(argument|objectOrClass) of class ReflectionClass constructor expects class-string<T of object>\|T of object, string given\.#'
             path: ./src/Zend/Log.php
@@ -35,3 +34,14 @@ parameters:
             message: '#Cannot cast array{}\|bool\|float\|int\|object\|string\|null to string\.#'
             count: 2
             path: ./src/Zend/Log/Formatter/Xml.php
+        -
+            message: '#^Cannot access offset ''filterName'' on array\|Zend_Config\.$#'
+            identifier: offsetAccess.nonOffsetAccessible
+            count: 1
+            path: src/Zend/Log.php
+
+        -
+            message: '#^Cannot access offset ''formatterName'' on array\|Zend_Config\.$#'
+            identifier: offsetAccess.nonOffsetAccessible
+            count: 1
+            path: src/Zend/Log.php
diff --git a/src/Zend/Log.php b/src/Zend/Log.php
@@ -116,7 +116,7 @@ class Zend_Log
      *
      * @param Zend_Log_Writer_Abstract|null  $writer  default writer
      */
-    public function __construct(Zend_Log_Writer_Abstract $writer = null)
+    public function __construct(Zend_Log_Writer_Abstract|null $writer = null)
     {
         $r                 = new ReflectionClass($this);
         $this->_priorities = array_flip($r->getConstants());

diff --git a/src/Zend/Log/Filter/Suppress.php b/src/Zend/Log/Filter/Suppress.php
@@ -65,7 +65,6 @@ public function accept($event)
      *
      * @param  array|Zend_Config $config
      * @return Zend_Log_Filter_Suppress
-     * @throws Zend_Log_Exception
      */
     public static function factory($config)
     {

diff --git a/tests/Zend/Log/LogTest.php b/tests/Zend/Log/LogTest.php
@@ -299,7 +299,7 @@ public function testUsingWithErrorHandler()
         $oldErrorLevel = error_reporting();
 
         $this->expectingLogging = true;
-        error_reporting(E_ALL | E_STRICT);
+        error_reporting(E_ALL);
 
         $oldHandler = set_error_handler(array($this, 'verifyHandlerData'));
         $logger->registerErrorHandler();