Merge pull request #1947 from mab05k/bugfix/subresource-filters

Subresource Filter Fix
api-platform · May 14, 2018 · 19fc20d · 19fc20d
2 parents e91f362 + ec61304
commit 19fc20d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/features/main/relation.feature b/features/main/relation.feature
@@ -97,6 +97,7 @@ Feature: Relations support
       "@id": "/related_to_dummy_friends/dummyFriend=1;relatedDummy=1",
       "@type": "RelatedToDummyFriend",
       "name": "Friends relation",
+      "description": null,
       "dummyFriend": {
         "@id": "/dummy_friends/1",
         "@type": "DummyFriend",
@@ -117,6 +118,7 @@ Feature: Relations support
       "@id": "/related_to_dummy_friends/dummyFriend=1;relatedDummy=1",
       "@type": "RelatedToDummyFriend",
       "name": "Friends relation",
+      "description": null,
       "dummyFriend": {
         "@id": "/dummy_friends/1",
         "@type": "DummyFriend",

diff --git a/features/swagger/docs.feature b/features/swagger/docs.feature
@@ -69,7 +69,11 @@ Feature: Documentation support
     And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[1].in" should be equal to "query"
     And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[1].required" should be false
     And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[1].type" should be equal to "string"
-    And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters" should have 2 element
+    And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[2].name" should be equal to "description"
+    And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[2].in" should be equal to "query"
+    And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[2].required" should be false
+    And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters[2].type" should be equal to "string"
+    And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.parameters" should have 3 element
 
     # Subcollection - check schema
     And the JSON node "paths./related_dummies/{id}/related_to_dummy_friends.get.responses.200.schema.items.$ref" should be equal to "#/definitions/RelatedToDummyFriend-fakemanytomany"

diff --git a/src/Swagger/Serializer/DocumentationNormalizer.php b/src/Swagger/Serializer/DocumentationNormalizer.php
@@ -154,7 +154,7 @@ public function normalize($object, $format = null, array $context = [])
                     }
                 }
 
-                if ($parameters = $this->getFiltersParameters($resourceClass, $operationName, $subResourceMetadata, $definitions, $serializerContext)) {
+                if ($parameters = $this->getFiltersParameters($subresourceOperation['resource_class'], $operationName, $subResourceMetadata, $definitions, $serializerContext)) {
                     foreach ($parameters as $parameter) {
                         if (!\in_array($parameter['name'], $parametersMemory, true)) {
                             $pathOperation['parameters'][] = $parameter;

diff --git a/tests/Fixtures/TestBundle/Entity/RelatedToDummyFriend.php b/tests/Fixtures/TestBundle/Entity/RelatedToDummyFriend.php
@@ -37,6 +37,14 @@ class RelatedToDummyFriend
      */
     private $name;
 
+    /**
+     * @var string|null The dummy description
+     *
+     * @ORM\Column(nullable=true)
+     * @Groups({"fakemanytomany", "friends"})
+     */
+    private $description;
+
     /**
      * @ORM\Id
      * @ORM\ManyToOne(targetEntity="DummyFriend")
@@ -64,6 +72,22 @@ public function getName()
         return $this->name;
     }
 
+    /**
+     * @return null|string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * @param null|string $description
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+    }
+
     /**
      * Gets dummyFriend.
      *

diff --git a/tests/Fixtures/app/config/config_test.yml b/tests/Fixtures/app/config/config_test.yml
@@ -204,7 +204,7 @@ services:
 
     app.related_dummy_to_friend_resource.search_filter:
         parent:    'api_platform.doctrine.orm.search_filter'
-        arguments: [ { 'name': 'ipartial' } ]
+        arguments: [ { 'name': 'ipartial', 'description': 'ipartial' } ]
         tags:      [ { name: 'api_platform.filter', id: 'related_to_dummy_friend.name' } ]
 
     logger: