✨ Case insensitive

Author: VincentLanglet

SymfonyCustom/Sniffs/NamingConventions/ValidTypeHintSniff.php

@@ -7,7 +7,6 @@
 use PHP_CodeSniffer\Exceptions\DeepExitException;
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Common;
 use SymfonyCustom\Helpers\SniffHelper;
 
 /**
@@ -69,12 +68,18 @@ class ValidTypeHintSniff implements Sniff
                 |
                 (?<classString>
                     class-string(?:
-                        \s*<\s*[\\\\\w]+\s*>
+                        \s*<\s*
+                        (?<classStringContent>
+                            (?&simple)
+                        )
+                        \s*>
                     )?
                 )
                 |
                 (?<simple>
-                    [@$?]?[\\\\\w]+
+                    \\\\?\w+(?:\\\\\w+)*
+                    |
+                    \$this
                 )
             )
         )
@@ -84,6 +89,36 @@ class-string(?:
     )
     ';
 
+    private const PRIMITIVES_TYPES = [
+        'string',
+        'int',
+        'float',
+        'bool',
+        'array',
+        'resource',
+        'null',
+        'callable',
+        'iterable',
+    ];
+    private const KEYWORD_TYPES = [
+        'mixed',
+        'void',
+        'object',
+        'number',
+        'false',
+        'true',
+        'self',
+        'static',
+        '$this',
+    ];
+    private const ALIAS_TYPES = [
+        'boolean'  => 'bool',
+        'integer'  => 'int',
+        'double'   => 'float',
+        'real'     => 'float',
+        'callback' => 'callable',
+    ];
+
     /**
      * @return array
      */
@@ -105,7 +140,7 @@ public function process(File $phpcsFile, $stackPtr): void
         }
 
         $matchingResult = preg_match(
-            '{^'.self::REGEX_TYPES.'(?:[\s\t].*)?$}sx',
+            '{^'.self::REGEX_TYPES.'(?:[\s\t].*)?$}six',
             $tokens[$stackPtr + 2]['content'],
             $matches
         );
@@ -153,16 +188,18 @@ private function getValidTypes(string $content): string
         $types = [];
         $separators = [];
         while ('' !== $content && false !== $content) {
-            preg_match('{^'.self::REGEX_TYPES.'$}x', $content, $matches);
+            preg_match('{^'.self::REGEX_TYPES.'$}ix', $content, $matches);
 
-            if (isset($matches['multiple']) && '' !== $matches['multiple']) {
+            if (isset($matches['array']) && '' !== $matches['array']) {
+                $validType = $this->getValidTypes(substr($matches['array'], 0, -2)).'[]';
+            } elseif (isset($matches['multiple']) && '' !== $matches['multiple']) {
                 $validType = '('.$this->getValidTypes($matches['mutipleContent']).')';
             } elseif (isset($matches['generic']) && '' !== $matches['generic']) {
                 $validType = $this->getValidGenericType($matches['genericName'], $matches['genericContent']);
             } elseif (isset($matches['object']) && '' !== $matches['object']) {
                 $validType = $this->getValidObjectType($matches['objectContent']);
-            } elseif (isset($matches['array']) && '' !== $matches['array']) {
-                $validType = $this->getValidTypes(substr($matches['array'], 0, -2)).'[]';
+            } elseif (isset($matches['classString']) && '' !== $matches['classString']) {
+                $validType = preg_replace('/class-string/i', 'class-string', $matches['classString']);
             } else {
                 $validType = $this->getValidType($matches['type']);
             }
@@ -225,7 +262,7 @@ private function getValidGenericType(string $genericName, string $genericContent
         $validType = $this->getValidType($genericName).'<';
 
         while ('' !== $genericContent && false !== $genericContent) {
-            preg_match('{^'.self::REGEX_TYPES.',?}x', $genericContent, $matches);
+            preg_match('{^'.self::REGEX_TYPES.',?}ix', $genericContent, $matches);
 
             $validType .= $this->getValidTypes($matches['types']).', ';
             $genericContent = substr($genericContent, strlen($matches['types']) + 1);
@@ -253,7 +290,7 @@ private function getValidObjectType(string $objectContent): string
                 $objectContent = $split[2];
             }
 
-            preg_match('{^'.self::REGEX_TYPES.',?}x', $objectContent, $matches);
+            preg_match('{^'.self::REGEX_TYPES.',?}ix', $objectContent, $matches);
 
             $validType .= $this->getValidTypes($matches['types']).', ';
             $objectContent = substr($objectContent, strlen($matches['types']) + 1);
@@ -270,15 +307,14 @@ private function getValidObjectType(string $objectContent): string
     private function getValidType(string $typeName): string
     {
         $lowerType = strtolower($typeName);
-        switch ($lowerType) {
-            case 'bool':
-            case 'boolean':
-                return 'bool';
-            case 'int':
-            case 'integer':
-                return 'int';
+        if (in_array($lowerType, self::PRIMITIVES_TYPES) || in_array($lowerType, self::KEYWORD_TYPES)) {
+            return $lowerType;
+        }
+
+        if (isset(self::ALIAS_TYPES[$lowerType])) {
+            return self::ALIAS_TYPES[$lowerType];
         }
 
-        return Common::suggestType($typeName);
+        return $typeName;
     }
 }

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc

@@ -55,6 +55,7 @@
  * Class-string
  *
  * @param class-string|class-string<Client>|integer
+ * @param class-STRING|cLass-stRIng<Client>|int
  */
 
 /**

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc.fixed

@@ -55,6 +55,7 @@
  * Class-string
  *
  * @param class-string|class-string<Client>|int
+ * @param class-string|class-string<Client>|int
  */
 
 /**

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.php

@@ -43,11 +43,12 @@ protected function getErrorList(): array
             50 => 1,
             51 => 1,
             57 => 1,
-            63 => 1,
+            58 => 1,
             64 => 1,
-            70 => 1,
+            65 => 1,
             71 => 1,
             72 => 1,
+            73 => 1,
         ];
     }