RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/#1250-DDC-3493-fix-class-pseudo-constant-parsing-in-entitygenerator-2.4-backport' into 2.4

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-15 04:20:39 +01:00
commit 8198a6ce7e
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

@ -679,7 +679,7 @@ public function __construct()
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

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