Skip to content

Commit

Permalink
Merge pull request #86 from KnpLabs/chore/update-php-symfony
Browse files Browse the repository at this point in the history
chore: upgrade to php 8.2 and symfony 6.3
  • Loading branch information
KevinArtus authored Jul 21, 2023
2 parents 0839af2 + b02e57d commit 17fa3ac
Show file tree
Hide file tree
Showing 17 changed files with 1,353 additions and 1,208 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

###> symfony/framework-bundle ###
/.env.local
/.env.local.php
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
FROM composer:2.4.2 as composer
FROM composer:2.5.8 as composer

##################################

FROM php:8.1-fpm-alpine3.16
FROM php:8.2.4-fpm-alpine3.17

COPY --from=composer /usr/bin/composer /usr/bin/composer

RUN apk add --no-cache \
bash=~5.1 \
git=~2.36 \
icu-dev=~71.1
bash==5.2.15-r0 \
git==2.38.5-r0 \
icu-dev==72.1-r1

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 \
g++=~11.2 \
make=~4.3 \
autoconf==2.71-r1 \
g++==12.2.1_git20220924-r4 \
make==4.3-r1 \
&& docker-php-ext-configure intl \
&& docker-php-ext-install -j"$(nproc)" intl pdo_mysql \
&& pecl install apcu \
Expand Down
74 changes: 37 additions & 37 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,55 @@
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": ">=8.0.2",
"php": ">=8.2.4",
"ext-ctype": "*",
"ext-iconv": "*",
"composer/package-versions-deprecated": "1.11.99.5",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.7",
"doctrine/annotations": "^2.0",
"doctrine/doctrine-bundle": "^2.10",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.13",
"doctrine/orm": "^2.15",
"phpdocumentor/reflection-docblock": "^5.3",
"sensio/framework-extra-bundle": "^6.2",
"symfony/asset": " 6.1.*",
"symfony/console": " 6.1.*",
"symfony/dotenv": " 6.1.*",
"symfony/expression-language": " 6.1.*",
"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.1.*",
"symfony/framework-bundle": " 6.1.*",
"symfony/http-client": " 6.1.*",
"symfony/intl": " 6.1.*",
"symfony/mailer": " 6.1.*",
"symfony/mime": " 6.1.*",
"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.1.*",
"symfony/process": " 6.1.*",
"symfony/property-access": " 6.1.*",
"symfony/property-info": " 6.1.*",
"symfony/proxy-manager-bridge": " 6.1.*",
"symfony/runtime": " 6.1.*",
"symfony/security-bundle": " 6.1.*",
"symfony/serializer": " 6.1.*",
"symfony/string": " 6.1.*",
"symfony/translation": " 6.1.*",
"symfony/twig-bundle": " 6.1.*",
"symfony/validator": " 6.1.*",
"symfony/web-link": " 6.1.*",
"symfony/yaml": " 6.1.*",
"twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^3.4.3"
"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"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "^3.4",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": " 6.1.*",
"symfony/css-selector": " 6.1.*",
"symfony/debug-bundle": " 6.1.*",
"symfony/browser-kit": "^6.3",
"symfony/css-selector": "^6.3",
"symfony/debug-bundle": "^6.3",
"symfony/maker-bundle": "^1.45",
"symfony/phpunit-bridge": " 6.1.*",
"symfony/stopwatch": " 6.1.*",
"symfony/web-profiler-bundle": " 6.1.*"
"symfony/phpunit-bridge": "^6.3",
"symfony/stopwatch": "^6.3",
"symfony/web-profiler-bundle": "^6.3"
},
"config": {
"allow-plugins": {
Expand Down Expand Up @@ -97,7 +97,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": " 6.1.*"
"require": "^6.3"
}
}
}
Loading

0 comments on commit 17fa3ac

Please sign in to comment.