Merge pull request #188 from NaokiTsuchiya/fix/parent-intercept

Fix wrong compiled method of parent
ray-di · Feb 21, 2022 · 7c5bcca · 7c5bcca
2 parents f6076c0 + 151e3b9
commit 7c5bcca
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 10 deletions.
diff --git a/src/AopClass.php b/src/AopClass.php
@@ -45,7 +45,7 @@ public function __invoke(CodeVisitor $visitor, ReflectionClass $sourceClass, Bin
     {
         assert($visitor->class instanceof Class_);
         $methods = $this->codeGenMethod->getMethods($sourceClass, $bind, $visitor);
-        $propStms = ($this->aopProps)($sourceClass);
+        $propStms = ($this->aopProps)($sourceClass, $visitor);
         $classStm = $visitor->class;
         $newClassName = ($this->aopClassName)((string) $visitor->class->name, $bind->toString(''));
         $classStm->name = new Identifier($newClassName);

diff --git a/src/AopProps.php b/src/AopProps.php
@@ -31,7 +31,7 @@ public function __construct(BuilderFactory $factory)
      *
      * @return Property[]
      */
-    public function __invoke(ReflectionClass $class): array
+    public function __invoke(ReflectionClass $class, CodeVisitor $visitor): array
     {
         $pros = [];
         $pros[] = $this->factory
@@ -47,12 +47,12 @@ public function __invoke(ReflectionClass $class): array
 
         $pros[] = $this->factory
             ->property('methodAnnotations')
-            ->setDefault($this->getMethodAnnotations($class))
+            ->setDefault($this->getMethodAnnotations($class, $visitor))
             ->makePublic()
             ->getNode();
         $pros[] = $this->factory
             ->property('classAnnotations')
-            ->setDefault($this->getClassAnnotation($class))
+            ->setDefault($this->getClassAnnotation($class, $visitor))
             ->makePublic()
             ->getNode();
         $pros[] = $this->factory
@@ -67,7 +67,7 @@ public function __invoke(ReflectionClass $class): array
     /**
      * @param ReflectionClass<object> $class
      */
-    private function getMethodAnnotations(ReflectionClass $class): string
+    private function getMethodAnnotations(ReflectionClass $class, CodeVisitor $visitor): string
     {
         $methodsAnnotation = [];
         $methods = $class->getMethods();
@@ -78,6 +78,7 @@ private function getMethodAnnotations(ReflectionClass $class): string
             }
 
             $methodsAnnotation[$method->name] = $annotations;
+            $visitor->addUses($annotations);
         }
 
         return serialize($methodsAnnotation);
@@ -88,9 +89,10 @@ private function getMethodAnnotations(ReflectionClass $class): string
      *
      * @template T of object
      */
-    private function getClassAnnotation(ReflectionClass $class): string
+    private function getClassAnnotation(ReflectionClass $class, CodeVisitor $visitor): string
     {
         $classAnnotations = $this->reader->getClassAnnotations($class);
+        $visitor->addUses($classAnnotations);
 
         return serialize($classAnnotations);
     }

diff --git a/src/CodeVisitor.php b/src/CodeVisitor.php
@@ -5,14 +5,19 @@
 namespace Ray\Aop;
 
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Use_;
+use PhpParser\Node\Stmt\UseUse;
 use PhpParser\NodeVisitorAbstract;
 use Ray\Aop\Exception\MultipleClassInOneFileException;
 
+use function get_class;
+use function implode;
+
 final class CodeVisitor extends NodeVisitorAbstract
 {
     /** @var ?Namespace_ */
@@ -42,7 +47,7 @@ public function enterNode(Node $node)
         }
 
         if ($node instanceof Use_) {
-            $this->use[] = $node;
+            $this->addUse($node);
 
             return null;
         }
@@ -84,4 +89,18 @@ private function enterNodeClass(Node $node)
 
         return null;
     }
+
+    /** @param array<object> $annotations */
+    public function addUses(array $annotations): void
+    {
+        foreach ($annotations as $annotation) {
+            $this->addUse(new Use_([new UseUse(new Name(get_class($annotation)))]));
+        }
+    }
+
+    private function addUse(Use_ $use): void
+    {
+        $index = implode('\\', $use->uses[0]->name->parts);
+        $this->use[$index] = $use;
+    }
 }
diff --git a/src/VisitorFactory.php b/src/VisitorFactory.php
@@ -5,6 +5,7 @@
 namespace Ray\Aop;
 
 use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\Parser;
 use Ray\Aop\Exception\InvalidSourceClassException;
 use ReflectionClass;
@@ -31,7 +32,9 @@ public function __construct(Parser $parser)
     public function __invoke(ReflectionClass $class): CodeVisitor
     {
         $traverser = new NodeTraverser();
+        $nameResolver = new NameResolver();
         $visitor = new CodeVisitor();
+        $traverser->addVisitor($nameResolver);
         $traverser->addVisitor($visitor);
         $fileName = $class->getFileName();
         if (is_bool($fileName)) {

diff --git a/tests/CodeGenPhp71Test.php b/tests/CodeGenPhp71Test.php
@@ -77,7 +77,7 @@ public function testTypedParam(): void
         $bind = new Bind();
         $bind->bindInterceptors('typed', []);
         $code = $this->codeGen->generate(new ReflectionClass(FakePhp71NullableClass::class), $bind);
-        $expected = 'public function typed(SplObjectStorage $storage)';
+        $expected = 'public function typed(\SplObjectStorage $storage) : \SplObjectStorage';
         $this->assertStringContainsString($expected, $code->code);
     }
 
@@ -86,7 +86,25 @@ public function testUseTyped(): void
         $bind = new Bind();
         $bind->bindInterceptors('useTyped', []);
         $code = $this->codeGen->generate(new ReflectionClass(FakePhp71NullableClass::class), $bind);
-        $expected = 'public function useTyped(CodeGen $codeGen)';
+        $expected = 'public function useTyped(\Ray\Aop\CodeGen $codeGen)';
+        $this->assertStringContainsString($expected, $code->code);
+    }
+
+    public function testAttribute(): void
+    {
+        $bind = new Bind();
+        $bind->bindInterceptors('attributed', []);
+        $code = $this->codeGen->generate(new ReflectionClass(FakePhp71NullableClass::class), $bind);
+        $expected = '#[\Ray\Aop\Annotation\FakeMarker3]';
+        $this->assertStringContainsString($expected, $code->code);
+    }
+
+    public function testUseAnnotation(): void
+    {
+        $bind = new Bind();
+        $bind->bindInterceptors('attributed', []);
+        $code = $this->codeGen->generate(new ReflectionClass(FakePhp71NullableClass::class), $bind);
+        $expected = "use Ray\\Aop\\Annotation\\FakeMarker3;\n";
         $this->assertStringContainsString($expected, $code->code);
     }
 }
diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -4,6 +4,7 @@
 
 namespace Ray\Aop;
 
+use ArrayIterator;
 use Doctrine\Common\Annotations\AnnotationReader;
 use FakeGlobalEmptyNamespaced;
 use FakeGlobalNamespaced;
@@ -130,6 +131,17 @@ public function testParentMethodIntercept(): void
         $this->assertSame(2, $result);
     }
 
+    public function testTypedParentMethodIntercept(): void
+    {
+        $bind = (new Bind())->bindInterceptors('passIterator', [new NullInterceptor()]);
+        $mock = $this->compiler->newInstance(FakeTypedMockChild::class, [], $bind);
+        assert($mock instanceof FakeTypedMockChild);
+        assert(property_exists($mock, 'bindings'));
+        $mock->bindings = $bind->getBindings();
+        $result = $mock->passIterator(new ArrayIterator());
+        $this->assertInstanceOf(ArrayIterator::class, $result);
+    }
+
     public function testParentOfParentMethodIntercept(): void
     {
         $mock = $this->compiler->newInstance(FakeMockChildChild::class, [], $this->bind);

diff --git a/tests/Fake/FakePhp71NullableClass.php b/tests/Fake/FakePhp71NullableClass.php
@@ -5,6 +5,7 @@
 namespace Ray\Aop;
 
 use Composer\Autoload;
+use Ray\Aop\Annotation\FakeMarker3;
 use SplObjectStorage;
 
 class FakePhp71NullableClass
@@ -34,11 +35,18 @@ public function variadicParam(int ...$ids)
         return $ids[0];
     }
 
-    public function typed(SplObjectStorage $storage)
+    public function typed(SplObjectStorage $storage): SplObjectStorage
     {
+        return $storage;
     }
 
     public function useTyped(CodeGen $codeGen)
     {
     }
+
+    /** @FakeMarker3 */
+    #[FakeMarker3]
+    public function attributed()
+    {
+    }
 }
diff --git a/tests/Fake/FakeTypedMock.php b/tests/Fake/FakeTypedMock.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Aop;
+
+use ArrayIterator;
+use Ray\Aop\Annotation\FakeMarker3;
+use Traversable;
+
+class FakeTypedMock
+{
+    /** @FakeMarker3  */
+    #[FakeMarker3]
+    public function passIterator(ArrayIterator $iterator): Traversable
+    {
+        return $iterator;
+    }
+}
diff --git a/tests/Fake/FakeTypedMockChild.php b/tests/Fake/FakeTypedMockChild.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ray\Aop;
+
+class FakeTypedMockChild extends FakeTypedMock
+{
+}