Fix generator for PHP >= 8.4

phpspec · Aug 14, 2024 · af0c870 · af0c870
1 parent 6884364
commit af0c870
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ jobs:
             composer-flags: "--prefer-lowest"
           - php: '8.3'
             composer-flags: "--ignore-platform-req=php+" # TODO move that to a normal job without flag once phpspec supports it
+          - php: '8.4'
+            composer-flags: "--ignore-platform-req=php+" # TODO move that to a normal job without flag once phpspec supports it
 
     steps:
       -   uses: actions/checkout@v4

diff --git a/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php b/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php
@@ -78,14 +78,14 @@ private function generateMethod(Node\MethodNode $method): string
         return $php.'}';
     }
 
-    private function generateTypes(TypeNodeAbstract $typeNode): string
+    private function generateTypes(TypeNodeAbstract $typeNode, bool $nullable = FALSE): string
     {
         if (!$typeNode->getTypes()) {
             return '';
         }
 
         // When we require PHP 8 we can stop generating ?foo nullables and remove this first block
-        if ($typeNode->canUseNullShorthand()) {
+        if ($typeNode->canUseNullShorthand() || $nullable) {
             return sprintf( '?%s', $typeNode->getNonNullTypes()[0]);
         } else {
             return join('|', $typeNode->getTypes());
@@ -101,7 +101,9 @@ private function generateArguments(array $arguments): array
     {
         return array_map(function (Node\ArgumentNode $argument){
 
-            $php = $this->generateTypes($argument->getTypeNode());
+            $types = $argument->getTypeNode()->getTypes();
+            $null = $argument->isOptional() && $argument->getDefault() === NULL && \count($types) === 1 && $types[0] !== 'mixed';
+            $php = $this->generateTypes($argument->getTypeNode(), $null);
 
             $php .= ' '.($argument->isPassedByReference() ? '&' : '');