Skip to content

Commit 607c291

Browse files
author
DKravtsov
committed
Improved environment and configuration options, updated composer dependencies.
1 parent f58d6d4 commit 607c291

26 files changed

+642
-521
lines changed

‎.env‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
COMPOSE_PROJECT_NAME=backend
1818
###< docker-compose configuration ###
1919

20+
###> docker configuration that can be overridden in .env.local ###
21+
WEB_PORT_HTTP=80
22+
WEB_PORT_SSL=443
23+
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
24+
XDEBUG_CONFIG=main
25+
# 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
26+
INNODB_USE_NATIVE_AIO=1
27+
###< docker configuration that can be overridden in .env.local ###
28+
2029
###> symfony/framework-bundle ###
2130
APP_ENV=dev
2231
APP_DEBUG=1

‎Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ARG HOST_GID=1000
99
ENV USERNAME=www-data
1010
ARG INSIDE_DOCKER_CONTAINER=1
1111
ENV INSIDE_DOCKER_CONTAINER=$INSIDE_DOCKER_CONTAINER
12+
ARG XDEBUG_CONFIG=main
13+
ENV XDEBUG_CONFIG=$XDEBUG_CONFIG
1214

1315
# check environment
1416
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; \
@@ -65,7 +67,7 @@ COPY ./docker/$BUILD_ARGUMENT_ENV/php.ini /usr/local/etc/php/php.ini
6567

6668
# install Xdebug in case dev/test environment
6769
COPY ./docker/general/do_we_need_xdebug.sh /tmp/
68-
COPY ./docker/dev/xdebug.ini /tmp/
70+
COPY ./docker/dev/xdebug-${XDEBUG_CONFIG}.ini /tmp/xdebug.ini
6971
RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
7072

7173
# install security-checker in case dev/test environment

‎Makefile‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
ifndef APP_ENV
2-
include .env
3-
# Determine if .env.local file exist
4-
ifneq ("$(wildcard .env.local)", "")
5-
include .env.local
6-
endif
1+
include .env
2+
# Determine if .env.local file exist
3+
ifneq ("$(wildcard .env.local)", "")
4+
include .env.local
75
endif
86

97
ifndef INSIDE_DOCKER_CONTAINER
@@ -25,86 +23,89 @@ ifeq ($(GITLAB_CI), 1)
2523
PHPUNIT_OPTIONS := --coverage-text --colors=never
2624
endif
2725

26+
test:
27+
@echo $(INNODB_USE_NATIVE_AIO)
28+
2829
build:
2930
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
30-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml build
31+
@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) docker-compose -f docker-compose.yml build
3132
else
3233
$(ERROR_ONLY_FOR_HOST)
3334
endif
3435

3536
build-test:
3637
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
37-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-test-ci.yml build
38+
@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) docker-compose -f docker-compose-test-ci.yml build
3839
else
3940
$(ERROR_ONLY_FOR_HOST)
4041
endif
4142

4243
build-staging:
4344
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
44-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-staging.yml build
45+
@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) docker-compose -f docker-compose-staging.yml build
4546
else
4647
$(ERROR_ONLY_FOR_HOST)
4748
endif
4849

4950
build-prod:
5051
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
51-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-prod.yml build
52+
@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) docker-compose -f docker-compose-prod.yml build
5253
else
5354
$(ERROR_ONLY_FOR_HOST)
5455
endif
5556

5657
start:
5758
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
58-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
59+
@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) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
5960
else
6061
$(ERROR_ONLY_FOR_HOST)
6162
endif
6263

6364
start-test:
6465
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
65-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) up -d
66+
@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) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) up -d
6667
else
6768
$(ERROR_ONLY_FOR_HOST)
6869
endif
6970

7071
start-staging:
7172
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
72-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) up -d
73+
@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) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) up -d
7374
else
7475
$(ERROR_ONLY_FOR_HOST)
7576
endif
7677

7778
start-prod:
7879
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
79-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) up -d
80+
@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) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) up -d
8081
else
8182
$(ERROR_ONLY_FOR_HOST)
8283
endif
8384

8485
stop:
8586
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
86-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
87+
@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) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
8788
else
8889
$(ERROR_ONLY_FOR_HOST)
8990
endif
9091

9192
stop-test:
9293
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
93-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
94+
@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) docker-compose -f docker-compose-test-ci.yml $(PROJECT_NAME) down
9495
else
9596
$(ERROR_ONLY_FOR_HOST)
9697
endif
9798

9899
stop-staging:
99100
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
100-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
101+
@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) docker-compose -f docker-compose-staging.yml $(PROJECT_NAME) down
101102
else
102103
$(ERROR_ONLY_FOR_HOST)
103104
endif
104105

105106
stop-prod:
106107
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
107-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
108+
@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) docker-compose -f docker-compose-prod.yml $(PROJECT_NAME) down
108109
else
109110
$(ERROR_ONLY_FOR_HOST)
110111
endif
@@ -137,56 +138,56 @@ endif
137138

138139
ssh:
139140
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
140-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
141+
@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) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
141142
else
142143
$(ERROR_ONLY_FOR_HOST)
143144
endif
144145

145146
ssh-root:
146147
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
147-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
148+
@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) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
148149
else
149150
$(ERROR_ONLY_FOR_HOST)
150151
endif
151152

152153
ssh-nginx:
153154
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
154-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec nginx /bin/sh
155+
@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) docker-compose $(PROJECT_NAME) exec nginx /bin/sh
155156
else
156157
$(ERROR_ONLY_FOR_HOST)
157158
endif
158159

159160
ssh-supervisord:
160161
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
161-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec supervisord bash
162+
@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) docker-compose $(PROJECT_NAME) exec supervisord bash
162163
else
163164
$(ERROR_ONLY_FOR_HOST)
164165
endif
165166

166167
ssh-mysql:
167168
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
168-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec mysql bash
169+
@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) docker-compose $(PROJECT_NAME) exec mysql bash
169170
else
170171
$(ERROR_ONLY_FOR_HOST)
171172
endif
172173

173174
ssh-rabbitmq:
174175
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
175-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
176+
@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) docker-compose $(PROJECT_NAME) exec rabbitmq /bin/sh
176177
else
177178
$(ERROR_ONLY_FOR_HOST)
178179
endif
179180

180181
ssh-elasticsearch:
181182
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
182-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec elasticsearch bash
183+
@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) docker-compose $(PROJECT_NAME) exec elasticsearch bash
183184
else
184185
$(ERROR_ONLY_FOR_HOST)
185186
endif
186187

187188
ssh-kibana:
188189
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
189-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec kibana bash
190+
@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) docker-compose $(PROJECT_NAME) exec kibana bash
190191
else
191192
$(ERROR_ONLY_FOR_HOST)
192193
endif
@@ -195,19 +196,19 @@ exec:
195196
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
196197
@$$cmd
197198
else
198-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
199+
@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) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
199200
endif
200201

201202
exec-bash:
202203
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
203204
@bash -c "$(cmd)"
204205
else
205-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
206+
@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) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
206207
endif
207208

208209
exec-by-root:
209210
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
210-
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
211+
@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) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
211212
else
212213
$(ERROR_ONLY_FOR_HOST)
213214
endif
@@ -239,49 +240,49 @@ info:
239240

240241
logs:
241242
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
242-
@docker logs -f ${COMPOSE_PROJECT_NAME}_symfony
243+
@docker logs -f ${COMPOSE_PROJECT_NAME}-symfony
243244
else
244245
$(ERROR_ONLY_FOR_HOST)
245246
endif
246247

247248
logs-nginx:
248249
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
249-
@docker logs -f ${COMPOSE_PROJECT_NAME}_nginx
250+
@docker logs -f ${COMPOSE_PROJECT_NAME}-nginx
250251
else
251252
$(ERROR_ONLY_FOR_HOST)
252253
endif
253254

254255
logs-supervisord:
255256
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
256-
@docker logs -f ${COMPOSE_PROJECT_NAME}_supervisord
257+
@docker logs -f ${COMPOSE_PROJECT_NAME}-supervisord
257258
else
258259
$(ERROR_ONLY_FOR_HOST)
259260
endif
260261

261262
logs-mysql:
262263
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
263-
@docker logs -f ${COMPOSE_PROJECT_NAME}_mysql
264+
@docker logs -f ${COMPOSE_PROJECT_NAME}-mysql
264265
else
265266
$(ERROR_ONLY_FOR_HOST)
266267
endif
267268

268269
logs-rabbitmq:
269270
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
270-
@docker logs -f ${COMPOSE_PROJECT_NAME}_rabbitmq
271+
@docker logs -f ${COMPOSE_PROJECT_NAME}-rabbitmq
271272
else
272273
$(ERROR_ONLY_FOR_HOST)
273274
endif
274275

275276
logs-elasticsearch:
276277
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
277-
@docker logs -f ${COMPOSE_PROJECT_NAME}_elasticsearch
278+
@docker logs -f ${COMPOSE_PROJECT_NAME}-elasticsearch
278279
else
279280
$(ERROR_ONLY_FOR_HOST)
280281
endif
281282

282283
logs-kibana:
283284
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
284-
@docker logs -f ${COMPOSE_PROJECT_NAME}_kibana
285+
@docker logs -f ${COMPOSE_PROJECT_NAME}-kibana
285286
else
286287
$(ERROR_ONLY_FOR_HOST)
287288
endif

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"mark-gerarts/automapper-plus-bundle": "^1.4",
5252
"matomo/device-detector": "^6.0",
5353
"matthiasnoback/symfony-console-form": "^5.3",
54-
"nelmio/api-doc-bundle": "^4.9",
54+
"nelmio/api-doc-bundle": "^4.10",
5555
"nelmio/cors-bundle": "^2.2",
5656
"phpdocumentor/reflection-docblock": "^5.3",
5757
"ramsey/uuid-doctrine": "^1.8",
@@ -101,7 +101,7 @@
101101
"roave/security-advisories": "dev-latest",
102102
"symfony/browser-kit": "6.1.*",
103103
"symfony/debug-bundle": "6.1.*",
104-
"symfony/maker-bundle": "^1.45",
104+
"symfony/maker-bundle": "^1.47",
105105
"symfony/requirements-checker": "^2.0",
106106
"symfony/stopwatch": "6.1.*",
107107
"symfony/var-dumper": "6.1.*",

0 commit comments

Comments
 (0)