fix(graphql): wrapped type should always take the query normalization context

CHANGELOG.md

@@ -1,41 +1,5 @@
 # Changelog
 
-## 2.7.0-beta
-
-Json-Ld: property metadata types and iris (#4769)
-Symfony: write listener uri variables converter (#4774)
-Metadata: extra properties operation inheritance (#4773)
-
-**BC**
-
-Doctrine: new interfaces for Filters and Extensions ready, switch to the `ApiPlatform\Doctrine` namespace after fixing your deprecations: (#4779)
-  - `ApiPlatform\Core\Bridge\Doctrine\Orm\Extension` interfaces have an `Operation` instead of the `$operationName`, the new namespace is `ApiPlatform\Doctrine\Orm\Extension`
-  - `ApiPlatform\Core\Bridge\Doctrine\MongoDbOdm\Extension` interfaces have an `Operation` instead of the `$operationName`, the new namespace is `ApiPlatform\Doctrine\Odm\Extension`
-
-## 2.7.0-alpha.7
-
-Metadata: defaults deprecation (#4772)
-
-## 2.7.0-alpha.6
-
-GraphQl: output creates its own type in TypeBuilder (#4766)
-Metadata: clear missing metadata cache pools (#4770)
-Metadata: property override when value is set (#4767)
-Metadata: add read and write to extractor (#4760) 
-JsonSchema: factory backward compatibility layer (#4758)
-Metadata: defaults properly overrides metadata (#4759) 
-Metadata: Add missing processor and provider to extractor (#4754)
-
-## 2.7.0-alpha.5
-
-* Backward compatibility: fix upgrade script for subresources (#4747)
-* Backward compatibility: fix dependency injection (#4748)
-
-## 2.7.0-alpha.4
-
-* Backward compatibility: fix dependency injection (#4744)
-* Metadata: allow extra keys within defaults (#4743)
-
 ## 2.7.0-alpha.3
 
 * Implements Skolem IRIs instead of blank nodes, can be disabled using `iri: false` (#4731)

behat.yml.dist

@@ -2,17 +2,17 @@ default:
   suites:
     default:
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -38,17 +38,17 @@ postgres:
     default: false
     postgres: &postgres-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -59,17 +59,17 @@ mongodb:
     default: false
     mongodb: &mongodb-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -82,9 +82,9 @@ elasticsearch:
       paths:
         - '%paths.base%/features/elasticsearch'
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\ElasticsearchContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\ElasticsearchContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
       filters:
@@ -94,18 +94,18 @@ default-coverage:
   suites:
     default: &default-coverage-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
 
@@ -115,18 +115,18 @@ mongodb-coverage:
     mongodb: &mongodb-coverage-suite
       <<: *mongodb-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\DoctrineContext'
-        - 'ApiPlatform\Core\Tests\Behat\GraphqlContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\HydraContext'
-        - 'ApiPlatform\Core\Tests\Behat\OpenApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\HttpCacheContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonApiContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonHalContext'
-        - 'ApiPlatform\Core\Tests\Behat\MercureContext'
-        - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
-        - 'ApiPlatform\Core\Tests\Behat\XmlContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\DoctrineContext'
+        - 'ApiPlatform\Tests\Behat\GraphqlContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\HydraContext'
+        - 'ApiPlatform\Tests\Behat\OpenApiContext'
+        - 'ApiPlatform\Tests\Behat\HttpCacheContext'
+        - 'ApiPlatform\Tests\Behat\JsonApiContext'
+        - 'ApiPlatform\Tests\Behat\JsonHalContext'
+        - 'ApiPlatform\Tests\Behat\MercureContext'
+        - 'ApiPlatform\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Tests\Behat\XmlContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'
 
@@ -136,9 +136,9 @@ elasticsearch-coverage:
     elasticsearch: &elasticsearch-coverage-suite
       <<: *elasticsearch-suite
       contexts:
-        - 'ApiPlatform\Core\Tests\Behat\CommandContext'
-        - 'ApiPlatform\Core\Tests\Behat\ElasticsearchContext'
-        - 'ApiPlatform\Core\Tests\Behat\JsonContext'
-        - 'ApiPlatform\Core\Tests\Behat\CoverageContext'
+        - 'ApiPlatform\Tests\Behat\CommandContext'
+        - 'ApiPlatform\Tests\Behat\ElasticsearchContext'
+        - 'ApiPlatform\Tests\Behat\JsonContext'
+        - 'ApiPlatform\Tests\Behat\CoverageContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'behatch:context:rest'

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=8.1",
         "doctrine/inflector": "^1.0 || ^2.0",
         "fig/link-util": "^1.0",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
@@ -29,7 +29,6 @@
     "require-dev": {
         "behat/behat": "^3.1",
         "behat/mink": "^1.9@dev",
-        "doctrine/annotations": "^1.7",
         "doctrine/cache": "^1.11 || ^2.1",
         "doctrine/common": "^2.11 || ^3.0",
         "doctrine/data-fixtures": "^1.2.2",
@@ -115,14 +114,10 @@
     "autoload": {
         "psr-4": {
             "ApiPlatform\\": "src/"
-        },
-        "files": [
-            "src/deprecation.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
-            "ApiPlatform\\Core\\Tests\\": "tests/Core/",
             "ApiPlatform\\Tests\\": "tests/",
             "App\\": "tests/Fixtures/app/var/tmp/src/"
         }
@@ -139,7 +134,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.7.x-dev"
+            "dev-main": "3.0.x-dev"
         },
         "symfony": {
             "require": "^3.4 || ^4.4 || ^5.1 || ^6.0"

features/graphql/input_output.feature

@@ -27,14 +27,12 @@ Feature: GraphQL DTO input and output
         "bat": "OutputDto/bat",
         "relatedDummies": "OutputDto/relatedDummies"
       },
-      "@type": "DummyDtoInputOutput",
-      "@id": "/dummy_dto_input_outputs/1",
+      "@type": "OutputDto",
       "id": 1,
       "baz": 1,
       "bat": "test",
       "relatedDummies": [
         {
-          "@context": "/contexts/RelatedDummy",
           "@id": "/related_dummies/1",
           "@type": "https://schema.org/Product",
           "name": "RelatedDummy with friends",

features/graphql/introspection.feature

@@ -565,4 +565,4 @@ Feature: GraphQL introspection support
     And the header "Content-Type" should be equal to "application/json"
     And the JSON node "errors[0].debugMessage" should be equal to 'Type with id "VoDummyInspectionCursorConnection" is not present in the types container'
     And the JSON node "data.typeNotAvailable" should be null
-    And the JSON node "data.typeOwner.fields[3].type.name" should be equal to "VoDummyInspectionCursorConnection"
+    And the JSON node "data.typeOwner.fields[1].type.name" should be equal to "VoDummyInspectionCursorConnection"

features/graphql/mutation.feature

@@ -819,26 +819,6 @@ Feature: GraphQL mutation support
     And the JSON node "data.testCustomArgumentsDummyCustomMutation.dummyCustomMutation.result" should be equal to "18"
     And the JSON node "data.testCustomArgumentsDummyCustomMutation.clientMutationId" should be equal to "myId"
 
-  Scenario: Execute a custom mutation with output
-    When I send the following GraphQL request:
-    """
-    mutation {
-      testOutputDummyCustomMutation(input: {id: "/dummy_custom_mutations/1", operandA: 9, clientMutationId: "myId"}) {
-        dummyCustomMutation {
-          baz
-          bat
-        }
-        clientMutationId
-      }
-    }
-    """
-    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.testOutputDummyCustomMutation.dummyCustomMutation.baz" should be equal to "98"
-    And the JSON node "data.testOutputDummyCustomMutation.dummyCustomMutation.bat" should be equal to "9"
-    And the JSON node "data.testOutputDummyCustomMutation.clientMutationId" should be equal to "myId"
-
   Scenario: Uploading a file with a custom mutation
     Given I have the following file for a GraphQL request:
       | name | file     |

features/graphql/query.feature

@@ -432,32 +432,6 @@ Feature: GraphQL query support
     }
     """
 
-  Scenario: Custom item query with output
-    Given there are 2 dummyCustomQuery objects
-    When I send the following GraphQL request:
-    """
-    {
-      testItemOutputDummyCustomQuery(id: "/dummy_custom_queries/1",) {
-        baz
-        bat
-      }
-    }
-    """
-    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 equal to:
-    """
-    {
-      "data": {
-        "testItemOutputDummyCustomQuery": {
-          "baz": 46,
-          "bat": "Success!"
-        }
-      }
-    }
-    """
-
   @createSchema
   Scenario: Retrieve an item with different serialization groups for item_query and collection_query
     Given there are 1 dummy with different GraphQL serialization groups objects

features/hal/input_output.feature

@@ -2,7 +2,6 @@ Feature: HAL DTO input and output
   In order to use a hypermedia API
   As a client software developer
   I need to be able to use DTOs on my resources as Input or Output objects.
-  TODO: in 3.0 we should change the generated IRIs, /dummy_dto_custom_output/1 should retrieve /dummy_dto_custom_output/1 not /dumy_dto_customs/1
   for the collection we can search for an Operation with the same Output class as the given one for the collection
 
   Background:
@@ -18,11 +17,6 @@ Feature: HAL DTO input and output
     And the JSON should be a superset of:
     """
     {
-      "_links": {
-        "self": {
-          "href": "/dummy_dto_customs/1"
-        }
-      },
       "foo": "test",
       "bar": 1
     }
@@ -41,20 +35,10 @@ Feature: HAL DTO input and output
       "_embedded": {
         "item": [
           {
-            "_links": {
-              "self": {
-                "href": "/dummy_dto_customs/1"
-              }
-            },
             "foo": "test",
             "bar": 1
           },
           {
-            "_links": {
-              "self": {
-                "href": "/dummy_dto_customs/2"
-              }
-            },
             "foo": "test",
             "bar": 2
           }