Skip to content

Commit 6815369

Browse files
author
DKravtsov
committed
PHP 8.5, MySQL 8.4.8, updated composer dependencies, refactoring.
1 parent c02498a commit 6815369

42 files changed

Lines changed: 2899 additions & 2143 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ XDEBUG_VERSION=3.5.0
3131
###< XDebug docker configuration ###
3232

3333
###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
34-
# MySQL version, recommend values: 9.4.0|8.4.7|8.0.43
35-
MYSQL_VERSION=8.4.7
34+
# MySQL version, recommend values: 9.6.0|8.4.8|8.0.43
35+
MYSQL_VERSION=8.4.8
3636
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
3737
INNODB_USE_NATIVE_AIO=1
3838
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode

.idea/htdocs.iml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php.xml

Lines changed: 274 additions & 270 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.7-labs
2-
FROM php:8.4-apache
2+
FROM php:8.5-apache-bookworm
33

44
# set main params
55
ARG BUILD_ARGUMENT_ENV=dev
@@ -14,7 +14,6 @@ ARG XDEBUG_CONFIG=main
1414
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
1515
ARG XDEBUG_VERSION=3.5.0
1616
ENV XDEBUG_VERSION=$XDEBUG_VERSION
17-
ENV PHP_CS_FIXER_IGNORE_ENV=1
1817

1918
# check environment
2019
RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev" && exit 2; \
@@ -53,7 +52,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
5352
pdo_mysql \
5453
sockets \
5554
intl \
56-
opcache \
5755
zip \
5856
bcmath \
5957
&& docker-php-ext-enable amqp \
@@ -64,6 +62,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
6462
&& rm -rf /var/lib/apt/lists/* \
6563
&& apt-get clean
6664

65+
# Pull the PHP extension installer from the official image
66+
COPY --from=mlocati/php-extension-installer:latest /usr/bin/install-php-extensions /usr/local/bin/
67+
6768
# disable default site and delete all default files inside APP_HOME
6869
RUN a2dissite 000-default.conf
6970
RUN rm -r $APP_HOME
@@ -86,9 +87,13 @@ RUN a2enmod rewrite
8687
RUN a2enmod ssl
8788

8889
# install Xdebug in case dev/test environment
89-
COPY ./docker/general/do_we_need_xdebug.sh /tmp/
9090
COPY ./docker/dev/xdebug-${XDEBUG_CONFIG}.ini /tmp/xdebug.ini
91-
RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
91+
RUN if [ "$ENV" = "dev" ] || [ "$ENV" = "test" ]; then \
92+
install-php-extensions xdebug-${XDEBUG_VERSION} && \
93+
mv /tmp/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; \
94+
else \
95+
rm /tmp/xdebug.ini; \
96+
fi
9297

9398
# install composer
9499
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ else
337337
endif
338338

339339
phpmd: ## Runs php mess detector
340-
@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"
340+
@make exec cmd="php ./vendor/bin/phpmd analyze --format=text --ruleset=phpmd_ruleset.xml --suffixes=php src tests"
341341

342342
phpstan: ## Runs PhpStan static analysis tool
343343
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
}
3737
],
3838
"require": {
39-
"php": "^8.4.0",
39+
"php": "^8.5.0",
4040
"ext-amqp": "*",
4141
"ext-ctype": "*",
4242
"ext-iconv": "*",
@@ -49,7 +49,8 @@
4949
"doctrine/doctrine-bundle": "3.2.*",
5050
"doctrine/doctrine-migrations-bundle": "4.0.*",
5151
"doctrine/orm": "3.6.*",
52-
"phpdocumentor/reflection-docblock": "^5.6.7",
52+
"friendsofphp/proxy-manager-lts": "^1.0.19",
53+
"phpdocumentor/reflection-docblock": "^6.0.3",
5354
"dukecity/command-scheduler-bundle": "6.0.*",
5455
"symfony/apache-pack": "^1.0.1",
5556
"symfony/amqp-messenger": "7.4.*",
@@ -69,21 +70,20 @@
6970
"symfony/mailer": "7.4.*",
7071
"symfony/messenger": "7.4.*",
7172
"symfony/mime": "7.4.*",
72-
"symfony/monolog-bundle": "^4.0.1",
73+
"symfony/monolog-bundle": "^4.0.2",
7374
"symfony/notifier": "7.4.*",
7475
"symfony/process": "7.4.*",
7576
"symfony/property-access": "7.4.*",
7677
"symfony/property-info": "7.4.*",
77-
"symfony/proxy-manager-bridge": "6.4.*",
7878
"symfony/runtime": "7.4.*",
7979
"symfony/routing": "7.4.*",
8080
"symfony/security-bundle": "7.4.*",
8181
"symfony/serializer": "7.4.*",
82-
"symfony/stimulus-bundle": "^2.33.0",
82+
"symfony/stimulus-bundle": "^2.34.0",
8383
"symfony/string": "7.4.*",
8484
"symfony/translation": "7.4.*",
8585
"symfony/twig-bundle": "7.4.*",
86-
"symfony/ux-turbo": "^2.33.0",
86+
"symfony/ux-turbo": "^2.34.0",
8787
"symfony/validator": "7.4.*",
8888
"symfony/web-link": "7.4.*",
8989
"symfony/yaml": "7.4.*",
@@ -121,7 +121,7 @@
121121
"config": {
122122
"allow-plugins": true,
123123
"platform": {
124-
"php": "8.4.0"
124+
"php": "8.5.0"
125125
},
126126
"preferred-install": {
127127
"*": "dist"

0 commit comments

Comments
 (0)