Merge branch 'php-8.0/psr1-sideeffects-support-nullsafe-operator' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

package.xml

@@ -1007,6 +1007,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.10.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.11.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.12.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.13.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.14.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.15.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.16.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="SideEffectsUnitTest.php" role="test" />
        </dir>
        <dir name="Methods">

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

@@ -193,6 +193,7 @@ private function searchForConflict($phpcsFile, $start, $end, $tokens)
             ) {
                 $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
                 if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
+                    && $tokens[$prev]['code'] !== T_NULLSAFE_OBJECT_OPERATOR
                     && $tokens[$prev]['code'] !== T_DOUBLE_COLON
                     && $tokens[$prev]['code'] !== T_FUNCTION
                 ) {
@@ -216,11 +217,13 @@ private function searchForConflict($phpcsFile, $start, $end, $tokens)
                 && strtolower($tokens[$i]['content']) === 'defined'
             ) {
                 $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                if ($tokens[$openBracket]['code'] === T_OPEN_PARENTHESIS
+                if ($openBracket !== false
+                    && $tokens[$openBracket]['code'] === T_OPEN_PARENTHESIS
                     && isset($tokens[$openBracket]['parenthesis_closer']) === true
                 ) {
                     $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
                     if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
+                        && $tokens[$prev]['code'] !== T_NULLSAFE_OBJECT_OPERATOR
                         && $tokens[$prev]['code'] !== T_DOUBLE_COLON
                         && $tokens[$prev]['code'] !== T_FUNCTION
                     ) {

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

@@ -0,0 +1,2 @@
+<?php
+defined('MINSIZE') === false OR $my->define("MAXSIZE", 100);

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

@@ -0,0 +1,2 @@
+<?php
+defined('MINSIZE') === false OR $my?->define("MAXSIZE", 100);

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

@@ -0,0 +1,2 @@
+<?php
+$my->defined('MINSIZE') or define("MAXSIZE", 100);

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

@@ -0,0 +1,2 @@
+<?php
+$my?->defined('MINSIZE') or define("MAXSIZE", 100);

src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php

@@ -67,6 +67,8 @@ public function getWarningList($testFile='')
         case 'SideEffectsUnitTest.5.inc':
         case 'SideEffectsUnitTest.10.inc':
         case 'SideEffectsUnitTest.12.inc':
+        case 'SideEffectsUnitTest.15.inc':
+        case 'SideEffectsUnitTest.16.inc':
             return [1 => 1];
         default:
             return [];