📦 Drop some supports

Author: VincentLanglet

SymfonyCustom/Sniffs/NamingConventions/ValidTypeHintSniff.php

@@ -19,8 +19,7 @@ class ValidTypeHintSniff implements Sniff
      * <array> is array of <simple>, eg `int[]` or `\Foo[]`
      * <generic> is generic collection type, like `array<string, int>`, `Collection<Item>` or more complex`
      * <object> is array key => value type, like `array{type: string, name: string, value: mixed}`
-     * <class-string> is Foo::class type, like `class-string` or `class-string<Foo>`
-     * <type> is <simple>, <class-string>, <array>, <object> or <generic> type
+     * <type> is <simple>, <array>, <object>, <generic> type
      * <types> is one or more types alternated via `|`, like `int|bool[]|Collection<ItemKey, ItemVal>`
      */
     private const REGEX_TYPES = '
@@ -66,16 +65,6 @@ class ValidTypeHintSniff implements Sniff
                     \s*}
                 )
                 |
-                (?<classString>
-                    class-string(?:
-                        \s*<\s*
-                        (?<classStringContent>
-                            (?&simple)
-                        )
-                        \s*>
-                    )?
-                )
-                |
                 (?<simple>
                     \\\\?\w+(?:\\\\\w+)*
                     |
@@ -89,28 +78,30 @@ 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',
+    /**
+     * False if the type is not a reserved keyword and the check can't be case insensitive
+     **/
+    private const TYPES = [
+        'array'    => true,
+        'bool'     => true,
+        'callable' => true,
+        'false'    => true,
+        'float'    => true,
+        'int'      => true,
+        'iterable' => true,
+        'mixed'    => false,
+        'null'     => true,
+        'number'   => false,
+        'object'   => true,
+        'resource' => false,
+        'self'     => true,
+        'static'   => true,
+        'string'   => true,
+        'true'     => true,
+        'void'     => true,
+        '$this'    => true,
     ];
+
     private const ALIAS_TYPES = [
         'boolean'  => 'bool',
         'integer'  => 'int',
@@ -198,8 +189,6 @@ private function getValidTypes(string $content): string
                 $validType = $this->getValidGenericType($matches['genericName'], $matches['genericContent']);
             } elseif (isset($matches['object']) && '' !== $matches['object']) {
                 $validType = $this->getValidObjectType($matches['objectContent']);
-            } elseif (isset($matches['classString']) && '' !== $matches['classString']) {
-                $validType = preg_replace('/class-string/i', 'class-string', $matches['classString']);
             } else {
                 $validType = $this->getValidType($matches['type']);
             }
@@ -307,12 +296,13 @@ private function getValidObjectType(string $objectContent): string
     private function getValidType(string $typeName): string
     {
         $lowerType = strtolower($typeName);
-        if (in_array($lowerType, self::PRIMITIVES_TYPES) || in_array($lowerType, self::KEYWORD_TYPES)) {
-            return $lowerType;
+        if (isset(self::TYPES[$lowerType])) {
+            return self::TYPES[$lowerType] ? $lowerType : $typeName;
         }
 
-        if (isset(self::ALIAS_TYPES[$lowerType])) {
-            return self::ALIAS_TYPES[$lowerType];
+        // This can't be case insensitive since this is not reserved keyword
+        if (isset(self::ALIAS_TYPES[$typeName])) {
+            return self::ALIAS_TYPES[$typeName];
         }
 
         return $typeName;

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc

@@ -14,10 +14,11 @@
  */
 
 /**
- * Don't care about case
+ * Don't care about case for reserved keyword
  *
- * @return BoOlEAn $a
+ * @return BOOL $a
  * @return boolean $a
+ * @return Boolean $a
  */
 
 /**
@@ -51,13 +52,6 @@
  * @param array{foo: integer, bar: string}
  */
 
-/**
- * Class-string
- *
- * @param class-string|class-string<Client>|integer
- * @param class-STRING|cLass-stRIng<Client>|int
- */
-
 /**
  * Handle space (Last one is a comment, correctly not replaced)
  *

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc.fixed

@@ -14,10 +14,11 @@
  */
 
 /**
- * Don't care about case
+ * Don't care about case for reserved keyword
  *
  * @return bool $a
  * @return bool $a
+ * @return Boolean $a
  */
 
 /**
@@ -51,13 +52,6 @@
  * @param array{foo: int, bar: string}
  */
 
-/**
- * Class-string
- *
- * @param class-string|class-string<Client>|int
- * @param class-string|class-string<Client>|int
- */
-
 /**
  * Handle space (Last one is a comment, correctly not replaced)
  *

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.php

@@ -26,29 +26,27 @@ protected function getErrorList(): array
             13 => 1,
             19 => 1,
             20 => 1,
-            26 => 1,
             27 => 1,
             28 => 1,
             29 => 1,
             30 => 1,
-            36 => 1,
+            31 => 1,
             37 => 1,
             38 => 1,
             39 => 1,
-            45 => 1,
+            40 => 1,
             46 => 1,
             47 => 1,
             48 => 1,
             49 => 1,
             50 => 1,
             51 => 1,
-            57 => 1,
+            52 => 1,
             58 => 1,
-            64 => 1,
+            59 => 1,
             65 => 1,
-            71 => 1,
-            72 => 1,
-            73 => 1,
+            66 => 1,
+            67 => 1,
         ];
     }