DCOM-6 - Change fix to skip unknown aliases instead of throwing an ex…

…ception
juzna · Sep 1, 2010 · 8e2dc32 · 8e2dc32
1 parent ad49a67
commit 8e2dc32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/Doctrine/Common/Annotations/Parser.php b/lib/Doctrine/Common/Annotations/Parser.php
@@ -318,7 +318,8 @@ public function Annotation()
 
             // If the namespace alias doesnt exist, throw exception
             if ( ! isset($this->namespaceAliases[$alias])) {
-                $this->syntaxError('a valid namespace alias', $this->lexer->token);
+                $this->lexer->skipUntil(Lexer::T_AT);
+                return false;
             }
 
             $name = $this->namespaceAliases[$alias] . implode('\\', $nameParts);

diff --git a/tests/Doctrine/Tests/Common/Annotations/ParserTest.php b/tests/Doctrine/Tests/Common/Annotations/ParserTest.php
@@ -301,13 +301,13 @@ class A {
 
     /**
      * @group DCOM-6
-     *
-     * @expectedException Doctrine\Common\Annotations\AnnotationException
      */
     public function testNonexistantNamespaceAlias()
     {
         $parser = new Parser;
-        $parser->parse('@nonalias:Name(foo="bar")');
+        $result = $parser->parse('@nonalias:Name(foo="bar")');
+
+        $this->assertEquals(0, count($result));
     }
 }