RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 12:32:59 +03:00
Code Issues Projects Releases Wiki Activity

DDC-3493 - fixed EntityGenerator parsing for php 5.5 "::class" syntax

Browse Source
This commit is contained in:
Andrea Sprega 2015-01-15 02:31:18 +00:00 committed by Marco Pivetta
parent 55a75bfb1b
commit 243210e896
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -827,7 +827,7 @@ public function __construct(<params>)
if ($token[0] == T_NAMESPACE) { if ($token[0] == T_NAMESPACE) {
$lastSeenNamespace = ""; $lastSeenNamespace = "";
$inNamespace = true; $inNamespace = true;
} elseif ($token[0] == T_CLASS) { } elseif ($token[0] == T_CLASS && $tokens[$i-1][0] != T_DOUBLE_COLON) {
$inClass = true; $inClass = true;
} elseif ($token[0] == T_FUNCTION) { } elseif ($token[0] == T_FUNCTION) {
if ($tokens[$i+2][0] == T_STRING) { if ($tokens[$i+2][0] == T_STRING) {

10
tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
View File

@ -1032,6 +1032,16 @@ Foo\Bar
class class
/* Comment */ /* Comment */
Baz {} Baz {}
',
array('Foo\Bar\Baz'),
),
array(
'
<?php namespace Foo\Bar; class Baz {
public static function someMethod(){
return self::class;
}
}
', ',
array('Foo\Bar\Baz'), array('Foo\Bar\Baz'),
), ),