soyuka · soyuka · Jan 22, 2023 · Jan 23, 2023 · Jan 24, 2023 · Jan 26, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -192,6 +192,11 @@ jobs:
           - JsonSchema
           - OpenApi
           - Metadata
+          - Elasticsearch
+          - HttpCache
+          - RamseyUuid
+          - GraphQl
+          - Serializer
       fail-fast: false
     steps:
       - name: Checkout

diff --git a/.github/workflows/guides.yaml b/.github/workflows/guides.yaml
@@ -42,7 +42,7 @@ jobs:
                     restore-keys: ${{ runner.os }}-composer-
             -   name: Install project dependencies
                 working-directory: docs
-                run: composer install --no-interaction --no-progress --ansi
+                run: composer install --no-interaction --no-progress --ansi && composer require webonyx/graphql-php
             -   name: Test guides
                 working-directory: docs
                 env:
@@ -53,10 +53,5 @@ jobs:
                     for d in guides/*.php; do
                       rm -f var/data.db
                       echo "Testing guide $d"
-                      pdg-phpunit $d
-                      code=$?
-                      if [[ $code -ne 0 ]]; then
-                        break
-                      fi
+                      pdg-phpunit $d || exit 1
                     done
-                    exit $code
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
 *.log
 /.php-cs-fixer.php
 /.php-cs-fixer.cache
-/.phpunit.result.cache
+.phpunit.result.cache
 /.phpunit.cache/
 /build/
-/composer.lock
+composer.lock
 /composer.phar
 /phpstan.neon
 /phpunit.xml
@@ -16,3 +16,4 @@
 /tests/Metadata/Extractor/Adapter/*.yaml
 /vendor/
 /Dockerfile
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## v3.1.14
+
+### Bug fixes
+
+* [146f55330](https://github.com/api-platform/core/commit/146f55330e3df8301ac84345b69a25cdfb908b27) fix(metadata): operation NotExposed status to 404 (#5717)
+* [4dcfc16c3](https://github.com/api-platform/core/commit/4dcfc16c38ab4c371a37a7d92d2f2f205de31f89) fix(symfony): perf regression with Symfony 6.3  (#5721)
+* [4f9626f42](https://github.com/api-platform/core/commit/4f9626f42b75a5fd1f9d681c80ad6c4ee56318fe) fix(serializer): use data if no uri_variables provided (#5743)
+* [7bb92a52f](https://github.com/api-platform/core/commit/7bb92a52f5c6e02705547408281eba93f73b588e) fix(doctrine): use stateOptions only within doctrine context (#5726)
+* [83dbfbff1](https://github.com/api-platform/core/commit/83dbfbff1717dabba7ce9e814d0bdb556b49fcb8) fix(metadata): generated NotExposed operation should inherit resource options (#5722)
+* [ccad63683](https://github.com/api-platform/core/commit/ccad6368303d341f37eff0317cc8e433504c460f) Revert "fix: search on nested sub-entity that doesn't use "id" as its ORM identifier (#5623)" (#5744)
+* [e2745855b](https://github.com/api-platform/core/commit/e2745855be4986d361626d1b853e45cde229d3d8) fix(openapi): model Example, Header and Reference (#5716)
+* [ebf03104f](https://github.com/api-platform/core/commit/ebf03104fcbffc5af74d78c3e9b14d02d7527214) fix(jsonld): skolem uri template may have a _format (#5729)
+
 ## v3.1.13
 
 ### Bug fixes

diff --git a/README.md b/README.md
@@ -1,17 +1,15 @@
 # API Platform Core
 
-API Platform Core is an easy to use and powerful system to create [hypermedia-driven REST](https://en.wikipedia.org/wiki/HATEOAS) and [GraphQL](https://graphql.org/) APIs.
+API Platform Core is an easy-to-use and powerful system to create [hypermedia-driven REST](https://en.wikipedia.org/wiki/HATEOAS) and [GraphQL](https://graphql.org/) APIs.
 It is a component of the [API Platform framework](https://api-platform.com) and it can be integrated
 with [the Symfony framework](https://symfony.com) using the bundle distributed with the library.
 
-It natively supports popular open formats including [JSON for Linked Data (JSON-LD)](https://json-ld.org), [Hydra Core Vocabulary](https://www.hydra-cg.com), [OpenAPI v2 (formerly Swagger) and v3](https://www.openapis.org), [HAL](https://tools.ietf.org/html/draft-kelly-json-hal-08) and [Problem Details](https://tools.ietf.org/html/rfc7807).
+It natively supports popular open formats including [JSON for Linked Data (JSON-LD)](https://json-ld.org), [Hydra Core Vocabulary](https://www.hydra-cg.com), [OpenAPI v2 (formerly Swagger) and v3](https://www.openapis.org), [JSON:API](https://jsonapi.org/), [HAL](https://tools.ietf.org/html/draft-kelly-json-hal-08) and [Problem Details](https://tools.ietf.org/html/rfc7807).
 
-Build a working and fully-featured CRUD API in minutes. Leverage the awesome features of the tool to develop complex and
-high performance API-first projects. Extend or override everything you want.
+Build a working and fully-featured web API in minutes. Leverage the awesome features of the tool to develop complex and
+high-performance API-first projects. Extend or override everything you want.
 
 [![GitHub Actions](https://github.com/api-platform/core/workflows/CI/badge.svg?branch=main)](https://github.com/api-platform/core/actions?query=workflow%3ACI+branch%3Amain)
-[![Codecov](https://codecov.io/gh/api-platform/core/branch/main/graph/badge.svg)](https://codecov.io/gh/api-platform/core/branch/main)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/api-platform/core/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/api-platform/core/?branch=main)
 
 ## Documentation
 

diff --git a/docs/adr/0005-refactor-state-management.md b/docs/adr/0005-refactor-state-management.md
@@ -0,0 +1,54 @@
+# Refactor State Management
+
+* Status: proposed
+* Deciders: @dunglas, @soyuka, @alanpoulain
+
+## Context and Problem Statement
+
+Since version 2.2, we support both REST and GraphQL API styles out of the box.
+This leads to some code duplication to extract states from request bodies (write requests),
+and to generate resource representations from states retrieved from the data source.
+
+The REST susbystem uses [Symfony-specific kernel event listeners](https://api-platform.com/docs/core/events/#built-in-event-listeners)
+while the GraphQL subsystem relies on [an ad-hoc resolver system](https://api-platform.com/docs/core/graphql/#workflow-of-the-resolvers).
+
+Also, while it's possible [to use API Platform as a standalone PHP library](https://api-platform.com/docs/core/bootstrap/),
+this requires writing boilerplate code doing mostly what is done in the Symfony-specific listeners.
+As we're working on integrating API Platform with Laravel, the Laravel package will contain similar code to the one in the Symfony
+event listeners too.
+
+As Martin Fowler writes in the _Patterns of Enterprise Application Architecture_:
+
+> There’s just one controller, so you can easily enhance its behavior at
+runtime with decorators [Gang of Four](https://en.wikipedia.org/wiki/Design_Patterns). You can have decorators for
+authentication, character encoding, internationalization, and so forth,
+and add them using a configuration file or even while the server is
+running. ([Alur et al.](http://www.corej2eepatterns.com/InterceptingFilter.htm) describe this approach in detail under the name
+Intercepting Filter.)
+
+For API Platform 3, we refactored the whole metadata susbsytem to be more flexible, powerful, and covering more use cases.
+This led to the refactoring of the two main interfaces allowing to plug a data source in API Platform: the state provider and the state processor interfaces.
+
+Leveraging these new interfaces, it should be possible to simplify the code base and to remove most code duplication by transforming most of the code currently
+stored in the kernel event listeners and in the GraphQL resolvers in dedicated state processors and state providers.
+
+## Decision Outcome
+
+1. Move the logic currently stored in `ReadListener`, `DeserializeListener`, `DenyAccessListener`, `ValidateListener`, `WriteListener` and `SerializeListener` in classes implementing the `StateProcessorInterface` or `StateProviderInterface`. These classes will implement the decorator pattern. All classes will be composed to create a chain. The classes containing Symfony-specific and/or Doctrine-specific logic will then be able to be easily replaced by other implementations (Laravel, PSR-7, super-globals...).
+2. Remove the corresponding listeners.
+3. Replace `PlaceholderController` by a controller calling the main `StateProcessor` and `StateProvider` objects directly.
+4. Remove the GraphQL resolvers, call the main `StateProcessor` and StateProvider objects directly.
+
+Consenquently, transforming the raw request body (e.g. the raw JSON document) to a PHP data structure will be the responsibility of a processor.
+The default one will use the Symfony Serializer component to do so, but this will give the opportunity to the user to replace this class by one using another Serializer if necessary.
+This will also allow the user to access the raw body if necessary, and will enable a whole class of optimizations, extra validations (e.g. validating a raw JSON string against a JSON Schema) etc.
+Similarly, transforming PHP data structures into strings to be stored in response bodies will now be the responsibility of a state provider.
+
+This will reduce the weigth of the code base and improve the whole design of API Platform.
+
+This new design will also replace what we currently call [the "DTO" feature](https://api-platform.com/docs/core/dto/): a "data transformer" will now be just another state provider or processor.
+
+Finally, the `resumable()` method will be removed from these interfaces. The decorator pattern allows, by ordering the composed objects, to achieve the same result with more flexibility.
+
+To help using API Platform without Symfony, we could provide factories building the correct chain of data providers and persisters without relying on the Symfony Dependency Injection Component.
+
diff --git a/features/doctrine/search_filter.feature b/features/doctrine/search_filter.feature
@@ -1025,15 +1025,6 @@ Feature: Search filter on collections
     And the response should be in JSON
     And the JSON node "hydra:totalItems" should be equal to 1
 
-  @!mongodb
-  @createSchema
-  Scenario: Search on nested sub-entity that doesn't use "id" as its ORM identifier
-    Given there is a dummy entity with a sub entity with id "stringId" and name "someName"
-    When I send a "GET" request to "/dummy_with_subresource?subEntity=/dummy_subresource/stringId"
-    Then the response status code should be 200
-    And the response should be in JSON
-    And the JSON node "hydra:totalItems" should be equal to 1
-
   @!mongodb
   @createSchema
   Scenario: Custom search filters can use Doctrine Expressions as join conditions

diff --git a/features/hal/problem.feature b/features/hal/problem.feature
@@ -16,9 +16,10 @@ Feature: Error handling valid according to RFC 7807 (application/problem+json)
     And the JSON should be equal to:
     """
     {
-      "type": "https://tools.ietf.org/html/rfc2616#section-10",
+      "type": "/validation_errors/c1051bb4-d103-4f74-8988-acbcafc7fdc3",
       "title": "An error occurred",
       "detail": "name: This value should not be blank.",
+      "status": "422",
       "violations": [
         {
           "propertyPath": "name",
@@ -44,7 +45,7 @@ Feature: Error handling valid according to RFC 7807 (application/problem+json)
     Then the response status code should be 400
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
-    And the JSON node "type" should be equal to "https://tools.ietf.org/html/rfc2616#section-10"
+    And the JSON node "type" should be equal to "/errors/400"
     And the JSON node "title" should be equal to "An error occurred"
     And the JSON node "detail" should be equal to 'Nested documents for attribute "relatedDummy" are not allowed. Use IRIs instead.'
     And the JSON node "trace" should exist
diff --git a/features/main/patch.feature b/features/main/patch.feature
@@ -58,3 +58,25 @@ Feature: Sending PATCH requets
       }
     }
     """
+
+  Scenario: Patch a relation with uri variables that are not `id`
+    When I add "Content-Type" header equal to "application/merge-patch+json"
+    And I send a "PATCH" request to "/betas/1" with body:
+    """
+      {
+        "alpha": "/alphas/2"
+      }
+    """
+    Then the response should be in JSON
+    And the response status code should be 200
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the JSON should be equal to:
+    """
+    {
+      "@context": "/contexts/Beta",
+      "@id": "/betas/1",
+      "@type": "Beta",
+      "betaId": 1,
+      "alpha": "/alphas/2"
+    }
+    """
diff --git a/features/main/union_intersect_types.feature b/features/main/union_intersect_types.feature
@@ -0,0 +1,121 @@
+Feature: Union/Intersect types
+
+  Scenario Outline: Create a resource with union type
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I add "Accept" header equal to "application/ld+json"
+    And I send a "POST" request to "/issue-5452/books" with body:
+    """
+    {
+      "number": <number>,
+      "isbn": "978-3-16-148410-0"
+    }
+    """
+    Then the response status code should be 201
+    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 valid according to this schema:
+    """
+    {
+      "type": "object",
+      "properties": {
+        "@type": {
+          "type": "string",
+          "pattern": "^Book$"
+        },
+        "@context": {
+          "type": "string",
+          "pattern": "^/contexts/Book$"
+        },
+        "@id": {
+          "type": "string",
+          "pattern": "^/.well-known/genid/.+$"
+        },
+        "number": {
+          "type": "<type>"
+        },
+        "isbn": {
+          "type": "string",
+          "pattern": "^978-3-16-148410-0$"
+        }
+      },
+      "required": [
+        "@type",
+        "@context",
+        "@id",
+        "number",
+        "isbn"
+      ]
+    }
+    """
+    Examples:
+    | number | type    |
+    | "1"    | string  |
+    | 1      | integer |
+
+  Scenario: Create a resource with valid intersect type
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/issue-5452/books" with body:
+    """
+    {
+      "number": 1,
+      "isbn": "978-3-16-148410-0",
+      "author": "/issue-5452/authors/1"
+    }
+    """
+    Then the response status code should be 201
+    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 valid according to this schema:
+    """
+    {
+      "type": "object",
+      "properties": {
+        "@type": {
+          "type": "string",
+          "pattern": "^Book$"
+        },
+        "@context": {
+          "type": "string",
+          "pattern": "^/contexts/Book$"
+        },
+        "@id": {
+          "type": "string",
+          "pattern": "^/.well-known/genid/.+$"
+        },
+        "number": {
+          "type": "integer"
+        },
+        "isbn": {
+          "type": "string",
+          "pattern": "^978-3-16-148410-0$"
+        },
+        "author": {
+          "type": "string",
+          "pattern": "^/issue-5452/authors/1$"
+        }
+      },
+      "required": [
+        "@type",
+        "@context",
+        "@id",
+        "number",
+        "isbn",
+        "author"
+      ]
+    }
+    """
+
+  Scenario: Create a resource with invalid intersect type
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/issue-5452/books" with body:
+    """
+    {
+      "number": 1,
+      "isbn": "978-3-16-148410-0",
+      "library": "/issue-5452/libraries/1"
+    }
+    """
+    Then the response status code should be 400
+    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 node "hydra:description" should be equal to 'Could not denormalize object of type "ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue5452\ActivableInterface", no supporting normalizer found.'
diff --git a/features/openapi/docs.feature b/features/openapi/docs.feature
@@ -10,7 +10,7 @@ Feature: Documentation support
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/json; charset=utf-8"
     # Context
-    And the JSON node "openapi" should be equal to "3.0.0"
+    And the JSON node "openapi" should be equal to "3.1.0"
     # Root properties
     And the JSON node "info.title" should be equal to "My Dummy API"
     And the JSON node "info.description" should contain "This is a test API."
@@ -86,19 +86,19 @@ Feature: Documentation support
     {
       "default": "male",
       "example": "male",
-      "type": "string",
+      "type": ["string", "null"],
       "enum": [
           "male",
           "female",
           null
-      ],
-      "nullable": true
+      ]
     }
     """
     And the "playMode" property exists for the OpenAPI class "VideoGame"
     And the "playMode" property for the OpenAPI class "VideoGame" should be equal to:
     """
     {
+      "owl:maxCardinality": 1,
       "type": "string",
       "format": "iri-reference"
     }
@@ -238,8 +238,7 @@ Feature: Documentation support
                                         "type": "string"
                                     },
                                     "property": {
-                                        "type": "string",
-                                        "nullable": true
+                                        "type": ["string", "null"]
                                     },
                                     "required": {
                                         "type": "boolean"
@@ -310,12 +309,15 @@ Feature: Documentation support
     And the "resourceRelated" property for the OpenAPI class "Resource" should be equal to:
     """
     {
-      "readOnly":true,
-      "anyOf":[
+      "owl:maxCardinality": 1,
+      "readOnly": true,
+      "anyOf": [
+        {
+          "$ref": "#/components/schemas/ResourceRelated"
+        },
         {
-          "$ref":"#/components/schemas/ResourceRelated"
+          "type": "null"
         }
-      ],
-      "nullable":true
+      ]
     }
     """