[Php80] Rollback preserve int key defined not start from 0 Fixture on…

… AnnotationToAttributeRector (#2811) * [Php80] Rollback preserver int key defined Fixture on AnnotationToAttributeRector * mark as single quoted 1 * Fixed 🎉 * [ci-review] Rector Rectify * final touch: variable clean up Co-authored-by: GitHub Action <action@github.com>
rectorphp · Aug 20, 2022 · 790ca8c · 790ca8c
1 parent 8e75310
commit 790ca8c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/...ges/PhpAttribute/AnnotationToAttributeMapper/CurlyListNodeAnnotationToAttributeMapper.php b/...ges/PhpAttribute/AnnotationToAttributeMapper/CurlyListNodeAnnotationToAttributeMapper.php
@@ -4,7 +4,6 @@
 
 namespace Rector\PhpAttribute\AnnotationToAttributeMapper;
 
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Scalar\LNumber;
@@ -13,7 +12,6 @@
 use Rector\PhpAttribute\Contract\AnnotationToAttributeMapperInterface;
 use Rector\PhpAttribute\Enum\DocTagNodeState;
 use Symfony\Contracts\Service\Attribute\Required;
-use Webmozart\Assert\Assert;
 
 /**
  * @implements AnnotationToAttributeMapperInterface<CurlyListNode>
@@ -42,29 +40,29 @@ public function isCandidate(mixed $value): bool
     public function map($value): Array_
     {
         $arrayItems = [];
-        $valuesWithExplicitSilent = $value->getValues();
+        $arrayItemNodes = $value->getValues();
         $loop = -1;
 
-        foreach ($valuesWithExplicitSilent as $key => $singleValue) {
-            $valueExpr = $this->annotationToAttributeMapper->map($singleValue);
+        foreach ($arrayItemNodes as $arrayItemNode) {
+            $valueExpr = $this->annotationToAttributeMapper->map($arrayItemNode);
 
             // remove node
             if ($valueExpr === DocTagNodeState::REMOVE_ARRAY) {
                 continue;
             }
 
-            if (! is_int($key)) {
-                $keyExpr = $this->annotationToAttributeMapper->map($key);
-                Assert::isInstanceOf($keyExpr, Expr::class);
-            } else {
-                ++$loop;
+            ++$loop;
 
-                $keyExpr = $loop !== $key
-                    ? new LNumber($key)
+            $keyExpr = $loop !== $arrayItemNode->key && is_numeric($arrayItemNode->key)
+                    ? new LNumber((int) $arrayItemNode->key)
                     : null;
-            }
 
-            $arrayItems[] = new ArrayItem($valueExpr, $keyExpr);
+            if ($valueExpr instanceof ArrayItem && $keyExpr instanceof LNumber) {
+                $valueExpr->key = $keyExpr;
+                $arrayItems[] = $valueExpr;
+            } else {
+                $arrayItems[] = new ArrayItem($valueExpr, $keyExpr);
+            }
         }
 
         return new Array_($arrayItems);

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,10 +5,7 @@ namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\D
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\DiscriminatorMap({
- *     "cost" = "CostEntity",
- *     "product" = "ProductEntity",
- * })
+ * @ORM\DiscriminatorMap({ "1" = "CostDetailEntity" })
  */
 class PreserveIntKeyDefined
 {
@@ -22,7 +19,7 @@ namespace Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Fixture\D
 
 use Doctrine\ORM\Mapping as ORM;
 
-#[ORM\DiscriminatorMap(['cost' => 'CostEntity', 'product' => 'ProductEntity'])]
+#[ORM\DiscriminatorMap([1 => 'CostDetailEntity'])]
 class PreserveIntKeyDefined
 {
 }