Skip to content

PSR1/SideEffects: improve recognition of disable/enable annotations #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2023
Merged

PSR1/SideEffects: improve recognition of disable/enable annotations #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ The file documents changes to the PHP_CodeSniffer project.
- Use composer or the phar files

### Fixed
- Fixed bug #3386 : PSR1/SideEffects : improved recognition of disable/enable annotations
- Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
- Fixed bug #3557 : Squiz.Arrays.ArrayDeclaration will now ignore PHP 7.4 array unpacking when determining whether an array is associative
- Thanks to Volker Dusch (@edorian) for the patch
- Fixed bug #3717 : Squiz.Commenting.FunctionComment: fixed false positive for InvalidNoReturn when type is never
Expand Down
6 changes: 4 additions & 2 deletions src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,17 @@ private function searchForConflict($phpcsFile, $start, $end, $tokens)
&& (empty($tokens[$i]['sniffCodes']) === true
|| isset($tokens[$i]['sniffCodes']['PSR1']) === true
|| isset($tokens[$i]['sniffCodes']['PSR1.Files']) === true
|| isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === true)
|| isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === true
|| isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects.FoundWithSymbols']) === true)
) {
do {
$i = $phpcsFile->findNext(T_PHPCS_ENABLE, ($i + 1));
} while ($i !== false
&& empty($tokens[$i]['sniffCodes']) === false
&& isset($tokens[$i]['sniffCodes']['PSR1']) === false
&& isset($tokens[$i]['sniffCodes']['PSR1.Files']) === false
&& isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === false);
&& isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === false
&& isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects.FoundWithSymbols']) === false);

if ($i === false) {
// The entire rest of the file is disabled,
Expand Down
8 changes: 8 additions & 0 deletions src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.17.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php
// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
define("MAXSIZE", 100);
// phpcs:enable
$defined = true;
if (defined('MINSIZE') === false) {
$defined = false;
}