ReadonlyPromotedPropertiesFixer - do not make readonly properies if class is already readonly (#913)

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-3445-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3451-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)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Fixer/ReadonlyPromotedPropertiesFixer.php

@@ -74,6 +74,10 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
+            if ($this->isClassReadonly($tokens, $index)) {
+                continue;
+            }
+
             $constructorAnalysis = $constructorAnalyzer->findNonAbstractConstructor($tokens, $index);
             if ($constructorAnalysis === null) {
                 continue;
@@ -87,6 +91,16 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
         }
     }
 
+    private function isClassReadonly(Tokens $tokens, int $index): bool
+    {
+        do {
+            $index = $tokens->getPrevMeaningfulToken($index);
+            \assert(\is_int($index));
+        } while ($tokens[$index]->isGivenKind([\T_ABSTRACT, \T_FINAL]));
+
+        return $tokens[$index]->isGivenKind(\T_READONLY);
+    }
+
     private function fixParameters(Tokens $tokens, int $openParenthesis, int $closeParenthesis): void
     {
         for ($index = $closeParenthesis; $index > $openParenthesis; $index--) {

tests/Fixer/ReadonlyPromotedPropertiesFixerTest.php

@@ -87,6 +87,7 @@ public function __construct(
                 ) {}
             }',
         ];
+
         yield [
             '<?php
                 class Foo { public function __construct(public readonly int $x) {} }
@@ -100,4 +101,47 @@ class Baz { public function __construct(public int $x) {} }
             ',
         ];
     }
+
+    /**
+     * @dataProvider provideFix82Cases
+     *
+     * @requires PHP 8.2
+     */
+    public function testFix82(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array<string>>
+     */
+    public static function provideFix82Cases(): iterable
+    {
+        $template = '<?php %s class C1 { public function __construct(public int $x) {} }';
+
+        foreach (
+            [
+                'readonly',
+                'abstract readonly',
+                'final readonly',
+                'readonly final',
+                'readonly abstract',
+            ] as $classModifiers
+        ) {
+            yield [\sprintf($template, $classModifiers)];
+        }
+
+        yield [
+            '<?php
+                class Foo { public function __construct(public readonly int $x) {} }
+                readonly class Bar { public function __construct(int $x) {} }
+                class Baz { public function __construct(public readonly int $x) {} }
+            ',
+            '<?php
+                class Foo { public function __construct(public int $x) {} }
+                readonly class Bar { public function __construct(int $x) {} }
+                class Baz { public function __construct(public int $x) {} }
+            ',
+        ];
+    }
 }