diff --git a/.github/workflows/functional_test__rector_examples.yml b/.github/workflows/functional_test__rector_examples.yml index 18f97385..2402ecf3 100644 --- a/.github/workflows/functional_test__rector_examples.yml +++ b/.github/workflows/functional_test__rector_examples.yml @@ -15,6 +15,7 @@ jobs: run_functional_test: name: Functional Test | PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal }}" strategy: + fail-fast: false matrix: include: - php-version: "7.4" diff --git a/composer.json b/composer.json index a1f6857e..2bb3d2ea 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "ast" ], "require": { - "rector/rector": "~0.18.0", + "rector/rector": "~0.19.0", "webflo/drupal-finder": "^1.2" }, "license": "MIT", diff --git a/config/drupal-8/drupal-8.2-deprecations.php b/config/drupal-8/drupal-8.2-deprecations.php index 7081b39b..439256be 100644 --- a/config/drupal-8/drupal-8.2-deprecations.php +++ b/config/drupal-8/drupal-8.2-deprecations.php @@ -12,7 +12,7 @@ }); // https://www.drupal.org/node/2802569 $rectorConfig->ruleWithConfiguration(FunctionToStaticRector::class, [ - new \DrupalRector\Rector\ValueObject\FunctionToStaticConfiguration( + new DrupalRector\Rector\ValueObject\FunctionToStaticConfiguration( '8.2.0', 'file_directory_os_temp', 'Drupal\Component\FileSystem\FileSystem', diff --git a/config/drupal-8/drupal-8.6-deprecations.php b/config/drupal-8/drupal-8.6-deprecations.php index dffe011b..34a09607 100644 --- a/config/drupal-8/drupal-8.6-deprecations.php +++ b/config/drupal-8/drupal-8.6-deprecations.php @@ -10,7 +10,7 @@ $rectorConfig->singleton(AddCommentService::class, function () { return new AddCommentService(); }); - $rectorConfig->ruleWithConfiguration(\DrupalRector\Drupal8\Rector\Deprecation\StaticToFunctionRector::class, [ + $rectorConfig->ruleWithConfiguration(DrupalRector\Drupal8\Rector\Deprecation\StaticToFunctionRector::class, [ // https://www.drupal.org/node/2850048 new StaticToFunctionConfiguration('Drupal\Component\Utility\Unicode', 'strlen', 'mb_strlen'), // https://www.drupal.org/node/2850048 diff --git a/config/drupal-9/drupal-9.1-deprecations.php b/config/drupal-9/drupal-9.1-deprecations.php index 8a6d1999..a2f5125c 100644 --- a/config/drupal-9/drupal-9.1-deprecations.php +++ b/config/drupal-9/drupal-9.1-deprecations.php @@ -42,7 +42,7 @@ $rectorConfig->rule(AssertNoFieldByNameRector::class); $rectorConfig->rule(AssertFieldByIdRector::class); - $rectorConfig->ruleWithConfiguration(\DrupalRector\Drupal9\Rector\Deprecation\AssertLegacyTraitRector::class, [ + $rectorConfig->ruleWithConfiguration(DrupalRector\Drupal9\Rector\Deprecation\AssertLegacyTraitRector::class, [ new AssertLegacyTraitConfiguration('assertLinkByHref', 'linkByHrefExists'), new AssertLegacyTraitConfiguration('assertLink', 'linkExists'), new AssertLegacyTraitConfiguration('assertNoEscaped', 'assertNoEscaped'), diff --git a/config/drupal-9/drupal-9.3-deprecations.php b/config/drupal-9/drupal-9.3-deprecations.php index 894747b8..6b6166a3 100644 --- a/config/drupal-9/drupal-9.3-deprecations.php +++ b/config/drupal-9/drupal-9.3-deprecations.php @@ -33,9 +33,9 @@ ]); // Change record: https://www.drupal.org/node/2940031 - $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Deprecation\FileCreateUrlRector::class); - $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Deprecation\FileUrlTransformRelativeRector::class); - $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Deprecation\FromUriRector::class); + $rectorConfig->rule(DrupalRector\Drupal9\Rector\Deprecation\FileCreateUrlRector::class); + $rectorConfig->rule(DrupalRector\Drupal9\Rector\Deprecation\FileUrlTransformRelativeRector::class); + $rectorConfig->rule(DrupalRector\Drupal9\Rector\Deprecation\FromUriRector::class); // Change record: https://www.drupal.org/node/3223520 $rectorConfig->ruleWithConfiguration(FunctionToServiceRector::class, [ diff --git a/config/drupal-9/drupal-9.4-deprecations.php b/config/drupal-9/drupal-9.4-deprecations.php index 8c5ab1c2..bff0e627 100644 --- a/config/drupal-9/drupal-9.4-deprecations.php +++ b/config/drupal-9/drupal-9.4-deprecations.php @@ -4,5 +4,5 @@ return static function (Rector\Config\RectorConfig $rectorConfig): void { // Change record https://www.drupal.org/node/3220952 - $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Deprecation\ModuleLoadRector::class); + $rectorConfig->rule(DrupalRector\Drupal9\Rector\Deprecation\ModuleLoadRector::class); }; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 1ef10e01..e7a5893b 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -109,3 +109,11 @@ parameters: message: "#^Call to an undefined method PHPStan\\\\Type\\\\Type\\:\\:getValue\\(\\)\\.$#" count: 1 path: src/Drupal9/Rector/Deprecation/ExtensionPathRector.php + + - + message: """ + #^Fetching deprecated class constant REMOVE_NODE of class PhpParser\\\\NodeTraverser\\: + Use NodeVisitor\\:\\:REMOVE_NODE instead\\.$# + """ + count: 1 + path: src/Drupal9/Rector/Deprecation/PassRector.php diff --git a/src/Drupal10/Rector/Deprecation/SystemTimeZonesRector.php b/src/Drupal10/Rector/Deprecation/SystemTimeZonesRector.php index 0740f3fe..8299e6b2 100644 --- a/src/Drupal10/Rector/Deprecation/SystemTimeZonesRector.php +++ b/src/Drupal10/Rector/Deprecation/SystemTimeZonesRector.php @@ -9,7 +9,7 @@ use DrupalRector\Rector\ValueObject\DrupalIntroducedVersionConfiguration; use PhpParser\Node; use PhpParser\Node\Expr\ConstFetch; -use Rector\Core\PhpParser\Node\Value\ValueResolver; +use Rector\PhpParser\Node\Value\ValueResolver; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/ConstantToClassConstantRector.php b/src/Drupal8/Rector/Deprecation/ConstantToClassConstantRector.php index a8a6bb0e..3ee74eb7 100644 --- a/src/Drupal8/Rector/Deprecation/ConstantToClassConstantRector.php +++ b/src/Drupal8/Rector/Deprecation/ConstantToClassConstantRector.php @@ -6,8 +6,8 @@ use DrupalRector\Drupal8\Rector\ValueObject\ConstantToClassConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/DBRector.php b/src/Drupal8/Rector/Deprecation/DBRector.php index 2a74594e..feb8aeb7 100644 --- a/src/Drupal8/Rector/Deprecation/DBRector.php +++ b/src/Drupal8/Rector/Deprecation/DBRector.php @@ -9,8 +9,8 @@ use PhpParser\Node; use PhpParser\Node\Expr; use PhpParser\Node\Expr\MethodCall; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/DrupalLRector.php b/src/Drupal8/Rector/Deprecation/DrupalLRector.php index 3852086f..ce176653 100644 --- a/src/Drupal8/Rector/Deprecation/DrupalLRector.php +++ b/src/Drupal8/Rector/Deprecation/DrupalLRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/DrupalServiceRenameRector.php b/src/Drupal8/Rector/Deprecation/DrupalServiceRenameRector.php index de2c0b60..43726353 100644 --- a/src/Drupal8/Rector/Deprecation/DrupalServiceRenameRector.php +++ b/src/Drupal8/Rector/Deprecation/DrupalServiceRenameRector.php @@ -6,8 +6,8 @@ use DrupalRector\Drupal8\Rector\ValueObject\DrupalServiceRenameConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/DrupalSetMessageRector.php b/src/Drupal8/Rector/Deprecation/DrupalSetMessageRector.php index 641f0e40..4d3addba 100644 --- a/src/Drupal8/Rector/Deprecation/DrupalSetMessageRector.php +++ b/src/Drupal8/Rector/Deprecation/DrupalSetMessageRector.php @@ -11,8 +11,8 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; -use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/DrupalURLRector.php b/src/Drupal8/Rector/Deprecation/DrupalURLRector.php index d560e90b..59c799f1 100644 --- a/src/Drupal8/Rector/Deprecation/DrupalURLRector.php +++ b/src/Drupal8/Rector/Deprecation/DrupalURLRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/EntityCreateRector.php b/src/Drupal8/Rector/Deprecation/EntityCreateRector.php index 6dec3a4a..8570c6f9 100644 --- a/src/Drupal8/Rector/Deprecation/EntityCreateRector.php +++ b/src/Drupal8/Rector/Deprecation/EntityCreateRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/EntityDeleteMultipleRector.php b/src/Drupal8/Rector/Deprecation/EntityDeleteMultipleRector.php index 64205e96..18cbf65b 100644 --- a/src/Drupal8/Rector/Deprecation/EntityDeleteMultipleRector.php +++ b/src/Drupal8/Rector/Deprecation/EntityDeleteMultipleRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/EntityInterfaceLinkRector.php b/src/Drupal8/Rector/Deprecation/EntityInterfaceLinkRector.php index c8815f48..31b85b90 100644 --- a/src/Drupal8/Rector/Deprecation/EntityInterfaceLinkRector.php +++ b/src/Drupal8/Rector/Deprecation/EntityInterfaceLinkRector.php @@ -6,7 +6,7 @@ use DrupalRector\Services\AddCommentService; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/EntityLoadRector.php b/src/Drupal8/Rector/Deprecation/EntityLoadRector.php index 5de75256..66e9bcc2 100644 --- a/src/Drupal8/Rector/Deprecation/EntityLoadRector.php +++ b/src/Drupal8/Rector/Deprecation/EntityLoadRector.php @@ -7,8 +7,8 @@ use DrupalRector\Drupal8\Rector\ValueObject\EntityLoadConfiguration; use DrupalRector\Services\AddCommentService; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -169,9 +169,15 @@ public function refactor(Node $node): ?Node $resetCache_method_name = new Node\Identifier('resetCache'); + if (!class_exists('\PhpParser\Node\ArrayItem')) { + $arrayItems = [new Node\Expr\ArrayItem($entity_id->value)]; + } else { + $arrayItems = [new \PhpParser\Node\ArrayItem($entity_id->value)]; + } + $reset_args = [ // This creates a new argument that wraps the entity ID in an array. - new Node\Arg(new Node\Expr\Array_([new Node\Expr\ArrayItem($entity_id->value)])), + new Node\Arg(new Node\Expr\Array_($arrayItems)), ]; $entity_load_reset_node = new Node\Expr\MethodCall($getStorage_node, diff --git a/src/Drupal8/Rector/Deprecation/EntityManagerRector.php b/src/Drupal8/Rector/Deprecation/EntityManagerRector.php index 473bbd8f..9b26d5b6 100644 --- a/src/Drupal8/Rector/Deprecation/EntityManagerRector.php +++ b/src/Drupal8/Rector/Deprecation/EntityManagerRector.php @@ -7,10 +7,10 @@ use DrupalRector\Services\AddCommentService; use PhpParser\Node; use PHPStan\Analyser\Scope; -use Rector\Core\Exception\ShouldNotHappenException; -use Rector\Core\Rector\AbstractRector; +use Rector\Exception\ShouldNotHappenException; use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/EntityViewRector.php b/src/Drupal8/Rector/Deprecation/EntityViewRector.php index 1a602de1..26e035b1 100644 --- a/src/Drupal8/Rector/Deprecation/EntityViewRector.php +++ b/src/Drupal8/Rector/Deprecation/EntityViewRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/FileDefaultSchemeRector.php b/src/Drupal8/Rector/Deprecation/FileDefaultSchemeRector.php index 224df6f0..2d98cd86 100644 --- a/src/Drupal8/Rector/Deprecation/FileDefaultSchemeRector.php +++ b/src/Drupal8/Rector/Deprecation/FileDefaultSchemeRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php b/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php index 3a0c80bd..68316c57 100644 --- a/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php +++ b/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php @@ -10,9 +10,9 @@ use PHPStan\Analyser\Scope; use PHPStan\Type\ObjectType; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; -use Rector\Core\Exception\ShouldNotHappenException; -use Rector\Core\PhpParser\Node\Value\ValueResolver; -use Rector\Core\Rector\AbstractScopeAwareRector; +use Rector\Exception\ShouldNotHappenException; +use Rector\PhpParser\Node\Value\ValueResolver; +use Rector\Rector\AbstractScopeAwareRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/GetMockRector.php b/src/Drupal8/Rector/Deprecation/GetMockRector.php index a30f3f1e..2f9f673d 100644 --- a/src/Drupal8/Rector/Deprecation/GetMockRector.php +++ b/src/Drupal8/Rector/Deprecation/GetMockRector.php @@ -7,10 +7,10 @@ use DrupalRector\Drupal8\Rector\ValueObject\GetMockConfiguration; use PhpParser\Node; use PHPStan\Analyser\Scope; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/LinkGeneratorTraitLRector.php b/src/Drupal8/Rector/Deprecation/LinkGeneratorTraitLRector.php index 825fa52a..4195de5c 100644 --- a/src/Drupal8/Rector/Deprecation/LinkGeneratorTraitLRector.php +++ b/src/Drupal8/Rector/Deprecation/LinkGeneratorTraitLRector.php @@ -7,8 +7,8 @@ use DrupalRector\Services\AddCommentService; use DrupalRector\Utility\FindParentByTypeTrait; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\Node\AttributeKey; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/RequestTimeConstRector.php b/src/Drupal8/Rector/Deprecation/RequestTimeConstRector.php index 8a98da03..526f61b8 100644 --- a/src/Drupal8/Rector/Deprecation/RequestTimeConstRector.php +++ b/src/Drupal8/Rector/Deprecation/RequestTimeConstRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/SafeMarkupFormatRector.php b/src/Drupal8/Rector/Deprecation/SafeMarkupFormatRector.php index 5bf6b0fa..d59b7acd 100644 --- a/src/Drupal8/Rector/Deprecation/SafeMarkupFormatRector.php +++ b/src/Drupal8/Rector/Deprecation/SafeMarkupFormatRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal8\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/Deprecation/StaticToFunctionRector.php b/src/Drupal8/Rector/Deprecation/StaticToFunctionRector.php index 52ef5b9a..59ab837e 100644 --- a/src/Drupal8/Rector/Deprecation/StaticToFunctionRector.php +++ b/src/Drupal8/Rector/Deprecation/StaticToFunctionRector.php @@ -6,8 +6,8 @@ use DrupalRector\Drupal8\Rector\ValueObject\StaticToFunctionConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal8/Rector/ValueObject/ConstantToClassConfiguration.php b/src/Drupal8/Rector/ValueObject/ConstantToClassConfiguration.php index 131274be..b8bfe544 100644 --- a/src/Drupal8/Rector/ValueObject/ConstantToClassConfiguration.php +++ b/src/Drupal8/Rector/ValueObject/ConstantToClassConfiguration.php @@ -4,7 +4,7 @@ namespace DrupalRector\Drupal8\Rector\ValueObject; -use Rector\Core\Validation\RectorAssert; +use Rector\Validation\RectorAssert; final class ConstantToClassConfiguration { diff --git a/src/Drupal8/Rector/ValueObject/EntityLoadConfiguration.php b/src/Drupal8/Rector/ValueObject/EntityLoadConfiguration.php index f5b96729..bdf2aa4f 100644 --- a/src/Drupal8/Rector/ValueObject/EntityLoadConfiguration.php +++ b/src/Drupal8/Rector/ValueObject/EntityLoadConfiguration.php @@ -4,7 +4,7 @@ namespace DrupalRector\Drupal8\Rector\ValueObject; -use Rector\Core\Validation\RectorAssert; +use Rector\Validation\RectorAssert; final class EntityLoadConfiguration { diff --git a/src/Drupal9/Rector/Deprecation/AssertFieldByIdRector.php b/src/Drupal9/Rector/Deprecation/AssertFieldByIdRector.php index 5fc330d4..677f5355 100644 --- a/src/Drupal9/Rector/Deprecation/AssertFieldByIdRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertFieldByIdRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/AssertFieldByNameRector.php b/src/Drupal9/Rector/Deprecation/AssertFieldByNameRector.php index 6200835a..69ca6451 100644 --- a/src/Drupal9/Rector/Deprecation/AssertFieldByNameRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertFieldByNameRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/AssertLegacyTraitRector.php b/src/Drupal9/Rector/Deprecation/AssertLegacyTraitRector.php index 02646a56..95e3a374 100644 --- a/src/Drupal9/Rector/Deprecation/AssertLegacyTraitRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertLegacyTraitRector.php @@ -10,8 +10,8 @@ use PhpParser\Node; use PhpParser\Node\Arg; use PhpParser\Node\VariadicPlaceholder; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/AssertNoFieldByIdRector.php b/src/Drupal9/Rector/Deprecation/AssertNoFieldByIdRector.php index 77934191..202a8b27 100644 --- a/src/Drupal9/Rector/Deprecation/AssertNoFieldByIdRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertNoFieldByIdRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/AssertNoFieldByNameRector.php b/src/Drupal9/Rector/Deprecation/AssertNoFieldByNameRector.php index 863b6b21..72fc873a 100644 --- a/src/Drupal9/Rector/Deprecation/AssertNoFieldByNameRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertNoFieldByNameRector.php @@ -9,7 +9,7 @@ use PhpParser\Node; use PhpParser\Node\Arg; use PhpParser\Node\VariadicPlaceholder; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/AssertNoUniqueTextRector.php b/src/Drupal9/Rector/Deprecation/AssertNoUniqueTextRector.php index 6407459c..caabeefa 100644 --- a/src/Drupal9/Rector/Deprecation/AssertNoUniqueTextRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertNoUniqueTextRector.php @@ -6,8 +6,8 @@ use DrupalRector\Utility\GetDeclaringSourceTrait; use PhpParser\Node; -use Rector\Core\Exception\ShouldNotHappenException; -use Rector\Core\Rector\AbstractRector; +use Rector\Exception\ShouldNotHappenException; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/AssertOptionSelectedRector.php b/src/Drupal9/Rector/Deprecation/AssertOptionSelectedRector.php index b090a2ab..09b7ae71 100644 --- a/src/Drupal9/Rector/Deprecation/AssertOptionSelectedRector.php +++ b/src/Drupal9/Rector/Deprecation/AssertOptionSelectedRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/ConstructFieldXpathRector.php b/src/Drupal9/Rector/Deprecation/ConstructFieldXpathRector.php index 1de4caff..f6c9b14e 100644 --- a/src/Drupal9/Rector/Deprecation/ConstructFieldXpathRector.php +++ b/src/Drupal9/Rector/Deprecation/ConstructFieldXpathRector.php @@ -6,7 +6,7 @@ use DrupalRector\Utility\GetDeclaringSourceTrait; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/ExtensionPathRector.php b/src/Drupal9/Rector/Deprecation/ExtensionPathRector.php index 9bb8d50d..e0d9ca33 100644 --- a/src/Drupal9/Rector/Deprecation/ExtensionPathRector.php +++ b/src/Drupal9/Rector/Deprecation/ExtensionPathRector.php @@ -7,8 +7,8 @@ use DrupalRector\Drupal9\Rector\ValueObject\ExtensionPathConfiguration; use DrupalRector\Services\AddCommentService; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/FileBuildUriRector.php b/src/Drupal9/Rector/Deprecation/FileBuildUriRector.php index 57864646..8ebefe34 100644 --- a/src/Drupal9/Rector/Deprecation/FileBuildUriRector.php +++ b/src/Drupal9/Rector/Deprecation/FileBuildUriRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/FileCreateUrlRector.php b/src/Drupal9/Rector/Deprecation/FileCreateUrlRector.php index bfd72b0f..1054a6d1 100644 --- a/src/Drupal9/Rector/Deprecation/FileCreateUrlRector.php +++ b/src/Drupal9/Rector/Deprecation/FileCreateUrlRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/FileUrlTransformRelativeRector.php b/src/Drupal9/Rector/Deprecation/FileUrlTransformRelativeRector.php index b6896ab4..1fa90220 100644 --- a/src/Drupal9/Rector/Deprecation/FileUrlTransformRelativeRector.php +++ b/src/Drupal9/Rector/Deprecation/FileUrlTransformRelativeRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/FromUriRector.php b/src/Drupal9/Rector/Deprecation/FromUriRector.php index 891b6ea6..f88f83e7 100644 --- a/src/Drupal9/Rector/Deprecation/FromUriRector.php +++ b/src/Drupal9/Rector/Deprecation/FromUriRector.php @@ -6,7 +6,7 @@ use DrupalRector\Utility\GetDeclaringSourceTrait; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/FunctionToEntityTypeStorageMethod.php b/src/Drupal9/Rector/Deprecation/FunctionToEntityTypeStorageMethod.php index 84619b7d..74c02230 100644 --- a/src/Drupal9/Rector/Deprecation/FunctionToEntityTypeStorageMethod.php +++ b/src/Drupal9/Rector/Deprecation/FunctionToEntityTypeStorageMethod.php @@ -6,8 +6,8 @@ use DrupalRector\Drupal9\Rector\ValueObject\FunctionToEntityTypeStorageConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/FunctionToFirstArgMethodRector.php b/src/Drupal9/Rector/Deprecation/FunctionToFirstArgMethodRector.php index 240253a0..7a89089e 100644 --- a/src/Drupal9/Rector/Deprecation/FunctionToFirstArgMethodRector.php +++ b/src/Drupal9/Rector/Deprecation/FunctionToFirstArgMethodRector.php @@ -6,8 +6,8 @@ use DrupalRector\Drupal9\Rector\ValueObject\FunctionToFirstArgMethodConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/GetAllOptionsRector.php b/src/Drupal9/Rector/Deprecation/GetAllOptionsRector.php index 9038a88b..68a57c69 100644 --- a/src/Drupal9/Rector/Deprecation/GetAllOptionsRector.php +++ b/src/Drupal9/Rector/Deprecation/GetAllOptionsRector.php @@ -6,8 +6,8 @@ use DrupalRector\Utility\GetDeclaringSourceTrait; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/GetRawContentRector.php b/src/Drupal9/Rector/Deprecation/GetRawContentRector.php index a0425cef..cf6d9dcb 100644 --- a/src/Drupal9/Rector/Deprecation/GetRawContentRector.php +++ b/src/Drupal9/Rector/Deprecation/GetRawContentRector.php @@ -6,8 +6,8 @@ use DrupalRector\Utility\GetDeclaringSourceTrait; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/ModuleLoadRector.php b/src/Drupal9/Rector/Deprecation/ModuleLoadRector.php index 866623ae..37c38d55 100644 --- a/src/Drupal9/Rector/Deprecation/ModuleLoadRector.php +++ b/src/Drupal9/Rector/Deprecation/ModuleLoadRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/PassRector.php b/src/Drupal9/Rector/Deprecation/PassRector.php index 7b12b400..60b68900 100644 --- a/src/Drupal9/Rector/Deprecation/PassRector.php +++ b/src/Drupal9/Rector/Deprecation/PassRector.php @@ -7,7 +7,7 @@ use DrupalRector\Utility\GetDeclaringSourceTrait; use PhpParser\Node; use PhpParser\NodeTraverser; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/SystemSortByInfoNameRector.php b/src/Drupal9/Rector/Deprecation/SystemSortByInfoNameRector.php index c30334f3..b99f44e4 100644 --- a/src/Drupal9/Rector/Deprecation/SystemSortByInfoNameRector.php +++ b/src/Drupal9/Rector/Deprecation/SystemSortByInfoNameRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/TaxonomyTermLoadMultipleByNameRector.php b/src/Drupal9/Rector/Deprecation/TaxonomyTermLoadMultipleByNameRector.php index 9e69b2e1..37be4883 100644 --- a/src/Drupal9/Rector/Deprecation/TaxonomyTermLoadMultipleByNameRector.php +++ b/src/Drupal9/Rector/Deprecation/TaxonomyTermLoadMultipleByNameRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesDrupalStaticResetRector.php b/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesDrupalStaticResetRector.php index 8579d38a..85843ad4 100644 --- a/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesDrupalStaticResetRector.php +++ b/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesDrupalStaticResetRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesRector.php b/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesRector.php index a8d525e0..d19ba3f1 100644 --- a/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesRector.php +++ b/src/Drupal9/Rector/Deprecation/TaxonomyVocabularyGetNamesRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/UiHelperTraitDrupalPostFormRector.php b/src/Drupal9/Rector/Deprecation/UiHelperTraitDrupalPostFormRector.php index 1adc87ec..eb2a9421 100644 --- a/src/Drupal9/Rector/Deprecation/UiHelperTraitDrupalPostFormRector.php +++ b/src/Drupal9/Rector/Deprecation/UiHelperTraitDrupalPostFormRector.php @@ -5,8 +5,8 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Exception\ShouldNotHappenException; -use Rector\Core\Rector\AbstractRector; +use Rector\Exception\ShouldNotHappenException; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Deprecation/UserPasswordRector.php b/src/Drupal9/Rector/Deprecation/UserPasswordRector.php index 19ba03af..e6c10d26 100644 --- a/src/Drupal9/Rector/Deprecation/UserPasswordRector.php +++ b/src/Drupal9/Rector/Deprecation/UserPasswordRector.php @@ -5,7 +5,7 @@ namespace DrupalRector\Drupal9\Rector\Deprecation; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector.php b/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector.php index 72dba517..b7a6ae09 100644 --- a/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector.php +++ b/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector.php @@ -5,8 +5,8 @@ namespace DrupalRector\Drupal9\Rector\Property; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; use Rector\Privatization\NodeManipulator\VisibilityManipulator; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Rector/AbstractDrupalCoreRector.php b/src/Rector/AbstractDrupalCoreRector.php index 54f857da..d95f1205 100644 --- a/src/Rector/AbstractDrupalCoreRector.php +++ b/src/Rector/AbstractDrupalCoreRector.php @@ -8,8 +8,8 @@ use DrupalRector\Contract\VersionedConfigurationInterface; use PhpParser\Node; use PhpParser\Node\Expr\ArrowFunction; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; abstract class AbstractDrupalCoreRector extends AbstractRector implements ConfigurableRectorInterface { diff --git a/src/Rector/Deprecation/Base/FunctionToFunctionBase.php b/src/Rector/Deprecation/Base/FunctionToFunctionBase.php index 92b90c27..8d2ce507 100644 --- a/src/Rector/Deprecation/Base/FunctionToFunctionBase.php +++ b/src/Rector/Deprecation/Base/FunctionToFunctionBase.php @@ -5,7 +5,7 @@ namespace DrupalRector\Rector\Deprecation\Base; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; /** * Replaces deprecated function call with a function call. diff --git a/src/Rector/Deprecation/Base/StaticToServiceBase.php b/src/Rector/Deprecation/Base/StaticToServiceBase.php index fb185a3e..618399d5 100644 --- a/src/Rector/Deprecation/Base/StaticToServiceBase.php +++ b/src/Rector/Deprecation/Base/StaticToServiceBase.php @@ -5,7 +5,7 @@ namespace DrupalRector\Rector\Deprecation\Base; use PhpParser\Node; -use Rector\Core\Rector\AbstractRector; +use Rector\Rector\AbstractRector; /** * Replaces deprecated static call with service method call. diff --git a/src/Rector/Deprecation/DeprecationHelperRemoveRector.php b/src/Rector/Deprecation/DeprecationHelperRemoveRector.php index af240ea2..2cc66505 100644 --- a/src/Rector/Deprecation/DeprecationHelperRemoveRector.php +++ b/src/Rector/Deprecation/DeprecationHelperRemoveRector.php @@ -6,8 +6,8 @@ use DrupalRector\Rector\ValueObject\DeprecationHelperRemoveConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Rector/Deprecation/FunctionToServiceRector.php b/src/Rector/Deprecation/FunctionToServiceRector.php index 124e0e4a..3465c936 100644 --- a/src/Rector/Deprecation/FunctionToServiceRector.php +++ b/src/Rector/Deprecation/FunctionToServiceRector.php @@ -6,8 +6,8 @@ use DrupalRector\Rector\ValueObject\FunctionToServiceConfiguration; use PhpParser\Node; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Rector/Deprecation/MethodToMethodWithCheckRector.php b/src/Rector/Deprecation/MethodToMethodWithCheckRector.php index 45ddb1c8..409feee4 100644 --- a/src/Rector/Deprecation/MethodToMethodWithCheckRector.php +++ b/src/Rector/Deprecation/MethodToMethodWithCheckRector.php @@ -8,9 +8,9 @@ use DrupalRector\Services\AddCommentService; use PhpParser\Node; use PHPStan\Type\ObjectType; -use Rector\Core\Contract\Rector\ConfigurableRectorInterface; -use Rector\Core\Exception\ShouldNotHappenException; -use Rector\Core\Rector\AbstractRector; +use Rector\Contract\Rector\ConfigurableRectorInterface; +use Rector\Exception\ShouldNotHappenException; +use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/src/Rector/PHPUnit/ShouldCallParentMethodsRector.php b/src/Rector/PHPUnit/ShouldCallParentMethodsRector.php index 90fe2b0c..934ef7fa 100644 --- a/src/Rector/PHPUnit/ShouldCallParentMethodsRector.php +++ b/src/Rector/PHPUnit/ShouldCallParentMethodsRector.php @@ -6,7 +6,7 @@ use PhpParser\Node; use PHPStan\Analyser\Scope; -use Rector\Core\Rector\AbstractScopeAwareRector; +use Rector\Rector\AbstractScopeAwareRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; diff --git a/tests/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector/config/configured_rule.php b/tests/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector/config/configured_rule.php index fe548ec0..4aa74c8f 100644 --- a/tests/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector/config/configured_rule.php +++ b/tests/src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector/config/configured_rule.php @@ -5,5 +5,5 @@ use Rector\Config\RectorConfig; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->rule(\DrupalRector\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector::class); + $rectorConfig->rule(DrupalRector\Drupal8\Rector\Deprecation\FunctionalTestDefaultThemePropertyRector::class); }; diff --git a/tests/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector/config/configured_rule.php b/tests/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector/config/configured_rule.php index 58043016..d424bb27 100644 --- a/tests/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector/config/configured_rule.php +++ b/tests/src/Drupal9/Rector/Property/ProtectedStaticModulesPropertyRector/config/configured_rule.php @@ -5,5 +5,5 @@ use Rector\Config\RectorConfig; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->rule(\DrupalRector\Drupal9\Rector\Property\ProtectedStaticModulesPropertyRector::class); + $rectorConfig->rule(DrupalRector\Drupal9\Rector\Property\ProtectedStaticModulesPropertyRector::class); };