Merge pull request #117 from KnpLabs/chore/bump-php-and-symfony

chore: bump symfony to v6.3 to v7.0 and php to 8.3.6
KnpLabs · Apr 18, 2024 · 069fb90 · 069fb90
2 parents a1a4341 + a0e20a2
commit 069fb90
Show file tree

Hide file tree

Showing 22 changed files with 1,516 additions and 1,818 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,23 +2,23 @@ FROM composer:2.5.8 as composer
 
 ##################################
 
-FROM php:8.2.8-fpm-alpine3.17
+FROM php:8.3.6-fpm-alpine3.19
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 RUN apk add --no-cache \
-    bash==5.2.15-r0 \
-    git==2.38.5-r0 \
-    icu-dev==72.1-r1
+    bash==5.2.21-r0 \
+    git==2.43.0-r0 \
+    icu-dev==74.1-r0
 
 RUN mkdir -p /usr/src/app \
     && addgroup docker \
     && adduser -S -h /home/docker -u ${USER_ID:-1000} -G docker docker \
     && chown -R docker /home/docker /usr/src/app \
     && apk add --no-cache --virtual=.build-deps \
-        autoconf==2.71-r1 \
-        g++==12.2.1_git20220924-r4 \
-        make==4.3-r1 \
+    autoconf==2.71-r2 \
+    g++==13.2.1_git20231014-r0 \
+    make==4.4.1-r2 \
     && docker-php-ext-configure intl \
     && docker-php-ext-install -j"$(nproc)" intl pdo_mysql \
     && pecl install apcu \

diff --git a/composer.json b/composer.json
@@ -4,55 +4,53 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.2.4",
+        "php": ">=8.3.6",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "composer/package-versions-deprecated": "1.11.99.5",
-        "doctrine/annotations": "^2.0",
-        "doctrine/doctrine-bundle": "^2.10",
-        "doctrine/doctrine-migrations-bundle": "^3.2",
-        "doctrine/orm": "^2.15",
-        "phpdocumentor/reflection-docblock": "^5.3",
-        "sensio/framework-extra-bundle": "^6.2",
-        "symfony/asset": "^6.3",
-        "symfony/console": "^6.3",
-        "symfony/dotenv": "^6.3",
-        "symfony/expression-language": "^6.3",
-        "symfony/flex": "^2.2.3",
-        "symfony/form": "^6.3",
-        "symfony/framework-bundle": "^6.3",
-        "symfony/http-client": "^6.3",
-        "symfony/intl": "^6.3",
-        "symfony/mailer": "^6.3",
-        "symfony/mime": "^6.3",
-        "symfony/monolog-bundle": "^3.8",
-        "symfony/notifier": "^6.3",
-        "symfony/process": "^6.3",
-        "symfony/property-access": "^6.3",
-        "symfony/property-info": "^6.3",
-        "symfony/proxy-manager-bridge": "^6.3",
-        "symfony/runtime": "^6.3",
-        "symfony/security-bundle": "^6.3",
-        "symfony/serializer": "^6.3",
-        "symfony/string": "^6.3",
-        "symfony/translation": "^6.3",
-        "symfony/twig-bundle": "^6.3",
-        "symfony/validator": "^6.3",
-        "symfony/web-link": "^6.3",
-        "symfony/yaml": "^6.3",
-        "twig/extra-bundle": "^3.6",
-        "twig/twig": "^3.6"
+        "doctrine/doctrine-bundle": "^2.12",
+        "doctrine/doctrine-migrations-bundle": "^3.3",
+        "doctrine/orm": "^3.1",
+        "phpdocumentor/reflection-docblock": "^5.4",
+        "symfony/asset": "^7.0",
+        "symfony/console": "^7.0",
+        "symfony/dotenv": "^7.0",
+        "symfony/expression-language": "^7.0",
+        "symfony/flex": "^2.4.5",
+        "symfony/form": "^7.0",
+        "symfony/framework-bundle": "^7.0",
+        "symfony/http-client": "^7.0",
+        "symfony/intl": "^7.0",
+        "symfony/mailer": "^7.0",
+        "symfony/mime": "^7.0",
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/notifier": "^7.0",
+        "symfony/process": "^7.0",
+        "symfony/property-access": "^7.0",
+        "symfony/property-info": "^7.0",
+        "symfony/proxy-manager-bridge": "^6.4",
+        "symfony/runtime": "^7.0",
+        "symfony/security-bundle": "^7.0",
+        "symfony/serializer": "^7.0",
+        "symfony/string": "^7.0",
+        "symfony/translation": "^7.0",
+        "symfony/twig-bundle": "^7.0",
+        "symfony/validator": "^7.0",
+        "symfony/web-link": "^7.0",
+        "symfony/yaml": "^7.0",
+        "twig/extra-bundle": "^3.8",
+        "twig/twig": "^3.8"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^3.4",
+        "doctrine/doctrine-fixtures-bundle": "^3.5",
         "phpunit/phpunit": "^9.5",
-        "symfony/browser-kit": "^6.3",
-        "symfony/css-selector": "^6.3",
-        "symfony/debug-bundle": "^6.3",
-        "symfony/maker-bundle": "^1.45",
-        "symfony/phpunit-bridge": "^6.3",
-        "symfony/stopwatch": "^6.3",
-        "symfony/web-profiler-bundle": "^6.3"
+        "symfony/browser-kit": "^7.0",
+        "symfony/css-selector": "^7.0",
+        "symfony/debug-bundle": "^7.0",
+        "symfony/maker-bundle": "^1.58",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/stopwatch": "^7.0",
+        "symfony/web-profiler-bundle": "^7.0"
     },
     "config": {
         "allow-plugins": {
@@ -97,7 +95,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "^6.3"
+            "require": "^7.0"
         }
     }
 }