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

@@ -53,11 +53,7 @@ public function getPriority(): int
 
     public function isCandidate(Tokens $tokens): bool
     {
-        return \defined('T_READONLY') && $tokens->isAnyTokenKindsFound([
-            CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE,
-            CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED,
-            CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC,
-        ]);
+        return \defined('T_READONLY') && $tokens->isAnyTokenKindsFound(self::getPromotedPropertyVisibilityKinds());
     }
 
     public function isRisky(): bool
@@ -83,6 +79,8 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
+            $constructorNameIndex = $tokens->getNextMeaningfulToken($constructorAnalysis->getConstructorIndex());
+
             $classOpenBraceIndex = $tokens->getNextTokenOfKind($index, ['{']);
             \assert(\is_int($classOpenBraceIndex));
             $classCloseBraceIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $classOpenBraceIndex);
@@ -119,34 +117,20 @@ private function fixParameters(
         int $constructorCloseParenthesisIndex
     ): void {
         for ($index = $constructorCloseParenthesisIndex; $index > $constructorOpenParenthesisIndex; $index--) {
-            if (
-                !$tokens[$index]->isGivenKind([
-                    CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE,
-                    CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED,
-                    CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC,
-                ])
-            ) {
-                continue;
-            }
-
-            $nextIndex = $tokens->getNextMeaningfulToken($index);
-            if ($tokens[$nextIndex]->isGivenKind(\T_READONLY)) {
+            if (!$tokens[$index]->isGivenKind(\T_VARIABLE)) {
                 continue;
             }
 
-            $prevIndex = $tokens->getPrevMeaningfulToken($index);
-            if ($tokens[$prevIndex]->isGivenKind(\T_READONLY)) {
+            $insertIndex = self::getInsertIndex($tokens, $index);
+            if ($insertIndex === null) {
                 continue;
             }
 
-            $propertyIndex = $tokens->getNextTokenOfKind($index, [[\T_VARIABLE]]);
-            \assert(\is_int($propertyIndex));
-
             $propertyAssignment = $tokens->findSequence(
                 [
                     [\T_VARIABLE, '$this'],
                     [\T_OBJECT_OPERATOR],
-                    [\T_STRING, \substr($tokens[$propertyIndex]->getContent(), 1)],
+                    [\T_STRING, \substr($tokens[$index]->getContent(), 1)],
                 ],
                 $classOpenBraceIndex,
                 $classCloseBraceIndex,
@@ -156,12 +140,56 @@ private function fixParameters(
             }
 
             $tokens->insertAt(
-                $index + 1,
+                $insertIndex + 1,
                 [
                     new Token([\T_WHITESPACE, ' ']),
                     new Token([\T_READONLY, 'readonly']),
                 ],
             );
         }
     }
+
+    private static function getInsertIndex(Tokens $tokens, int $index): ?int
+    {
+        $insertIndex = null;
+
+        $index = $tokens->getPrevMeaningfulToken($index);
+        \assert(\is_int($index));
+        while (!$tokens[$index]->equalsAny([',', '('])) {
+            $index = $tokens->getPrevMeaningfulToken($index);
+            \assert(\is_int($index));
+            if ($tokens[$index]->isGivenKind(\T_READONLY)) {
+                return null;
+            }
+            if ($insertIndex === null && $tokens[$index]->isGivenKind(self::getPromotedPropertyVisibilityKinds())) {
+                $insertIndex = $index;
+            }
+        }
+
+        return $insertIndex;
+    }
+
+    /**
+     * @return list<int>
+     */
+    private static function getPromotedPropertyVisibilityKinds(): array
+    {
+        /** @var null|list<int> $promotedPropertyVisibilityKinds */
+        static $promotedPropertyVisibilityKinds = null;
+
+        if ($promotedPropertyVisibilityKinds === null) {
+            $promotedPropertyVisibilityKinds = [
+                CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE,
+                CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED,
+                CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC,
+            ];
+            if (\defined('T_PUBLIC_SET')) {
+                $promotedPropertyVisibilityKinds[] = \T_PUBLIC_SET;
+                $promotedPropertyVisibilityKinds[] = \T_PROTECTED_SET;
+                $promotedPropertyVisibilityKinds[] = \T_PRIVATE_SET;
+            }
+        }
+
+        return $promotedPropertyVisibilityKinds;
+    }
 }

tests/Fixer/ReadonlyPromotedPropertiesFixerTest.php

@@ -255,6 +255,5 @@ public function __construct(
             }
             PHP,
         ];
-
     }
 }