Skip to content

Commit 844f0c8

Browse files
joanheyjoanhey
authored
[php] Symfony update to PHP 8.5 (#10322)
* [php] Symfony update to PHP 8.5 * Update and fix DbRawController
1 parent 7c714be commit 844f0c8

File tree

10 files changed

+38
-42
lines changed

10 files changed

+38
-42
lines changed

‎frameworks/PHP/symfony/config/packages/doctrine.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ doctrine:
1111
!php/const \PDO::ATTR_PERSISTENT: true
1212
url: '%env(resolve:DATABASE_URL)%'
1313
orm:
14-
auto_generate_proxy_classes: true
1514
naming_strategy: doctrine.orm.naming_strategy.default
1615
auto_mapping: true
1716
mappings:

‎frameworks/PHP/symfony/config/packages/prod/doctrine.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
doctrine:
22
orm:
3-
auto_generate_proxy_classes: false
43
metadata_cache_driver:
54
type: pool
65
pool: doctrine.system_cache_pool

‎frameworks/PHP/symfony/src/Controller/DbRawController.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Controller;
44

55
use Doctrine\DBAL\Connection;
6-
use Doctrine\DBAL\FetchMode;
76
use Symfony\Component\HttpFoundation\JsonResponse;
87
use Symfony\Component\HttpFoundation\Request;
98
use Symfony\Component\Routing\Annotation\Route;
@@ -22,8 +21,7 @@ public function __construct(Connection $connection)
2221

2322
public function db(): JsonResponse
2423
{
25-
$statement = $this->connection->prepare('SELECT id,randomNumber FROM World WHERE id = ?');
26-
$world = $statement->execute([mt_rand(1, 10000)]);
24+
$world = $this->connection->executeQuery('SELECT id,randomNumber FROM World WHERE id = ?', [mt_rand(1, 10000)]);
2725

2826
return new JsonResponse($world->fetchAssociative());
2927
}
@@ -40,7 +38,8 @@ public function queries(Request $request): JsonResponse
4038

4139
$statement = $this->connection->prepare('SELECT id,randomNumber FROM World WHERE id = ?');
4240
for ($i = 0; $i < $queries; ++$i) {
43-
$world = $statement->execute([mt_rand(1, 10000)]);
41+
$statement->bindValue(1, mt_rand(1, 10000));
42+
$world = $statement->executeQuery();
4443
$worlds[] = $world->fetchAssociative();
4544
}
4645

@@ -61,11 +60,12 @@ public function updates(Request $request): JsonResponse
6160

6261
for ($i = 0; $i < $queries; ++$i) {
6362
$id = mt_rand(1, 10000);
64-
$world = $readStatement->execute([$id]);
65-
$world = $world->fetchAssociative();
66-
$writeStatement->execute(
67-
[$world['randomNumber'] = mt_rand(1, 10000), $id]
68-
);
63+
$readStatement->bindValue(1, $id);
64+
$world = $readStatement->executeQuery();
65+
$world = $world->fetchAssociative();
66+
$writeStatement->bindValue(1, mt_rand(1, 10000));
67+
$writeStatement->bindValue(2, $id);
68+
$writeStatement->executeStatement();
6969
$worlds[] = $world;
7070
}
7171

‎frameworks/PHP/symfony/symfony-franken.dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
FROM dunglas/frankenphp:php8.4
1+
FROM dunglas/frankenphp:php8.5
22

33
# add additional extensions here:
44
RUN install-php-extensions \
5-
opcache \
65
pdo_pgsql \
76
zip > /dev/null
87

‎frameworks/PHP/symfony/symfony-mysql.dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get install -yqq nginx git unzip curl \
10-
php8.4-cli php8.4-fpm php8.4-mysql \
11-
php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
10+
php8.5-cli php8.5-fpm php8.5-mysql \
11+
php8.5-mbstring php8.5-xml php8.5-curl > /dev/null
1212

1313
COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
1414

15-
COPY --link deploy/conf/* /etc/php/8.4/fpm/
15+
COPY --link deploy/conf/* /etc/php/8.5/fpm/
1616
WORKDIR /symfony
1717
COPY --link . .
1818

19-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
19+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
2020

2121
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --no-scripts --quiet
2222
RUN cp deploy/mysql/.env . && composer dump-env prod && bin/console cache:clear
2323

24-
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.4/fpm/php.ini
24+
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.5/fpm/php.ini
2525

2626
EXPOSE 8080
2727

2828
# Uncomment next line for Laravel console error logging to be viewable in docker logs
29-
# RUN echo "catch_workers_output = yes" >> /etc/php/8.4/fpm/php-fpm.conf
29+
# RUN echo "catch_workers_output = yes" >> /etc/php/8.5/fpm/php-fpm.conf
3030

3131
RUN mkdir -p /run/php
32-
CMD service php8.4-fpm start && \
32+
CMD service php8.5-fpm start && \
3333
nginx -c /symfony/deploy/nginx.conf

‎frameworks/PHP/symfony/symfony-raw.dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get install -yqq nginx git unzip curl \
10-
php8.4-cli php8.4-fpm php8.4-pgsql \
11-
php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
10+
php8.5-cli php8.5-fpm php8.5-pgsql \
11+
php8.5-mbstring php8.5-xml php8.5-curl > /dev/null
1212

1313
COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
1414

15-
COPY --link deploy/conf/* /etc/php/8.4/fpm/
15+
COPY --link deploy/conf/* /etc/php/8.5/fpm/
1616
WORKDIR /symfony
1717
COPY --link . .
1818

19-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
19+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
2020

2121
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --no-scripts --quiet
2222
RUN cp deploy/postgresql/.env . && composer dump-env prod && bin/console cache:clear
2323

24-
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.4/fpm/php.ini
24+
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.5/fpm/php.ini
2525

2626
EXPOSE 8080
2727

2828
# Uncomment next line for Laravel console error logging to be viewable in docker logs
29-
# RUN echo "catch_workers_output = yes" >> /etc/php/8.4/fpm/php-fpm.conf
29+
# RUN echo "catch_workers_output = yes" >> /etc/php/8.5/fpm/php-fpm.conf
3030

3131
RUN mkdir -p /run/php
32-
CMD service php8.4-fpm start && \
32+
CMD service php8.5-fpm start && \
3333
nginx -c /symfony/deploy/nginx.conf

‎frameworks/PHP/symfony/symfony-react.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM php:8.4-cli
1+
FROM php:8.5-cli
22

33
RUN apt-get update -yqq && \
44
apt-get install -yqq libpq-dev libicu-dev git > /dev/null && \
5-
docker-php-ext-install pdo_pgsql opcache intl pcntl > /dev/null
5+
docker-php-ext-install pdo_pgsql intl pcntl > /dev/null
66

77
COPY --link deploy/swoole/php.ini /usr/local/etc/php/
88
WORKDIR /symfony

‎frameworks/PHP/symfony/symfony-roadrunner.dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
FROM php:8.4-cli
1+
FROM php:8.5-cli
22

33
COPY --from=ghcr.io/roadrunner-server/roadrunner:2025.1 --link /usr/bin/rr /usr/local/bin/rr
44
COPY --from=mlocati/php-extension-installer --link /usr/bin/install-php-extensions /usr/local/bin/
55
COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
66

77
RUN install-php-extensions \
88
intl \
9-
opcache \
109
pdo_pgsql \
1110
sockets \
1211
zip > /dev/null

‎frameworks/PHP/symfony/symfony-workerman.dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get install -yqq unzip \
10-
php8.4-cli php8.4-pgsql php8.4-mbstring php8.4-xml php8.4-curl > /dev/null
10+
php8.5-cli php8.5-pgsql php8.5-mbstring php8.5-xml php8.5-curl > /dev/null
1111

1212
COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
1313

14-
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null && \
15-
pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
14+
RUN apt-get install -y php-pear php8.5-dev libevent-dev > /dev/null && \
15+
pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.5/cli/conf.d/event.ini
1616

1717
WORKDIR /symfony
1818
COPY --link . .
1919

2020
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --no-scripts --quiet
2121
RUN cp deploy/postgresql/.env . && composer dump-env prod && bin/console cache:clear
2222

23-
COPY --link deploy/conf/cli-php.ini /etc/php/8.4/cli/conf.d/20-adapterman.ini
23+
COPY --link deploy/conf/cli-php.ini /etc/php/8.5/cli/conf.d/20-adapterman.ini
2424

2525
EXPOSE 8080
2626

‎frameworks/PHP/symfony/symfony.dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
77
apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
88

99
RUN apt-get install -yqq nginx git unzip curl \
10-
php8.4-bcmath php8.4-cli php8.4-fpm php8.4-pgsql \
11-
php8.4-mbstring php8.4-xml php8.4-curl php8.4-intl > /dev/null
10+
php8.5-bcmath php8.5-cli php8.5-fpm php8.5-pgsql \
11+
php8.5-mbstring php8.5-xml php8.5-curl php8.5-intl > /dev/null
1212

1313
COPY --from=composer/composer:latest-bin --link /composer /usr/local/bin/composer
1414

15-
COPY --link deploy/conf/* /etc/php/8.4/fpm/
15+
COPY --link deploy/conf/* /etc/php/8.5/fpm/
1616

1717
WORKDIR /symfony
1818
COPY --link . .
1919

20-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
20+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
2121

2222
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --no-scripts --quiet
2323
RUN cp deploy/postgresql/.env . && composer dump-env prod && bin/console cache:clear
2424

25-
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.4/fpm/php.ini
25+
RUN echo "opcache.preload=/symfony/var/cache/prod/App_KernelProdContainer.preload.php" >> /etc/php/8.5/fpm/php.ini
2626

2727
EXPOSE 8080
2828

2929
# Uncomment next line for Laravel console error logging to be viewable in docker logs
30-
# RUN echo "catch_workers_output = yes" >> /etc/php/8.4/fpm/php-fpm.conf
30+
# RUN echo "catch_workers_output = yes" >> /etc/php/8.5/fpm/php-fpm.conf
3131

3232
RUN mkdir -p /run/php
33-
CMD service php8.4-fpm start && \
33+
CMD service php8.5-fpm start && \
3434
nginx -c /symfony/deploy/nginx.conf

0 commit comments

Comments
 (0)