From 90ad00c0775fb6a01a4350612a2e7767b648c25f Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 25 Nov 2023 12:20:20 +0100 Subject: [PATCH 1/8] EntityReferenceTestTrait to EntityReferenceFieldCreationTrait rector using RenameClassRector. Fixes: https://www.drupal.org/node/3401941 --- config/drupal-10/drupal-10.2-deprecations.php | 13 +++++++++++++ .../d10/rector_examples/entity_reference_trait.php | 9 +++++++++ .../entity_reference_trait.php | 7 +++++++ 3 files changed, 29 insertions(+) create mode 100644 config/drupal-10/drupal-10.2-deprecations.php create mode 100644 fixtures/d10/rector_examples/entity_reference_trait.php create mode 100644 fixtures/d10/rector_examples_updated/entity_reference_trait.php diff --git a/config/drupal-10/drupal-10.2-deprecations.php b/config/drupal-10/drupal-10.2-deprecations.php new file mode 100644 index 00000000..0d6ebcb8 --- /dev/null +++ b/config/drupal-10/drupal-10.2-deprecations.php @@ -0,0 +1,13 @@ +ruleWithConfiguration(RenameClassRector::class, [ + 'Drupal\\Tests\\field\\Traits\\EntityReferenceTestTrait' => 'Drupal\\Tests\\field\\Traits\\EntityReferenceFieldCreationTrait', + ]); +}; diff --git a/fixtures/d10/rector_examples/entity_reference_trait.php b/fixtures/d10/rector_examples/entity_reference_trait.php new file mode 100644 index 00000000..bb7a1bc6 --- /dev/null +++ b/fixtures/d10/rector_examples/entity_reference_trait.php @@ -0,0 +1,9 @@ + Date: Sat, 25 Nov 2023 12:21:57 +0100 Subject: [PATCH 2/8] Small typo --- fixtures/d10/rector_examples_updated/entity_reference_trait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/d10/rector_examples_updated/entity_reference_trait.php b/fixtures/d10/rector_examples_updated/entity_reference_trait.php index f6f7da6d..5ba81dae 100644 --- a/fixtures/d10/rector_examples_updated/entity_reference_trait.php +++ b/fixtures/d10/rector_examples_updated/entity_reference_trait.php @@ -1,6 +1,6 @@ Date: Sat, 25 Nov 2023 12:25:44 +0100 Subject: [PATCH 3/8] Add 10.2 set to config --- config/drupal-10/drupal-10-all-deprecations.php | 1 + src/Set/Drupal10SetList.php | 1 + 2 files changed, 2 insertions(+) diff --git a/config/drupal-10/drupal-10-all-deprecations.php b/config/drupal-10/drupal-10-all-deprecations.php index d7667917..43cbdd84 100644 --- a/config/drupal-10/drupal-10-all-deprecations.php +++ b/config/drupal-10/drupal-10-all-deprecations.php @@ -9,6 +9,7 @@ $rectorConfig->sets([ Drupal10SetList::DRUPAL_100, Drupal10SetList::DRUPAL_101, + Drupal10SetList::DRUPAL_102, ]); $rectorConfig->bootstrapFiles([ diff --git a/src/Set/Drupal10SetList.php b/src/Set/Drupal10SetList.php index aafeb6e5..768e2eba 100644 --- a/src/Set/Drupal10SetList.php +++ b/src/Set/Drupal10SetList.php @@ -11,4 +11,5 @@ final class Drupal10SetList implements SetListInterface public const DRUPAL_10 = __DIR__.'/../../config/drupal-10/drupal-10-all-deprecations.php'; public const DRUPAL_100 = __DIR__.'/../../config/drupal-10/drupal-10.0-deprecations.php'; public const DRUPAL_101 = __DIR__.'/../../config/drupal-10/drupal-10.1-deprecations.php'; + public const DRUPAL_102 = __DIR__.'/../../config/drupal-10/drupal-10.2-deprecations.php'; } From fdbe1e0ce1a19115d2b86499b781fe15a809ecdd Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 25 Nov 2023 12:39:45 +0100 Subject: [PATCH 4/8] When renaming it does not remove the old use statement. This should not error, but is ugly. Can only be avoided if we start applying codestyle to the files. Which seem overkill. Although something like this could work maybe? rector-src/vendor/symplify/easy-coding-standard/config/set/common/namespaces.php --- fixtures/d10/rector_examples_updated/entity_reference_trait.php | 1 + 1 file changed, 1 insertion(+) diff --git a/fixtures/d10/rector_examples_updated/entity_reference_trait.php b/fixtures/d10/rector_examples_updated/entity_reference_trait.php index 5ba81dae..6adbfb18 100644 --- a/fixtures/d10/rector_examples_updated/entity_reference_trait.php +++ b/fixtures/d10/rector_examples_updated/entity_reference_trait.php @@ -1,5 +1,6 @@ Date: Sat, 25 Nov 2023 12:40:47 +0100 Subject: [PATCH 5/8] whitespace --- fixtures/d10/rector_examples_updated/entity_reference_trait.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fixtures/d10/rector_examples_updated/entity_reference_trait.php b/fixtures/d10/rector_examples_updated/entity_reference_trait.php index 6adbfb18..5ab6f7be 100644 --- a/fixtures/d10/rector_examples_updated/entity_reference_trait.php +++ b/fixtures/d10/rector_examples_updated/entity_reference_trait.php @@ -6,3 +6,5 @@ class EntityReferenceItemTest extends FieldKernelTestBase { use EntityReferenceFieldCreationTrait; + +} From 945e35f1029f80d18bb6542ee19f288ee2f5dee6 Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 25 Nov 2023 12:41:51 +0100 Subject: [PATCH 6/8] order --- fixtures/d10/rector_examples_updated/entity_reference_trait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/d10/rector_examples_updated/entity_reference_trait.php b/fixtures/d10/rector_examples_updated/entity_reference_trait.php index 5ab6f7be..6bfa74d1 100644 --- a/fixtures/d10/rector_examples_updated/entity_reference_trait.php +++ b/fixtures/d10/rector_examples_updated/entity_reference_trait.php @@ -1,7 +1,7 @@ Date: Fri, 8 Mar 2024 11:46:39 -0500 Subject: [PATCH 7/8] Add missing use statenemt --- config/drupal-10/drupal-10.2-deprecations.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/drupal-10/drupal-10.2-deprecations.php b/config/drupal-10/drupal-10.2-deprecations.php index 4edfef3b..bf434a7e 100644 --- a/config/drupal-10/drupal-10.2-deprecations.php +++ b/config/drupal-10/drupal-10.2-deprecations.php @@ -7,6 +7,7 @@ use DrupalRector\Rector\ValueObject\FunctionToStaticConfiguration; use DrupalRector\Rector\ValueObject\MethodToMethodWithCheckConfiguration; use Rector\Config\RectorConfig; +use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Symfony\Set\SymfonySetList; return static function (RectorConfig $rectorConfig): void { From 6522dfb75a0fab379c3320cddde7c8ba88da4f71 Mon Sep 17 00:00:00 2001 From: Ken Rickard Date: Fri, 26 Apr 2024 12:17:49 -0400 Subject: [PATCH 8/8] Fix style issue from the merge conflict. --- config/drupal-10/drupal-10.2-deprecations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/drupal-10/drupal-10.2-deprecations.php b/config/drupal-10/drupal-10.2-deprecations.php index aa6d0ac3..32f7c101 100644 --- a/config/drupal-10/drupal-10.2-deprecations.php +++ b/config/drupal-10/drupal-10.2-deprecations.php @@ -31,7 +31,7 @@ // https://www.drupal.org/node/3401941 $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [ 'Drupal\\Tests\\field\\Traits\\EntityReferenceTestTrait' => 'Drupal\\Tests\\field\\Traits\\EntityReferenceFieldCreationTrait', - ]); + ]); // https://www.drupal.org/node/3358337 $rectorConfig->ruleWithConfiguration(VersionedFunctionToServiceRector::class, [