Merge branch 'main' into use_FCT_constants

Author: kubawerlos

.dev-tools/composer.json

@@ -54,7 +54,7 @@
             "phpcbf || exit 0"
         ],
         "infection": [
-            "infection run --min-msi=100 --logger-github --no-progress --threads=16"
+            "infection run"
         ]
     }
 }

.dev-tools/composer.lock

@@ -6,6 +6,7 @@
         ]
     },
     "timeout": 10,
+    "threads": "max",
     "logs": {
         "text": "php://stdout",
         "github": true,
@@ -194,5 +195,6 @@
         "While_": true,
         "YieldValue": true,
         "Yield_": true
-    }
+    },
+    "minMsi": 100
 }

.dev-tools/infection.json

@@ -43,6 +43,7 @@ public function build(): array
             '$schema' => './vendor/infection/infection/resources/schema.json',
             'source' => ['directories' => ['../src']],
             'timeout' => 10,
+            'threads' => 'max',
             'logs' => [
                 'text' => 'php://stdout',
                 'github' => true,
@@ -53,6 +54,7 @@ public function build(): array
                 'customPath' => '../vendor/phpunit/phpunit/phpunit',
             ],
             'mutators' => [],
+            'minMsi' => 100,
         ];
 
         $mutators = \array_keys(ProfileList::ALL_MUTATORS);

.dev-tools/src/InfectionConfigBuilder.php

@@ -1,5 +1,8 @@
 # CHANGELOG for PHP CS Fixer: custom fixers
 
+## v3.30.0
+- Update minimum PHP CS Fixer version to 3.82.0
+
 ## v3.29.0
 - Update minimum PHP CS Fixer version to 3.77.0
 

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

README.md

@@ -13,7 +13,7 @@
         "php": "^7.4 || ^8.0",
         "ext-filter": "*",
         "ext-tokenizer": "*",
-        "friendsofphp/php-cs-fixer": "^3.77"
+        "friendsofphp/php-cs-fixer": "^3.82"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6.22 || 10.5.45 || ^11.5.7"

composer.json

@@ -67,7 +67,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
             // remove ones not having type at the beginning
             self::removeVarAnnotationNotMatchingPattern($tokens, $index, '/@var\\s+[\\?\\\\a-zA-Z_\\x7f-\\xff]/');
 
-            $nextIndex = $tokens->getNextMeaningfulToken($index);
+            $nextIndex = self::getIndexAfterPhpDoc($tokens, $index);
 
             if ($nextIndex === null) {
                 self::removeVarAnnotationNotMatchingPattern($tokens, $index, null);
@@ -93,6 +93,18 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
         }
     }
 
+    private static function getIndexAfterPhpDoc(Tokens $tokens, int $index): ?int
+    {
+        $nextIndex = $tokens->getNextMeaningfulToken($index);
+
+        while ($nextIndex !== null && \defined('T_ATTRIBUTE') && $tokens[$nextIndex]->isGivenKind(\T_ATTRIBUTE)) {
+            $nextIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_ATTRIBUTE, $nextIndex);
+            $nextIndex = $tokens->getNextMeaningfulToken($nextIndex);
+        }
+
+        return $nextIndex;
+    }
+
     private static function removeForClassElement(Tokens $tokens, int $index, int $propertyStartIndex): void
     {
         $variableIndex = $tokens->getTokenNotOfKindsSibling($propertyStartIndex, 1, [\T_NS_SEPARATOR, \T_STATIC, \T_STRING, \T_WHITESPACE, CT::T_ARRAY_TYPEHINT, CT::T_NULLABLE_TYPE, CT::T_TYPE_ALTERNATION, CT::T_TYPE_INTERSECTION, FCT::T_READONLY]);

src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php

@@ -15,7 +15,6 @@
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\Preg;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 
@@ -122,7 +121,7 @@ private static function getFilteredDocComment(string $comment, array $paramNames
 
         $foundParamNames = [];
         foreach ($doc->getAnnotationsOfType('param') as $annotation) {
-            $paramName = self::getParamName($annotation->getContent());
+            $paramName = $annotation->getVariableName();
 
             if (\in_array($paramName, $paramNames, true) && !\in_array($paramName, $foundParamNames, true)) {
                 $foundParamNames[] = $paramName;
@@ -134,18 +133,4 @@ private static function getFilteredDocComment(string $comment, array $paramNames
 
         return $doc->getContent();
     }
-
-    private static function getParamName(string $annotation): ?string
-    {
-        Preg::match('/@param\\s+(?:[^\\$]+)?\\s*(\\$[a-zA-Z_\\x80-\\xff][a-zA-Z0-9_\\x80-\\xff]*)\\b/', $annotation, $matches);
-
-        if (!\array_key_exists(1, $matches)) {
-            return null;
-        }
-
-        // @phpstan-ignore function.alreadyNarrowedType
-        \assert(\is_string($matches[1]));
-
-        return $matches[1];
-    }
 }

src/Fixer/PhpdocNoSuperfluousParamFixer.php

@@ -167,15 +167,16 @@ private function promoteProperties(Tokens $tokens, int $classIndex, ConstructorA
                 continue;
             }
 
-            $tokensToInsert = self::removePropertyAndReturnTokensToInsert($tokens, $propertyIndex);
+            [$tokensToInsertBefore, $tokensToInsertAfter] = self::removePropertyAndReturnTokensToInsert($tokens, $propertyIndex);
 
             self::renameVariable($tokens, $constructorAnalysis->getConstructorIndex(), $oldParameterName, $newParameterName);
 
             self::removeAssignment($tokens, $constructorPromotableAssignments[$constructorParameterName]);
             $this->updateParameterSignature(
                 $tokens,
                 $constructorParameterIndex,
-                $tokensToInsert,
+                $tokensToInsertBefore,
+                $tokensToInsertAfter,
                 \substr($propertyType, 0, 1) === '?',
             );
         }
@@ -316,12 +317,12 @@ private static function getClassProperties(Tokens $tokens, int $classIndex): arr
     }
 
     /**
-     * @return list<Token>
+     * @return array{list<Token>, list<Token>}
      */
     private static function removePropertyAndReturnTokensToInsert(Tokens $tokens, ?int $propertyIndex): array
     {
         if ($propertyIndex === null) {
-            return [new Token([\T_PUBLIC, 'public'])];
+            return [[new Token([\T_PUBLIC, 'public'])], []];
         }
 
         $visibilityIndex = $tokens->getPrevTokenOfKind($propertyIndex, [[\T_PRIVATE], [\T_PROTECTED], [\T_PUBLIC], [\T_VAR]]);
@@ -342,21 +343,28 @@ private static function removePropertyAndReturnTokensToInsert(Tokens $tokens, ?i
             $removeFrom++;
         }
 
-        $tokensToInsert = [];
+        $tokensToInsertBefore = [];
         for ($index = $removeFrom; $index <= $visibilityIndex - 1; $index++) {
-            $tokensToInsert[] = $tokens[$index];
+            $tokensToInsertBefore[] = $tokens[$index];
         }
 
         $visibilityToken = $tokens[$visibilityIndex];
         if ($tokens[$visibilityIndex]->isGivenKind(\T_VAR)) {
             $visibilityToken = new Token([\T_PUBLIC, 'public']);
         }
-        $tokensToInsert[] = $visibilityToken;
+        $tokensToInsertBefore[] = $visibilityToken;
+
+        $tokensToInsertAfter = [];
+        if ($tokens[$removeTo]->isGivenKind(CT::T_PROPERTY_HOOK_BRACE_CLOSE)) {
+            for ($index = $propertyIndex + 1; $index <= $removeTo; $index++) {
+                $tokensToInsertAfter[] = $tokens[$index];
+            }
+        }
 
         $tokens->clearRange($removeFrom + 1, $removeTo);
         TokenRemover::removeWithLinesIfPossible($tokens, $removeFrom);
 
-        return $tokensToInsert;
+        return [$tokensToInsertBefore, $tokensToInsertAfter];
     }
 
     /**
@@ -377,6 +385,10 @@ private static function getTokenOfKindSibling(Tokens $tokens, int $direction, in
                 }
             }
 
+            if ($tokens[$index]->isGivenKind(CT::T_PROPERTY_HOOK_BRACE_CLOSE)) {
+                break;
+            }
+
             $index += $direction;
         }
 
@@ -412,31 +424,42 @@ private static function removeAssignment(Tokens $tokens, int $variableAssignment
     }
 
     /**
-     * @param list<Token> $tokensToInsert
+     * @param list<Token> $tokensToInsertBefore
+     * @param list<Token> $tokensToInsertAfter
      */
-    private function updateParameterSignature(Tokens $tokens, int $constructorParameterIndex, array $tokensToInsert, bool $makeTypeNullable): void
-    {
+    private function updateParameterSignature(
+        Tokens $tokens,
+        int $constructorParameterIndex,
+        array $tokensToInsertBefore,
+        array $tokensToInsertAfter,
+        bool $makeTypeNullable
+    ): void {
         $prevElementIndex = $tokens->getPrevTokenOfKind($constructorParameterIndex, ['(', ',', [CT::T_ATTRIBUTE_CLOSE]]);
         \assert(\is_int($prevElementIndex));
 
         $propertyStartIndex = $tokens->getNextMeaningfulToken($prevElementIndex);
         \assert(\is_int($propertyStartIndex));
 
-        foreach ($tokensToInsert as $index => $token) {
+        foreach ($tokensToInsertBefore as $index => $token) {
             if ($token->isGivenKind(\T_PUBLIC)) {
-                $tokensToInsert[$index] = new Token([CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC, $token->getContent()]);
+                $tokensToInsertBefore[$index] = new Token([CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC, $token->getContent()]);
             } elseif ($token->isGivenKind(\T_PROTECTED)) {
-                $tokensToInsert[$index] = new Token([CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED, $token->getContent()]);
+                $tokensToInsertBefore[$index] = new Token([CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED, $token->getContent()]);
             } elseif ($token->isGivenKind(\T_PRIVATE)) {
-                $tokensToInsert[$index] = new Token([CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE, $token->getContent()]);
+                $tokensToInsertBefore[$index] = new Token([CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE, $token->getContent()]);
             }
         }
-        $tokensToInsert[] = new Token([\T_WHITESPACE, ' ']);
+        $tokensToInsertBefore[] = new Token([\T_WHITESPACE, ' ']);
 
         if ($makeTypeNullable && !$tokens[$propertyStartIndex]->isGivenKind(CT::T_NULLABLE_TYPE)) {
-            $tokensToInsert[] = new Token([CT::T_NULLABLE_TYPE, '?']);
+            $tokensToInsertBefore[] = new Token([CT::T_NULLABLE_TYPE, '?']);
         }
 
-        $this->tokensToInsert[$propertyStartIndex] = $tokensToInsert;
+        $this->tokensToInsert[$propertyStartIndex] = $tokensToInsertBefore;
+
+        $nextPropertyStartIndex = $tokens->getNextMeaningfulToken($propertyStartIndex);
+        \assert(\is_int($nextPropertyStartIndex));
+
+        $this->tokensToInsert[$nextPropertyStartIndex + 1] = $tokensToInsertAfter;
     }
 }