Merge pull request #81 from ray-di/revert

Revert "update ReflectionMethod from native class to package class"
ray-di · Mar 1, 2018 · f908124 · f908124
2 parents 462c1c2 + a794200
commit f908124
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 48 deletions.
diff --git a/demo/tmp/.placefolder → demo/tmp/.gitkeep b/demo/tmp/.placefolder → demo/tmp/.gitkeep
diff --git a/src/MethodInvocation.php b/src/MethodInvocation.php
@@ -23,7 +23,7 @@ interface MethodInvocation extends Invocation
      *
      * <p>This method is a friendly implementation of the {@link * Joinpoint#getStaticPart()} method (same result).
      *
-     * @return ReflectionMethod method being called
+     * @return \ReflectionMethod|ReflectionMethod method being called
      */
-    public function getMethod() : ReflectionMethod;
+    public function getMethod() : \ReflectionMethod;
 }
diff --git a/src/ReflectiveMethodInvocation.php b/src/ReflectiveMethodInvocation.php
@@ -21,7 +21,7 @@ final class ReflectiveMethodInvocation implements MethodInvocation
     private $arguments;
 
     /**
-     * @var ReflectionMethod
+     * @var \ReflectionMethod
      */
     private $method;
 
@@ -30,9 +30,15 @@ final class ReflectiveMethodInvocation implements MethodInvocation
      */
     private $interceptors;
 
+    /**
+     * @param object              $object
+     * @param \ReflectionMethod   $method
+     * @param Arguments           $arguments
+     * @param MethodInterceptor[] $interceptors
+     */
     public function __construct(
         $object,
-        ReflectionMethod $method,
+        \ReflectionMethod $method,
         Arguments $arguments,
         array $interceptors = []
     ) {
@@ -45,7 +51,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getMethod() : ReflectionMethod
+    public function getMethod() : \ReflectionMethod
     {
         if ($this->object instanceof WeavedInterface) {
             $class = (new \ReflectionObject($this->object))->getParentClass();

diff --git a/template/AopTemplate.php b/template/AopTemplate.php
@@ -42,7 +42,7 @@ public function returnSame($a)
         $this->isIntercepting = false;
         $invocationResult = (new \Ray\Aop\ReflectiveMethodInvocation(
             $this,
-            new \Ray\Aop\ReflectionMethod($this, __FUNCTION__),
+            new \ReflectionMethod($this, __FUNCTION__),
             new \Ray\Aop\Arguments(func_get_args()),
             $this->bindings[__FUNCTION__]
         ))->proceed();

diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -7,7 +7,7 @@
 class CompilerTest extends TestCase
 {
     /**
-     * @var Bind
+     * @var BindInterface
      */
     private $bind;
 
@@ -19,13 +19,10 @@ class CompilerTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->compiler = new Compiler(
-            $_ENV['TMP_DIR']
-        );
-        $this->bind = new Bind;
+        $this->compiler = new Compiler($_ENV['TMP_DIR']);
         $matcher = new Matcher;
         $pointcut = new Pointcut($matcher->any(), $matcher->startsWith('return'), [new FakeDoubleInterceptor]);
-        $this->bind->bind(FakeWeaved::class, [$pointcut]);
+        $this->bind = (new Bind)->bind(FakeWeaved::class, [$pointcut]);
     }
 
     public function testNewInstance()
@@ -105,9 +102,9 @@ public function testMethodReturnValue(FakeMock $weaved)
 
     public function testGetPrivateVal()
     {
-        $weaved = $this->getWeaved();
-        $val = $weaved->getPrivateVal();
-        /* @var FakeMock $weaved */
+        /** @var \Ray\Aop\FakeMock $mock */
+        $mock = $this->compiler->newInstance(FakeMock::class, [], $this->bind);
+        $val = $mock->getPrivateVal();
         $this->assertSame($val, 1);
     }
 
@@ -116,9 +113,10 @@ public function testCallAbortProceedInterceptorTwice()
         $matcher = new Matcher;
         $pointcut = new Pointcut($matcher->any(), $matcher->startsWith('return'), [new FakeAbortProceedInterceptor]);
         $this->bind->bind(FakeWeaved::class, [$pointcut]);
-        $weaved = $this->getWeaved();
-        $this->assertSame(40, $weaved->returnSame(1));
-        $this->assertSame(40, $weaved->returnSame(1));
+        /** @var \Ray\Aop\FakeMock $mock */
+        $mock = $this->compiler->newInstance(FakeMock::class, [], $this->bind);
+        $this->assertSame(40, $mock->returnSame(1));
+        $this->assertSame(40, $mock->returnSame(1));
     }
 
     public function testClassDocComment()
@@ -222,8 +220,10 @@ public function testHasBound()
 
     public function testMethodAnnotationReader()
     {
-        $mock = $this->getAnnotated();
-        /* @var $mock FakeAnnotateClass */
+        $bind = (new Bind)->bindInterceptors('getDouble', [new FakeMethodAnnotationReaderInterceptor]);
+        $compiler = new Compiler($_ENV['TMP_DIR']);
+        /** @var \Ray\Aop\FakeAnnotateClass $mock */
+        $mock = $compiler->newInstance(FakeAnnotateClass::class, [], $bind);
         $mock->getDouble(1);
         $this->assertInstanceOf(FakeMarker::class, FakeMethodAnnotationReaderInterceptor::$methodAnnotation);
         $this->assertCount(3, FakeMethodAnnotationReaderInterceptor::$methodAnnotations);
@@ -254,24 +254,4 @@ public function testMethodAnnotationReaderReturnNull()
         $this->assertNull(FakeMethodAnnotationReaderInterceptor::$methodAnnotation);
         $this->assertCount(0, FakeMethodAnnotationReaderInterceptor::$methodAnnotations);
     }
-
-    private function getWeaved() : FakeMock
-    {
-        $mock = $this->compiler->newInstance(FakeMock::class, [], $this->bind);
-        if ($mock instanceof FakeMock) {
-            return $mock;
-        }
-        throw new \LogicException;
-    }
-
-    private function getAnnotated() : FakeAnnotateClass
-    {
-        $bind = (new Bind)->bindInterceptors('getDouble', [new FakeMethodAnnotationReaderInterceptor]);
-        $compiler = new Compiler($_ENV['TMP_DIR']);
-        $mock = $compiler->newInstance(FakeAnnotateClass::class, [], $bind);
-        if ($mock instanceof FakeAnnotateClass) {
-            return $mock;
-        }
-        throw new \LogicException;
-    }
 }
diff --git a/tests/Fake/FakeMethodAnnotationReaderInterceptor.php b/tests/Fake/FakeMethodAnnotationReaderInterceptor.php
@@ -10,10 +10,12 @@ class FakeMethodAnnotationReaderInterceptor implements MethodInterceptor
 
     public function invoke(MethodInvocation $invocation)
     {
-        self::$methodAnnotations = $invocation->getMethod()->getAnnotations();
-        self::$methodAnnotation = $invocation->getMethod()->getAnnotation(FakeMarker::class);
-        self::$classAnnotations = $invocation->getMethod()->getDeclaringClass()->getAnnotations();
-        self::$classAnnotation = $invocation->getMethod()->getDeclaringClass()->getAnnotation(FakeClassAnnotation::class);
+        /** @var \Ray\Aop\ReflectionMethod $method */
+        $method = $invocation->getMethod();
+        self::$methodAnnotations = $method->getAnnotations();
+        self::$methodAnnotation = $method->getAnnotation(FakeMarker::class);
+        self::$classAnnotations = $method->getDeclaringClass()->getAnnotations();
+        self::$classAnnotation = $method->getDeclaringClass()->getAnnotation(FakeClassAnnotation::class);
 
         return $invocation->proceed();
     }

diff --git a/tests/Fake/FakeWeaved.php b/tests/Fake/FakeWeaved.php
@@ -26,7 +26,7 @@ public function returnSame($a)
         $interceptors = $this->bind[__FUNCTION__];
         $invocation = new ReflectiveMethodInvocation(
             $this,
-            new ReflectionMethod($this, __FUNCTION__),
+            new \ReflectionMethod($this, __FUNCTION__),
             new Arguments(func_get_args()),
             $interceptors
         );

diff --git a/tests/ReflectiveMethodInvocationTest.php b/tests/ReflectiveMethodInvocationTest.php
@@ -19,7 +19,7 @@ protected function setUp()
     {
         parent::setUp();
         $this->fake = new FakeClass;
-        $this->invocation = new ReflectiveMethodInvocation($this->fake, new ReflectionMethod($this->fake, 'add'), new Arguments([1]));
+        $this->invocation = new ReflectiveMethodInvocation($this->fake, new \ReflectionMethod($this->fake, 'add'), new Arguments([1]));
     }
 
     public function testGetMethod()
@@ -63,7 +63,7 @@ public function testGetThis()
     public function testGetParentMethod()
     {
         $fake = new FakeWeavedClass;
-        $invocation = new ReflectiveMethodInvocation($fake, new ReflectionMethod($fake, 'add'), new Arguments([1]));
+        $invocation = new ReflectiveMethodInvocation($fake, new \ReflectionMethod($fake, 'add'), new Arguments([1]));
         $method = $invocation->getMethod();
         $this->assertSame(FakeClass::class, $method->class);
         $this->assertSame('add', $method->name);
@@ -72,7 +72,7 @@ public function testGetParentMethod()
     public function testProceedMultipleInterceptors()
     {
         $fake = new FakeWeavedClass;
-        $invocation = new ReflectiveMethodInvocation($fake, new ReflectionMethod($fake, 'add'), new Arguments([1]), [new FakeInterceptor, new FakeInterceptor]);
+        $invocation = new ReflectiveMethodInvocation($fake, new \ReflectionMethod($fake, 'add'), new Arguments([1]), [new FakeInterceptor, new FakeInterceptor]);
         $invocation->proceed();
         $this->assertSame(1, $fake->a);
     }