RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-08 00:09:26 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Close #1250
Close #1256
This commit is contained in:
Marco Pivetta 2015-01-15 04:13:28 +01:00
commit 5be57d0f4a
1 changed files with 1 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) {