Do not test deprecated fixers from main repo (#1018)

kubawerlos · web-flow · commit d30d3636f255 · 2025-04-24T20:51:30.000+02:00
diff --git a/README.md b/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-3613-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3607-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)
diff --git a/src/Fixer/ConstructorEmptyBracesFixer.php b/src/Fixer/ConstructorEmptyBracesFixer.php
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * Must run after BracesFixer, CurlyBracesPositionFixer, PromotedConstructorPropertyFixer.
+     * Must run after BracesPositionFixer, PromotedConstructorPropertyFixer.
      */
     public function getPriority(): int
     {
diff --git a/src/Fixer/MultilinePromotedPropertiesFixer.php b/src/Fixer/MultilinePromotedPropertiesFixer.php
@@ -88,12 +88,12 @@ public function setWhitespacesConfig(WhitespacesFixerConfig $config): void
     }
 
     /**
-     * Must run before BracesFixer.
+     * Must run before BracesPositionFixer.
      * Must run after PromotedConstructorPropertyFixer.
      */
     public function getPriority(): int
     {
-        return 36;
+        return 0;
     }
 
     public function isCandidate(Tokens $tokens): bool
diff --git a/src/Fixer/NoDoctrineMigrationsGeneratedCommentFixer.php b/src/Fixer/NoDoctrineMigrationsGeneratedCommentFixer.php
@@ -48,11 +48,11 @@ public function down(Schema $schema)
     }
 
     /**
-     * Must run before BracesFixer.
+     * Must run before NoExtraBlankLinesFixer.
      */
     public function getPriority(): int
     {
-        return 36;
+        return 0;
     }
 
     public function isCandidate(Tokens $tokens): bool
diff --git a/src/Fixer/PromotedConstructorPropertyFixer.php b/src/Fixer/PromotedConstructorPropertyFixer.php
@@ -84,7 +84,7 @@ public function configure(array $configuration): void
     }
 
     /**
-     * Must run before BracesFixer, ClassAttributesSeparationFixer, ConstructorEmptyBracesFixer, MultilinePromotedPropertiesFixer, NoExtraBlankLinesFixer, ReadonlyPromotedPropertiesFixer.
+     * Must run before ClassAttributesSeparationFixer, ConstructorEmptyBracesFixer, MultilinePromotedPropertiesFixer, NoExtraBlankLinesFixer, ReadonlyPromotedPropertiesFixer.
      */
     public function getPriority(): int
     {
diff --git a/tests/PriorityTest.php b/tests/PriorityTest.php
@@ -11,6 +11,8 @@
 
 namespace Tests;
 
+use PhpCsFixer\AbstractFixer;
+use PhpCsFixer\Fixer\DeprecatedFixerInterface;
 use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerFactory;
@@ -45,6 +47,13 @@ public function testPriorities(FixerInterface $firstFixer, FixerInterface $secon
      */
     public function testInOrder(FixerInterface $firstFixer, FixerInterface $secondFixer, string $expected, string $input): void
     {
+        if ($firstFixer instanceof AbstractFixer) {
+            self::assertNotInstanceOf(DeprecatedFixerInterface::class, $firstFixer);
+        }
+        if ($secondFixer instanceof AbstractFixer) {
+            self::assertNotInstanceOf(DeprecatedFixerInterface::class, $secondFixer);
+        }
+
         Tokens::clearCache();
         $tokens = Tokens::fromCode($input);
 
diff --git a/tests/priority_fixtures/Custom_multiline_promoted_properties,braces_position.test b/tests/priority_fixtures/Custom_multiline_promoted_properties,braces_position.test
@@ -1,5 +1,5 @@
 --CONFIGURATION--
-{ "PhpCsFixerCustomFixers/multiline_promoted_properties": true, "braces": true }
+{ "PhpCsFixerCustomFixers/multiline_promoted_properties": true, "braces_position": true }
 --EXPECTED--
 <?php class Foo
 {
diff --git a/tests/priority_fixtures/Custom_no_doctrine_migrations_generated_comment,no_extra_blank_lines.test b/tests/priority_fixtures/Custom_no_doctrine_migrations_generated_comment,no_extra_blank_lines.test
@@ -1,5 +1,5 @@
 --CONFIGURATION--
-{ "PhpCsFixerCustomFixers/no_doctrine_migrations_generated_comment": true, "braces": true }
+{ "PhpCsFixerCustomFixers/no_doctrine_migrations_generated_comment": true, "no_extra_blank_lines": {"tokens": ["curly_brace_block"]} }
 --EXPECTED--
 <?php
 use Doctrine\Migrations\AbstractMigration;
diff --git a/tests/priority_fixtures/Custom_promoted_constructor_property,braces.test b/tests/priority_fixtures/Custom_promoted_constructor_property,braces.test
diff --git a/tests/priority_fixtures/braces_position,Custom_constructor_empty_braces.test b/tests/priority_fixtures/braces_position,Custom_constructor_empty_braces.test
@@ -1,5 +1,5 @@
 --CONFIGURATION--
-{ "braces": true, "PhpCsFixerCustomFixers/constructor_empty_braces": true }
+{ "braces_position": true, "PhpCsFixerCustomFixers/constructor_empty_braces": true }
 --EXPECTED--
 <?php class Foo
 {
diff --git a/tests/priority_fixtures/curly_braces_position,Custom_constructor_empty_braces.test b/tests/priority_fixtures/curly_braces_position,Custom_constructor_empty_braces.test

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct(`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * Must run after BracesFixer, CurlyBracesPositionFixer, PromotedConstructorPropertyFixer.`
	`44`	`+ * Must run after BracesPositionFixer, PromotedConstructorPropertyFixer.`
`45`	`45`	`*/`
`46`	`46`	`public function getPriority(): int`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,12 @@ public function setWhitespacesConfig(WhitespacesFixerConfig $config): void`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`
`91`		`- * Must run before BracesFixer.`
	`91`	`+ * Must run before BracesPositionFixer.`
`92`	`92`	`* Must run after PromotedConstructorPropertyFixer.`
`93`	`93`	`*/`
`94`	`94`	`public function getPriority(): int`
`95`	`95`	`{`
`96`		`- return 36;`
	`96`	`+ return 0;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public function isCandidate(Tokens $tokens): bool`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ public function down(Schema $schema)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * Must run before BracesFixer.`
	`51`	`+ * Must run before NoExtraBlankLinesFixer.`
`52`	`52`	`*/`
`53`	`53`	`public function getPriority(): int`
`54`	`54`	`{`
`55`		`- return 36;`
	`55`	`+ return 0;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function isCandidate(Tokens $tokens): bool`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function configure(array $configuration): void`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * Must run before BracesFixer, ClassAttributesSeparationFixer, ConstructorEmptyBracesFixer, MultilinePromotedPropertiesFixer, NoExtraBlankLinesFixer, ReadonlyPromotedPropertiesFixer.`
	`87`	`+ * Must run before ClassAttributesSeparationFixer, ConstructorEmptyBracesFixer, MultilinePromotedPropertiesFixer, NoExtraBlankLinesFixer, ReadonlyPromotedPropertiesFixer.`
`88`	`88`	`*/`
`89`	`89`	`public function getPriority(): int`
`90`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`--CONFIGURATION--`
`2`		`-{ "PhpCsFixerCustomFixers/multiline_promoted_properties": true, "braces": true }`
	`2`	`+{ "PhpCsFixerCustomFixers/multiline_promoted_properties": true, "braces_position": true }`
`3`	`3`	`--EXPECTED--`
`4`	`4`	`<?php class Foo`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`--CONFIGURATION--`
`2`		`-{ "braces": true, "PhpCsFixerCustomFixers/constructor_empty_braces": true }`
	`2`	`+{ "braces_position": true, "PhpCsFixerCustomFixers/constructor_empty_braces": true }`
`3`	`3`	`--EXPECTED--`
`4`	`4`	`<?php class Foo`
`5`	`5`	`{`