fix(upgrade): use Link for uri variables definition (#4683)

Author: soyuka

src/Core/Upgrade/UpgradeApiSubresourceVisitor.php

@@ -18,6 +18,7 @@
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Link;
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
 use ReflectionClass;
@@ -89,6 +90,13 @@ public function enterNode(Node $node)
                                 ApiResource::class
                             )
                         ),
+                    ]),
+                    new Node\Stmt\Use_([
+                        new Node\Stmt\UseUse(
+                            new Node\Name(
+                                Link::class
+                            )
+                        ),
                     ])
                 );
             }
@@ -99,62 +107,44 @@ public function enterNode(Node $node)
 
             foreach ($this->subresourceMetadata['uri_variables'] as $identifier => $resource) {
                 $identifierNodes = [
-                    new Node\Expr\ArrayItem(
-                        new Node\Expr\ClassConstFetch(
+                    'fromClass' => new Node\Expr\ClassConstFetch(
                             new Node\Name(
                                 ($resource['from_class'] === $this->subresourceMetadata['resource_class']) ? 'self' : '\\'.$resource['from_class']
                             ),
                             'class'
                         ),
-                        new Node\Scalar\String_('from_class')
-                    ),
-                    new Node\Expr\ArrayItem(
-                        new Node\Expr\Array_(
+                    'identifiers' => new Node\Expr\Array_(
                             isset($resource['identifiers'][0]) ? [
                                 new Node\Expr\ArrayItem(new Node\Scalar\String_($resource['identifiers'][0])),
                             ] : [],
-                            ['kind' => Node\Expr\Array_::KIND_SHORT]),
-                        new Node\Scalar\String_('identifiers')
-                    ),
+                            ['kind' => Node\Expr\Array_::KIND_SHORT]
+                        ),
                 ];
 
                 if (isset($resource['expanded_value'])) {
-                    $identifierNodes[] = new Node\Expr\ArrayItem(
-                        new Node\Scalar\String_('expanded_value'),
-                        new Node\Scalar\String_($resource['expanded_value'])
-                    );
+                    $identifierNodes['expandedValue'] = new Node\Scalar\String_($resource['expanded_value']);
                 }
 
                 if (isset($resource['from_property']) || isset($resource['to_property'])) {
-                    $identifierNodes[] = new Node\Expr\ArrayItem(
-                        new Node\Scalar\String_($resource['to_property'] ?? $resource['from_property']),
-                        new Node\Scalar\String_(isset($resource['to_property']) ? 'to_property' : 'from_property')
-                    );
+                    $identifierNodes[isset($resource['to_property']) ? 'toProperty' : 'fromProperty'] = new Node\Scalar\String_($resource['to_property'] ?? $resource['from_property']);
                 }
 
-                $identifiersNodeItems[] = new Node\Expr\ArrayItem(
-                    new Node\Expr\Array_(
-                        $identifierNodes,
-                        [
-                            'kind' => Node\Expr\Array_::KIND_SHORT,
-                        ]
-                    ),
+                $identifierNodeItems[] = new Node\Expr\ArrayItem(
+                    new Node\Expr\New_(new Node\Name('Link'), $this->arrayToArguments($identifierNodes)),
                     new Node\Scalar\String_($identifier)
                 );
             }
 
-            $identifiersNode = new Node\Expr\Array_($identifiersNodeItems, ['kind' => Node\Expr\Array_::KIND_SHORT]);
-
             $arguments = [
                 new Node\Arg(
-                    new Node\Scalar\String_(str_replace('.{_format}', '', $this->subresourceMetadata['path'])),
+                    new Node\Scalar\String_($this->subresourceMetadata['path']),
                     false,
                     false,
                     [],
                     new Node\Identifier('uriTemplate')
                 ),
                 new Node\Arg(
-                    $identifiersNode,
+                    new Node\Expr\Array_($identifierNodeItems, ['kind' => Node\Expr\Array_::KIND_SHORT]),
                     false,
                     false,
                     [],
@@ -280,4 +270,17 @@ public function enterNode(Node $node)
             $node->attrGroups[] = $apiResourceAttribute;
         }
     }
+
+    /**
+     * @return Node\Arg[]
+     */
+    private function arrayToArguments(array $arguments)
+    {
+        $args = [];
+        foreach ($arguments as $key => $value) {
+            $args[] = new Node\Arg($value, false, false, [], new Node\Identifier($key));
+        }
+
+        return $args;
+    }
 }

tests/Core/Bridge/Symfony/Bundle/Command/UpgradeApiResourceCommandTest.php

@@ -92,7 +92,7 @@ public function testDebugResource()
             '+use ApiPlatform\\Metadata\\ApiResource',
             '+use ApiPlatform\\Metadata\\Get',
             "+#[ApiResource(graphQlOperations: [new Query(name: 'item_query'), new Mutation(name: 'update', normalizationContext: ['groups' => ['chicago', 'fakemanytomany']], denormalizationContext: ['groups' => ['friends']])], types: ['https://schema.org/Product'], normalizationContext: ['groups' => ['friends']], filters: ['related_dummy.friends', 'related_dummy.complex_sub_query'])]",
-            "+#[ApiResource(uriTemplate: '/related_dummies/{id}/id', uriVariables: ['id' => ['from_class' => self::class, 'identifiers' => ['id']]], status: 200, types: ['https://schema.org/Product'], filters: ['related_dummy.friends', 'related_dummy.complex_sub_query'], normalizationContext: ['groups' => ['friends']], operations: [new Get()])]",
+            "#[ApiResource(uriTemplate: '/related_dummies/{id}/id.{_format}', uriVariables: ['id' => new Link(fromClass: self::class, identifiers: ['id'])], status: 200, types: ['https://schema.org/Product'], filters: ['related_dummy.friends', 'related_dummy.complex_sub_query'], normalizationContext: ['groups' => ['friends']], operations: [new Get()])]",
         ];
 
         $display = $commandTester->getDisplay();