Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 067e988

Browse files
Remove defined guards for T_NAME... constants
1 parent 8107636 commit 067e988

File tree

2 files changed

+25
-39
lines changed

2 files changed

+25
-39
lines changed

‎VariableAnalysis/Lib/Helpers.php‎

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -322,16 +322,12 @@ public static function findFunctionCall(File $phpcsFile, $stackPtr)
322322
if (is_int($functionPtr)) {
323323
$functionTokenCode = $tokens[$functionPtr]['code'];
324324
// In PHPCS 4.x, function names can be T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, or T_NAME_RELATIVE
325-
$validFunctionTokens = [T_STRING];
326-
if (defined('T_NAME_FULLY_QUALIFIED')) {
327-
$validFunctionTokens[] = T_NAME_FULLY_QUALIFIED;
328-
}
329-
if (defined('T_NAME_QUALIFIED')) {
330-
$validFunctionTokens[] = T_NAME_QUALIFIED;
331-
}
332-
if (defined('T_NAME_RELATIVE')) {
333-
$validFunctionTokens[] = T_NAME_RELATIVE;
334-
}
325+
$validFunctionTokens = [
326+
T_STRING,
327+
T_NAME_FULLY_QUALIFIED,
328+
T_NAME_QUALIFIED,
329+
T_NAME_RELATIVE,
330+
];
335331
if (in_array($functionTokenCode, $validFunctionTokens, true)) {
336332
return $functionPtr;
337333
}
@@ -560,17 +556,10 @@ public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $s
560556
T_DOUBLE_QUOTED_STRING,
561557
T_HEREDOC,
562558
T_STRING,
559+
T_NAME_FULLY_QUALIFIED,
560+
T_NAME_QUALIFIED,
561+
T_NAME_RELATIVE,
563562
];
564-
// In PHPCS 4.x, function names can be T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, or T_NAME_RELATIVE
565-
if (defined('T_NAME_FULLY_QUALIFIED')) {
566-
$allowedTypes[] = T_NAME_FULLY_QUALIFIED;
567-
}
568-
if (defined('T_NAME_QUALIFIED')) {
569-
$allowedTypes[] = T_NAME_QUALIFIED;
570-
}
571-
if (defined('T_NAME_RELATIVE')) {
572-
$allowedTypes[] = T_NAME_RELATIVE;
573-
}
574563
if (! in_array($tokens[$stackPtr]['code'], $allowedTypes, true)) {
575564
throw new \Exception("Cannot find variable scope for non-variable {$tokens[$stackPtr]['type']}");
576565
}
@@ -1705,28 +1694,25 @@ public static function getFunctionNameWithNamespace(File $phpcsFile, $stackPtr)
17051694

17061695
// In PHPCS 4.x, T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED, and T_NAME_RELATIVE
17071696
// tokens already contain the full namespaced name, so we can return early.
1708-
if (defined('T_NAME_FULLY_QUALIFIED') && $tokens[$stackPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
1697+
if ($tokens[$stackPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
17091698
return $functionName;
17101699
}
1711-
if (defined('T_NAME_QUALIFIED') && $tokens[$stackPtr]['code'] === T_NAME_QUALIFIED) {
1700+
if ($tokens[$stackPtr]['code'] === T_NAME_QUALIFIED) {
17121701
return $functionName;
17131702
}
1714-
if (defined('T_NAME_RELATIVE') && $tokens[$stackPtr]['code'] === T_NAME_RELATIVE) {
1703+
if ($tokens[$stackPtr]['code'] === T_NAME_RELATIVE) {
17151704
return $functionName;
17161705
}
17171706

17181707
// Move backwards from the token, collecting namespace separators and
17191708
// strings, until we encounter whitespace or something else.
1720-
$partOfNamespace = [T_NS_SEPARATOR, T_STRING];
1721-
if (defined('T_NAME_QUALIFIED')) {
1722-
$partOfNamespace[] = T_NAME_QUALIFIED;
1723-
}
1724-
if (defined('T_NAME_RELATIVE')) {
1725-
$partOfNamespace[] = T_NAME_RELATIVE;
1726-
}
1727-
if (defined('T_NAME_FULLY_QUALIFIED')) {
1728-
$partOfNamespace[] = T_NAME_FULLY_QUALIFIED;
1729-
}
1709+
$partOfNamespace = [
1710+
T_NS_SEPARATOR,
1711+
T_STRING,
1712+
T_NAME_QUALIFIED,
1713+
T_NAME_RELATIVE,
1714+
T_NAME_FULLY_QUALIFIED,
1715+
];
17301716
for ($i = $stackPtr - 1; $i > $startOfScope; $i--) {
17311717
if (! in_array($tokens[$i]['code'], $partOfNamespace, true)) {
17321718
break;
@@ -1751,13 +1737,13 @@ private static function isTokenPossiblyPartOfTypehint(File $phpcsFile, $stackPtr
17511737
if ($token['code'] === 'PHPCS_T_NULLABLE') {
17521738
return true;
17531739
}
1754-
if (defined('T_NAME_QUALIFIED') && $token['code'] === T_NAME_QUALIFIED) {
1740+
if ($token['code'] === T_NAME_QUALIFIED) {
17551741
return true;
17561742
}
1757-
if (defined('T_NAME_RELATIVE') && $token['code'] === T_NAME_RELATIVE) {
1743+
if ($token['code'] === T_NAME_RELATIVE) {
17581744
return true;
17591745
}
1760-
if (defined('T_NAME_FULLY_QUALIFIED') && $token['code'] === T_NAME_FULLY_QUALIFIED) {
1746+
if ($token['code'] === T_NAME_FULLY_QUALIFIED) {
17611747
return true;
17621748
}
17631749
if ($token['code'] === T_NS_SEPARATOR) {

‎VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,17 +1508,17 @@ protected function processVariableAsPassByReferenceFunctionCall(File $phpcsFile,
15081508
// tokens contain the full namespaced name. Extract just the base name for the
15091509
// first check so that 'my_function' in the config can match '\My\Namespace\my_function'.
15101510
$functionBaseName = $functionName;
1511-
if (defined('T_NAME_FULLY_QUALIFIED') && $tokens[$functionPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
1511+
if ($tokens[$functionPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
15121512
$lastBackslashPos = strrpos($functionName, '\\');
15131513
if ($lastBackslashPos !== false) {
15141514
$functionBaseName = substr($functionName, $lastBackslashPos + 1);
15151515
}
1516-
} elseif (defined('T_NAME_QUALIFIED') && $tokens[$functionPtr]['code'] === T_NAME_QUALIFIED) {
1516+
} elseif ($tokens[$functionPtr]['code'] === T_NAME_QUALIFIED) {
15171517
$lastBackslashPos = strrpos($functionName, '\\');
15181518
if ($lastBackslashPos !== false) {
15191519
$functionBaseName = substr($functionName, $lastBackslashPos + 1);
15201520
}
1521-
} elseif (defined('T_NAME_RELATIVE') && $tokens[$functionPtr]['code'] === T_NAME_RELATIVE) {
1521+
} elseif ($tokens[$functionPtr]['code'] === T_NAME_RELATIVE) {
15221522
$lastBackslashPos = strrpos($functionName, '\\');
15231523
if ($lastBackslashPos !== false) {
15241524
$functionBaseName = substr($functionName, $lastBackslashPos + 1);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /