Merge branch 'php-8.0/squiz-objectoperatorspacing-support-nullsafe-op…

…erator' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Sep 2, 2020 · 356d998 · 356d998
2 parents 4efd0ad + a4f0110
commit 356d998
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
@@ -33,6 +33,7 @@ public function register()
         return [
             T_OBJECT_OPERATOR,
             T_DOUBLE_COLON,
+            T_NULLSAFE_OBJECT_OPERATOR,
         ];
 
     }//end register()

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
@@ -46,3 +46,7 @@ thisObject::
     testThis();
 
 // phpcs:set Squiz.WhiteSpace.ObjectOperatorSpacing ignoreNewlines false
+
+$this?->testThis();
+$this?-> testThis();
+$this    ?->  testThis();
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc.fixed
@@ -42,3 +42,7 @@ thisObject::
     testThis();
 
 // phpcs:set Squiz.WhiteSpace.ObjectOperatorSpacing ignoreNewlines false
+
+$this?->testThis();
+$this?->testThis();
+$this?->testThis();
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
@@ -43,6 +43,8 @@ public function getErrorList()
             39 => 1,
             40 => 2,
             42 => 2,
+            51 => 1,
+            52 => 2,
         ];
 
     }//end getErrorList()