Merge pull request #4845 from nawel-les-tilleuls/feat/upgrade-filters

Migrate ApiFilter to new format
api-platform · Jul 25, 2022 · 5f4ceb6 · 5f4ceb6
2 parents 1470b1f + 77bd78d
commit 5f4ceb6
Show file tree

Hide file tree

Showing 8 changed files with 417 additions and 6 deletions.
diff --git a/features/main/subresource.feature b/features/main/subresource.feature
@@ -108,7 +108,7 @@ Feature: Subresource support
       "hydra:totalItems": 2,
       "hydra:search": {
         "@type": "hydra:IriTemplate",
-        "hydra:template": "/dummies/1/related_dummies{?relatedToDummyFriend.dummyFriend,relatedToDummyFriend.dummyFriend[],name,age,age[]}",
+        "hydra:template": "/dummies/1/related_dummies{?relatedToDummyFriend.dummyFriend,relatedToDummyFriend.dummyFriend[],name,age,age[],id,id[],symfony,symfony[],dummyDate[before],dummyDate[strictly_before],dummyDate[after],dummyDate[strictly_after]}",
         "hydra:variableRepresentation": "BasicRepresentation",
         "hydra:mapping": [
           {
@@ -140,6 +140,54 @@ Feature: Subresource support
             "variable": "age[]",
             "property": "age",
             "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "id",
+            "property": "id",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "id[]",
+            "property": "id",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "symfony",
+            "property": "symfony",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "symfony[]",
+            "property": "symfony",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[before]",
+            "property": "dummyDate",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[strictly_before]",
+            "property": "dummyDate",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[after]",
+            "property": "dummyDate",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[strictly_after]",
+            "property": "dummyDate",
+            "required": false
           }
         ]
       }
@@ -185,7 +233,7 @@ Feature: Subresource support
       },
       "hydra:search": {
         "@type": "hydra:IriTemplate",
-        "hydra:template": "/dummies/1/related_dummies{?relatedToDummyFriend.dummyFriend,relatedToDummyFriend.dummyFriend[],name,age,age[]}",
+        "hydra:template": "/dummies/1/related_dummies{?relatedToDummyFriend.dummyFriend,relatedToDummyFriend.dummyFriend[],name,age,age[],id,id[],symfony,symfony[],dummyDate[before],dummyDate[strictly_before],dummyDate[after],dummyDate[strictly_after]}",
         "hydra:variableRepresentation": "BasicRepresentation",
         "hydra:mapping": [
           {
@@ -217,6 +265,54 @@ Feature: Subresource support
             "variable": "age[]",
             "property": "age",
             "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "id",
+            "property": "id",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "id[]",
+            "property": "id",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "symfony",
+            "property": "symfony",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "symfony[]",
+            "property": "symfony",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[before]",
+            "property": "dummyDate",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[strictly_before]",
+            "property": "dummyDate",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[after]",
+            "property": "dummyDate",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "dummyDate[strictly_after]",
+            "property": "dummyDate",
+            "required": false
           }
         ]
       }

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -224,6 +224,7 @@ parameters:
 		- src/Core/Upgrade/SubresourceTransformer.php
 		- src/Core/Upgrade/UpgradeApiResourceVisitor.php
 		- src/Core/Upgrade/UpgradeApiSubresourceVisitor.php
+		- src/Core/Upgrade/UpgradeApiFilterVisitor.php
 		- src/Core/Util/AttributesExtractor.php
 		- src/Core/Util/ErrorFormatGuesser.php
 		- src/Core/Util/Inflector.php

diff --git a/src/Core/Bridge/Symfony/Bundle/Command/UpgradeApiResourceCommand.php b/src/Core/Bridge/Symfony/Bundle/Command/UpgradeApiResourceCommand.php
@@ -19,6 +19,7 @@
 use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface;
 use ApiPlatform\Core\Upgrade\ColorConsoleDiffFormatter;
 use ApiPlatform\Core\Upgrade\SubresourceTransformer;
+use ApiPlatform\Core\Upgrade\UpgradeApiFilterVisitor;
 use ApiPlatform\Core\Upgrade\UpgradeApiResourceVisitor;
 use ApiPlatform\Core\Upgrade\UpgradeApiSubresourceVisitor;
 use ApiPlatform\Exception\ResourceClassNotFoundException;
@@ -107,6 +108,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $traverser = new NodeTraverser();
             [$attribute, $isAnnotation] = $this->readApiResource($resourceClass);
 
+            $traverser->addVisitor(new UpgradeApiFilterVisitor($this->reader, $resourceClass));
+
             if (!$attribute) {
                 continue;
             }