✨ More case for valid scalar

Author: VincentLanglet

SymfonyCustom/Sniffs/NamingConventions/ValidScalarTypeNameSniff.php

@@ -15,6 +15,10 @@
  */
 class ValidScalarTypeNameSniff implements Sniff
 {
+    private const OPENER = '\<\[\{\(';
+    private const CLOSER = '\>\]\}\)';
+    private const MIDDLE = '\,\:';
+
     /**
      * @return array
      */
@@ -32,29 +36,26 @@ public function process(File $phpcsFile, $stackPtr): void
         $tokens = $phpcsFile->getTokens();
 
         if (in_array($tokens[$stackPtr]['content'], SniffHelper::TAGS_WITH_TYPE)) {
+            $openerWithSpace = '['.self::OPENER.']\s*';
+            $closerWithSpace =
+                '(?:['.self::CLOSER.']\s+)(?=[\|'.self::OPENER.self::MIDDLE.self::CLOSER.'])'
+                .'|['.self::CLOSER.']';
+            $middleWithSpace = '\s*['.self::MIDDLE.']\s*';
+
             preg_match(
-                '`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9\[\<\,\>\]]+))*)( .*)?`i',
+                "`^((?:\|?(?:(?:[\\\\a-z0-9]|${openerWithSpace}|${middleWithSpace}|${closerWithSpace})+))*)(.*)?`i",
                 $tokens[($stackPtr + 2)]['content'],
                 $match
             );
 
+            var_dump($match);
             if (isset($match[1]) === false) {
                 return;
             }
 
             // Check type (can be multiple, separated by '|').
             $type = $match[1];
-            $typeNames = explode('|', $type);
-            $suggestedNames = [];
-            foreach ($typeNames as $i => $typeName) {
-                $suggestedName = $this->getValidTypeName($typeName);
-
-                if (in_array($suggestedName, $suggestedNames, true) === false) {
-                    $suggestedNames[] = $suggestedName;
-                }
-            }
-
-            $suggestedType = implode('|', $suggestedNames);
+            $suggestedType = $this->getValidTypeName($type);
             if ($type !== $suggestedType) {
                 $fix = $phpcsFile->addFixableError(
                     'For type-hinting in PHPDocs, use %s instead of %s',
@@ -82,7 +83,13 @@ public function process(File $phpcsFile, $stackPtr): void
      */
     private function getValidTypeName(string $typeName): string
     {
-        $parts = preg_split('/([\<\,\>])/', $typeName, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $typeNameWithoutSpace = str_replace(' ', '', $typeName);
+        $parts = preg_split(
+            '/([\|'.self::OPENER.self::MIDDLE.self::CLOSER.'])/',
+            $typeNameWithoutSpace,
+            -1,
+            PREG_SPLIT_DELIM_CAPTURE
+        );
         $partsNumber = count($parts) - 1;
 
         $validType = '';
@@ -104,10 +111,6 @@ private function getValidTypeName(string $typeName): string
      */
     private function suggestType(string $typeName): string
     {
-        if ('[]' === substr($typeName, -2)) {
-            return $this->suggestType(substr($typeName, 0, -2)).'[]';
-        }
-
         $lowerType = strtolower($typeName);
         switch ($lowerType) {
             case 'bool':

SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc

@@ -43,4 +43,5 @@ echo ( float ) $a;
 /** @var real $c */
 
 /** @method integer|string  */
-/** @method array<integer,boolean>|integer[]|string  */
+/** @method array<integer,boolean>|integer[]|array<integer> truc */
+/** @method array<integer, boolean>|integer[] |string|(integer|boolean)[] truc */

SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.inc.fixed

@@ -43,4 +43,5 @@ echo ( float ) $a;
 /** @var float $c */
 
 /** @method int|string  */
-/** @method array<int,bool>|int[]|string  */
+/** @method array<int,bool>|int[]|array<int> truc */
+/** @method array<int,bool>|int[]|string|(int|bool)[] truc */

SymfonyCustom/Tests/NamingConventions/ValidScalarTypeNameUnitTest.php

@@ -36,6 +36,7 @@ protected function getErrorList(): array
             43 => 1,
             45 => 1,
             46 => 1,
+            47 => 1,
         ];
     }