Merge branch 'hotfix/#1256-DDC-3493-fix' into hotfix/#1250-DDC-3493-f…

…ix-class-pseudo-constant-parsing-in-entitygenerator Close #1250 Close #1256
doctrine · Jan 15, 2015 · 5be57d0 · 5be57d0
2 parents 41dd584 + 243210e
commit 5be57d0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -827,7 +827,7 @@ protected function parseTokensInEntityFile($src)
             if ($token[0] == T_NAMESPACE) {
                 $lastSeenNamespace = "";
                 $inNamespace = true;
-            } elseif ($token[0] == T_CLASS) {
+            } elseif ($token[0] == T_CLASS && $tokens[$i-1][0] != T_DOUBLE_COLON) {
                 $inClass = true;
             } elseif ($token[0] == T_FUNCTION) {
                 if ($tokens[$i+2][0] == T_STRING) {