Merge pull request #219 from ray-di/bug-with-AnnotatedWithMatcher

Bug with annotated with matcher
ray-di · Sep 3, 2024 · e7df832 · e7df832
2 parents 1b2d410 + 5e88adb
commit e7df832
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Aspect.php b/src/Aspect.php
@@ -198,7 +198,7 @@ private function newInstanceWithPhp(string $className, array $args): object
     private function createBind(string $className): Bind
     {
         $bind = new Bind();
-        $reflection = new ReflectionClass($className);
+        $reflection = new \Ray\Aop\ReflectionClass($className);
 
         foreach ($this->matchers as $matcher) {
             if (! $matcher['classMatcher']->matchesClass($reflection, $matcher['classMatcher']->getArguments())) {

diff --git a/tests/Aspect/AspectTest.php b/tests/Aspect/AspectTest.php
@@ -5,6 +5,7 @@
 namespace Ray\Aop;
 
 use PHPUnit\Framework\TestCase;
+use Ray\Aop\Annotation\FakeClassMarker;
 use Ray\Aop\Aspect\Fake\src\FakeMyClass;
 use Ray\Aop\Matcher\AnyMatcher;
 use Ray\Aop\Matcher\StartsWithMatcher;
@@ -63,4 +64,17 @@ public function testWeave(): void
         // the original method is intercepted
         $this->assertEquals('intercepted original', $result);
     }
+
+    public function testAnnotateMatcher(): void
+    {
+        $aspect = new Aspect();
+        $aspect->bind(
+            (new Matcher())->annotatedWith(FakeClassMarker::class),
+            (new Matcher())->any(),
+            [new FakeMyInterceptor()]
+        );
+
+        $billing = $aspect->newInstance(FakeMyClass::class);
+        $this->assertInstanceOf(FakeMyClass::class, $billing);
+    }
 }