Merge 3.2

Author: soyuka

CHANGELOG.md

@@ -81,6 +81,21 @@ api_platform:
         form: ['multipart/form-data']
 ```
 
+## v3.2.17
+
+### Bug fixes
+
+* [2819d56c8](https://github.com/api-platform/core/commit/2819d56c80f39a53f2e3d5fd7119566ad96b4075) fix(hydra): hydra:view with absolute iris (#6208)
+* [98f4b8fca](https://github.com/api-platform/core/commit/98f4b8fcab39b1d09110cc133206e27782ea4791) fix(metadata): Operations priority sort (#6206)
+* [a1309bbf2](https://github.com/api-platform/core/commit/a1309bbf2f678081a82290818a91f0a376b3c94c) fix(serializer): skip symfony validation exception (#6220)
+
+## v3.2.16
+
+### Bug fixes
+
+* [56744dcfa](https://github.com/api-platform/core/commit/56744dcfa07f79ca58926cb199356e849ddb3a93) fix(serializer): fix union types on collection denormalization (#6192)
+* [d8e2d0c5e](https://github.com/api-platform/core/commit/d8e2d0c5e9b48c15d60a734086b0102b6ecf95c8) fix(doctrine): doctrine/orm:^3.0 support (#6193)
+* [f891f16d5](https://github.com/api-platform/core/commit/f891f16d50b665f25e4699291526161e16ce0fa7) fix(doctrine): isAssociationInverseSide before getMappedBy (#6197)
 
 ## v3.2.15
 
@@ -92,7 +107,6 @@ api_platform:
 * [8535f9def](https://github.com/api-platform/core/commit/8535f9def6fbd2baff9cedc79c34103940eb4fca) fix(doctrine): read parent class properties on PUT (#6176)
 * [a188c9473](https://github.com/api-platform/core/commit/a188c947396e0400ba6e1aadaa262d2e785fd941) fix(symfony): autoconfigure legacy alias fixes #6177 (#6181)
 * [e7b442149](https://github.com/api-platform/core/commit/e7b4421496b58f7c3db414d11dd357a8dc759323) fix(validator): stop considering properties marked with NotBlank(allowNull=true) as required (#6184)
->>>>>>> upstream/3.2
 
 ## v3.2.14
 

features/doctrine/multiple_filter.feature

@@ -38,7 +38,7 @@ Feature: Multiple filters on collections
         "hydra:view": {
           "type": "object",
           "properties": {
-          "@id": {"pattern": "^/dummies\\?dummyDate%5Bafter%5D=2015-04-28&dummyBoolean=1$"},
+          "@id": {"pattern": "^/dummies\\?dummyBoolean=1&dummyDate%5Bafter%5D=2015-04-28$"},
             "@type": {"pattern": "^hydra:PartialCollectionView$"}
           }
         }

features/elasticsearch/match_filter.feature

@@ -209,7 +209,7 @@ Feature: Match filter on collections from Elasticsearch
         "hydra:view": {
           "type": "object",
           "properties": {
-            "@id": {"pattern": "^/tweets\\?message%5B%5D=Good%20job&message%5B%5D=run&author.firstName=Caroline$"},
+            "@id": {"pattern": "^/tweets\\?author.firstName=Caroline&message%5B%5D=Good%20job&message%5B%5D=run$"},
             "@type": {"pattern": "^hydra:PartialCollectionView$"}
           }
         }
@@ -422,7 +422,7 @@ Feature: Match filter on collections from Elasticsearch
         "hydra:view": {
           "type": "object",
           "properties": {
-            "@id": {"pattern": "^/books\\?message%5B%5D=Good%20job&message%5B%5D=run&library.firstName=Caroline$"},
+            "@id": {"pattern": "^/books\\?library.firstName=Caroline&message%5B%5D=Good%20job&message%5B%5D=run$"},
             "@type": {"pattern": "^hydra:PartialCollectionView$"}
           }
         }

features/hydra/absolute.feature

@@ -0,0 +1,23 @@
+Feature: Collections with absolute IRIs support
+  In order to retrieve large collections of resources
+  As a client software developer
+  I need to retrieve paged collections respecting the Hydra specification and with absolute iris
+
+  @createSchema
+  Scenario: Retrieve third page of collection with absolute iris
+    Given there are 30 absoluteUrlDummy objects with a related absoluteUrlRelationDummy
+    When I send a "GET" request to "/absolute_url_dummies?page=3"
+    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 node "hydra:view" should be equal to:
+    """
+    {
+      "@id": "http://example.com/absolute_url_dummies?page=3",
+      "@type": "hydra:PartialCollectionView",
+      "hydra:first": "http://example.com/absolute_url_dummies?page=1",
+      "hydra:last": "http://example.com/absolute_url_dummies?page=10",
+      "hydra:previous": "http://example.com/absolute_url_dummies?page=2",
+      "hydra:next": "http://example.com/absolute_url_dummies?page=4"
+    }
+    """

features/hydra/collection.feature

@@ -576,10 +576,10 @@ Feature: Collections support
         "hydra:view": {
           "type": "object",
           "properties": {
-            "@id": {"pattern": "^/so_manies\\?order%5Bid%5D=desc&id%5Bgt%5D=10$"},
+            "@id": {"pattern": "^/so_manies\\?id%5Bgt%5D=10&order%5Bid%5D=desc$"},
             "@type": {"pattern": "^hydra:PartialCollectionView$"},
-            "hydra:previous": {"pattern": "^/so_manies\\?order%5Bid%5D=desc&id%5Bgt%5D=13$"},
-            "hydra:next": {"pattern": "^/so_manies\\?order%5Bid%5D=desc&id%5Blt%5D=10$"}
+            "hydra:previous": {"pattern": "^/so_manies\\?id%5Bgt%5D=13&order%5Bid%5D=desc$"},
+            "hydra:next": {"pattern": "^/so_manies\\?id%5Blt%5D=10&order%5Bid%5D=desc$"}
           },
           "additionalProperties": false
         }

features/hydra/docs.feature

@@ -69,6 +69,7 @@ Feature: Documentation support
     And the value of the node "hydra:property.domain" of the property "name" of the Hydra class "Dummy" is "#Dummy"
     And the value of the node "hydra:property.range" of the property "name" of the Hydra class "Dummy" is "xmls:string"
     And the value of the node "hydra:property.range" of the property "relatedDummy" of the Hydra class "Dummy" is "https://schema.org/Product"
+    And the value of the node "hydra:property.owl:maxCardinality" of the property "relatedDummy" of the Hydra class "Dummy" is "1"
     And the value of the node "hydra:property.range" of the property "relatedDummies" of the Hydra class "Dummy" is "https://schema.org/Product"
     And the value of the node "hydra:title" of the property "name" of the Hydra class "Dummy" is "name"
     And the value of the node "hydra:description" of the property "name" of the Hydra class "Dummy" is "The dummy name"
@@ -84,6 +85,6 @@ Feature: Documentation support
     And the value of the node "returns" of the operation "DELETE" of the Hydra class "Dummy" is "owl:Nothing"
     # Deprecations
     And the boolean value of the node "owl:deprecated" of the Hydra class "DeprecatedResource" is true
-    And the boolean value of the node "owl:deprecated" of the property "deprecatedField" of the Hydra class "DeprecatedResource" is true
+    And the boolean value of the node "hydra:property.owl:deprecated" of the property "deprecatedField" of the Hydra class "DeprecatedResource" is true
     And the boolean value of the node "owl:deprecated" of the property "The collection of DeprecatedResource resources" of the Hydra class "The API entrypoint" is true
     And the boolean value of the node "owl:deprecated" of the operation "GET" of the Hydra class "DeprecatedResource" is true

features/issues/5926.feature

@@ -10,3 +10,27 @@ Feature: Issue 5926
     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; charset=utf-8"
+
+  @!mongodb
+  Scenario: Create and retrieve a JSON:API WriteResource
+    When I add "Accept" header equal to "application/vnd.api+json"
+    And I send a "GET" request to "/test_issue5926s/1"
+    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/vnd.api+json; charset=utf-8"
+
+  @!mongodb
+  Scenario: Create and retrieve a LD+JSON WriteResource
+    When I add "Accept" header equal to "application/ld+json"
+    And I send a "GET" request to "/test_issue5926s/1"
+    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"
+
+  @!mongodb
+  Scenario: Create and retrieve a HAL WriteResource
+    When I add "Accept" header equal to "application/hal+json"
+    And I send a "GET" request to "/test_issue5926s/1"
+    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/hal+json; charset=utf-8"

src/Doctrine/Odm/Tests/DoctrineMongoDbOdmTestCase.php

@@ -34,7 +34,7 @@ public static function createTestDocumentManager($paths = []): DocumentManager
         $config->setHydratorDir(sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');
         $config->setHydratorNamespace('SymfonyTests\Doctrine');
-        $config->setMetadataDriverImpl(new AttributeDriver($paths, new AttributeReader()));
+        $config->setMetadataDriverImpl(new AttributeDriver($paths, class_exists(\Doctrine\Common\Annotations\Reader::class) ? new AttributeReader() : null)); // @phpstan-ignore-line type is only documented as phpdoc
         $config->setMetadataCache(new ArrayAdapter());
 
         return DocumentManager::create(null, $config);

src/Hal/Serializer/ItemNormalizer.php

@@ -61,8 +61,9 @@ public function normalize(mixed $object, ?string $format = null, array $context
             return parent::normalize($object, $format, $context);
         }
 
-        if ($this->resourceClassResolver->isResourceClass($resourceClass)) {
-            $resourceClass = $this->resourceClassResolver->getResourceClass($object, $context['resource_class'] ?? null);
+        $previousResourceClass = $context['resource_class'] ?? null;
+        if ($this->resourceClassResolver->isResourceClass($resourceClass) && (null === $previousResourceClass || $this->resourceClassResolver->isResourceClass($previousResourceClass))) {
+            $resourceClass = $this->resourceClassResolver->getResourceClass($object, $previousResourceClass);
         }
 
         $context = $this->initContext($resourceClass, $context);

src/Hydra/Serializer/DocumentationNormalizer.php

@@ -505,6 +505,18 @@ private function getProperty(ApiProperty $propertyMetadata, string $propertyName
             'domain' => $prefixedShortName,
         ];
 
+        if ($propertyMetadata->getDeprecationReason()) {
+            $propertyData['owl:deprecated'] = true;
+        }
+
+        if ($this->isSingleRelation($propertyMetadata)) {
+            $propertyData['owl:maxCardinality'] = 1;
+        }
+
+        if (null !== $range = $this->getRange($propertyMetadata)) {
+            $propertyData['range'] = $range;
+        }
+
         $property = [
             '@type' => 'hydra:SupportedProperty',
             'hydra:property' => $propertyData,
@@ -514,22 +526,10 @@ private function getProperty(ApiProperty $propertyMetadata, string $propertyName
             'hydra:writeable' => $propertyMetadata->isWritable() || $propertyMetadata->isInitializable(),
         ];
 
-        if (null !== $range = $this->getRange($propertyMetadata)) {
-            $property['hydra:property']['range'] = $range;
-        }
-
         if (null !== $description = $propertyMetadata->getDescription()) {
             $property['hydra:description'] = $description;
         }
 
-        if ($propertyMetadata->getDeprecationReason()) {
-            $property['owl:deprecated'] = true;
-        }
-
-        if ($this->isSingleRelation($propertyMetadata)) {
-            $property['owl:maxCardinality'] = true;
-        }
-
         return $property;
     }