Merge 4.3

soyuka · soyuka · commit d57200ae42f7 · 2026-05-07T13:28:03.000+02:00
diff --git a/tests/Fixtures/TestBundle/ApiResource/BooleanQueryParameterDefault/BooleanQueryParameterDefault.php b/tests/Fixtures/TestBundle/ApiResource/BooleanQueryParameterDefault/BooleanQueryParameterDefault.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue7354;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\BooleanQueryParameterDefault;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
@@ -22,7 +22,7 @@
     operations: [
         new Get(
             normalizationContext: ['hydra_prefix' => false],
-            uriTemplate: '/issue7354_boolean_query_parameters',
+            uriTemplate: '/boolean_query_parameter_defaults',
             parameters: [
                 'booleanParameter' => new QueryParameter(
                     schema: [
@@ -39,7 +39,7 @@
         ),
     ]
 )]
-class BooleanQueryParameter
+class BooleanQueryParameterDefault
 {
     public function __construct(
         public bool $booleanParameter,
diff --git a/tests/Fixtures/TestBundle/ApiResource/DataUriFileUpload/FileUploadResource.php b/tests/Fixtures/TestBundle/ApiResource/DataUriFileUpload/FileUploadResource.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue7490;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\DataUriFileUpload;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Post;
@@ -20,7 +20,7 @@
 #[ApiResource(
     operations: [
         new Post(
-            uriTemplate: '/issue7490_file_uploads',
+            uriTemplate: '/data_uri_file_uploads',
         ),
     ]
 )]
diff --git a/tests/Fixtures/TestBundle/ApiResource/ErrorResourceWithGroups/Error.php b/tests/Fixtures/TestBundle/ApiResource/ErrorResourceWithGroups/Error.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue6926;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\ErrorResourceWithGroups;
 
 use ApiPlatform\Metadata\ErrorResource;
 use ApiPlatform\Metadata\Exception\ProblemExceptionInterface;
diff --git a/tests/Fixtures/TestBundle/ApiResource/ErrorResourceWithGroups/ThrowsAnExceptionWithGroup.php b/tests/Fixtures/TestBundle/ApiResource/ErrorResourceWithGroups/ThrowsAnExceptionWithGroup.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue6926;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\ErrorResourceWithGroups;
 
 use ApiPlatform\Metadata\Post;
 use Symfony\Component\Serializer\Attribute\Groups;
 
 #[Post(
-    uriTemplate: '/issue6926',
+    uriTemplate: '/error_resource_with_groups',
     processor: [self::class, 'process'],
     denormalizationContext: ['groups' => ['login_request:write']],
     normalizationContext: ['groups' => ['login_request:read']],
diff --git a/tests/Fixtures/TestBundle/Document/PartialPaginationMongo/PartialPaginationMongoDummy.php b/tests/Fixtures/TestBundle/Document/PartialPaginationMongo/PartialPaginationMongoDummy.php
@@ -11,21 +11,17 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\Document\Issue7349;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\Document\PartialPaginationMongo;
 
 use ApiPlatform\Metadata\ApiResource;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 
-/**
- * Foo7349.
- *
- * @author Maxime Valin <contact@maximeval.in>
- */
 #[ApiResource(
+    shortName: 'PartialPaginationMongoDummy',
     paginationClientPartial: true,
 )]
 #[ODM\Document]
-class Foo7349
+class PartialPaginationMongoDummy
 {
     /**
      * @var int id
diff --git a/tests/Fixtures/TestBundle/Entity/UuidIriRelation/Bar.php b/tests/Fixtures/TestBundle/Entity/UuidIriRelation/Bar.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity\Issue7135;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity\UuidIriRelation;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
@@ -20,14 +20,14 @@
 
 #[ORM\Entity()]
 #[ApiResource(
-    shortName: 'BarPr7135',
+    shortName: 'UuidIriRelationBar',
     operations: [
         new Get(
-            uriTemplate: '/pull-request-7135/bar/{id}',
+            uriTemplate: '/uuid_iri_relation/bar/{id}',
         ),
     ]
 )]
-#[ORM\Table(name: 'bar6466')]
+#[ORM\Table(name: 'uuid_iri_relation_bar')]
 class Bar
 {
     #[ORM\Id]
diff --git a/tests/Fixtures/TestBundle/Entity/UuidIriRelation/Foo.php b/tests/Fixtures/TestBundle/Entity/UuidIriRelation/Foo.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity\Issue7135;
+namespace ApiPlatform\Tests\Fixtures\TestBundle\Entity\UuidIriRelation;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Post;
@@ -20,15 +20,15 @@
 
 #[ORM\Entity()]
 #[ApiResource(
-    shortName: 'FooPr7135',
+    shortName: 'UuidIriRelationFoo',
     operations: [
         new Post(
-            uriTemplate: '/pull-request-7135/foo',
+            uriTemplate: '/uuid_iri_relation/foo',
         ),
     ],
     normalizationContext: ['iri_only' => true],
 )]
-#[ORM\Table(name: 'foo6466')]
+#[ORM\Table(name: 'uuid_iri_relation_foo')]
 class Foo
 {
     #[ORM\Id]
diff --git a/tests/Fixtures/app/DefaultParametersAppKernel.php b/tests/Fixtures/app/DefaultParametersAppKernel.php
@@ -11,16 +11,14 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Functional;
-
 use ApiPlatform\Metadata\HeaderParameter;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @author Maxence Castel <maxence.castel59@gmail.com>
  */
-class DefaultParametersAppKernel extends \AppKernel
+class DefaultParametersAppKernel extends AppKernel
 {
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void
     {
diff --git a/tests/Fixtures/app/bootstrap.php b/tests/Fixtures/app/bootstrap.php
@@ -21,5 +21,6 @@
 
 $loader = require __DIR__.'/../../../vendor/autoload.php';
 require __DIR__.'/AppKernel.php';
+require __DIR__.'/DefaultParametersAppKernel.php';
 
 return $loader;
diff --git a/tests/Functional/DefaultParametersTest.php b/tests/Functional/DefaultParametersTest.php
@@ -27,7 +27,7 @@ final class DefaultParametersTest extends ApiTestCase
 
     protected static function getKernelClass(): string
     {
-        return DefaultParametersAppKernel::class;
+        return \DefaultParametersAppKernel::class;
     }
 
     /**
diff --git a/tests/Functional/Doctrine/PartialPaginationMongoDbTest.php b/tests/Functional/Doctrine/PartialPaginationMongoDbTest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Functional\Issues;
+namespace ApiPlatform\Tests\Functional\Doctrine;
 
 use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
-use ApiPlatform\Tests\Fixtures\TestBundle\Document\Issue7349\Foo7349;
+use ApiPlatform\Tests\Fixtures\TestBundle\Document\PartialPaginationMongo\PartialPaginationMongoDummy;
 use ApiPlatform\Tests\RecreateSchemaTrait;
 use ApiPlatform\Tests\SetupClassResourcesTrait;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -25,7 +25,7 @@
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 
-class Issue7349Test extends ApiTestCase
+class PartialPaginationMongoDbTest extends ApiTestCase
 {
     use RecreateSchemaTrait;
     use RefreshDatabase;
@@ -37,7 +37,7 @@ class Issue7349Test extends ApiTestCase
      */
     public static function getResources(): array
     {
-        return [Foo7349::class];
+        return [PartialPaginationMongoDummy::class];
     }
 
     /**
@@ -49,7 +49,7 @@ public function testGetPartialNoItemCount(): void
             $this->markTestSkipped();
         }
 
-        $response = self::createClient()->request('GET', '/foo7349s?page=1&itemsPerPage=3&partial=true', [
+        $response = self::createClient()->request('GET', '/partial_pagination_mongo_dummies?page=1&itemsPerPage=3&partial=true', [
             'headers' => [
                 'Accept' => 'application/ld+json',
             ],
@@ -73,7 +73,7 @@ public function testGetItemCount(): void
             $this->markTestSkipped();
         }
 
-        $response = self::createClient()->request('GET', '/foo7349s?page=1&itemsPerPage=3&partial=false', [
+        $response = self::createClient()->request('GET', '/partial_pagination_mongo_dummies?page=1&itemsPerPage=3&partial=false', [
             'headers' => [
                 'Accept' => 'application/ld+json',
             ],
diff --git a/tests/Functional/ErrorTest.php b/tests/Functional/ErrorTest.php
@@ -15,6 +15,9 @@
 
 use ApiPlatform\State\ApiResource\Error;
 use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
+use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\DataUriFileUpload\FileUploadResource;
+use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\ErrorResourceWithGroups\Error as ErrorResourceWithGroupsError;
+use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\ErrorResourceWithGroups\ThrowsAnExceptionWithGroup;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\XmlWithJsonError;
 use ApiPlatform\Tests\SetupClassResourcesTrait;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -30,7 +33,7 @@ final class ErrorTest extends ApiTestCase
      */
     public static function getResources(): array
     {
-        return [Error::class, XmlWithJsonError::class];
+        return [Error::class, XmlWithJsonError::class, ThrowsAnExceptionWithGroup::class, ErrorResourceWithGroupsError::class, FileUploadResource::class];
     }
 
     #[DataProvider('formatsProvider')]
@@ -108,4 +111,30 @@ public function testXmlError(): void
         $this->assertResponseStatusCodeSame(404);
         $this->assertResponseHeaderSame('content-type', 'application/xml; charset=utf-8');
     }
+
+    public function testErrorResourceThrownFromProcessorRespectsGroups(): void
+    {
+        $response = self::createClient()->request('POST', '/error_resource_with_groups', ['json' => []]);
+        $this->assertEquals('This should be returned in the response.', $response->toArray(false)['detail'] ?? false);
+    }
+
+    public function testDataUriExceptionMessageIsNotWrapped(): void
+    {
+        $response = self::createClient()->request('POST', '/data_uri_file_uploads', [
+            'json' => [
+                'file' => 'data:invalid',
+            ],
+            'headers' => [
+                'Content-Type' => 'application/ld+json',
+            ],
+        ]);
+
+        $this->assertResponseStatusCodeSame(400);
+        $this->assertResponseHeaderSame('content-type', 'application/problem+json; charset=utf-8');
+
+        $responseData = $response->toArray(false);
+
+        $this->assertStringContainsString('The provided "data:" URI is not valid', $responseData['hydra:description'] ?? $responseData['detail']);
+        $this->assertStringNotContainsString('The type of the "file" attribute must be', $responseData['hydra:description'] ?? $responseData['detail']);
+    }
 }
diff --git a/tests/Functional/HalCircularReferenceTest.php b/tests/Functional/HalCircularReferenceTest.php
@@ -16,9 +16,12 @@
 use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue4358\ResourceA;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\Issue4358\ResourceB;
+use ApiPlatform\Tests\SetupClassResourcesTrait;
 
-class HALCircularReference extends ApiTestCase
+class HalCircularReferenceTest extends ApiTestCase
 {
+    use SetupClassResourcesTrait;
+
     protected static ?bool $alwaysBootKernel = false;
 
     public function testIssue4358(): void
diff --git a/tests/Functional/Issue7490Test.php b/tests/Functional/Issue7490Test.php
diff --git a/tests/Functional/Issues/Issue6926Test.php b/tests/Functional/Issues/Issue6926Test.php
diff --git a/tests/Functional/JsonSchema/JsonSchemaWithDefaultParametersTest.php b/tests/Functional/JsonSchema/JsonSchemaWithDefaultParametersTest.php
diff --git a/tests/Functional/Parameters/BooleanQueryParameterDefaultTest.php b/tests/Functional/Parameters/BooleanQueryParameterDefaultTest.php
diff --git a/tests/Functional/Uuid/UuidIriRelationTest.php b/tests/Functional/Uuid/UuidIriRelationTest.php

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ final class DefaultParametersTest extends ApiTestCase`
`27`	`27`
`28`	`28`	`protected static function getKernelClass(): string`
`29`	`29`	`{`
`30`		`- return DefaultParametersAppKernel::class;`
	`30`	`+ return \DefaultParametersAppKernel::class;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`