Merge branch 'php-8.0/squiz-operatorbracket-support-nullsafe-operator…

…' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Sep 2, 2020 · 908b5ce · 908b5ce
2 parents 62154b4 + 9d58172
commit 908b5ce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
@@ -140,6 +140,7 @@ public function process(File $phpcsFile, $stackPtr)
             T_SELF,
             T_STATIC,
             T_OBJECT_OPERATOR,
+            T_NULLSAFE_OBJECT_OPERATOR,
             T_DOUBLE_COLON,
             T_OPEN_SQUARE_BRACKET,
             T_CLOSE_SQUARE_BRACKET,
@@ -283,6 +284,7 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
             T_SELF                     => true,
             T_STATIC                   => true,
             T_OBJECT_OPERATOR          => true,
+            T_NULLSAFE_OBJECT_OPERATOR => true,
             T_DOUBLE_COLON             => true,
             T_MODULUS                  => true,
             T_ISSET                    => true,

diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc
@@ -170,3 +170,5 @@ $value = (binary) $blah + b"binary $foo";
 
 $test = (1 * static::TEST);
 $test = myfunc(1 * static::TEST);
+
+$errorPos = $params[$x]?->getLine() + $commentStart;
diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed
@@ -170,3 +170,5 @@ $value = ((binary) $blah + b"binary $foo");
 
 $test = (1 * static::TEST);
 $test = myfunc(1 * static::TEST);
+
+$errorPos = ($params[$x]?->getLine() + $commentStart);
diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
@@ -66,6 +66,7 @@ public function getErrorList($testFile='OperatorBracketUnitTest.inc')
                 163 => 2,
                 165 => 2,
                 169 => 1,
+                174 => 1,
             ];
             break;
         case 'OperatorBracketUnitTest.js':