Add Support for PHP 8.4 (#201)

Add support for PHP 8.4 Fixes various minor 8.4 compatibility issues in tests Signed-off-by: Nishant Rana <[email protected]>
laminas · Oct 25, 2024 · e8dedb5 · e8dedb5
1 parent 562e02b
commit e8dedb5
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 139 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,5 @@
+{
+  "ignore_php_platform_requirements": {
+    "8.4": true
+  }
+}
diff --git a/composer.json b/composer.json
@@ -9,14 +9,14 @@
     "homepage": "https://laminas.dev",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
     "require-dev": {
         "ext-phar": "*",
         "doctrine/annotations": "^2.0.1",
         "laminas/laminas-coding-standard": "^2.5.0",
-        "laminas/laminas-stdlib": "^3.17.0",
-        "phpunit/phpunit": "^10.3.3",
+        "laminas/laminas-stdlib": "^3.18.0",
+        "phpunit/phpunit": "^10.5.37",
         "psalm/plugin-phpunit": "^0.19.0",
         "vimeo/psalm": "^5.15.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/docs/book/migration.md b/docs/book/migration.md
@@ -93,7 +93,6 @@ $parameterGenerator->setType('*'); // invalid (throws exception)
 $parameterGenerator->setType('\\'); // invalid (throws exception)
 ```
 
-
 ## Generated type-hints are now prefixed by `"\"`
 
 Generated type-hints are now prefixed with the `NAMESPACE_SEPARATOR`,

diff --git a/test/Generator/TestAsset/ParameterClass.php b/test/Generator/TestAsset/ParameterClass.php
@@ -75,7 +75,7 @@ public function defaultConstant($con = self::FOO)
 
     }
 
-    public function defaultObjectEqualsNullAndNotOptional(\stdClass $a = null, $b)
+    public function nullableAndRequired(?\stdClass $a, $b)
     {
 
     }

diff --git a/test/Generator/TestAsset/TestSampleSingleClass.php b/test/Generator/TestAsset/TestSampleSingleClass.php
@@ -32,7 +32,7 @@ public function someMethod()
     protected function withParamsAndReturnType(
         $mixed,
         array $array,
-        callable $callable = null,
+        ?callable $callable = null,
         ?int $int = 0
     ): bool {
         /* test test */

diff --git a/test/Reflection/TestAsset/TestSampleClass5.php b/test/Reflection/TestAsset/TestSampleClass5.php
@@ -34,7 +34,7 @@ class TestSampleClass5
      *                      which spans multiple lines
      * @return mixed Some return descr
      */
-    public function doSomething($one, $two = 2, $three = 'three', array $array = array(), TestSampleClass $class = null)
+    public function doSomething($one, $two = 2, $three = 'three', array $array = array(), ?TestSampleClass $class = null)
     {
         return 'mixedValue';
     }
@@ -63,7 +63,7 @@ public function doSomethingElse($one, $two = 2, $three = 'three')
     public function methodWithNotAllParamsDeclared(
         string $one,
         $two = null,
-        int $three = null,
+        ?int $three = null,
         string $four = '',
         $five = null
     ) {

diff --git a/test/TestAsset/IterableHintsClass.php b/test/TestAsset/IterableHintsClass.php
@@ -12,7 +12,7 @@ public function nullableIterableParameter(?iterable $foo)
     {
     }
 
-    public function nullDefaultIterableParameter(iterable $foo = null)
+    public function nullDefaultIterableParameter(?iterable $foo = null)
     {
     }
 

diff --git a/test/TestAsset/ObjectHintsClass.php b/test/TestAsset/ObjectHintsClass.php
@@ -12,7 +12,7 @@ public function nullableObjectParameter(?object $foo)
     {
     }
 
-    public function nullDefaultObjectParameter(object $foo = null)
+    public function nullDefaultObjectParameter(?object $foo = null)
     {
     }
-Original file line number
+Diff line change
@@ Expand Up @@
     $parameterGenerator->setType('\\'); // invalid (throws exception)
     ```
     ## Generated type-hints are now prefixed by `"\"`
     Generated type-hints are now prefixed with the `NAMESPACE_SEPARATOR`,
@@ Expand Down @@