Update

Author: kubawerlos

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-3637-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3640-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)

src/Fixer/NoUselessWriteVisibilityFixer.php

@@ -78,6 +78,11 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
     private function fixVisibility(Tokens $tokens, int $index, int $kind, bool $makePublicIfNone): void
     {
         $prevIndex = $tokens->getPrevMeaningfulToken($index);
+        \assert(\is_int($prevIndex));
+        while ($tokens[$prevIndex]->isGivenKind([\T_ABSTRACT, \T_READONLY])) {
+            $prevIndex = $tokens->getPrevMeaningfulToken($prevIndex);
+            \assert(\is_int($prevIndex));
+        }
 
         if (!$tokens[$prevIndex]->isGivenKind($this->predecessorKindMap[$kind])) {
             if ($makePublicIfNone) {

tests/Fixer/NoUselessWriteVisibilityFixerTest.php

@@ -15,6 +15,8 @@
  * @internal
  *
  * @covers \PhpCsFixerCustomFixers\Fixer\NoUselessWriteVisibilityFixer
+ *
+ * @requires PHP >= 8.4
  */
 final class NoUselessWriteVisibilityFixerTest extends AbstractFixerTestCase
 {
@@ -24,8 +26,6 @@ public function testIsRisky(): void
     }
 
     /**
-     * @requires PHP >= 8.4
-     *
      * @dataProvider provideFixCases
      */
     public function testFix(string $expected, ?string $input = null): void
@@ -34,11 +34,11 @@ public function testFix(string $expected, ?string $input = null): void
     }
 
     /**
-     * @return iterable<array{0: string, 1?: string}>
+     * @return iterable<string, array{0: string, 1?: string}>
      */
     public static function provideFixCases(): iterable
     {
-        yield [
+        yield 'class properties' => [
             <<<'PHP'
                 <?php class Foo {
                     public $x;
@@ -55,7 +55,7 @@ public static function provideFixCases(): iterable
                 PHP,
         ];
 
-        yield [
+        yield 'only write visibility' => [
             <<<'PHP'
                 <?php class Foo {
                     public $x;
@@ -68,7 +68,7 @@ public static function provideFixCases(): iterable
                 PHP,
         ];
 
-        yield [
+        yield 'promoted properties' => [
             <<<'PHP'
                 <?php class Foo {
                     public function __construct(
@@ -88,5 +88,44 @@ public function __construct(
                 }
                 PHP,
         ];
+
+        yield 'readonly property' => [
+            <<<'PHP'
+                <?php class Foo {
+                    public readonly $x { get => 'x'; }
+                }
+                PHP,
+            <<<'PHP'
+                <?php class Foo {
+                    public readonly public(set) $x { get => 'x'; }
+                }
+                PHP,
+        ];
+
+        yield 'abstract property' => [
+            <<<'PHP'
+                <?php abstract class Foo {
+                    public abstract $x { get => 'x'; }
+                }
+                PHP,
+            <<<'PHP'
+                <?php abstract class Foo {
+                    public abstract public(set) $x { get => 'x'; }
+                }
+                PHP,
+        ];
+
+        yield 'abstract readonly property' => [
+            <<<'PHP'
+                <?php abstract class Foo {
+                    public abstract readonly $x { get => 'x'; }
+                }
+                PHP,
+            <<<'PHP'
+                <?php abstract class Foo {
+                    public abstract readonly public(set) $x { get => 'x'; }
+                }
+                PHP,
+        ];
     }
 }