Fix return type pass with nullable types and intersection types.

bobthecow · Jun 9, 2024 · aee429c · aee429c
1 parent 2df7c5c
commit aee429c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/CodeCleaner/ReturnTypePass.php b/src/CodeCleaner/ReturnTypePass.php
@@ -15,6 +15,7 @@
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\IntersectionType;
 use PhpParser\Node\Name;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt\Function_;
@@ -101,15 +102,15 @@ private function typeName(Node $node): string
             return \implode('|', \array_map([$this, 'typeName'], $node->types));
         }
 
-        if ($node instanceof NullableType) {
-            return \strtolower($node->type->name);
+        if ($node instanceof IntersectionType) {
+            return \implode('&', \array_map([$this, 'typeName'], $node->types));
         }
 
-        if ($node instanceof Identifier) {
-            return \strtolower($node->name);
+        if ($node instanceof NullableType) {
+            return $this->typeName($node->type);
         }
 
-        if ($node instanceof Name) {
+        if ($node instanceof Identifier || $node instanceof Name) {
             return $node->toLowerString();
         }
 

diff --git a/test/CodeCleaner/ReturnTypePassTest.php b/test/CodeCleaner/ReturnTypePassTest.php
@@ -39,6 +39,11 @@ public function happyPaths()
     {
         return [
             ['$x = function(): DateTime { return new DateTime(); };'],
+            ['$x = function(): ?DateTime { return new DateTime(); };'],
+            ['$x = function(): A|B { return new C(); };'],
+            ['$x = function(): A|DateTime { return new C(); };'],
+            ['$x = function(): A&B { return new C(); };'],
+            ['$x = function(): A&DateTime { return new C(); };'],
         ];
     }