Merge pull request #504 from ciaranmcnulty/inherited-self

Fix handling of inherited 'self'
phpspec · Sep 29, 2020 · 54d7320 · 54d7320
2 parents 765cd5d + 2a681a0
commit 54d7320
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/fixtures/AbstractBaseClassWithMethodWithReturnType.php b/fixtures/AbstractBaseClassWithMethodWithReturnType.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\Prophecy;
+
+abstract class AbstractBaseClassWithMethodWithReturnType
+{
+    public function returnSelf(?\DateTimeInterface $test): self
+    {
+    }
+}
diff --git a/fixtures/ClassExtendAbstractWithMethodWithReturnType.php b/fixtures/ClassExtendAbstractWithMethodWithReturnType.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\Prophecy;
+
+class ClassExtendAbstractWithMethodWithReturnType extends AbstractBaseClassWithMethodWithReturnType
+{
+}
diff --git a/src/Prophecy/Doubler/Generator/ClassMirror.php b/src/Prophecy/Doubler/Generator/ClassMirror.php
@@ -104,7 +104,7 @@ private function reflectClassToNode(ReflectionClass $class, Node\ClassNode $node
                 continue;
             }
 
-            $this->reflectMethodToNode($method, $node, $class);
+            $this->reflectMethodToNode($method, $node);
         }
 
         foreach ($class->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
@@ -118,7 +118,7 @@ private function reflectClassToNode(ReflectionClass $class, Node\ClassNode $node
                 continue;
             }
 
-            $this->reflectMethodToNode($method, $node, $class);
+            $this->reflectMethodToNode($method, $node);
         }
     }
 
@@ -127,11 +127,11 @@ private function reflectInterfaceToNode(ReflectionClass $interface, Node\ClassNo
         $node->addInterface($interface->getName());
 
         foreach ($interface->getMethods() as $method) {
-            $this->reflectMethodToNode($method, $node, $interface);
+            $this->reflectMethodToNode($method, $node);
         }
     }
 
-    private function reflectMethodToNode(ReflectionMethod $method, Node\ClassNode $classNode, ReflectionClass $class)
+    private function reflectMethodToNode(ReflectionMethod $method, Node\ClassNode $classNode)
     {
         $node = new Node\MethodNode($method->getName());
 
@@ -148,7 +148,7 @@ private function reflectMethodToNode(ReflectionMethod $method, Node\ClassNode $c
         }
 
         if ($method->hasReturnType()) {
-            $returnTypes = $this->getTypeHints($method->getReturnType(), $class, $method->getReturnType()->allowsNull());
+            $returnTypes = $this->getTypeHints($method->getReturnType(), $method->getDeclaringClass(), $method->getReturnType()->allowsNull());
             $node->setReturnTypeNode(new ReturnTypeNode(...$returnTypes));
         }
 

diff --git a/tests/Doubler/Generator/ClassMirrorTest.php b/tests/Doubler/Generator/ClassMirrorTest.php
@@ -559,6 +559,14 @@ public function it_can_double_a_class_with_mixed_types()
         $this->assertEquals(new ReturnTypeNode('mixed'), $methodNode->getReturnTypeNode());
     }
 
+    /** @test */
+    public function it_can_double_inherited_self_return_type()
+    {
+        $classNode = (new ClassMirror())->reflect(new \ReflectionClass('Fixtures\Prophecy\ClassExtendAbstractWithMethodWithReturnType'), []);
+        $methodNode = $classNode->getMethods()['returnSelf'];
+
+        $this->assertEquals(new ReturnTypeNode('Fixtures\Prophecy\AbstractBaseClassWithMethodWithReturnType'), $methodNode->getReturnTypeNode());
+    }
 
     /**
      * @test