From 4de11f5df522d68d93a9ea76b57462bfa17119ff Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 17 Oct 2026 22:35:22 +0200 Subject: [PATCH] Deprecate AddArrayResultColumnNamesRector ArrayResult is rarely used, and the column keys this rule guesses need manual correction anyway. Mark as deprecated, drop the test, and remove it from the composer-based set. --- config/sets/composer-based.php | 4 +-- .../AddArrayResultColumnNamesRectorTest.php | 28 ----------------- .../Fixture/passing_new_array_result.php.inc | 31 ------------------- .../Fixture/skip_already_two_args.php.inc | 13 -------- .../config/configured_rule.php | 10 ------ .../New_/AddArrayResultColumnNamesRector.php | 5 +-- 6 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/AddArrayResultColumnNamesRectorTest.php delete mode 100644 rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/passing_new_array_result.php.inc delete mode 100644 rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/skip_already_two_args.php.inc delete mode 100644 rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/config/configured_rule.php diff --git a/config/sets/composer-based.php b/config/sets/composer-based.php index 94683732..5c09aaa4 100644 --- a/config/sets/composer-based.php +++ b/config/sets/composer-based.php @@ -16,7 +16,6 @@ use Rector\Doctrine\Dbal36\Rector\MethodCall\MigrateQueryBuilderResetQueryPartRector; use Rector\Doctrine\Dbal40\Rector\MethodCall\ChangeCompositeExpressionAddMultipleWithWithRector; use Rector\Doctrine\Dbal40\Rector\StmtsAwareInterface\ExecuteQueryParamsToBindValueRector; -use Rector\Doctrine\Dbal42\Rector\New_\AddArrayResultColumnNamesRector; use Rector\Doctrine\DoctrineFixture\Rector\MethodCall\AddGetReferenceTypeRector; use Rector\Doctrine\Orm214\Rector\Param\ReplaceLifecycleEventArgsByDedicatedEventArgsRector; use Rector\Doctrine\Orm28\Rector\MethodCall\IterateToToIterableRector; @@ -77,10 +76,9 @@ // doctrine/dbal 3.2 PlatformGetNameToInstanceofRector::class, - // doctrine/dbal 4.0 and 4.2 + // doctrine/dbal 4.0 ChangeCompositeExpressionAddMultipleWithWithRector::class, ExecuteQueryParamsToBindValueRector::class, - AddArrayResultColumnNamesRector::class, // doctrine/doctrine-bundle 2.3 and 2.8 AddAnnotationToRepositoryRector::class, diff --git a/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/AddArrayResultColumnNamesRectorTest.php b/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/AddArrayResultColumnNamesRectorTest.php deleted file mode 100644 index e524a810..00000000 --- a/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/AddArrayResultColumnNamesRectorTest.php +++ /dev/null @@ -1,28 +0,0 @@ -doTestFile($filePath); - } - - public static function provideData(): Iterator - { - return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); - } - - public function provideConfigFilePath(): string - { - return __DIR__ . '/config/configured_rule.php'; - } -} diff --git a/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/passing_new_array_result.php.inc b/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/passing_new_array_result.php.inc deleted file mode 100644 index 50b64dd4..00000000 --- a/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/passing_new_array_result.php.inc +++ /dev/null @@ -1,31 +0,0 @@ - ------ - diff --git a/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/skip_already_two_args.php.inc b/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/skip_already_two_args.php.inc deleted file mode 100644 index 6e6e73d4..00000000 --- a/rules-tests/Dbal42/Rector/New_/AddArrayResultColumnNamesRector/Fixture/skip_already_two_args.php.inc +++ /dev/null @@ -1,13 +0,0 @@ -rule(AddArrayResultColumnNamesRector::class); -}; diff --git a/rules/Dbal42/Rector/New_/AddArrayResultColumnNamesRector.php b/rules/Dbal42/Rector/New_/AddArrayResultColumnNamesRector.php index 3ee6ed71..1c2f0a63 100644 --- a/rules/Dbal42/Rector/New_/AddArrayResultColumnNamesRector.php +++ b/rules/Dbal42/Rector/New_/AddArrayResultColumnNamesRector.php @@ -13,6 +13,7 @@ use PhpParser\Node\Expr\New_; use PhpParser\Node\Name; use PhpParser\Node\Scalar\Int_; +use Rector\Configuration\Deprecation\Contract\DeprecatedInterface; use Rector\Doctrine\Enum\DoctrineClass; use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; @@ -23,9 +24,9 @@ /** * @see https://github.com/doctrine/dbal/pull/6504/files * - * @see \Rector\Doctrine\Tests\Dbal42\Rector\New_\AddArrayResultColumnNamesRector\AddArrayResultColumnNamesRectorTest + * @deprecated This rule is deprecated, as ArrayResult is rarely used and the guessed column keys need manual correction anyway. */ -final class AddArrayResultColumnNamesRector extends AbstractRector implements ComposerPackageConstraintInterface +final class AddArrayResultColumnNamesRector extends AbstractRector implements ComposerPackageConstraintInterface, DeprecatedInterface { public function provideComposerPackageConstraint(): ComposerPackageConstraint {