Merge pull request #54 from PHPCSStandards/feature/3386-psr1-sideffects-allow-for-ignore-with-errorcode

PSR1/SideEffects: improve recognition of disable/enable annotations

Author: jrfnl

CHANGELOG.md

@@ -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

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

@@ -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,

src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.17.inc

@@ -0,0 +1,8 @@
+<?php
+// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
+define("MAXSIZE", 100);
+// phpcs:enable
+$defined = true;
+if (defined('MINSIZE') === false) {
+    $defined = false;
+}