Merge branch 'php-8.0/generic-uppercaseconstantname-support-nullsafe-…

…operator' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Sep 2, 2020 · f2a099d · f2a099d
2 parents 4dfbad3 + 8a17a80
commit f2a099d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
@@ -83,6 +83,7 @@ public function process(File $phpcsFile, $stackPtr)
         $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
         if ($tokens[$prev]['code'] === T_OBJECT_OPERATOR
             || $tokens[$prev]['code'] === T_DOUBLE_COLON
+            || $tokens[$prev]['code'] === T_NULLSAFE_OBJECT_OPERATOR
         ) {
             return;
         }

diff --git a/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc b/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc
@@ -29,3 +29,5 @@ class ClassConstBowOutTest {
     const // phpcs:ignore Standard.Category.Sniff
         some_constant = 2;
 }
+
+$foo->getBar()?->define('foo');