Skip to content

Commit

Permalink
chore: use api-platform/core:dev-main
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentchalamon committed Mar 11, 2024
1 parent 67d837f commit e1b9a57
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 124 deletions.
1 change: 0 additions & 1 deletion api/Dockerfile
Expand Up @@ -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

Expand Down
12 changes: 2 additions & 10 deletions api/composer.json
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
}
}
}
65 changes: 9 additions & 56 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

27 changes: 0 additions & 27 deletions api/patches/fix__fix_PHPUnit_11_compatibility.patch

This file was deleted.

0 comments on commit e1b9a57

Please sign in to comment.