Refactor PhpdocArrayStyleFixer (#663)

Author: kubawerlos

README.md

@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3063-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3064-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Fixer/PhpdocArrayStyleFixer.php

@@ -93,11 +93,13 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
 
     private function fixType(string $type): string
     {
-        do {
-            /** @var string $type */
-            $type = Preg::replace('/([\\\\a-zA-Z0-9>]+)\[\]/', 'array<$1>', $type, -1, $count);
-        } while ($count > 0);
+        /** @var string $newType */
+        $newType = Preg::replace('/([\\\\a-zA-Z0-9>]+)\[\]/', 'array<$1>', $type, -1, $count);
 
-        return $type;
+        if ($newType === $type) {
+            return $type;
+        }
+
+        return $this->fixType($newType);
     }
 }

tests/Fixer/PhpdocArrayStyleFixerTest.php

@@ -104,5 +104,16 @@ public static function provideFixCases(): iterable
                 /** @var int[] */
               ',
         ];
+
+        $expected = $input = 'string';
+        for ($i = 0; $i < 1000; $i++) {
+            $expected = 'array<' . $expected . '>';
+            $input .= '[]';
+        }
+
+        yield [
+            \sprintf('<?php /** @var %s */', $expected),
+            \sprintf('<?php /** @var %s */', $input),
+        ];
     }
 }