Skip to content

Commit 85127bf

Browse files
author
DKravtsov
committed
MySQL 8.1, updated composer dependencies, fixed make stop command, added make down command, updated docs, added Qodana code quality tool integration.
1 parent 4baa75c commit 85127bf

31 files changed

+2757
-2548
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ jobs:
2222
make drop-migrate
2323
make messenger-setup-transports
2424
25+
- run:
26+
name: Show framework version and additional info, php & composer version
27+
command: |
28+
make info
29+
2530
- run:
2631
name: Run unit/functional tests
2732
command: |

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
12
root = true
23

34
[*]

‎.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ 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
2628
# 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
2729
INNODB_USE_NATIVE_AIO=1
2830
# 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‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ on:
1313
types: [published]
1414

1515
jobs:
16-
1716
build:
18-
1917
runs-on: ubuntu-latest
20-
2118
steps:
2219
- uses: actions/checkout@v1
2320
- name: Build the docker images
@@ -32,6 +29,8 @@ jobs:
3229
run: make drop-migrate
3330
- name: Setup transports for Messenger component
3431
run: make messenger-setup-transports
32+
- name: Show framework version and additional info, php & composer version
33+
run: make info
3534
- name: Run test suite
3635
run: make phpunit
3736
- name: Run PHP coding standard
@@ -48,3 +47,20 @@ jobs:
4847
run: make phpinsights
4948
- name: Stop the docker images
5049
run: make stop-test
50+
51+
qodana:
52+
runs-on: ubuntu-latest
53+
needs: build
54+
permissions:
55+
contents: write
56+
pull-requests: write
57+
checks: write
58+
steps:
59+
- uses: actions/checkout@v3
60+
with:
61+
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
62+
fetch-depth: 0 # a full history is required for pull request analysis
63+
- name: 'Qodana Scan'
64+
uses: JetBrains/qodana-action@v2023.2
65+
env:
66+
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

‎Makefile‎

Lines changed: 53 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,84 +30,112 @@ 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) 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) 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) 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) 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
4444

4545
build-staging: ## Build staging environment
4646
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
47-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml build
47+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml build
4848
else
4949
$(ERROR_ONLY_FOR_HOST)
5050
endif
5151

5252
build-prod: ## Build prod environment
5353
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
54-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml build
54+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml build
5555
else
5656
$(ERROR_ONLY_FOR_HOST)
5757
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) 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) 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) 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) 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
7272

7373
start-staging: ## Start staging environment
7474
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
75-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) up -d
75+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) up -d
7676
else
7777
$(ERROR_ONLY_FOR_HOST)
7878
endif
7979

8080
start-prod: ## Start prod environment
8181
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
82-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) up -d
82+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) up -d
8383
else
8484
$(ERROR_ONLY_FOR_HOST)
8585
endif
8686

87-
stop: ## Stop dev environment
87+
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) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
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
9090
else
9191
$(ERROR_ONLY_FOR_HOST)
9292
endif
9393

94-
stop-test: ## Stop test or continuous integration environment
94+
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) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
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
9797
else
9898
$(ERROR_ONLY_FOR_HOST)
9999
endif
100100

101-
stop-staging: ## Stop staging environment
101+
stop-staging: ## Stop staging environment containers
102102
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
103-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
103+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) stop
104104
else
105105
$(ERROR_ONLY_FOR_HOST)
106106
endif
107107

108-
stop-prod: ## Stop prod environment
108+
stop-prod: ## Stop prod environment containers
109109
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
110-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
110+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) stop
111+
else
112+
$(ERROR_ONLY_FOR_HOST)
113+
endif
114+
115+
down: ## Stop and remove dev environment containers, networks
116+
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
118+
else
119+
$(ERROR_ONLY_FOR_HOST)
120+
endif
121+
122+
down-test: ## Stop and remove test or continuous integration environment containers, networks
123+
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
125+
else
126+
$(ERROR_ONLY_FOR_HOST)
127+
endif
128+
129+
down-staging: ## Stop and remove staging environment containers, networks
130+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
131+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
132+
else
133+
$(ERROR_ONLY_FOR_HOST)
134+
endif
135+
136+
down-prod: ## Stop and remove prod environment containers, networks
137+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
138+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
111139
else
112140
$(ERROR_ONLY_FOR_HOST)
113141
endif
@@ -125,14 +153,14 @@ env-staging: ## Creates cached config file .env.local.php (usually for staging e
125153

126154
ssh: ## Get bash inside symfony docker container
127155
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
128-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) 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) 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
129157
else
130158
$(ERROR_ONLY_FOR_HOST)
131159
endif
132160

133161
ssh-root: ## Get bash as root user inside symfony docker container
134162
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
135-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) 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) 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
136164
else
137165
$(ERROR_ONLY_FOR_HOST)
138166
endif
@@ -146,21 +174,21 @@ endif
146174

147175
ssh-supervisord: ## Get bash inside supervisord docker container (cron jobs running there, etc...)
148176
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
149-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec supervisord 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) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec supervisord bash
150178
else
151179
$(ERROR_ONLY_FOR_HOST)
152180
endif
153181

154182
ssh-mysql: ## Get bash inside mysql docker container
155183
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) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec mysql bash
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 mysql bash
157185
else
158186
$(ERROR_ONLY_FOR_HOST)
159187
endif
160188

161189
ssh-rabbitmq: ## Get bash inside rabbitmq docker container
162190
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) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
191+
@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
164192
else
165193
$(ERROR_ONLY_FOR_HOST)
166194
endif
@@ -169,19 +197,19 @@ exec:
169197
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
170198
@$$cmd
171199
else
172-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$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) 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
173201
endif
174202

175203
exec-bash:
176204
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
177205
@bash -c "$(cmd)"
178206
else
179-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) 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)"
207+
@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)"
180208
endif
181209

182210
exec-by-root:
183211
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) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
212+
@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
185213
else
186214
$(ERROR_ONLY_FOR_HOST)
187215
endif
@@ -207,6 +235,7 @@ composer-update: ## Updates composer dependencies
207235
info: ## Shows Php and Symfony version
208236
@make exec cmd="php --version"
209237
@make exec cmd="bin/console about"
238+
@make exec cmd="composer --version"
210239

211240
logs: ## Shows logs from the symfony container. Use ctrl+c in order to exit
212241
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
"doctrine/annotations": "^2.0",
3434
"doctrine/doctrine-bundle": "^2.10",
3535
"doctrine/doctrine-migrations-bundle": "^3.2",
36-
"doctrine/orm": "^2.15",
36+
"doctrine/orm": "^2.16",
3737
"phpdocumentor/reflection-docblock": "^5.3",
3838
"dukecity/command-scheduler-bundle": "^5.0",
3939
"symfony/asset": "6.3.*",
4040
"symfony/config": "6.3.*",
4141
"symfony/console": "6.3.*",
4242
"symfony/dotenv": "6.3.*",
4343
"symfony/expression-language": "6.3.*",
44-
"symfony/flex": "^2.2",
44+
"symfony/flex": "^2.3",
4545
"symfony/form": "6.3.*",
4646
"symfony/framework-bundle": "6.3.*",
4747
"symfony/http-client": "6.3.*",
@@ -81,7 +81,7 @@
8181
"roave/security-advisories": "dev-latest",
8282
"symfony/browser-kit": "6.3.*",
8383
"symfony/debug-bundle": "6.3.*",
84-
"symfony/maker-bundle": "^1.49",
84+
"symfony/maker-bundle": "^1.51",
8585
"symfony/requirements-checker": "^2.0",
8686
"symfony/stopwatch": "6.3.*",
8787
"symfony/var-dumper": "6.3.*",

0 commit comments

Comments
 (0)