From 0eba231b075849ea4b327ce96c28ec359e7b7636 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 6 Jun 2022 17:48:45 +0200 Subject: [PATCH] [PHP 8.1] Move ConstantListClassToEnumRector to PHP 8.1 (#2444) --- .../docs/rector_rules_overview.md | 2 +- phpstan.neon | 8 +++--- .../Fixture/enum_type_property.php.inc | 28 ------------------- .../ConstantListClassToEnumRectorTest.php | 2 +- .../Fixture/change_param_type.php.inc | 10 +++---- .../Fixture/change_return_type.php.inc | 10 +++---- .../Fixture/enum_type_property.php.inc | 28 +++++++++++++++++++ .../Fixture/multiple_params_change.php.inc | 10 +++---- .../Fixture/skip_also_other_elements.php.inc | 2 +- .../Fixture/skip_differnet_type.php.inc | 2 +- .../Fixture/skip_non_public_const.php.inc | 2 +- .../Fixture/skip_non_scalar_types.php.inc | 2 +- .../Fixture/skip_unknown_class.php.inc | 2 +- .../Fixture/some_class.php.inc | 4 +-- .../Source/Gear.php | 2 +- .../config/configured_rule.php | 2 +- .../EnumConstListClassDetector.php | 2 +- .../Class_/ConstantListClassToEnumRector.php | 6 ++-- 18 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/enum_type_property.php.inc rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php (91%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc (50%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_return_type.php.inc (54%) create mode 100644 rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/enum_type_property.php.inc rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc (60%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/skip_also_other_elements.php.inc (70%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/skip_differnet_type.php.inc (65%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/skip_non_public_const.php.inc (66%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/skip_non_scalar_types.php.inc (68%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/skip_unknown_class.php.inc (73%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Fixture/some_class.php.inc (64%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/Source/Gear.php (69%) rename rules-tests/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector/config/configured_rule.php (75%) rename rules/{Php80 => Php81}/NodeAnalyzer/EnumConstListClassDetector.php (98%) rename rules/{Php80 => Php81}/Rector/Class_/ConstantListClassToEnumRector.php (97%) diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md index f5321791d52..6b0b730de8e 100644 --- a/build/target-repository/docs/rector_rules_overview.md +++ b/build/target-repository/docs/rector_rules_overview.md @@ -8273,7 +8273,7 @@ Change simple property init and assign to constructor promotion Upgrade constant list classes to full blown enum -- class: [`Rector\Php80\Rector\Class_\ConstantListClassToEnumRector`](../rules/Php80/Rector/Class_/ConstantListClassToEnumRector.php) +- class: [`Rector\Php81\Rector\Class_\ConstantListClassToEnumRector`](../rules/Php80/Rector/Class_/ConstantListClassToEnumRector.php) ```diff -class Direction diff --git a/phpstan.neon b/phpstan.neon index 8e2e5ac121b..3f7d9e1bd39 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -705,13 +705,13 @@ parameters: message: '#Class has a static method must so must contains "Static" in its name#' path: rules/CodingStyle/Enum/PreferenceSelfThis.php - # optional rule for PHP 8.0 - - '#Register "Rector\\Php80\\Rector\\Class_\\ConstantListClassToEnumRector" service to "php80\.php" config set#' - - '#Rule Rector\\Php80\\Rector\\Class_\\ConstantListClassToEnumRector must implements Rector\\VersionBonding\\Contract\\MinPhpVersionInterface#' + # optional rule for PHP 8.1 + - '#Register "Rector\\Php81\\Rector\\Class_\\ConstantListClassToEnumRector" service to "php81\.php" config set#' + - '#Rule Rector\\Php81\\Rector\\Class_\\ConstantListClassToEnumRector must implements Rector\\VersionBonding\\Contract\\MinPhpVersionInterface#' - '#Register "Rector\\DowngradePhp80\\Rector\\Enum_\\DowngradeEnumToConstantListClassRector" service to "downgrade\-php80\.php" config set#' - message: '#Method "refactor(Params|Return)\(\)" returns bool type, so the name should start with is/has/was#' - path: rules/Php80/Rector/Class_/ConstantListClassToEnumRector.php + path: rules/Php81/Rector/Class_/ConstantListClassToEnumRector.php # known values - diff --git a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/enum_type_property.php.inc b/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/enum_type_property.php.inc deleted file mode 100644 index e910719d63e..00000000000 --- a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/enum_type_property.php.inc +++ /dev/null @@ -1,28 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php b/rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php similarity index 91% rename from rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php rename to rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php index 35a02fefe13..ccb57ae1e15 100644 --- a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php +++ b/rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/ConstantListClassToEnumRectorTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\Tests\Php80\Rector\Class_\ConstantListClassToEnumRector; +namespace Rector\Tests\Php81\Rector\Class_\ConstantListClassToEnumRector; use Iterator; use Rector\Testing\PHPUnit\AbstractRectorTestCase; diff --git a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc b/rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc similarity index 50% rename from rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc rename to rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc index 25d7c35f651..65c526b5aac 100644 --- a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc +++ b/rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/change_param_type.php.inc @@ -1,8 +1,8 @@ +----- + diff --git a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc b/rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc similarity index 60% rename from rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc rename to rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc index 2630ecd0963..551420d0a3c 100644 --- a/rules-tests/Php80/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc +++ b/rules-tests/Php81/Rector/Class_/ConstantListClassToEnumRector/Fixture/multiple_params_change.php.inc @@ -1,8 +1,8 @@ rule(ConstantListClassToEnumRector::class); diff --git a/rules/Php80/NodeAnalyzer/EnumConstListClassDetector.php b/rules/Php81/NodeAnalyzer/EnumConstListClassDetector.php similarity index 98% rename from rules/Php80/NodeAnalyzer/EnumConstListClassDetector.php rename to rules/Php81/NodeAnalyzer/EnumConstListClassDetector.php index 261c85bd727..135f579d41a 100644 --- a/rules/Php80/NodeAnalyzer/EnumConstListClassDetector.php +++ b/rules/Php81/NodeAnalyzer/EnumConstListClassDetector.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\Php80\NodeAnalyzer; +namespace Rector\Php81\NodeAnalyzer; use PhpParser\Node\Scalar; use PhpParser\Node\Stmt\Class_; diff --git a/rules/Php80/Rector/Class_/ConstantListClassToEnumRector.php b/rules/Php81/Rector/Class_/ConstantListClassToEnumRector.php similarity index 97% rename from rules/Php80/Rector/Class_/ConstantListClassToEnumRector.php rename to rules/Php81/Rector/Class_/ConstantListClassToEnumRector.php index 5f9e2c155b5..42b39491c3e 100644 --- a/rules/Php80/Rector/Class_/ConstantListClassToEnumRector.php +++ b/rules/Php81/Rector/Class_/ConstantListClassToEnumRector.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\Php80\Rector\Class_; +namespace Rector\Php81\Rector\Class_; use PhpParser\Node; use PhpParser\Node\Name\FullyQualified; @@ -16,15 +16,15 @@ use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover; use Rector\Core\Rector\AbstractRector; use Rector\Core\Reflection\ReflectionResolver; -use Rector\Php80\NodeAnalyzer\EnumConstListClassDetector; use Rector\Php80\NodeAnalyzer\EnumParamAnalyzer; use Rector\Php80\ValueObject\ClassNameAndTagValueNode; +use Rector\Php81\NodeAnalyzer\EnumConstListClassDetector; use Rector\Php81\NodeFactory\EnumFactory; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** - * @see \Rector\Tests\Php80\Rector\Class_\ConstantListClassToEnumRector\ConstantListClassToEnumRectorTest + * @see \Rector\Tests\Php81\Rector\Class_\ConstantListClassToEnumRector\ConstantListClassToEnumRectorTest */ final class ConstantListClassToEnumRector extends AbstractRector {