Merge pull request #316 from alcaeus/fix-ignored-annotation-names

Fix checks for ignored annotations
doctrine · Apr 2, 2020 · 3d31fc1 · 3d31fc1
2 parents f9deab6 + f1eac35
commit 3d31fc1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/Doctrine/Common/Annotations/DocParser.php b/lib/Doctrine/Common/Annotations/DocParser.php
@@ -752,7 +752,7 @@ private function Annotation()
 
         // verify that the class is really meant to be an annotation and not just any ordinary class
         if (self::$annotationMetadata[$name]['is_annotation'] === false) {
-            if ($this->ignoreNotImportedAnnotations || isset($this->ignoredAnnotationNames[$originalName])) {
+            if ($this->isIgnoredAnnotation($name)) {
                 return false;
             }
 

diff --git a/tests/Doctrine/Tests/Common/Annotations/DocParserTest.php b/tests/Doctrine/Tests/Common/Annotations/DocParserTest.php
@@ -1055,7 +1055,6 @@ public function provideTestIgnoreWholeNamespaces()
     public function testNotAnAnnotationClassIsIgnoredWithoutWarning()
     {
         $parser = new DocParser();
-        $parser->setIgnoreNotImportedAnnotations(true);
         $parser->setIgnoredAnnotationNames([\PHPUnit\Framework\TestCase::class => true]);
         $result = $parser->parse('@\PHPUnit\Framework\TestCase');