Skip to content

Commit 15b37a8

Browse files
author
DKravtsov
committed
Php 8.3, Symfony 6.4, MySQL 8.2, updated composer dependencies.
1 parent 5a10f2c commit 15b37a8

Some content is hidden

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

50 files changed

+4349
-3574
lines changed

Diff for: ‎.env

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ WEB_PORT_HTTP=80
2323
WEB_PORT_SSL=443
2424
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2525
XDEBUG_CONFIG=main
26-
# MySQL version, recommend values: 8.1|8.0
27-
MYSQL_VERSION=8.1
26+
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
27+
XDEBUG_VERSION=3.3.1
28+
# MySQL version, recommend values: 8.2|8.1|8.0
29+
MYSQL_VERSION=8.2
2830
# 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
2931
INNODB_USE_NATIVE_AIO=1
3032
# 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

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
# with:
6767
# ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
6868
# fetch-depth: 0 # a full history is required for pull request analysis
69-
# php-version: '8.2'
69+
# php-version: '8.3'
7070
# - name: 'Install dependencies'
7171
# run: COMPOSER_MEMORY_LIMIT=-1 composer install
7272
# - name: 'Download coverage data for Qodana'

Diff for: ‎.idea/codeception.xml

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

Diff for: ‎.idea/htdocs.iml

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

Diff for: ‎.idea/php.xml

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

Diff for: ‎.idea/phpspec.xml

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

Diff for: ‎.idea/phpunit.xml

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

Diff for: ‎Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2-apache
1+
FROM php:8.3-apache
22

33
# set main params
44
ARG BUILD_ARGUMENT_ENV=dev
@@ -11,6 +11,8 @@ ARG INSIDE_DOCKER_CONTAINER=1
1111
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
1212
ARG XDEBUG_CONFIG=main
1313
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
14+
ARG XDEBUG_VERSION=3.3.1
15+
ENV XDEBUG_VERSION=$XDEBUG_VERSION
1416

1517
# check environment
1618
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; \

Diff for: ‎Makefile

+16-16
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ help: ## Shows available commands with description
3030

3131
build: ## Build dev environment
3232
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
33-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml build
33+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml build
3434
else
3535
$(ERROR_ONLY_FOR_HOST)
3636
endif
3737

3838
build-test: ## Build test or continuous integration environment
3939
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
40-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml build
40+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml build
4141
else
4242
$(ERROR_ONLY_FOR_HOST)
4343
endif
@@ -58,14 +58,14 @@ endif
5858

5959
start: ## Start dev environment
6060
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
61-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
61+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
6262
else
6363
$(ERROR_ONLY_FOR_HOST)
6464
endif
6565

6666
start-test: ## Start test or continuous integration environment
6767
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
68-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) up -d
68+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) up -d
6969
else
7070
$(ERROR_ONLY_FOR_HOST)
7171
endif
@@ -86,14 +86,14 @@ endif
8686

8787
stop: ## Stop dev environment containers
8888
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
89-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) stop
89+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) stop
9090
else
9191
$(ERROR_ONLY_FOR_HOST)
9292
endif
9393

9494
stop-test: ## Stop test or continuous integration environment containers
9595
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
96-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) stop
96+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) stop
9797
else
9898
$(ERROR_ONLY_FOR_HOST)
9999
endif
@@ -114,14 +114,14 @@ endif
114114

115115
down: ## Stop and remove dev environment containers, networks
116116
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
117-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
117+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
118118
else
119119
$(ERROR_ONLY_FOR_HOST)
120120
endif
121121

122122
down-test: ## Stop and remove test or continuous integration environment containers, networks
123123
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
124-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
124+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
125125
else
126126
$(ERROR_ONLY_FOR_HOST)
127127
endif
@@ -153,35 +153,35 @@ env-staging: ## Creates cached config file .env.local.php (usually for staging e
153153

154154
ssh: ## Get bash inside symfony docker container
155155
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
156-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
156+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
157157
else
158158
$(ERROR_ONLY_FOR_HOST)
159159
endif
160160

161161
ssh-root: ## Get bash as root user inside symfony docker container
162162
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
163-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
163+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
164164
else
165165
$(ERROR_ONLY_FOR_HOST)
166166
endif
167167

168168
ssh-supervisord: ## Get bash inside supervisord docker container (cron jobs running there, etc...)
169169
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
170-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec supervisord bash
170+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec supervisord bash
171171
else
172172
$(ERROR_ONLY_FOR_HOST)
173173
endif
174174

175175
ssh-mysql: ## Get bash inside mysql docker container
176176
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
177-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec mysql bash
177+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec mysql bash
178178
else
179179
$(ERROR_ONLY_FOR_HOST)
180180
endif
181181

182182
ssh-rabbitmq: ## Get bash inside rabbitmq docker container
183183
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
184-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
184+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
185185
else
186186
$(ERROR_ONLY_FOR_HOST)
187187
endif
@@ -190,19 +190,19 @@ exec:
190190
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
191191
@$$cmd
192192
else
193-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
193+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
194194
endif
195195

196196
exec-bash:
197197
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
198198
@bash -c "$(cmd)"
199199
else
200-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
200+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
201201
endif
202202

203203
exec-by-root:
204204
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
205-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
205+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
206206
else
207207
$(ERROR_ONLY_FOR_HOST)
208208
endif

Diff for: ‎composer.json

+43-43
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^8.2.0",
25+
"php": "^8.3.0",
2626
"ext-amqp": "*",
2727
"ext-ctype": "*",
2828
"ext-iconv": "*",
@@ -31,43 +31,43 @@
3131
"ext-pdo": "*",
3232
"ext-pdo_mysql": "*",
3333
"doctrine/annotations": "^2.0",
34-
"doctrine/doctrine-bundle": "^2.10",
35-
"doctrine/doctrine-migrations-bundle": "^3.2",
36-
"doctrine/orm": "^2.16",
34+
"doctrine/doctrine-bundle": "^2.11",
35+
"doctrine/doctrine-migrations-bundle": "^3.3",
36+
"doctrine/orm": "^2.18",
3737
"phpdocumentor/reflection-docblock": "^5.3",
3838
"dukecity/command-scheduler-bundle": "^5.0",
3939
"symfony/apache-pack": "^1.0",
40-
"symfony/asset": "6.3.*",
41-
"symfony/config": "6.3.*",
42-
"symfony/console": "6.3.*",
43-
"symfony/dotenv": "6.3.*",
44-
"symfony/expression-language": "6.3.*",
40+
"symfony/asset": "6.4.*",
41+
"symfony/config": "6.4.*",
42+
"symfony/console": "6.4.*",
43+
"symfony/dotenv": "6.4.*",
44+
"symfony/expression-language": "6.4.*",
4545
"symfony/flex": "^2.4",
46-
"symfony/form": "6.3.*",
47-
"symfony/framework-bundle": "6.3.*",
48-
"symfony/http-client": "6.3.*",
49-
"symfony/intl": "6.3.*",
50-
"symfony/mailer": "6.3.*",
51-
"symfony/messenger": "6.3.*",
52-
"symfony/amqp-messenger": "6.3.*",
53-
"symfony/doctrine-messenger": "6.3.*",
54-
"symfony/mime": "6.3.*",
55-
"symfony/monolog-bundle": "^3.8",
56-
"symfony/notifier": "6.3.*",
57-
"symfony/process": "6.3.*",
58-
"symfony/property-access": "6.3.*",
59-
"symfony/property-info": "6.3.*",
60-
"symfony/proxy-manager-bridge": "6.3.*",
61-
"symfony/runtime": "6.3.*",
62-
"symfony/routing": "6.3.*",
63-
"symfony/security-bundle": "6.3.*",
64-
"symfony/serializer": "6.3.*",
65-
"symfony/string": "6.3.*",
66-
"symfony/translation": "6.3.*",
67-
"symfony/twig-bundle": "6.3.*",
68-
"symfony/validator": "6.3.*",
69-
"symfony/web-link": "6.3.*",
70-
"symfony/yaml": "6.3.*",
46+
"symfony/form": "6.4.*",
47+
"symfony/framework-bundle": "6.4.*",
48+
"symfony/http-client": "6.4.*",
49+
"symfony/intl": "6.4.*",
50+
"symfony/mailer": "6.4.*",
51+
"symfony/messenger": "6.4.*",
52+
"symfony/amqp-messenger": "6.4.*",
53+
"symfony/doctrine-messenger": "6.4.*",
54+
"symfony/mime": "6.4.*",
55+
"symfony/monolog-bundle": "^3.10",
56+
"symfony/notifier": "6.4.*",
57+
"symfony/process": "6.4.*",
58+
"symfony/property-access": "6.4.*",
59+
"symfony/property-info": "6.4.*",
60+
"symfony/proxy-manager-bridge": "6.4.*",
61+
"symfony/runtime": "6.4.*",
62+
"symfony/routing": "6.4.*",
63+
"symfony/security-bundle": "6.4.*",
64+
"symfony/serializer": "6.4.*",
65+
"symfony/string": "6.4.*",
66+
"symfony/translation": "6.4.*",
67+
"symfony/twig-bundle": "6.4.*",
68+
"symfony/validator": "6.4.*",
69+
"symfony/web-link": "6.4.*",
70+
"symfony/yaml": "6.4.*",
7171
"twig/extra-bundle": "^2.12|^3.0"
7272
},
7373
"conflict": {
@@ -77,16 +77,16 @@
7777
},
7878
"require-dev": {
7979
"bamarni/composer-bin-plugin": "^1.8",
80-
"doctrine/doctrine-fixtures-bundle": "^3.4",
80+
"doctrine/doctrine-fixtures-bundle": "^3.5",
8181
"systemsdk/easy-log-bundle": "2.0.*",
8282
"roave/security-advisories": "dev-latest",
83-
"symfony/browser-kit": "6.3.*",
84-
"symfony/debug-bundle": "6.3.*",
85-
"symfony/maker-bundle": "^1.51",
83+
"symfony/browser-kit": "6.4.*",
84+
"symfony/debug-bundle": "6.4.*",
85+
"symfony/maker-bundle": "^1.54",
8686
"symfony/requirements-checker": "^2.0",
87-
"symfony/stopwatch": "6.3.*",
88-
"symfony/var-dumper": "6.3.*",
89-
"symfony/web-profiler-bundle": "6.3.*"
87+
"symfony/stopwatch": "6.4.*",
88+
"symfony/var-dumper": "6.4.*",
89+
"symfony/web-profiler-bundle": "6.4.*"
9090
},
9191
"replace": {
9292
"symfony/polyfill-ctype": "*",
@@ -98,7 +98,7 @@
9898
"config": {
9999
"allow-plugins": true,
100100
"platform": {
101-
"php": "8.2.0"
101+
"php": "8.3.0"
102102
},
103103
"preferred-install": {
104104
"*": "dist"
@@ -114,7 +114,7 @@
114114
},
115115
"symfony": {
116116
"allow-contrib": true,
117-
"require": "6.3.*"
117+
"require": "6.4.*"
118118
}
119119
},
120120
"autoload": {

0 commit comments

Comments
 (0)