Merge remote-tracking branch 'origin/main' into phpdoc-sorter-property

# Conflicts:
#	src/Fixer/PhpdocPropertySortedFixer.php
#	tests/Fixer/PhpdocPropertySortedFixerTest.php

Author: kilya11

.dev-tools/composer.json

@@ -5,17 +5,17 @@
         "ergebnis/composer-normalize": "^2.48.2",
         "infection/infection": "^0.31.2",
         "kubawerlos/composer-smaller-lock": "^1.1.0",
-        "kubawerlos/php-cs-fixer-config": "^5.3",
+        "kubawerlos/php-cs-fixer-config": "^5.4",
         "mi-schi/phpmd-extension": "^4.3",
         "phpmd/phpmd": "^2.15",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.23",
+        "phpstan/phpstan": "^2.1.28",
         "phpstan/phpstan-phpunit": "^2.0.7",
         "phpstan/phpstan-strict-rules": "^2.0.6",
         "shipmonk/composer-dependency-analyser": "^1.8.3",
         "shipmonk/dead-code-detector": "^0.13.3",
         "shipmonk/phpstan-rules": "^4.2.1",
-        "squizlabs/php_codesniffer": "^3.13.4",
+        "squizlabs/php_codesniffer": "^4.0",
         "tomasvotruba/type-coverage": "^2.0.2",
         "vimeo/psalm": "^6.13.1"
     },

.dev-tools/composer.lock

@@ -13,7 +13,7 @@
 
     <rule ref='PSR12'>
         <exclude name='Generic.Files.LineLength' />
-        <exclude name='PSR12.Files.FileHeader.SpacingAfterBlock' />
+        <exclude name='PSR12.Files.FileHeader.SpacingAfterTagBlock' />
         <exclude name='PSR12.Files.OpenTag.NotAlone' />
         <exclude name='Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore' />
     </rule>

.dev-tools/phpcs.xml

@@ -10,6 +10,9 @@
  */
 
 namespace PhpCsFixer\Tokenizer {
+    /**
+     * @internal
+     */
     final class FCT
     {
         public const int T_ATTRIBUTE = \T_ATTRIBUTE;
@@ -18,5 +21,8 @@ final class FCT
         public const int T_PUBLIC_SET = \T_PUBLIC_SET;
         public const int T_READONLY = \T_READONLY;
     }
+    /**
+     * @internal
+     */
     final class OtherClassSoTheNameOfClassAboveIsNotChanged {}
 }

.dev-tools/psalm_stub.php

@@ -14,6 +14,9 @@
 use Infection\Mutator\ProfileList;
 use PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer;
 
+/**
+ * @internal
+ */
 final class InfectionConfigBuilder
 {
     private const UNWANTED_MUTATORS = [

.dev-tools/src/InfectionConfigBuilder.php

@@ -19,6 +19,9 @@
 use PhpCsFixerCustomFixers\Fixers;
 use Tests\PriorityTest;
 
+/**
+ * @internal
+ */
 final class PriorityCollection
 {
     /** @var list<PriorityFixer> */

.dev-tools/src/Priority/PriorityCollection.php

@@ -13,6 +13,9 @@
 
 use PhpCsFixer\Fixer\FixerInterface;
 
+/**
+ * @internal
+ */
 final class PriorityFixer
 {
     private FixerInterface $fixer;

.dev-tools/src/Priority/PriorityFixer.php

@@ -13,8 +13,11 @@
 
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\DeprecatedFixerInterface;
+use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSampleInterface;
+use PhpCsFixer\FixerFactory;
+use PhpCsFixer\RuleSet\RuleSet;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixer\Utils;
 use PhpCsFixer\WhitespacesFixerConfig;
@@ -168,7 +171,22 @@ private static function fixers(): string
                 $fixer->getDefinition()->getSummary(),
             );
 
-            $output .= $fixer instanceof DeprecatedFixerInterface ? \sprintf("\n  DEPRECATED: use `%s` instead.", \implode('`, `', $fixer->getSuccessorsNames())) : '';
+            if ($fixer instanceof DeprecatedFixerInterface) {
+                $fixers = (new FixerFactory())
+                    ->registerBuiltInFixers()
+                    ->registerCustomFixers(new Fixers())
+                    ->useRuleSet(new RuleSet(\array_combine($fixer->getSuccessorsNames(), [true])))
+                    ->getFixers();
+
+                $successors = \array_map(
+                    static fn (FixerInterface $fixer): string => $fixer instanceof AbstractFixer
+                    ? (new \ReflectionObject($fixer))->getShortName()
+                    : $fixer->getName(),
+                    $fixers,
+                );
+
+                $output .= \sprintf("\n  DEPRECATED: use `%s` instead.", \implode('`, `', $successors));
+            }
 
             if ($fixer instanceof DataProviderStaticFixer) {
                 $fixer->configure(['force' => true]);

.dev-tools/src/Readme/ReadmeCommand.php

@@ -1,5 +1,9 @@
 # CHANGELOG for PHP CS Fixer: custom fixers
 
+## v3.34.0
+- Add PhpdocPropertySortedFixer
+- Deprecate PhpDocPropertySorterFixer - use PhpdocPropertySortedFixer
+
 ## v3.33.0
 - Add PhpDocPropertySorterFixer
 - Deprecate PhpdocTagNoNamedArgumentsFixer - use "phpdoc_tag_no_named_arguments"

CHANGELOG.md

@@ -463,6 +463,7 @@ Configuration options:
 
 #### PhpDocPropertySorterFixer
 Sorts @property annotations in PHPDoc blocks alphabetically within groups separated by empty lines.
+  DEPRECATED: use `PhpdocPropertySortedFixer` instead.
 ```diff
  <?php
  /**
@@ -615,6 +616,19 @@ The `@param` annotations must have a type.
  function a($foo, $bar) {}
 ```
 
+#### PhpdocPropertySortedFixer
+Sorts @property annotations in PHPDoc blocks alphabetically within groups separated by empty lines.
+```diff
+ <?php
+ /**
+- * @property string $zzz
+  * @property int $aaa
+  * @property bool $mmm
++ * @property string $zzz
+  */
+ class Foo {}
+```
+
 #### PhpdocSelfAccessorFixer
 In PHPDoc, the class or interface element `self` must be used instead of the class name itself.
 ```diff