From c5e184a67b3db3c06c7cc2e2a53e68ba6ac57bac Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 17 Nov 2026 12:36:28 +0100 Subject: [PATCH] [Set] Remove deprecated SetList::NAMING constant --- config/set/naming.php | 9 --------- phpstan-deprecated.neon | 6 ------ src/Configuration/RectorConfigBuilder.php | 3 +-- src/Set/ValueObject/SetList.php | 5 ----- 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 config/set/naming.php diff --git a/config/set/naming.php b/config/set/naming.php deleted file mode 100644 index 16082b4e1c4..00000000000 --- a/config/set/naming.php +++ /dev/null @@ -1,9 +0,0 @@ -rules([]); -}; diff --git a/phpstan-deprecated.neon b/phpstan-deprecated.neon index 784ccdfd16f..40506644177 100644 --- a/phpstan-deprecated.neon +++ b/phpstan-deprecated.neon @@ -10,9 +10,3 @@ parameters: - message: '#deprecated (class|interface) Rector\\(Set|Bridge)\\#' path: src/Configuration/RectorConfigBuilder.php - - # EARLY_RETURN set is deprecated (empty, merged into code-quality), still mapped internally until removed - - - identifier: classConstant.deprecated - paths: - - src/Configuration/RectorConfigBuilder.php diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php index ed68e724d4d..4c17f31c053 100644 --- a/src/Configuration/RectorConfigBuilder.php +++ b/src/Configuration/RectorConfigBuilder.php @@ -603,7 +603,7 @@ public function withPhpSets( // as we already use PHP 8.0 and should go with withPhpSets() instead /** - * @param bool $naming @deprecated The naming set often causes conflicting variable and param names; use a coding standard tool instead + * @param bool $naming @deprecated No longer applied. The naming set often causes conflicting variable and param names; use a coding standard tool instead * @param bool $instanceOf @deprecated No longer applied, use $codeQuality instead, as most instanceof rules were moved there * @param bool $if @deprecated No longer applied, use $codeQuality and $codingStyle instead, as the if rules were moved there or deprecated * @param bool $earlyReturn @deprecated No longer applied, use $codeQuality instead, as all early return rules were moved there @@ -653,7 +653,6 @@ public function withPreparedSets( SetList::TYPE_DECLARATION => $typeDeclarations, SetList::TYPE_DECLARATION_DOCBLOCKS => $typeDeclarationDocblocks, SetList::PRIVATIZATION => $privatization, - SetList::NAMING => $naming, SetList::NAMED_ARGS => $namedArgs, SetList::CARBON => $carbon, SetList::RECTOR_PRESET => $rectorPreset, diff --git a/src/Set/ValueObject/SetList.php b/src/Set/ValueObject/SetList.php index 93617bafe7c..03a20d9e7ad 100644 --- a/src/Set/ValueObject/SetList.php +++ b/src/Set/ValueObject/SetList.php @@ -17,11 +17,6 @@ final class SetList public const string DEAD_CODE = __DIR__ . '/../../../config/set/dead-code.php'; - /** - * @deprecated Niche set for a rarely used extension, it is empty now and will be removed. - */ - public const string NAMING = __DIR__ . '/../../../config/set/naming.php'; - public const string NAMED_ARGS = __DIR__ . '/../../../config/set/named-args.php'; /**