Skip to content

Commit 624ffb7

Browse files
committed
Only use T_NAME... constants if they exist
1 parent d6979aa commit 624ffb7

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

VariableAnalysis/Lib/Helpers.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,16 @@ public static function getFunctionNameWithNamespace(File $phpcsFile, $stackPtr)
17781778

17791779
// Move backwards from the token, collecting namespace separators and
17801780
// strings, until we encounter whitespace or something else.
1781-
$partOfNamespace = [T_NS_SEPARATOR, T_STRING, T_NAME_RELATIVE, T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED];
1781+
$partOfNamespace = [T_NS_SEPARATOR, T_STRING];
1782+
if (defined('T_NAME_QUALIFIED')) {
1783+
$partOfNamespace[] = T_NAME_QUALIFIED;
1784+
}
1785+
if (defined('T_NAME_RELATIVE')) {
1786+
$partOfNamespace[] = T_NAME_RELATIVE;
1787+
}
1788+
if (defined('T_NAME_FULLY_QUALIFIED')) {
1789+
$partOfNamespace[] = T_NAME_FULLY_QUALIFIED;
1790+
}
17821791
for ($i = $stackPtr - 1; $i > $startOfScope; $i--) {
17831792
if (! in_array($tokens[$i]['code'], $partOfNamespace, true)) {
17841793
break;
@@ -1803,13 +1812,13 @@ private static function isTokenPossiblyPartOfTypehint(File $phpcsFile, $stackPtr
18031812
if ($token['code'] === 'PHPCS_T_NULLABLE') {
18041813
return true;
18051814
}
1806-
if ($token['code'] === T_NAME_QUALIFIED) {
1815+
if (defined('T_NAME_QUALIFIED') && $token['code'] === T_NAME_QUALIFIED) {
18071816
return true;
18081817
}
1809-
if ($token['code'] === T_NAME_RELATIVE) {
1818+
if (defined('T_NAME_RELATIVE') && $token['code'] === T_NAME_RELATIVE) {
18101819
return true;
18111820
}
1812-
if ($token['code'] === T_NAME_FULLY_QUALIFIED) {
1821+
if (defined('T_NAME_FULLY_QUALIFIED') && $token['code'] === T_NAME_FULLY_QUALIFIED) {
18131822
return true;
18141823
}
18151824
if ($token['code'] === T_NS_SEPARATOR) {

0 commit comments

Comments
 (0)