PhpdocArrayStyleFixer - fix for classes with _ in name (#955)

kubawerlos · Jan 25, 2024 · e17ffa5 · e17ffa5
1 parent 7ddc5ac
commit e17ffa5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,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-3527-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3528-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/actions/workflows/ci.yaml/badge.svg)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml)

diff --git a/src/Fixer/PhpdocArrayStyleFixer.php b/src/Fixer/PhpdocArrayStyleFixer.php
@@ -46,7 +46,7 @@ public function getPriority(): int
 
     protected function fixType(string $type): string
     {
-        $newType = Preg::replace('/([\\\\a-zA-Z0-9>]+)\[\]/', 'array<$1>', $type);
+        $newType = Preg::replace('/([\\\\a-zA-Z0-9_>]+)\[\]/', 'array<$1>', $type);
 
         if ($newType === $type) {
             return $type;

diff --git a/tests/Fixer/PhpdocArrayStyleFixerTest.php b/tests/Fixer/PhpdocArrayStyleFixerTest.php
@@ -105,6 +105,11 @@ public static function provideFixCases(): iterable
               ',
         ];
 
+        yield [
+            '<?php /** @var array<Hello_Legacy_Naming> */',
+            '<?php /** @var Hello_Legacy_Naming[] */',
+        ];
+
         $expected = $input = 'string';
         for ($i = 0; $i < 128; $i++) {
             $expected = 'array<' . $expected . '>';