use interface for AnnotationReader

rectorphp · Oct 30, 2019 · cfb0262 · cfb0262
1 parent aa98acb
commit cfb0262
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/BetterPhpDocParser/config/config.yaml b/packages/BetterPhpDocParser/config/config.yaml
@@ -14,3 +14,6 @@ services:
 
     PHPStan\PhpDocParser\Parser\PhpDocParser:
         alias: 'Rector\BetterPhpDocParser\PhpDocParser\BetterPhpDocParser'
+
+    Doctrine\Common\Annotations\Reader:
+        alias: 'Doctrine\Common\Annotations\AnnotationReader'
diff --git a/packages/BetterPhpDocParser/src/AnnotationReader/AnnotationReaderFactory.php b/packages/BetterPhpDocParser/src/AnnotationReader/AnnotationReaderFactory.php
@@ -6,10 +6,11 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Doctrine\Common\Annotations\Reader;
 
 final class AnnotationReaderFactory
 {
-    public function create(): AnnotationReader
+    public function create(): Reader
     {
         AnnotationRegistry::registerLoader('class_exists');
 

diff --git a/packages/BetterPhpDocParser/src/AnnotationReader/NodeAnnotationReader.php b/packages/BetterPhpDocParser/src/AnnotationReader/NodeAnnotationReader.php
@@ -5,7 +5,7 @@
 namespace Rector\BetterPhpDocParser\AnnotationReader;
 
 use Doctrine\Common\Annotations\AnnotationException;
-use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\Annotations\Reader;
 use Doctrine\ORM\Mapping\Annotation;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -22,18 +22,18 @@
 final class NodeAnnotationReader
 {
     /**
-     * @var AnnotationReader
+     * @var Reader
      */
-    private $annotationReader;
+    private $reader;
 
     /**
      * @var NameResolver
      */
     private $nameResolver;
 
-    public function __construct(AnnotationReader $annotationReader, NameResolver $nameResolver)
+    public function __construct(Reader $reader, NameResolver $nameResolver)
     {
-        $this->annotationReader = $annotationReader;
+        $this->reader = $reader;
         $this->nameResolver = $nameResolver;
     }
 
@@ -51,7 +51,7 @@ public function readMethodAnnotation(ClassMethod $classMethod, string $annotatio
         $reflectionMethod = new ReflectionMethod($className, $methodName);
 
         try {
-            return $this->annotationReader->getMethodAnnotation($reflectionMethod, $annotationClassName);
+            return $this->reader->getMethodAnnotation($reflectionMethod, $annotationClassName);
         } catch (AnnotationException $annotationException) {
             // unable to laod
             return null;
@@ -65,7 +65,7 @@ public function readClassAnnotation(Class_ $class, string $annotationClassName)
     {
         $classReflection = $this->createClassReflectionFromNode($class);
 
-        return $this->annotationReader->getClassAnnotation($classReflection, $annotationClassName);
+        return $this->reader->getClassAnnotation($classReflection, $annotationClassName);
     }
 
     /**
@@ -79,7 +79,7 @@ public function readPropertyAnnotation(Property $property, string $annotationCla
         }
 
         /** @var Annotation|null $propertyAnnotation */
-        $propertyAnnotation = $this->annotationReader->getPropertyAnnotation($propertyReflection, $annotationClassName);
+        $propertyAnnotation = $this->reader->getPropertyAnnotation($propertyReflection, $annotationClassName);
         if ($propertyAnnotation === null) {
             return null;
         }