PHP 8.5, MySQL 8.4.8, updated composer dependencies, refactoring.

Author: DKravtsov

.env

@@ -31,8 +31,8 @@ XDEBUG_VERSION=3.5.0
 ###< XDebug docker configuration ###
 
 ###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
-# MySQL version, recommend values: 9.4.0|8.4.7|8.0.43
-MYSQL_VERSION=8.4.7
+# MySQL version, recommend values: 9.6.0|8.4.8|8.0.43
+MYSQL_VERSION=8.4.8
 # 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
 INNODB_USE_NATIVE_AIO=1
 # 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
@@ -120,7 +120,7 @@ JWT_TOKEN_TTL=3600
 ###< lexik/jwt-authentication-bundle ###
 
 ###> nelmio/cors-bundle ###
-CORS_ALLOW_ORIGIN='^https?://localhost(:[0-9]+)?$'
+CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###
 
 ###> Api-key options ###

.idea/php.xml

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.7-labs
-FROM php:8.4-fpm
+FROM php:8.5-fpm-bookworm
 
 # set main params
 ARG BUILD_ARGUMENT_ENV=dev
@@ -14,7 +14,6 @@ ARG XDEBUG_CONFIG=main
 ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
 ARG XDEBUG_VERSION=3.5.0
 ENV XDEBUG_VERSION=$XDEBUG_VERSION
-ENV PHP_CS_FIXER_IGNORE_ENV=1
 
 # check environment
 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; \
@@ -54,7 +53,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       pdo_mysql \
       sockets \
       intl \
-      opcache \
       zip \
       bcmath \
     && docker-php-ext-enable amqp \
@@ -65,6 +63,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     && rm -rf /var/lib/apt/lists/* \
     && apt-get clean
 
+# Pull the PHP extension installer from the official image
+COPY --from=mlocati/php-extension-installer:latest /usr/bin/install-php-extensions /usr/local/bin/
+
 # create document root, fix permissions for www-data user and change owner to www-data
 RUN mkdir -p $APP_HOME/public && \
     mkdir -p /home/$USERNAME && chown $USERNAME:$USERNAME /home/$USERNAME \
@@ -77,9 +78,13 @@ COPY ./docker/$BUILD_ARGUMENT_ENV/www.conf /usr/local/etc/php-fpm.d/www.conf
 COPY ./docker/$BUILD_ARGUMENT_ENV/php.ini /usr/local/etc/php/php.ini
 
 # install Xdebug in case dev/test environment
-COPY ./docker/general/do_we_need_xdebug.sh /tmp/
 COPY ./docker/dev/xdebug-${XDEBUG_CONFIG}.ini /tmp/xdebug.ini
-RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
+RUN if [ "$ENV" = "dev" ] || [ "$ENV" = "test" ]; then \
+        install-php-extensions xdebug-${XDEBUG_VERSION} && \
+        mv /tmp/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; \
+    else \
+        rm /tmp/xdebug.ini; \
+    fi
 
 # install composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

Dockerfile

@@ -407,7 +407,7 @@ else
 endif
 
 phpmd: ## Runs php mess detector
-	@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"
+	@make exec cmd="php ./vendor/bin/phpmd analyze --format=text --ruleset=phpmd_ruleset.xml --suffixes=php src tests"
 
 phpstan: ## Runs PhpStan static analysis tool
 ifeq ($(INSIDE_DOCKER_CONTAINER), 1)

Makefile

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v3.9.0",
+	"version": "v4.0.0",
 	"license": "MIT",
 	"authors": [
 		{
@@ -45,7 +45,7 @@
 		}
 	],
 	"require": {
-		"php": "^8.4.0",
+		"php": "^8.5.0",
 		"ext-amqp": "*",
 		"ext-ctype": "*",
 		"ext-iconv": "*",
@@ -65,11 +65,11 @@
 		"gedmo/doctrine-extensions": "3.22.*",
 		"lexik/jwt-authentication-bundle": "3.2.*",
 		"mark-gerarts/automapper-plus-bundle": "1.5.*",
-		"matomo/device-detector": "6.4.*",
-		"matthiasnoback/symfony-console-form": "6.0.*",
-		"nelmio/api-doc-bundle": "5.8.*",
+		"matomo/device-detector": "6.5.*",
+		"matthiasnoback/symfony-console-form": "7.0.*",
+		"nelmio/api-doc-bundle": "5.9.*",
 		"nelmio/cors-bundle": "2.6.*",
-		"phpdocumentor/reflection-docblock": "^5.6.6",
+		"phpdocumentor/reflection-docblock": "^6.0.3",
 		"ramsey/uuid-doctrine": "2.1.*",
 		"symfony/amqp-messenger": "7.4.*",
 		"symfony/asset": "7.4.*",
@@ -97,11 +97,11 @@
 		"symfony/routing": "7.4.*",
 		"symfony/security-bundle": "7.4.*",
 		"symfony/serializer": "7.4.*",
-		"symfony/stimulus-bundle": "^2.33.0",
+		"symfony/stimulus-bundle": "^2.34.0",
 		"symfony/string": "7.4.*",
 		"symfony/translation": "7.4.*",
 		"symfony/twig-bundle": "7.4.*",
-		"symfony/ux-turbo": "^2.33.0",
+		"symfony/ux-turbo": "^2.34.0",
 		"symfony/validator": "7.4.*",
 		"symfony/web-link": "7.4.*",
 		"symfony/yaml": "7.4.*",
@@ -119,7 +119,7 @@
 		"systemsdk/easy-log-bundle": "^2.1.0",
 		"roave/security-advisories": "dev-latest",
 		"symfony/debug-bundle": "7.4.*",
-		"symfony/maker-bundle": "^1.66.0",
+		"symfony/maker-bundle": "^1.67.0",
 		"symfony/requirements-checker": "^2.0.3",
 		"symfony/stopwatch": "7.4.*",
 		"symfony/var-dumper": "7.4.*",
@@ -139,7 +139,7 @@
 	"config": {
 		"allow-plugins": true,
 		"platform": {
-			"php": "8.4.0"
+			"php": "8.5.0"
 		},
 		"preferred-install": {
 			"*": "dist"