[PHP 8.0] Add always class to AnnotationToAttribute to include string…

… to ::class reference conversion (#5619) * cleanup * add fixture * try without corrections * remove unused ExprParameterReflectionTypeCorrector, handle in expected way
rectorphp · Feb 14, 2024 · 2ff0f08 · 2ff0f08
1 parent 435d125
commit 2ff0f08
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 191 deletions.
diff --git a/.../Doctrine/embeddable_to_attribute.php.inc → .../Fixture/Doctrine/doctrine_entity.php.inc b/.../Doctrine/embeddable_to_attribute.php.inc → .../Fixture/Doctrine/doctrine_entity.php.inc
@@ -3,9 +3,9 @@
 namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\Doctrine;
 
 /**
- * @\Doctrine\ORM\Mapping\Embeddable
+ * @\Doctrine\ORM\Mapping\Entity(repositoryClass="App\Some\Class")
  */
-class PreserveIntKeyDefined
+class DoctrineEntity
 {
 }
 
@@ -15,8 +15,8 @@ class PreserveIntKeyDefined
 
 namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\Doctrine;
 
-#[\Doctrine\ORM\Mapping\Embeddable]
-class PreserveIntKeyDefined
+#[\Doctrine\ORM\Mapping\Entity(repositoryClass: \App\Some\Class::class)]
+class DoctrineEntity
 {
 }
 

diff --git a/...ctor/Class_/AnnotationToAttributeRector/Fixture/Doctrine/preserve_int_key_defined.php.inc b/...ctor/Class_/AnnotationToAttributeRector/Fixture/Doctrine/preserve_int_key_defined.php.inc
@@ -5,6 +5,7 @@ namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\D
 use Doctrine\ORM\Mapping as ORM;
 
 /**
+ * @\Doctrine\ORM\Mapping\Embeddable
  * @ORM\DiscriminatorMap({ 1 = "CostDetailEntity" })
  */
 class PreserveIntKeyDefined
@@ -19,6 +20,7 @@ namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\D
 
 use Doctrine\ORM\Mapping as ORM;
 
+#[\Doctrine\ORM\Mapping\Embeddable]
 #[ORM\DiscriminatorMap([1 => 'CostDetailEntity'])]
 class PreserveIntKeyDefined
 {

diff --git a/.../Class_/AnnotationToAttributeRector/Fixture/annotation_converted_an_keep_docblock.php.inc b/.../Class_/AnnotationToAttributeRector/Fixture/annotation_converted_an_keep_docblock.php.inc
diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/configured_rule.php
@@ -11,11 +11,8 @@
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\Attribute\OpenApi\FutureAttribute;
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\GenericAnnotation;
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\GenericSingleImplicitAnnotation;
-use Rector\ValueObject\PhpVersionFeature;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES);
-
     $rectorConfig
         ->ruleWithConfiguration(AnnotationToAttributeRector::class, [
             new AnnotationToAttribute('Doctrine\ORM\Mapping\Embeddable'),
@@ -27,21 +24,17 @@
             new AnnotationToAttribute(GenericAnnotation::class),
             new AnnotationToAttribute(GenericSingleImplicitAnnotation::class),
 
-            new AnnotationToAttribute('inject', 'Nette\DI\Attributes\Inject'),
             new AnnotationToAttribute('Symfony\Component\Routing\Annotation\Route'),
 
             // doctrine
-            new AnnotationToAttribute('Doctrine\ORM\Mapping\Entity'),
-            new AnnotationToAttribute('Doctrine\ORM\Mapping\ManyToMany'),
+            new AnnotationToAttribute('Doctrine\ORM\Mapping\Entity', null, ['repositoryClass']),
             new AnnotationToAttribute('Doctrine\ORM\Mapping\DiscriminatorMap'),
 
             // validation
-            new AnnotationToAttribute('Symfony\Component\Validator\Constraints\All'),
             new AnnotationToAttribute('Symfony\Component\Validator\Constraints\Choice'),
             new AnnotationToAttribute('Symfony\Component\Validator\Constraints\Length'),
 
             // JMS + Symfony
-            new AnnotationToAttribute('JMS\Serializer\Annotation\AccessType'),
             new AnnotationToAttribute('Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter'),
 
             // test for alias used

diff --git a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/mutiple_cases.php b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/mutiple_cases.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture;
+
+final class MultipleCases
+{
+    public function run($value)
+    {
+        switch ($value) {
+            case 'v1':
+            case 'v2':
+            case 'v3':
+                return 100;
+            default:
+                return 1000;
+        }
+    }
+}
+
+?>
diff --git a/rules/Php80/ValueObject/AnnotationToAttribute.php b/rules/Php80/ValueObject/AnnotationToAttribute.php
@@ -6,18 +6,25 @@
 
 use Rector\Php80\Contract\ValueObject\AnnotationToAttributeInterface;
 use Rector\Validation\RectorAssert;
+use Webmozart\Assert\Assert;
 
 final readonly class AnnotationToAttribute implements AnnotationToAttributeInterface
 {
+    /**
+     * @param string[] $classReferenceFields
+     */
     public function __construct(
         private string $tag,
-        private ?string $attributeClass = null
+        private ?string $attributeClass = null,
+        private array $classReferenceFields = []
     ) {
         RectorAssert::className($tag);
 
         if (is_string($attributeClass)) {
             RectorAssert::className($attributeClass);
         }
+
+        Assert::allString($classReferenceFields);
     }
 
     public function getTag(): string
@@ -33,4 +40,12 @@ public function getAttributeClass(): string
 
         return $this->attributeClass;
     }
+
+    /**
+     * @return string[]
+     */
+    public function getClassReferenceFields(): array
+    {
+        return $this->classReferenceFields;
+    }
 }
diff --git a/src/PhpAttribute/AnnotationToAttributeMapper.php b/src/PhpAttribute/AnnotationToAttributeMapper.php
@@ -30,9 +30,9 @@ public function __construct(
     }
 
     /**
-     * @return Expr|DocTagNodeState::REMOVE_ARRAY
+     * @return mixed|DocTagNodeState::REMOVE_ARRAY
      */
-    public function map(mixed $value): Expr|string
+    public function map(mixed $value): mixed
     {
         foreach ($this->annotationToAttributeMappers as $annotationToAttributeMapper) {
             if ($annotationToAttributeMapper->isCandidate($value)) {

diff --git a/src/PhpAttribute/AttributeArrayNameInliner.php b/src/PhpAttribute/AttributeArrayNameInliner.php
@@ -18,9 +18,10 @@ final class AttributeArrayNameInliner
 {
     /**
      * @param Array_|Arg[] $array
+     * @param string[] $classReferenceFields
      * @return Arg[]
      */
-    public function inlineArrayToArgs(Array_|array $array): array
+    public function inlineArrayToArgs(Array_|array $array, array $classReferenceFields = []): array
     {
         if (is_array($array)) {
             return $this->inlineArray($array);

diff --git a/src/PhpAttribute/NodeAnalyzer/ExprParameterReflectionTypeCorrector.php b/src/PhpAttribute/NodeAnalyzer/ExprParameterReflectionTypeCorrector.php