Use regex pattern instead of Common::isCamelCaps() - parity with original

Author: simPod

src/Cdn77/Sniffs/NamingConventions/ValidVariableNameSniff.php

@@ -6,12 +6,13 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
-use PHP_CodeSniffer\Util\Common;
 use PHP_CodeSniffer\Util\Tokens;
 
 use function assert;
 use function ltrim;
+use function preg_match;
 use function preg_match_all;
+use function sprintf;
 use function strpos;
 use function substr;
 use function ucfirst;
@@ -25,6 +26,8 @@
 
 class ValidVariableNameSniff extends AbstractVariableSniff
 {
+    public string $pattern = '^[a-zA-Z][a-zA-Z0-9]*?([A-Z][a-zA-Z0-9]*?)*?$';
+
     /**
      * Processes this test, when one of its tokens is encountered.
      *
@@ -68,7 +71,7 @@ protected function processVariable(File $phpcsFile, $stackPtr): void
                         $objVarName = substr($objVarName, 1);
                     }
 
-                    if (Common::isCamelCaps($objVarName, false, true, false) === false) {
+                    if (! $this->matchesRegex($objVarName)) {
                         $error = 'Member variable "%s" is not in valid camel caps format';
                         $data = [$originalVarName];
                         $phpcsFile->addError($error, $var, 'MemberNotCamelCaps', $data);
@@ -86,7 +89,7 @@ protected function processVariable(File $phpcsFile, $stackPtr): void
                 $objVarName = substr($objVarName, 1);
             }
 
-            if (Common::isCamelCaps($objVarName, false, true, false) === false) {
+            if (!$this->matchesRegex($objVarName)) {
                 $error = 'Member variable "%s" is not in valid camel caps format';
                 $data = [$tokens[$stackPtr]['content']];
                 $phpcsFile->addError($error, $stackPtr, 'MemberNotCamelCaps', $data);
@@ -106,7 +109,7 @@ protected function processVariable(File $phpcsFile, $stackPtr): void
             }
         }
 
-        if (Common::isCamelCaps($varName, false, true, false) !== false) {
+        if ($this->matchesRegex($varName)) {
             return;
         }
 
@@ -158,7 +161,7 @@ protected function processMemberVar(File $phpcsFile, $stackPtr): void
         // Remove a potential underscore prefix for testing CamelCaps.
         $varName = ltrim($varName, '_');
 
-        if (Common::isCamelCaps($varName, false, true, false) !== false) {
+        if ($this->matchesRegex($varName)) {
             return;
         }
 
@@ -195,7 +198,7 @@ protected function processVariableInString(File $phpcsFile, $stackPtr): void
                 continue;
             }
 
-            if (Common::isCamelCaps($varName, false, true, false) !== false) {
+            if ($this->matchesRegex($varName)) {
                 continue;
             }
 
@@ -204,4 +207,9 @@ protected function processVariableInString(File $phpcsFile, $stackPtr): void
             $phpcsFile->addError($error, $stackPtr, 'StringNotCamelCaps', $data);
         }
     }
+
+    private function matchesRegex(string $varName): bool
+    {
+        return preg_match(sprintf('~%s~', $this->pattern), $varName) === 1;
+    }
 }

tests/Sniffs/NamingConventions/ValidVariableNameSniffTest.php

@@ -50,7 +50,7 @@ public function testErrors(): void
             67 => self::CODE_NOT_CAMEL_CAPS,
             81 => self::CODE_STRING_NOT_CAMEL_CAPS,
             106 => self::CODE_PUBLIC_HAS_UNDERSCORE,
-            107 => [self::CODE_PUBLIC_HAS_UNDERSCORE,self::CODE_MEMBER_NOT_CAMEL_CAPS],
+            107 => self::CODE_PUBLIC_HAS_UNDERSCORE,
             108 => self::CODE_PUBLIC_HAS_UNDERSCORE,
             111 => self::CODE_PRIVATE_NO_UNDERSCORE,
             112 => self::CODE_PRIVATE_NO_UNDERSCORE,
@@ -78,6 +78,6 @@ public function testErrors(): void
             }
         }
 
-        self::assertSame(38, $file->getErrorCount());
+        self::assertSame(37, $file->getErrorCount());
     }
 }