Skip to content

Commit 36c77da

Browse files
committed
Convert PHP 8 fix to Model file parser to use fix from Migration parser
This more clearly indicates that the change in functionality is due to a PHP 8 BC-incompatible change. Refs: 9a018df
1 parent 66f2cc6 commit 36c77da

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

classes/ModelFileParser.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,12 @@ protected function extractNamespace($stream)
9797
if ($stream->getNextExpected(T_WHITESPACE) === null) {
9898
return null;
9999
}
100-
$expectedCodesOrValues = [T_STRING, T_NS_SEPARATOR];
101100

102-
// namespace string on php 8.0 returns code 314 (T_NAME_QUALIFIED)
103-
if (defined('T_NAME_QUALIFIED') && T_NAME_QUALIFIED > 0) {
104-
$expectedCodesOrValues[] = T_NAME_QUALIFIED;
101+
if (PHP_VERSION_ID >= 80000) {
102+
return $stream->getNextExpectedTerminated([T_NAME_QUALIFIED], [T_WHITESPACE, ';']);
105103
}
106-
return $stream->getNextExpectedTerminated($expectedCodesOrValues, [T_WHITESPACE, ';']);
104+
105+
return $stream->getNextExpectedTerminated([T_STRING, T_NS_SEPARATOR], [T_WHITESPACE, ';']);
107106
}
108107

109108
protected function extractClassName($stream)

0 commit comments

Comments
 (0)