diff --git a/api/Dockerfile b/api/Dockerfile index 0130ea74..f33e11e8 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -88,7 +88,6 @@ COPY --link frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile # prevent the reinstallation of vendors at every changes in the source code COPY --link composer.* symfony.* ./ -COPY --link patches/ ./patches/ RUN set -eux; \ composer install --no-cache --prefer-dist --no-dev --no-autoloader --no-scripts --no-progress diff --git a/api/composer.json b/api/composer.json index 203550a4..617dd9d4 100644 --- a/api/composer.json +++ b/api/composer.json @@ -5,8 +5,7 @@ "php": ">=8.3", "ext-ctype": "*", "ext-iconv": "*", - "api-platform/core": "@alpha", - "cweagans/composer-patches": "^1.7", + "api-platform/core": "dev-main", "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-fixtures-bundle": "^3.5", "doctrine/doctrine-migrations-bundle": "^3.3", @@ -64,8 +63,7 @@ "allow-plugins": { "symfony/flex": true, "symfony/runtime": true, - "phpstan/extension-installer": true, - "cweagans/composer-patches": true + "phpstan/extension-installer": true } }, "autoload": { @@ -110,12 +108,6 @@ "allow-contrib": false, "require": "7.0.*", "docker": false - }, - "patches": { - "api-platform/core": { - "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 7265af3f..dbc3f4c3 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "284bf111cad395c14070178281bc3ee8", + "content-hash": "ddeee9d417669f7f3c9e35c3e3eacc94", "packages": [ { "name": "api-platform/core", - "version": "v3.3.0-alpha.2", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/api-platform/core.git", - "reference": "8206b27300553a97eeddc4a5596687a9142c240d" + "reference": "ca6be326d533282a4a1c1284a289c2f1e3f92219" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/8206b27300553a97eeddc4a5596687a9142c240d", - "reference": "8206b27300553a97eeddc4a5596687a9142c240d", + "url": "https://api.github.com/repos/api-platform/core/zipball/ca6be326d533282a4a1c1284a289c2f1e3f92219", + "reference": "ca6be326d533282a4a1c1284a289c2f1e3f92219", "shasum": "" }, "require": { @@ -129,6 +129,7 @@ "symfony/web-profiler-bundle": "To use the data collector.", "webonyx/graphql-php": "To support GraphQL." }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -189,9 +190,9 @@ ], "support": { "issues": "https://github.com/api-platform/core/issues", - "source": "https://github.com/api-platform/core/tree/v3.3.0-alpha.2" + "source": "https://github.com/api-platform/core/tree/main" }, - "time": "2024-03-05T12:47:24+00:00" + "time": "2024-03-11T10:12:39+00:00" }, { "name": "brick/math", @@ -253,54 +254,6 @@ ], "time": "2023-11-29T23:19:16+00:00" }, - { - "name": "cweagans/composer-patches", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-patches.git", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3.0" - }, - "require-dev": { - "composer/composer": "~1.0 || ~2.0", - "phpunit/phpunit": "~4.6" - }, - "type": "composer-plugin", - "extra": { - "class": "cweagans\\Composer\\Patches" - }, - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a way to patch Composer packages.", - "support": { - "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" - }, - "time": "2022-12-20T22:53:13+00:00" - }, { "name": "doctrine/cache", "version": "2.2.0", @@ -10241,7 +10194,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "api-platform/core": 15 + "api-platform/core": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/api/patches/fix(validation)__fix_validation_exception_resource.patch b/api/patches/fix(validation)__fix_validation_exception_resource.patch deleted file mode 100644 index 434d0f5f..00000000 --- a/api/patches/fix(validation)__fix_validation_exception_resource.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/patches/fix__fix_PHPUnit_11_compatibility.patch b/api/patches/fix__fix_PHPUnit_11_compatibility.patch deleted file mode 100644 index 2d7ca4a0..00000000 --- a/api/patches/fix__fix_PHPUnit_11_compatibility.patch +++ /dev/null @@ -1,27 +0,0 @@ -Subject: [PATCH] fix: fix PHPUnit 11 compatibility ---- -Index: src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php b/src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php ---- a/src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php (revision 8206b27300553a97eeddc4a5596687a9142c240d) -+++ b/src/Symfony/Bundle/Test/Constraint/ArraySubsetTrait.php (revision 812997876b175f6c6b0addf48c3f422cfe90fde8) -@@ -14,6 +14,7 @@ - namespace ApiPlatform\Symfony\Bundle\Test\Constraint; - - use SebastianBergmann\Comparator\ComparisonFailure; -+use SebastianBergmann\Exporter\Exporter; - - /** - * Constraint that asserts that the array it is evaluated for has a specified subset. -@@ -67,7 +68,7 @@ - */ - public function toString(): string - { -- return 'has the subset '.$this->exporter()->export($this->subset); -+ return 'has the subset '.(new Exporter())->export($this->subset); - } - - /**