From 0b07b964e58d8a3cc327b567f47871f9fcfb6161 Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 15 Mar 2024 14:53:03 +0100 Subject: [PATCH 1/2] doc: Fix doc for AnnotationToAttributeRector and generate new docs. --- docs/rules_overview.md | 60 ++++++++++++++++++- .../AnnotationToAttributeRector.php | 8 ++- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/docs/rules_overview.md b/docs/rules_overview.md index 1a80073f..ccf94f13 100644 --- a/docs/rules_overview.md +++ b/docs/rules_overview.md @@ -1,21 +1,56 @@ -# 52 Rules Overview +# 54 Rules Overview
## Categories -- [Drupal10](#drupal10) (2) +- [Drupal10](#drupal10) (3) - [Drupal8](#drupal8) (18) - [Drupal9](#drupal9) (26) -- [DrupalRector](#drupalrector) (6) +- [DrupalRector](#drupalrector) (7)
## Drupal10 +### AnnotationToAttributeRector + +Change annotations with value to attribute + +:wrench: **configure it!** + +- class: [`DrupalRector\Drupal10\Rector\Deprecation\AnnotationToAttributeRector`](../src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php) + +```diff + namespace Drupal\Core\Action\Plugin\Action; + ++use Drupal\Core\Action\Plugin\Action\Derivative\EntityPublishedActionDeriver; ++use Drupal\Core\Action\Attribute\Action; + use Drupal\Core\Session\AccountInterface; ++use Drupal\Core\StringTranslation\TranslatableMarkup; + + /** + * Publishes an entity. +- * +- * @Action( +- * id = "entity:publish_action", +- * action_label = @Translation("Publish"), +- * deriver = "Drupal\Core\Action\Plugin\Action\Derivative\EntityPublishedActionDeriver", +- * ) + */ ++#[Action( ++ id: 'entity:publish_action', ++ action_label: new TranslatableMarkup('Publish'), ++ deriver: EntityPublishedActionDeriver::class ++)] + class PublishAction extends EntityActionBase { +``` + +
+ ### SystemTimeZonesRector Fixes deprecated `system_time_zones()` calls @@ -843,6 +878,25 @@ Fixes deprecated `user_password()` calls ## DrupalRector +### ClassConstantToClassConstantRector + +Fixes deprecated class contant use, used in Drupal 9.1 deprecations + +:wrench: **configure it!** + +- class: [`DrupalRector\Rector\Deprecation\ClassConstantToClassConstantRector`](../src/Rector/Deprecation/ClassConstantToClassConstantRector.php) + +```diff +-$value = Symfony\Cmf\Component\Routing\RouteObjectInterface::ROUTE_NAME; +-$value2 = Symfony\Cmf\Component\Routing\RouteObjectInterface::ROUTE_OBJECT; +-$value3 = Symfony\Cmf\Component\Routing\RouteObjectInterface::CONTROLLER_NAME; ++$value = \Drupal\Core\Routing\RouteObjectInterface::ROUTE_NAME; ++$value2 = \Drupal\Core\Routing\RouteObjectInterface::ROUTE_OBJECT; ++$value3 = \Drupal\Core\Routing\RouteObjectInterface::CONTROLLER_NAME; +``` + +
+ ### ConstantToClassConstantRector Fixes deprecated contant use, used in Drupal 8 and 9 deprecations diff --git a/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php b/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php index 5f0c0e94..95c48f2a 100644 --- a/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php +++ b/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php @@ -28,6 +28,7 @@ use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; +use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** @@ -80,7 +81,7 @@ public function configure(array $configuration): void public function getRuleDefinition(): RuleDefinition { - return new RuleDefinition('Change annotations with value to attribute', [new CodeSample(<<<'CODE_SAMPLE' + return new RuleDefinition('Change annotations with value to attribute', [new ConfiguredCodeSample(<<<'CODE_SAMPLE' namespace Drupal\Core\Action\Plugin\Action; @@ -116,7 +117,10 @@ class PublishAction extends EntityActionBase { )] class PublishAction extends EntityActionBase { CODE_SAMPLE - )]); + , + [ + new AnnotationToAttributeConfiguration('10.2.0', '12.0.0', 'Action', 'Drupal\Core\Action\Attribute\Action'), + ])]); } /** From c0f67f48ff6b8a9b55f72be417c8d1bacb1c46df Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 16 Mar 2024 15:53:21 +0100 Subject: [PATCH 2/2] fix: remove extra use statement --- .../Rector/Deprecation/AnnotationToAttributeRector.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php b/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php index 95c48f2a..ba2b311b 100644 --- a/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php +++ b/src/Drupal10/Rector/Deprecation/AnnotationToAttributeRector.php @@ -27,7 +27,6 @@ use Rector\PhpAttribute\AnnotationToAttributeMapper; use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; -use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -117,10 +116,10 @@ class PublishAction extends EntityActionBase { )] class PublishAction extends EntityActionBase { CODE_SAMPLE - , - [ - new AnnotationToAttributeConfiguration('10.2.0', '12.0.0', 'Action', 'Drupal\Core\Action\Attribute\Action'), - ])]); + , + [ + new AnnotationToAttributeConfiguration('10.2.0', '12.0.0', 'Action', 'Drupal\Core\Action\Attribute\Action'), + ])]); } /**