Merge e4bf4d1 into 75deb1a

api-platform · Dec 18, 2020 · b061d30 · b061d30
2 parents 75deb1a + e4bf4d1
commit b061d30
Show file tree

Hide file tree

Showing 19 changed files with 277 additions and 218 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -11,6 +11,7 @@ default:
         - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -45,6 +46,7 @@ postgres:
         - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -64,6 +66,7 @@ mongodb:
         - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -98,6 +101,7 @@ default-coverage:
         - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
         - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
 
@@ -117,6 +121,7 @@ mongodb-coverage:
         - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
         - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
         - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "symfony/http-foundation": "^4.4 || ^5.1",
         "symfony/http-kernel": "^4.4 || ^5.1",
         "symfony/property-access": "^3.4.19 || ^4.4 || ^5.1",
-        "symfony/property-info": "^3.4 || ^4.4 || ^5.1",
+        "symfony/property-info": "^3.4 || ^4.4 || ^5.1@dev",
         "symfony/serializer": "^4.4 || ^5.1",
         "symfony/web-link": "^4.4 || ^5.1",
         "willdurand/negotiation": "^2.0.3 || ^3.0"

diff --git a/features/doctrine/search_filter.feature b/features/doctrine/search_filter.feature
@@ -19,7 +19,7 @@ Feature: Search filter on collections
     Given there is a DummyCar entity with related colors
     When I send a "GET" request to "/dummy_cars?colors.prop=red"
     Then the response status code should be 200
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
       "@context": "/contexts/DummyCar",
@@ -81,25 +81,25 @@ Feature: Search filter on collections
         "hydra:mapping": [
           {
             "@type": "IriTemplateMapping",
-            "variable": "availableAt[after]",
+            "variable": "availableAt[before]",
             "property": "availableAt",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "availableAt[before]",
+            "variable": "availableAt[strictly_before]",
             "property": "availableAt",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "availableAt[strictly_after]",
+            "variable": "availableAt[after]",
             "property": "availableAt",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "availableAt[strictly_before]",
+            "variable": "availableAt[strictly_after]",
             "property": "availableAt",
             "required": false
           },
@@ -111,44 +111,38 @@ Feature: Search filter on collections
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "colors",
-            "property": "colors",
-            "required": false
-          },
-          {
-            "@type": "IriTemplateMapping",
-            "variable": "colors.prop",
-            "property": "colors.prop",
+            "variable": "foobar[]",
+            "property": null,
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "colors[]",
-            "property": "colors",
+            "variable": "foobargroups[]",
+            "property": null,
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "foobar[]",
+            "variable": "foobargroups_override[]",
             "property": null,
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "foobargroups[]",
-            "property": null,
+            "variable": "colors.prop",
+            "property": "colors.prop",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "foobargroups_override[]",
-            "property": null,
+            "variable": "colors",
+            "property": "colors",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "name",
-            "property": "name",
+            "variable": "colors[]",
+            "property": "colors",
             "required": false
           },
           {
@@ -186,6 +180,12 @@ Feature: Search filter on collections
             "variable": "uuid[]",
             "property": "uuid",
             "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "name",
+            "property": "name",
+            "required": false
           }
         ]
       }
@@ -278,7 +278,6 @@ Feature: Search filter on collections
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
-    And print last JSON response
     And the JSON should be valid according to this schema:
     """
     {

diff --git a/features/graphql/introspection.feature b/features/graphql/introspection.feature
@@ -71,7 +71,7 @@ Feature: GraphQL introspection support
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/json"
     And the JSON node "data.type1.description" should be equal to "Dummy Product."
-    And the JSON node "data.type1.fields[1].type.name" should be equal to "DummyAggregateOfferConnection"
+    And the JSON node "data.type1.fields[2].type.name" should be equal to "DummyAggregateOfferConnection"
     And the JSON node "data.type2.fields[0].name" should be equal to "edges"
     And the JSON node "data.type2.fields[0].type.ofType.name" should be equal to "DummyAggregateOfferEdge"
     And the JSON node "data.type3.fields[0].name" should be equal to "node"
@@ -201,7 +201,7 @@ Feature: GraphQL introspection support
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/json"
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
       "data": {
@@ -286,8 +286,8 @@ Feature: GraphQL introspection support
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/json"
-    And the JSON node "data.__type.fields[9].name" should be equal to "jsonData"
-    And the JSON node "data.__type.fields[9].type.name" should be equal to "Iterable"
+    And the JSON node "data.__type.fields[13].name" should be equal to "jsonData"
+    And the JSON node "data.__type.fields[13].type.name" should be equal to "Iterable"
 
   Scenario: Retrieve entity - using serialization groups - fields
     When I send the following GraphQL request:
@@ -424,8 +424,8 @@ Feature: GraphQL introspection support
     And the JSON node "data.typeCreatePayload.fields[0].name" should be equal to "dummyProperty"
     And the JSON node "data.typeCreatePayload.fields[0].type.name" should be equal to "createDummyPropertyPayloadData"
     And the JSON node "data.typeCreatePayload.fields[1].name" should be equal to "clientMutationId"
-    And the JSON node "data.typeCreatePayloadData.fields[3].name" should be equal to "group"
-    And the JSON node "data.typeCreatePayloadData.fields[3].type.name" should be equal to "createDummyGroupNestedPayload"
+    And the JSON node "data.typeCreatePayloadData.fields[4].name" should be equal to "group"
+    And the JSON node "data.typeCreatePayloadData.fields[4].type.name" should be equal to "createDummyGroupNestedPayload"
     And the JSON node "data.typeCreateNestedPayload.fields[0].name" should be equal to "id"
 
   Scenario: Retrieve a type name through a GraphQL query

diff --git a/features/jsonapi/related-resouces-inclusion.feature b/features/jsonapi/related-resouces-inclusion.feature
@@ -14,7 +14,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "data": {
@@ -56,7 +56,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "data": {
@@ -86,7 +86,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "data": {
@@ -123,7 +123,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "data": {
@@ -158,7 +158,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "data": {
@@ -238,7 +238,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "data": {
@@ -328,7 +328,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
         {
             "data": {
@@ -398,7 +398,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "links": {
@@ -510,7 +510,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "links": {
@@ -602,7 +602,7 @@ Feature: JSON API Inclusion of Related Resources
     Then the response status code should be 200
     And the response should be in JSON
     And the JSON should be valid according to the JSON API schema
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
         "links": {

diff --git a/features/main/composite.feature b/features/main/composite.feature
@@ -11,7 +11,7 @@ Feature: Retrieve data with Composite identifiers
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
-    And the JSON should be deep equal to:
+    And the JSON should be equal to:
     """
     {
       "@context": "/contexts/CompositeItem",

diff --git a/features/main/content_negotiation.feature b/features/main/content_negotiation.feature
@@ -15,7 +15,8 @@ Feature: Content Negotiation support
     """
     Then the response status code should be 201
     And the header "Content-Type" should be equal to "application/xml; charset=utf-8"
-    And the response should be equal to
+    And the response should be in XML
+    And the XML should be equal to:
     """
     <?xml version="1.0"?>
     <response><description/><dummy/><dummyBoolean/><dummyDate/><dummyFloat/><dummyPrice/><relatedDummy/><relatedDummies/><jsonData/><arrayData/><name_converted/><relatedOwnedDummy/><relatedOwningDummy/><id>1</id><name>XML!</name><alias/><foo/></response>
@@ -26,7 +27,8 @@ Feature: Content Negotiation support
     And I send a "GET" request to "/dummies"
     Then the response status code should be 200
     And the header "Content-Type" should be equal to "application/xml; charset=utf-8"
-    And the response should be equal to
+    And the response should be in XML
+    And the XML should be equal to:
     """
     <?xml version="1.0"?>
     <response><item key="0"><description/><dummy/><dummyBoolean/><dummyDate/><dummyFloat/><dummyPrice/><relatedDummy/><relatedDummies/><jsonData/><arrayData/><name_converted/><relatedOwnedDummy/><relatedOwningDummy/><id>1</id><name>XML!</name><alias/><foo/></item></response>
@@ -36,7 +38,8 @@ Feature: Content Negotiation support
     When I send a "GET" request to "/dummies.xml"
     Then the response status code should be 200
     And the header "Content-Type" should be equal to "application/xml; charset=utf-8"
-    And the response should be equal to
+    And the response should be in XML
+    And the XML should be equal to:
     """
     <?xml version="1.0"?>
     <response><item key="0"><description/><dummy/><dummyBoolean/><dummyDate/><dummyFloat/><dummyPrice/><relatedDummy/><relatedDummies/><jsonData/><arrayData/><name_converted/><relatedOwnedDummy/><relatedOwningDummy/><id>1</id><name>XML!</name><alias/><foo/></item></response>
@@ -82,7 +85,8 @@ Feature: Content Negotiation support
     """
     Then the response status code should be 201
     And the header "Content-Type" should be equal to "application/xml; charset=utf-8"
-    And the response should be equal to
+    And the response should be in XML
+    And the XML should be equal to:
     """
     <?xml version="1.0"?>
     <response><description/><dummy/><dummyBoolean/><dummyDate/><dummyFloat/><dummyPrice/><relatedDummy/><relatedDummies/><jsonData/><arrayData/><name_converted/><relatedOwnedDummy/><relatedOwningDummy/><id>2</id><name>Sent in JSON</name><alias/><foo/></response>
@@ -134,7 +138,8 @@ Feature: Content Negotiation support
     """
     Then the response status code should be 201
     And the header "Content-Type" should be equal to "application/xml; charset=utf-8"
-    And the response should be equal to
+    And the response should be in XML
+    And the XML should be equal to:
     """
     <?xml version="1.0"?>
     <response><id>1</id><name>Kevin</name></response>