php 8.4 & xdebug 3.4.0, symfony 7.2, mysql 8.4.3, rabbitmq 4, phpcpd …

…8.0.0, updated composer dependencies, refactoring.

.circleci/config.yml

@@ -43,6 +43,11 @@ jobs:
           command: |
             make report-code-coverage
 
+      - run:
+          name: Checks for security vulnerability advisories for installed packages
+          command: |
+            make composer-audit
+
       - run:
           name: Check coding standard & CodeSniffer
           command: |

.env

@@ -27,12 +27,12 @@ WEB_PORT_SSL=443
 # XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
 XDEBUG_CONFIG=main
 # Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
-XDEBUG_VERSION=3.3.2
+XDEBUG_VERSION=3.4.0
 ###< XDebug docker configuration ###
 
 ###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
-# MySQL version, recommend values: 9.1.0|9.0.1|8.4.2|8.3.0|8.2.0|8.1.0|8.0.39
-MYSQL_VERSION=8.4.2
+# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
+MYSQL_VERSION=8.4.3
 # 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

.github/workflows/ci.yml

@@ -50,6 +50,8 @@ jobs:
               with:
                   name: php-coverage-data
                   path: reports/clover.xml
+            - name: Checks for security vulnerability advisories for installed packages
+              run: make composer-audit
             - name: Run coding standard
               run: make ecs
             - name: Run codeSniffer

.gitlab-ci.yml

@@ -37,6 +37,7 @@ build:
     - make elastic-create-or-update-template
     - *general_scripts
     - make phpunit
+    - make composer-audit
     - make ecs
     - make phpcs
     - make phpstan

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.7-labs
-FROM php:8.3-fpm
+FROM php:8.4-fpm
 
 # set main params
 ARG BUILD_ARGUMENT_ENV=dev
@@ -12,8 +12,9 @@ ARG INSIDE_DOCKER_CONTAINER=1
 ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
 ARG XDEBUG_CONFIG=main
 ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
-ARG XDEBUG_VERSION=3.3.2
+ARG XDEBUG_VERSION=3.4.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; \
@@ -114,10 +115,6 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ];
     else export APP_ENV=$BUILD_ARGUMENT_ENV && COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
     fi
 
-# checks for security vulnerability advisories for installed packages in case dev/test environment
-RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then COMPOSER_MEMORY_LIMIT=-1 composer audit; \
-    fi
-
 # create cached config file .env.local.php in case staging/prod environment
 RUN if [ "$BUILD_ARGUMENT_ENV" = "staging" ] || [ "$BUILD_ARGUMENT_ENV" = "prod" ]; then composer dump-env $BUILD_ARGUMENT_ENV; \
     fi

Makefile

@@ -392,7 +392,7 @@ else
 endif
 
 phpcpd: ## Runs php copy/paste detector
-	@make exec cmd="php phpcpd.phar --fuzzy src tests"
+	@make exec cmd="php phpcpd.phar --fuzzy --verbose src tests"
 
 phpmd: ## Runs php mess detector
 	@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"

bitbucket-pipelines.yml

@@ -23,6 +23,7 @@ pipelines:
           - make elastic-create-or-update-template
           - make info
           - make phpunit
+          - make composer-audit
           - make ecs
           - make phpcs
           - make phpstan

composer.json

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v3.3.0",
+	"version": "v3.4.0",
 	"license": "MIT",
 	"authors": [
 		{
@@ -31,7 +31,7 @@
 		}
 	],
 	"require": {
-		"php": "^8.3.0",
+		"php": "^8.4.0",
 		"ext-amqp": "*",
 		"ext-ctype": "*",
 		"ext-iconv": "*",
@@ -44,50 +44,50 @@
 		"beberlei/doctrineextensions": "^1.5",
 		"doctrine/doctrine-bundle": "^2.13",
 		"doctrine/doctrine-migrations-bundle": "^3.3",
-		"doctrine/orm": "^2.19",
+		"doctrine/orm": "^2.20",
 		"dukecity/command-scheduler-bundle": "^6.0",
 		"elasticsearch/elasticsearch": "^7.17",
 		"gedmo/doctrine-extensions": "^3.17",
 		"lexik/jwt-authentication-bundle": "^3.1",
 		"mark-gerarts/automapper-plus-bundle": "^1.5",
 		"matomo/device-detector": "^6.4",
 		"matthiasnoback/symfony-console-form": "^6.0",
-		"nelmio/api-doc-bundle": "^4.32",
+		"nelmio/api-doc-bundle": "^4.33",
 		"nelmio/cors-bundle": "^2.5",
-		"phpdocumentor/reflection-docblock": "^5.4",
+		"phpdocumentor/reflection-docblock": "^5.6",
 		"ramsey/uuid-doctrine": "^2.1",
-		"symfony/amqp-messenger": "7.1.*",
-		"symfony/asset": "7.1.*",
-		"symfony/config": "7.1.*",
-		"symfony/console": "7.1.*",
-		"symfony/doctrine-bridge": "7.1.*",
-		"symfony/doctrine-messenger": "7.1.*",
-		"symfony/dotenv": "7.1.*",
-		"symfony/expression-language": "7.1.*",
+		"symfony/amqp-messenger": "7.2.*",
+		"symfony/asset": "7.2.*",
+		"symfony/config": "7.2.*",
+		"symfony/console": "7.2.*",
+		"symfony/doctrine-bridge": "7.2.*",
+		"symfony/doctrine-messenger": "7.2.*",
+		"symfony/dotenv": "7.2.*",
+		"symfony/expression-language": "7.2.*",
 		"symfony/flex": "^2.4",
-		"symfony/form": "7.1.*",
-		"symfony/framework-bundle": "7.1.*",
-		"symfony/http-client": "7.1.*",
-		"symfony/intl": "7.1.*",
-		"symfony/mailer": "7.1.*",
-		"symfony/messenger": "7.1.*",
-		"symfony/mime": "7.1.*",
+		"symfony/form": "7.2.*",
+		"symfony/framework-bundle": "7.2.*",
+		"symfony/http-client": "7.2.*",
+		"symfony/intl": "7.2.*",
+		"symfony/mailer": "7.2.*",
+		"symfony/messenger": "7.2.*",
+		"symfony/mime": "7.2.*",
 		"symfony/monolog-bundle": "^3.10",
-		"symfony/notifier": "7.1.*",
-		"symfony/process": "7.1.*",
-		"symfony/property-access": "7.1.*",
-		"symfony/property-info": "7.1.*",
+		"symfony/notifier": "7.2.*",
+		"symfony/process": "7.2.*",
+		"symfony/property-access": "7.2.*",
+		"symfony/property-info": "7.2.*",
 		"symfony/proxy-manager-bridge": "6.4.*",
-		"symfony/runtime": "7.1.*",
-		"symfony/routing": "7.1.*",
-		"symfony/security-bundle": "7.1.*",
-		"symfony/serializer": "7.1.*",
-		"symfony/string": "7.1.*",
-		"symfony/translation": "7.1.*",
-		"symfony/twig-bundle": "7.1.*",
-		"symfony/validator": "7.1.*",
-		"symfony/web-link": "7.1.*",
-		"symfony/yaml": "7.1.*",
+		"symfony/runtime": "7.2.*",
+		"symfony/routing": "7.2.*",
+		"symfony/security-bundle": "7.2.*",
+		"symfony/serializer": "7.2.*",
+		"symfony/string": "7.2.*",
+		"symfony/translation": "7.2.*",
+		"symfony/twig-bundle": "7.2.*",
+		"symfony/validator": "7.2.*",
+		"symfony/web-link": "7.2.*",
+		"symfony/yaml": "7.2.*",
 		"twig/extra-bundle": "^2.12|^3.0"
 	},
 	"conflict": {
@@ -97,16 +97,16 @@
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",
-		"doctrine/doctrine-fixtures-bundle": "^3.6",
+		"doctrine/doctrine-fixtures-bundle": "^4.0",
 		"systemsdk/easy-log-bundle": "2.0.*",
 		"roave/security-advisories": "dev-latest",
-		"symfony/browser-kit": "7.1.*",
-		"symfony/debug-bundle": "7.1.*",
+		"symfony/browser-kit": "7.2.*",
+		"symfony/debug-bundle": "7.2.*",
 		"symfony/maker-bundle": "^1.60",
 		"symfony/requirements-checker": "^2.0",
-		"symfony/stopwatch": "7.1.*",
-		"symfony/var-dumper": "7.1.*",
-		"symfony/web-profiler-bundle": "7.1.*"
+		"symfony/stopwatch": "7.2.*",
+		"symfony/var-dumper": "7.2.*",
+		"symfony/web-profiler-bundle": "7.2.*"
 	},
 	"replace": {
 		"symfony/polyfill-ctype": "*",
@@ -118,7 +118,7 @@
 	"config": {
 		"allow-plugins": true,
 		"platform": {
-			"php": "8.3.0"
+			"php": "8.4.0"
 		},
 		"preferred-install": {
 			"*": "dist"
@@ -135,7 +135,7 @@
 		"projectTitle": "Docker Symfony API",
 		"symfony": {
 			"allow-contrib": true,
-			"require": "7.1.*"
+			"require": "7.2.*"
 		}
 	},
 	"autoload": {
@@ -170,14 +170,12 @@
 		"post-install-cmd": [
 			"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
 			"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all install; fi",
-			"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
 			"@auto-scripts",
 			"@composer dump-autoload"
 		],
 		"post-update-cmd": [
 			"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
 			"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all update; fi",
-			"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
 			"@auto-scripts",
 			"@composer dump-autoload"
 		],