Merge pull request #128 from samsonasik/step5-php82

[Step 5 Upgrade] Bump requirement to php 8.2
goaop · Jan 23, 2024 · b8e46fa · b8e46fa
2 parents bd12c88 + 03d5aa8
commit b8e46fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -16,7 +16,7 @@ jobs:
           - "lowest"
           - "highest"
         php-version:
-          - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/composer.json b/composer.json
@@ -22,11 +22,11 @@
     }
   },
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "nikic/php-parser": "^4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^10.5.7",
+    "phpunit/phpunit": "^10.5.8",
     "tracy/tracy": "^2.10"
   },
   "extra": {

diff --git a/src/ReflectionParameter.php b/src/ReflectionParameter.php
@@ -320,6 +320,10 @@ public function getType(): ?\ReflectionType
             return null;
         }
 
+        if ($parameterType === 'iterable') {
+            $parameterType = 'Traversable|array';
+        }
+
         return new ReflectionNamedType($parameterType, $allowsNull, $isBuiltin);
     }
 

diff --git a/src/Traits/ReflectionFunctionLikeTrait.php b/src/Traits/ReflectionFunctionLikeTrait.php
@@ -198,6 +198,10 @@ public function getReturnType(): ?\ReflectionType
             return null;
         }
 
+        if ($returnType === 'iterable') {
+            $returnType = 'Traversable|array';
+        }
+
         return new ReflectionNamedType($returnType, $isNullable, $isBuiltin);
     }