Do not use annotation reader

Update native ReflectionClass/Method annotation readable

src/di/AnnotatedClass.php

@@ -28,7 +28,7 @@ public function __construct(Reader $reader)
      *
      * @phpstan-param ReflectionClass<object> $class Target class reflection
      */
-    public function getNewInstance(ReflectionClass $class): NewInstance
+    public function getNewInstance(\Ray\Aop\ReflectionClass $class): NewInstance
     {
         $setterMethods = new SetterMethods([]);
         $methods = $class->getMethods();
@@ -54,7 +54,7 @@ public function getPostConstruct(ReflectionClass $class): ?ReflectionMethod
     {
         $methods = $class->getMethods();
         foreach ($methods as $method) {
-            $annotation = $this->reader->getMethodAnnotation($method, PostConstruct::class);
+            $annotation = $method->getAnnotation(PostConstruct::class);
             if ($annotation instanceof PostConstruct) {
                 return $method;
             }

src/di/AnnotatedClassMethods.php

@@ -5,10 +5,10 @@
 namespace Ray\Di;
 
 use Doctrine\Common\Annotations\Reader;
+use Ray\Aop\ReflectionClass;
+use Ray\Aop\ReflectionMethod;
 use Ray\Di\Di\InjectInterface;
 use Ray\Di\Di\Named;
-use ReflectionClass;
-use ReflectionMethod;
 
 use const PHP_VERSION_ID;
 
@@ -37,18 +37,18 @@ public function getConstructorName(ReflectionClass $class): Name
         }
 
         if (PHP_VERSION_ID >= 80000) {
-            $name = Name::withAttributes(new ReflectionMethod($class->getName(), '__construct'));
+            $name = Name::withAttributes(new \ReflectionMethod($class->getName(), '__construct'));
             if ($name) {
                 return $name;
             }
         }
 
-        $named = $this->reader->getMethodAnnotation($constructor, Named::class);
+        $named = $constructor->getAnnotation(Named::class);
         if ($named instanceof Named) {
             return new Name($named->value);
         }
 
-        $name = ($this->nameKeyVarString)($constructor);
+        $name = ($this->nameKeyVarString)(new ReflectionMethod($class->name, $constructor->name));
         if ($name !== null) {
             return new Name($name);
         }
@@ -58,7 +58,7 @@ public function getConstructorName(ReflectionClass $class): Name
 
     public function getSetterMethod(ReflectionMethod $method): ?SetterMethod
     {
-        $inject = $this->reader->getMethodAnnotation($method, InjectInterface::class);
+        $inject = $method->getAnnotation(InjectInterface::class);
         if (! $inject instanceof InjectInterface) {
             return null;
         }
@@ -72,7 +72,7 @@ public function getSetterMethod(ReflectionMethod $method): ?SetterMethod
         return $setterMethod;
     }
 
-    private function getName(ReflectionMethod $method): Name
+    private function getName(\Ray\Aop\ReflectionMethod $method): Name
     {
         if (PHP_VERSION_ID >= 80000) {
             $name = Name::withAttributes($method);

src/di/Bind.php

@@ -5,10 +5,10 @@
 namespace Ray\Di;
 
 use Ray\Aop\MethodInterceptor;
+use Ray\Aop\ReflectionClass;
+use Ray\Aop\ReflectionMethod;
 use Ray\Di\Exception\InvalidToConstructorNameParameter;
-use ReflectionClass;
 use ReflectionException;
-use ReflectionMethod;
 
 use function array_keys;
 use function array_reduce;

src/di/BindValidator.php

@@ -6,10 +6,10 @@
 
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\NullInterceptor;
+use Ray\Aop\ReflectionClass;
 use Ray\Di\Exception\InvalidProvider;
 use Ray\Di\Exception\InvalidType;
 use Ray\Di\Exception\NotFound;
-use ReflectionClass;
 
 use function class_exists;
 use function interface_exists;

src/di/DependencyFactory.php

@@ -4,8 +4,8 @@
 
 namespace Ray\Di;
 
+use Ray\Aop\ReflectionClass;
 use Ray\ServiceLocator\ServiceLocator;
-use ReflectionClass;
 use ReflectionMethod;
 
 use function assert;

src/di/InjectionPoint.php

@@ -5,9 +5,9 @@
 namespace Ray\Di;
 
 use Doctrine\Common\Annotations\Reader;
+use Ray\Aop\ReflectionClass;
+use Ray\Aop\ReflectionMethod;
 use Ray\Di\Di\Qualifier;
-use ReflectionClass;
-use ReflectionMethod;
 use ReflectionParameter;
 use Serializable;
 
@@ -21,9 +21,6 @@ final class InjectionPoint implements InjectionPointInterface, Serializable
     /** @var ?ReflectionParameter */
     private $parameter;
 
-    /** @var Reader */
-    private $reader;
-
     /** @var string */
     private $pClass;
 
@@ -58,7 +55,6 @@ public function getMethod(): ReflectionMethod
     {
         $this->parameter = $this->getParameter();
         $class = $this->parameter->getDeclaringClass();
-        assert($class instanceof ReflectionClass);
         $method = $this->parameter->getDeclaringFunction()->getShortName();
         assert(class_exists($class->name));
 
@@ -72,9 +68,8 @@ public function getClass(): ReflectionClass
     {
         $this->parameter = $this->getParameter();
         $class = $this->parameter->getDeclaringClass();
-        assert($class instanceof ReflectionClass);
 
-        return $class;
+        return new ReflectionClass($class->name);
     }
 
     /**
@@ -83,13 +78,10 @@ public function getClass(): ReflectionClass
     public function getQualifiers(): array
     {
         $qualifiers = [];
-        $annotations = $this->reader->getMethodAnnotations($this->getMethod());
+        $annotations = $this->getMethod()->getAnnotations();
         foreach ($annotations as $annotation) {
-            $qualifier = $this->reader->getClassAnnotation(
-                new ReflectionClass($annotation),
-                Qualifier::class
-            );
-            if ($qualifier instanceof Qualifier) {
+            $maybeQualifier = (new ReflectionClass($annotation))->getAnnotation(Qualifier::class);
+            if ($maybeQualifier instanceof Qualifier) {
                 $qualifiers[] = $annotation;
             }
         }

src/di/InjectionPointInterface.php

@@ -4,8 +4,8 @@
 
 namespace Ray\Di;
 
-use ReflectionClass;
-use ReflectionMethod;
+use Ray\Aop\ReflectionClass;
+use Ray\Aop\ReflectionMethod;
 use ReflectionParameter;
 
 interface InjectionPointInterface

src/di/NameKeyVarString.php

@@ -5,10 +5,10 @@
 namespace Ray\Di;
 
 use Doctrine\Common\Annotations\Reader;
+use Ray\Aop\ReflectionClass;
+use Ray\Aop\ReflectionMethod;
 use Ray\Di\Di\Named;
 use Ray\Di\Di\Qualifier;
-use ReflectionClass;
-use ReflectionMethod;
 
 use function get_class;
 use function implode;
@@ -27,7 +27,7 @@ public function __construct(Reader $reader)
     public function __invoke(ReflectionMethod $method): ?string
     {
         $keyVal = [];
-        $named = $this->reader->getMethodAnnotation($method, Named::class);
+        $named = $method->getAnnotation(Named::class);
         if ($named instanceof Named) {
             $keyVal[] = $named->value;
         }
@@ -42,10 +42,10 @@ public function __invoke(ReflectionMethod $method): ?string
 
     private function getQualifierKeyVarString(ReflectionMethod $method): string
     {
-        $annotations = $this->reader->getMethodAnnotations($method);
+        $annotations = $method->getAnnotations();
         $names = [];
         foreach ($annotations as $annotation) {
-            $qualifier = $this->reader->getClassAnnotation(new ReflectionClass($annotation), Qualifier::class);
+            $qualifier = (new ReflectionClass($annotation))->getAnnotation(Qualifier::class);
             if ($qualifier instanceof Qualifier) {
                 /** @var ?scalar $annotation->value */
                 $value = $annotation->value ?? Name::ANY; // @phpstan-ignore-line

src/di/Untarget.php

@@ -4,7 +4,7 @@
 
 namespace Ray\Di;
 
-use ReflectionClass;
+use Ray\Aop\ReflectionClass;
 
 final class Untarget
 {

tests/di/AnnotatedClassTest.php

@@ -7,7 +7,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use LogicException;
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
+use Ray\Aop\ReflectionClass;
 
 class AnnotatedClassTest extends TestCase
 {