Merge 3.4

Author: soyuka

CHANGELOG.md

@@ -199,6 +199,12 @@ Notes:
 
 * [0d5f35683](https://github.com/api-platform/core/commit/0d5f356839eb6aa9f536044abe4affa736553e76) feat(laravel): laravel component (#5882)
 
+## v3.4.7
+
+### Bug fixes
+
+* [2d25e79e0](https://github.com/api-platform/core/commit/2d25e79e0e04ce549fb67ecc2017798a8deb7458) fix(symfony): unset item_uri_template when serializing an error (#6816)
+
 ## v3.4.6
 
 ### Bug fixes

src/Metadata/ApiResource.php

@@ -106,7 +106,7 @@ public function __construct(
          *       'jsonapi' => ['application/vnd.api+json'],
          *       'json' =>    ['application/json'],
          *       'xml' =>     ['application/xml', 'text/xml'],
-         *       'yaml' =>    ['application/x-yaml'],
+         *       'yaml' =>    ['application/yaml'],
          *       'csv' =>     ['text/csv'],
          *       'html' =>    ['text/html'],
          *       'myformat' =>['application/vnd.myformat'],

src/Symfony/EventListener/ErrorListener.php

@@ -99,6 +99,10 @@ protected function duplicateRequest(\Throwable $exception, Request $request): Re
             $normalizationContext += ['api_error_resource' => true];
         }
 
+        if (isset($normalizationContext['item_uri_template'])) {
+            unset($normalizationContext['item_uri_template']);
+        }
+
         if (!isset($normalizationContext[AbstractObjectNormalizer::IGNORED_ATTRIBUTES])) {
             $normalizationContext[AbstractObjectNormalizer::IGNORED_ATTRIBUTES] = ['trace', 'file', 'line', 'code', 'message', 'traceAsString'];
         }

tests/Fixtures/TestBundle/ApiResource/Issue6718/Organization.php

@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue6718;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Operation;
+
+#[ApiResource(
+    shortName: 'OrganisationIssue6718',
+    extraProperties: ['rfc_7807_compliant_errors' => true],
+    operations: [
+        new Get(
+            uriTemplate: '/6718_organisations/{id}',
+            provider: [self::class, 'itemProvider'],
+        ),
+        new Get(
+            uriTemplate: '/6718_users/{userId}/organisation',
+            uriVariables: [
+                'userId',
+            ],
+            normalizationContext: [
+                'item_uri_template' => '/6718_organisations/{id}',
+                'hydra_prefix' => false,
+            ],
+            provider: [self::class, 'userOrganizationItemProvider']
+        ),
+    ],
+)]
+class Organization
+{
+    public function __construct(public readonly string $id)
+    {
+    }
+
+    public static function itemProvider(Operation $operation, array $uriVariables = []): ?self
+    {
+        return new self($uriVariables['id']);
+    }
+
+    public static function userOrganizationItemProvider(): ?self
+    {
+        return null;
+    }
+}

tests/Functional/ItemUriTemplateTest.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Tests\Functional;
+
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
+
+class ItemUriTemplateTest extends ApiTestCase
+{
+    public function testIssue6718(): void
+    {
+        self::createClient()->request('GET', '/6718_users/1/organisation', [
+            'headers' => ['accept' => 'application/ld+json'],
+        ]);
+        $this->assertResponseStatusCodeSame(404);
+        $this->assertJsonContains(['description' => 'Not Found']);
+    }
+}