Remove instatioation

ray-di · Sep 6, 2023 · e87032e · e87032e
1 parent 2ee4f5c
commit e87032e
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/Matcher/AnnotatedWithMatcher.php b/src/Matcher/AnnotatedWithMatcher.php
@@ -4,21 +4,32 @@
 
 namespace Ray\Aop\Matcher;
 
+use Doctrine\Common\Annotations\Reader;
 use Ray\Aop\AbstractMatcher;
 use Ray\ServiceLocator\ServiceLocator;
 use ReflectionClass;
 use ReflectionMethod;
 
 final class AnnotatedWithMatcher extends AbstractMatcher
 {
+    /** @var Reader */
+    private $reader;
+
+    public function __construct()
+    {
+        $this->reader = ServiceLocator::getReader();
+
+        parent::__construct();
+    }
+
     /**
      * {@inheritDoc}
      */
     public function matchesClass(ReflectionClass $class, array $arguments): bool
     {
         /** @var array<class-string> $arguments */
         [$annotation] = $arguments;
-        $annotation = ServiceLocator::getReader()->getClassAnnotation($class, $annotation);
+        $annotation = $this->reader->getClassAnnotation($class, $annotation);
 
         return (bool) $annotation;
     }
@@ -30,7 +41,7 @@ public function matchesMethod(ReflectionMethod $method, array $arguments): bool
     {
         /** @var array<class-string> $arguments */
         [$annotation] = $arguments;
-        $annotation = ServiceLocator::getReader()->getMethodAnnotation($method, $annotation);
+        $annotation = $this->reader->getMethodAnnotation($method, $annotation);
 
         return (bool) $annotation;
     }