1
0
mirror of synced 2025-01-31 20:41:44 +03:00

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

Close #1250
Close #1256
This commit is contained in:
Marco Pivetta 2015-01-15 04:13:28 +01:00
commit 5be57d0f4a

View File

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