RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed DDC-77 - Prevent PHP Warning on certain annotation constallations

Browse source
This commit is contained in:
beberlei 2009-10-30 00:20:17 +00:00
parent 49bcc69f3a
commit 1eec9f211b
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Doctrine/Common/Annotations/Parser.php
View file

@ -235,9 +235,10 @@ class Parser
// If it really an annotation class? // If it really an annotation class?
if ( if (
! $this->_isNestedAnnotation && $this->_lexer->lookahead != null && (! $this->_isNestedAnnotation && $this->_lexer->lookahead != null &&
! $this->_lexer->isNextToken('(') && ! $this->_lexer->isNextToken('(') &&
! $this->_lexer->isNextToken('@') || ! $this->_lexer->isNextToken('@')) ||
! class_exists($name) ||
! is_subclass_of($name, 'Doctrine\Common\Annotations\Annotation') ! is_subclass_of($name, 'Doctrine\Common\Annotations\Annotation')
) { ) {
$this->_lexer->skipUntil('@'); $this->_lexer->skipUntil('@');

21
tests/Doctrine/Tests/Common/Annotations/ParserTest.php
View file

@ -73,11 +73,22 @@ DOCBLOCK;
*/ */
DOCBLOCK; DOCBLOCK;
$result = $parser->parse($docblock); $result = $parser->parse($docblock);
$this->assertEquals(1, count($result)); $this->assertEquals(1, count($result));
$annot = $result['Doctrine\Tests\Common\Annotations\Name']; $annot = $result['Doctrine\Tests\Common\Annotations\Name'];
$this->assertTrue($annot instanceof Name); $this->assertTrue($annot instanceof Name);
$this->assertEquals("bar", $annot->foo); $this->assertEquals("bar", $annot->foo);
}
/**
* @group DDC-77
*/
public function testAnnotationWithoutClassIsIgnoredWithoutWarning()
{
$parser = new Parser();
$result = $parser->parse("@param");
$this->assertEquals(0, count($result));
} }
} }