Skip to content

Commit e9f74a6

Browse files
committed
PSR1/SideEffects: fix sniff to work with the PHP 8 identifier tokens
Includes adjusting a pre-existing test to cover this change.
1 parent 894c5d9 commit e9f74a6

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,9 @@ private function searchForConflict($phpcsFile, $start, $end, $tokens)
201201

202202
$i = $tokens[$i]['scope_closer'];
203203
continue;
204-
} else if ($tokens[$i]['code'] === T_STRING
205-
&& strtolower($tokens[$i]['content']) === 'define'
204+
} else if (($tokens[$i]['code'] === T_STRING
205+
|| $tokens[$i]['code'] === T_NAME_FULLY_QUALIFIED)
206+
&& strtolower(ltrim($tokens[$i]['content'], '\\')) === 'define'
206207
) {
207208
$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
208209
if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
@@ -226,8 +227,9 @@ private function searchForConflict($phpcsFile, $start, $end, $tokens)
226227
// Special case for defined() as it can be used to see
227228
// if a constant (a symbol) should be defined or not and
228229
// doesn't need to use a full conditional block.
229-
if ($tokens[$i]['code'] === T_STRING
230-
&& strtolower($tokens[$i]['content']) === 'defined'
230+
if (($tokens[$i]['code'] === T_STRING
231+
|| $tokens[$i]['code'] === T_NAME_FULLY_QUALIFIED)
232+
&& strtolower(ltrim($tokens[$i]['content'], '\\')) === 'defined'
231233
) {
232234
$openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
233235
if ($openBracket !== false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?php
2-
$my?->defined('MINSIZE') or define("MAXSIZE", 100);
2+
$my?->defined('MINSIZE') or \define("MAXSIZE", 100);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
3-
define("MAXSIZE", 100);
3+
\define("MAXSIZE", 100);
44
// phpcs:enable
55
$defined = true;
6-
if (defined('MINSIZE') === false) {
6+
if (\defined('MINSIZE') === false) {
77
$defined = false;
88
}

0 commit comments

Comments
 (0)