✨ Handle space

Author: VincentLanglet

SymfonyCustom/Sniffs/NamingConventions/ValidTypeHintSniff.php

@@ -14,13 +14,7 @@
  */
 class ValidTypeHintSniff implements Sniff
 {
-    private const TEXT = '[\\\\a-z0-9]';
-    private const OPENER = '\<|\[|\{|\(';
-    private const MIDDLE = '\,|\:|\=\>';
-    private const CLOSER = '\>|\]|\}|\)';
-    private const SEPARATOR = '\&|\|';
-
-    /*
+    /**
      * <simple> is any non-array, non-generic, non-alternated type, eg `int` or `\Foo`
      * <array> is array of <simple>, eg `int[]` or `\Foo[]`
      * <generic> is generic collection type, like `array<string, int>`, `Collection<Item>` and more complex like `Collection<int, \null|SubCollection<string>>`
@@ -30,24 +24,24 @@ class ValidTypeHintSniff implements Sniff
     private const REGEX_TYPES = '
     (?<types>
         (?<type>
-            (?<array>
-                (?&simple)(\[\])*
-            )
-            |
-            (?<simple>
-                [@$?]?[\\\\\w]+
-            )
-            |
             (?<generic>
-                (?<genericName>(?&simple))
-                <
-                    (?:(?<genericKey>(?&types)),\s*)?(?<genericValue>(?&types)|(?&generic))
+                (?<genericName>(?&simple))\s*
+                <\s*
+                    (?:
+                        (?<genericKey>(?&types))\s*
+                        ,\s*
+                    )?
+                    (?<genericValue>(?&types)|(?&generic))\s*
                 >
             )
+            |
+            (?<array>(?&simple)(\s*\[\s*\])+)
+            |
+            (?<simple>[@$?]?[\\\\\w]+)
         )
         (?:
-            \|
-            (?:(?&simple)|(?&array)|(?&generic))
+            \s*\|\s*
+            (?:(?&generic)|(?&array)|(?&simple))
         )*
     )
     ';
@@ -76,7 +70,7 @@ public function process(File $phpcsFile, $stackPtr): void
             );
 
             $content = 1 === $matchingResult ? $matches['types'] : '';
-            $endOfContent = preg_replace('/'.preg_quote($content, '/').'/', '', $tokens[$stackPtr + 2]['content'], 1);
+            $endOfContent = substr($tokens[$stackPtr + 2]['content'], strlen($content));
 
             $suggestedType = $this->getValidTypes($content);
 
@@ -95,38 +89,19 @@ public function process(File $phpcsFile, $stackPtr): void
         }
     }
 
-    /**
-     * @param string $content
-     *
-     * @return array
-     */
-    private function getTypes(string $content): array
-    {
-        $types = [];
-        while ('' !== $content && false !== $content) {
-            preg_match('{^'.self::REGEX_TYPES.'$}x', $content, $matches);
-
-            $types[] = $matches['type'];
-            $content = substr($content, strlen($matches['type']) + 1);
-        }
-
-        return $types;
-    }
-
     /**
      * @param string $content
      *
      * @return string
      */
     private function getValidTypes(string $content): string
     {
+        $content = preg_replace('/\s/', '', $content);
         $types = $this->getTypes($content);
-
         foreach ($types as $index => $type) {
-            $type = str_replace(' ', '', $type);
-
             preg_match('{^'.self::REGEX_TYPES.'$}x', $type, $matches);
-            if (isset($matches['generic'])) {
+
+            if (isset($matches['generic']) && '' !== $matches['generic']) {
                 $validType = $this->getValidType($matches['genericName']).'<';
 
                 if ('' !== $matches['genericKey']) {
@@ -157,6 +132,24 @@ private function getValidTypes(string $content): string
         return implode('|', $types);
     }
 
+    /**
+     * @param string $content
+     *
+     * @return array
+     */
+    private function getTypes(string $content): array
+    {
+        $types = [];
+        while ('' !== $content && false !== $content) {
+            preg_match('{^'.self::REGEX_TYPES.'$}x', $content, $matches);
+
+            $types[] = $matches['type'];
+            $content = substr($content, strlen($matches['type']) + 1);
+        }
+
+        return $types;
+    }
+
     /**
      * @param string $typeName
      *

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc

@@ -51,3 +51,5 @@ echo ( float ) $a;
  * @return string[]|null|int[]
  * @return Foo<integer|null|string, boolean|null|string>|null|int[]
  */
+
+/** @method array < integer , null | boolean > | integer [ ] | array < array < integer > > truc */

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc.fixed

@@ -51,3 +51,5 @@ echo ( float ) $a;
  * @return string[]|int[]|null
  * @return Foo<int|string|null, bool|string|null>|int[]|null
  */
+
+/** @method array<int, bool|null>|int[]|array<array<int>> truc */

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.php

@@ -40,6 +40,7 @@ protected function getErrorList(): array
             50 => 1,
             51 => 1,
             52 => 1,
+            55 => 1,
         ];
     }