Skip to content

Commit c690ebb

Browse files
author
DKravtsov
committed
php 8.4 & xdebug 3.4.0, symfony 7.2, mysql 8.4.3, rabbitmq 4, phpcpd 8.0.0, updated composer dependencies, refactoring.
1 parent d1cd1eb commit c690ebb

File tree

69 files changed

+3031
-2942
lines changed

Some content is hidden

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

69 files changed

+3031
-2942
lines changed

Diff for: ‎.circleci/config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
command: |
4444
make report-code-coverage
4545
46+
- run:
47+
name: Checks for security vulnerability advisories for installed packages
48+
command: |
49+
make composer-audit
50+
4651
- run:
4752
name: Check coding standard & CodeSniffer
4853
command: |

Diff for: ‎.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ WEB_PORT_SSL=443
2727
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2828
XDEBUG_CONFIG=main
2929
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
30-
XDEBUG_VERSION=3.3.2
30+
XDEBUG_VERSION=3.4.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.1.0|9.0.1|8.4.2|8.3.0|8.2.0|8.1.0|8.0.39
35-
MYSQL_VERSION=8.4.2
34+
# 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
35+
MYSQL_VERSION=8.4.3
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

Diff for: ‎.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
with:
5151
name: php-coverage-data
5252
path: reports/clover.xml
53+
- name: Checks for security vulnerability advisories for installed packages
54+
run: make composer-audit
5355
- name: Run coding standard
5456
run: make ecs
5557
- name: Run codeSniffer

Diff for: ‎.gitlab-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ build:
3737
- make elastic-create-or-update-template
3838
- *general_scripts
3939
- make phpunit
40+
- make composer-audit
4041
- make ecs
4142
- make phpcs
4243
- make phpstan

Diff for: ‎.idea/PMDPlugin.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.idea/htdocs.iml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.idea/php.xml

+375-358
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Dockerfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.7-labs
2-
FROM php:8.3-fpm
2+
FROM php:8.4-fpm
33

44
# set main params
55
ARG BUILD_ARGUMENT_ENV=dev
@@ -12,8 +12,9 @@ ARG INSIDE_DOCKER_CONTAINER=1
1212
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
1313
ARG XDEBUG_CONFIG=main
1414
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
15-
ARG XDEBUG_VERSION=3.3.2
15+
ARG XDEBUG_VERSION=3.4.0
1616
ENV XDEBUG_VERSION=$XDEBUG_VERSION
17+
ENV PHP_CS_FIXER_IGNORE_ENV=1
1718

1819
# check environment
1920
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" ];
114115
else export APP_ENV=$BUILD_ARGUMENT_ENV && COMPOSER_MEMORY_LIMIT=-1 composer install --optimize-autoloader --no-interaction --no-progress --no-dev; \
115116
fi
116117

117-
# checks for security vulnerability advisories for installed packages in case dev/test environment
118-
RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then COMPOSER_MEMORY_LIMIT=-1 composer audit; \
119-
fi
120-
121118
# create cached config file .env.local.php in case staging/prod environment
122119
RUN if [ "$BUILD_ARGUMENT_ENV" = "staging" ] || [ "$BUILD_ARGUMENT_ENV" = "prod" ]; then composer dump-env $BUILD_ARGUMENT_ENV; \
123120
fi

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ else
392392
endif
393393

394394
phpcpd: ## Runs php copy/paste detector
395-
@make exec cmd="php phpcpd.phar --fuzzy src tests"
395+
@make exec cmd="php phpcpd.phar --fuzzy --verbose src tests"
396396

397397
phpmd: ## Runs php mess detector
398398
@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"

Diff for: ‎bitbucket-pipelines.yml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pipelines:
2323
- make elastic-create-or-update-template
2424
- make info
2525
- make phpunit
26+
- make composer-audit
2627
- make ecs
2728
- make phpcs
2829
- make phpstan

Diff for: ‎composer.json

+42-44
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"Elasticsearch"
1515
],
1616
"homepage": "https://github.com/systemsdk/docker-symfony-api",
17-
"version": "v3.3.0",
17+
"version": "v3.4.0",
1818
"license": "MIT",
1919
"authors": [
2020
{
@@ -31,7 +31,7 @@
3131
}
3232
],
3333
"require": {
34-
"php": "^8.3.0",
34+
"php": "^8.4.0",
3535
"ext-amqp": "*",
3636
"ext-ctype": "*",
3737
"ext-iconv": "*",
@@ -44,50 +44,50 @@
4444
"beberlei/doctrineextensions": "^1.5",
4545
"doctrine/doctrine-bundle": "^2.13",
4646
"doctrine/doctrine-migrations-bundle": "^3.3",
47-
"doctrine/orm": "^2.19",
47+
"doctrine/orm": "^2.20",
4848
"dukecity/command-scheduler-bundle": "^6.0",
4949
"elasticsearch/elasticsearch": "^7.17",
5050
"gedmo/doctrine-extensions": "^3.17",
5151
"lexik/jwt-authentication-bundle": "^3.1",
5252
"mark-gerarts/automapper-plus-bundle": "^1.5",
5353
"matomo/device-detector": "^6.4",
5454
"matthiasnoback/symfony-console-form": "^6.0",
55-
"nelmio/api-doc-bundle": "^4.32",
55+
"nelmio/api-doc-bundle": "^4.33",
5656
"nelmio/cors-bundle": "^2.5",
57-
"phpdocumentor/reflection-docblock": "^5.4",
57+
"phpdocumentor/reflection-docblock": "^5.6",
5858
"ramsey/uuid-doctrine": "^2.1",
59-
"symfony/amqp-messenger": "7.1.*",
60-
"symfony/asset": "7.1.*",
61-
"symfony/config": "7.1.*",
62-
"symfony/console": "7.1.*",
63-
"symfony/doctrine-bridge": "7.1.*",
64-
"symfony/doctrine-messenger": "7.1.*",
65-
"symfony/dotenv": "7.1.*",
66-
"symfony/expression-language": "7.1.*",
59+
"symfony/amqp-messenger": "7.2.*",
60+
"symfony/asset": "7.2.*",
61+
"symfony/config": "7.2.*",
62+
"symfony/console": "7.2.*",
63+
"symfony/doctrine-bridge": "7.2.*",
64+
"symfony/doctrine-messenger": "7.2.*",
65+
"symfony/dotenv": "7.2.*",
66+
"symfony/expression-language": "7.2.*",
6767
"symfony/flex": "^2.4",
68-
"symfony/form": "7.1.*",
69-
"symfony/framework-bundle": "7.1.*",
70-
"symfony/http-client": "7.1.*",
71-
"symfony/intl": "7.1.*",
72-
"symfony/mailer": "7.1.*",
73-
"symfony/messenger": "7.1.*",
74-
"symfony/mime": "7.1.*",
68+
"symfony/form": "7.2.*",
69+
"symfony/framework-bundle": "7.2.*",
70+
"symfony/http-client": "7.2.*",
71+
"symfony/intl": "7.2.*",
72+
"symfony/mailer": "7.2.*",
73+
"symfony/messenger": "7.2.*",
74+
"symfony/mime": "7.2.*",
7575
"symfony/monolog-bundle": "^3.10",
76-
"symfony/notifier": "7.1.*",
77-
"symfony/process": "7.1.*",
78-
"symfony/property-access": "7.1.*",
79-
"symfony/property-info": "7.1.*",
76+
"symfony/notifier": "7.2.*",
77+
"symfony/process": "7.2.*",
78+
"symfony/property-access": "7.2.*",
79+
"symfony/property-info": "7.2.*",
8080
"symfony/proxy-manager-bridge": "6.4.*",
81-
"symfony/runtime": "7.1.*",
82-
"symfony/routing": "7.1.*",
83-
"symfony/security-bundle": "7.1.*",
84-
"symfony/serializer": "7.1.*",
85-
"symfony/string": "7.1.*",
86-
"symfony/translation": "7.1.*",
87-
"symfony/twig-bundle": "7.1.*",
88-
"symfony/validator": "7.1.*",
89-
"symfony/web-link": "7.1.*",
90-
"symfony/yaml": "7.1.*",
81+
"symfony/runtime": "7.2.*",
82+
"symfony/routing": "7.2.*",
83+
"symfony/security-bundle": "7.2.*",
84+
"symfony/serializer": "7.2.*",
85+
"symfony/string": "7.2.*",
86+
"symfony/translation": "7.2.*",
87+
"symfony/twig-bundle": "7.2.*",
88+
"symfony/validator": "7.2.*",
89+
"symfony/web-link": "7.2.*",
90+
"symfony/yaml": "7.2.*",
9191
"twig/extra-bundle": "^2.12|^3.0"
9292
},
9393
"conflict": {
@@ -97,16 +97,16 @@
9797
},
9898
"require-dev": {
9999
"bamarni/composer-bin-plugin": "^1.8",
100-
"doctrine/doctrine-fixtures-bundle": "^3.6",
100+
"doctrine/doctrine-fixtures-bundle": "^4.0",
101101
"systemsdk/easy-log-bundle": "2.0.*",
102102
"roave/security-advisories": "dev-latest",
103-
"symfony/browser-kit": "7.1.*",
104-
"symfony/debug-bundle": "7.1.*",
103+
"symfony/browser-kit": "7.2.*",
104+
"symfony/debug-bundle": "7.2.*",
105105
"symfony/maker-bundle": "^1.60",
106106
"symfony/requirements-checker": "^2.0",
107-
"symfony/stopwatch": "7.1.*",
108-
"symfony/var-dumper": "7.1.*",
109-
"symfony/web-profiler-bundle": "7.1.*"
107+
"symfony/stopwatch": "7.2.*",
108+
"symfony/var-dumper": "7.2.*",
109+
"symfony/web-profiler-bundle": "7.2.*"
110110
},
111111
"replace": {
112112
"symfony/polyfill-ctype": "*",
@@ -118,7 +118,7 @@
118118
"config": {
119119
"allow-plugins": true,
120120
"platform": {
121-
"php": "8.3.0"
121+
"php": "8.4.0"
122122
},
123123
"preferred-install": {
124124
"*": "dist"
@@ -135,7 +135,7 @@
135135
"projectTitle": "Docker Symfony API",
136136
"symfony": {
137137
"allow-contrib": true,
138-
"require": "7.1.*"
138+
"require": "7.2.*"
139139
}
140140
},
141141
"autoload": {
@@ -170,14 +170,12 @@
170170
"post-install-cmd": [
171171
"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
172172
"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all install; fi",
173-
"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
174173
"@auto-scripts",
175174
"@composer dump-autoload"
176175
],
177176
"post-update-cmd": [
178177
"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
179178
"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all update; fi",
180-
"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
181179
"@auto-scripts",
182180
"@composer dump-autoload"
183181
],

0 commit comments

Comments
 (0)