Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[DocParser] Don't check class exists if annotation name is ignored #232

Closed
wants to merge 4 commits into from

4 participants

@f1nder

DocParser checks for the exist of all the annotation names even if they are ignored. Maybe this is feature , but i don't sure.

@doctrinebot
Collaborator

Hello,

thank you for positing this Pull Request. I have automatically opened an issue on our Jira Bug Tracker for you with the details of this Pull-Request. See the Link:

http://doctrine-project.org/jira/browse/DCOM-150

@Ocramius
Owner

@Stroitel can you provide a failing test case for the issue you're fixing?

@f1nder f1nder closed this
@jmikola
Owner

Superseded by #233

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/Doctrine/Common/Annotations/DocParser.php
View
4 lib/Doctrine/Common/Annotations/DocParser.php
@@ -620,10 +620,10 @@ private function Annotation()
$name = $this->imports[$loweredAlias];
}
$found = true;
- } elseif (isset($this->imports['__NAMESPACE__']) && $this->classExists($this->imports['__NAMESPACE__'].'\\'.$name)) {
+ } elseif (!isset($this->ignoredAnnotationNames[$name]) && isset($this->imports['__NAMESPACE__']) && $this->classExists($this->imports['__NAMESPACE__'].'\\'.$name)) {
$name = $this->imports['__NAMESPACE__'].'\\'.$name;
$found = true;
- } elseif ($this->classExists($name)) {
+ } elseif (!isset($this->ignoredAnnotationNames[$name]) && $this->classExists($name)) {
$found = true;
}
Something went wrong with that request. Please try again.