Merge 4.0

Author: soyuka

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v4.0.7
+
+### Bug fixes
+
+* [17c916c3a](https://github.com/api-platform/core/commit/17c916c3a1bcc837c9bc842dc48390dbeb043450) fix(symfony): BackedEnumProvider typo fix (#6769)
+* [216d9ccaa](https://github.com/api-platform/core/commit/216d9ccaacf7845daaaeab30f3a58bb5567430fe) fix(serializer): fetch type on normalization error when possible (#6761)
+* [2f967d934](https://github.com/api-platform/core/commit/2f967d9345004779f409b9ce1b5d0cbba84c7132) fix(doctrine): throw an exception when a filter is not found in a parameter (#6767)
+* [6c9b508b0](https://github.com/api-platform/core/commit/6c9b508b030976741a68f84e226502e6c218e896) fix(laravel): remove link header when jsonld is not enabled (#6768)
+* [736ca045e](https://github.com/api-platform/core/commit/736ca045e6832f04aaa002ddd7b85c55df4696bb) fix(validator): allow to pass both a ConstraintViolationList and a previous exception (#6762)
+* [9ac3661b6](https://github.com/api-platform/core/commit/9ac3661b6a75255832203b87a9ba7994add64061) fix(hydra): store and use hydra context in a local variable (#6765)
+
+### Features
+
 ## v4.0.6
 
 ### Bug fixes

composer.json

@@ -9,7 +9,10 @@
     "autoload": {
         "psr-4": {
             "ApiPlatform\\": "src/"
-        }
+        },
+        "files": [
+            "src/JsonLd/HydraContext.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

features/hydra/docs.feature

@@ -13,7 +13,7 @@ Feature: Documentation support
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
     # Context
-    And the JSON node "@context[0]" should be equal to "http://www.w3.org/ns/hydra/context.jsonld"
+    And the Hydra context matches the online resource "http://www.w3.org/ns/hydra/context.jsonld"
     And the JSON node "@context[1].@vocab" should be equal to "http://example.com/docs.jsonld#"
     And the JSON node "@context[1].hydra" should be equal to "http://www.w3.org/ns/hydra/core#"
     And the JSON node "@context[1].rdf" should be equal to "http://www.w3.org/1999/02/22-rdf-syntax-ns#"

src/Hydra/Serializer/DocumentationNormalizer.php

@@ -35,6 +35,8 @@
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
+use const ApiPlatform\JsonLd\HYDRA_CONTEXT;
+
 /**
  * Creates a machine readable Hydra API documentation.
  *
@@ -573,7 +575,7 @@ private function computeDoc(Documentation $object, array $classes, string $hydra
     private function getContext(string $hydraPrefix = ContextBuilder::HYDRA_PREFIX): array
     {
         return [
-            ContextBuilderInterface::HYDRA_CONTEXT,
+            HYDRA_CONTEXT,
             [
                 '@vocab' => $this->urlGenerator->generate('api_doc', ['_format' => self::FORMAT], UrlGeneratorInterface::ABS_URL).'#',
                 'hydra' => ContextBuilderInterface::HYDRA_NS,

src/Hydra/Tests/Serializer/DocumentationNormalizerTest.php

@@ -37,6 +37,8 @@
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\PropertyInfo\Type;
 
+use const ApiPlatform\JsonLd\HYDRA_CONTEXT;
+
 /**
  * @author Amrouche Hamza <hamza.simperfit@gmail.com>
  */
@@ -106,7 +108,7 @@ private function doTestNormalize($resourceMetadataFactory = null): void
 
         $expected = [
             '@context' => [
-                'http://www.w3.org/ns/hydra/context.jsonld',
+                HYDRA_CONTEXT,
                 [
                     '@vocab' => '/doc#',
                     'hydra' => 'http://www.w3.org/ns/hydra/core#',
@@ -406,7 +408,7 @@ public function testNormalizeInputOutputClass(): void
 
         $expected = [
             '@context' => [
-                'http://www.w3.org/ns/hydra/context.jsonld',
+                HYDRA_CONTEXT,
                 [
                     '@vocab' => '/doc#',
                     'hydra' => 'http://www.w3.org/ns/hydra/core#',
@@ -766,7 +768,7 @@ public function testNormalizeWithoutPrefix(): void
 
         $expected = [
             '@context' => [
-                'http://www.w3.org/ns/hydra/context.jsonld',
+                HYDRA_CONTEXT,
                 [
                     '@vocab' => '/doc#',
                     'hydra' => 'http://www.w3.org/ns/hydra/core#',

src/JsonLd/ContextBuilder.php

@@ -185,7 +185,7 @@ private function getResourceContextWithShortname(string $resourceClass, int $ref
         }
 
         if (false === ($this->defaultContext[self::HYDRA_CONTEXT_HAS_PREFIX] ?? true)) {
-            return [ContextBuilderInterface::HYDRA_CONTEXT, $context];
+            return [HYDRA_CONTEXT, $context];
         }
 
         return $context;