From d64aa8805b6e6eb51b5fa1856fc03d28abec7640 Mon Sep 17 00:00:00 2001 From: Vincent Chalamon <407859+vincentchalamon@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:53:42 +0100 Subject: [PATCH] fix: patch api-platform/core ValidationException --- api/composer.json | 3 +- api/composer.lock | 2 +- ...)__fix_validation_exception_resource.patch | 30 +++++++++++++++++++ api/phpunit.xml.dist | 6 +++- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 api/patches/fix(validation)__fix_validation_exception_resource.patch diff --git a/api/composer.json b/api/composer.json index 32d0c971..203550a4 100644 --- a/api/composer.json +++ b/api/composer.json @@ -113,7 +113,8 @@ }, "patches": { "api-platform/core": { - "Fix ArraySubsetTrait for PHPUnit 11": "patches/fix__fix_PHPUnit_11_compatibility.patch" + "Fix ArraySubsetTrait for PHPUnit 11": "patches/fix__fix_PHPUnit_11_compatibility.patch", + "Fix ValidationException": "patches/fix(validation)__fix_validation_exception_resource.patch" } } } diff --git a/api/composer.lock b/api/composer.lock index 284cc1d5..7265af3f 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a0cf1922d731dd0e63b4e0a30a009094", + "content-hash": "284bf111cad395c14070178281bc3ee8", "packages": [ { "name": "api-platform/core", diff --git a/api/patches/fix(validation)__fix_validation_exception_resource.patch b/api/patches/fix(validation)__fix_validation_exception_resource.patch new file mode 100644 index 00000000..434d0f5f --- /dev/null +++ b/api/patches/fix(validation)__fix_validation_exception_resource.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] fix(validation): fix validation exception resource +--- +Index: src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php +--- a/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php (revision 54638d3ca6d497ff829a6978dd1db9137b5bcf3a) ++++ b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php (revision b1dad841a7dcc2e1bd13b8d4917a2612c595796e) +@@ -45,9 +45,10 @@ + use ApiPlatform\Symfony\EventListener\AddTagsListener; + use ApiPlatform\Symfony\EventListener\DenyAccessListener; + use ApiPlatform\Symfony\GraphQl\Resolver\Factory\DataCollectorResolverFactory; +-use ApiPlatform\Symfony\Validator\Exception\ValidationException; ++use ApiPlatform\Symfony\Validator\Exception\ValidationException as SymfonyValidationException; + use ApiPlatform\Symfony\Validator\Metadata\Property\Restriction\PropertySchemaRestrictionMetadataInterface; + use ApiPlatform\Symfony\Validator\ValidationGroupsGeneratorInterface; ++use ApiPlatform\Validator\Exception\ValidationException; + use Doctrine\Persistence\ManagerRegistry; + use phpDocumentor\Reflection\DocBlockFactoryInterface; + use PHPStan\PhpDocParser\Parser\PhpDocParser; +@@ -373,6 +374,7 @@ + { + return [ + Error::class, ++ SymfonyValidationException::class, + ValidationException::class, + ]; + } diff --git a/api/phpunit.xml.dist b/api/phpunit.xml.dist index 9a0bdb4e..201620f8 100644 --- a/api/phpunit.xml.dist +++ b/api/phpunit.xml.dist @@ -17,8 +17,12 @@ - + tests + tests/Api + + + tests/Api