Skip to content

Commit 9994a2b

Browse files
author
Chris Smith
committed
[master] Updated all dependencies to support Illuminate 7 and Symfony 5
1 parent 66a8c88 commit 9994a2b

File tree

3 files changed

+827
-773
lines changed

3 files changed

+827
-773
lines changed

Makefile

+10-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ xuidentity:
100100

101101
# Composer
102102

103-
.PHONY: composer-install composer-update composer-install-dev composer-dump-auto
104-
.SILENT: composer-install composer-update composer-install-dev composer-dump-auto
103+
.PHONY: composer-install composer-update composer-install-dev composer-dump-auto composer-interactive
104+
.SILENT: composer-install composer-update composer-install-dev composer-dump-auto composer-interactive
105105

106106
composer-install:
107107
docker run --rm \
@@ -151,6 +151,14 @@ composer-add-dev-dep:
151151
composer /bin/bash -ci "composer require $(module) $(version) --dev --ignore-platform-reqs --no-scripts"
152152
rm -f auth.json
153153

154+
composer-interactive:
155+
docker run --rm --interactive --tty \
156+
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
157+
--env-file .env \
158+
--user $(id -u):$(id -g) \
159+
composer /bin/bash
160+
rm -f auth.json
161+
154162
# CICD
155163

156164
.PHONY: cicd-composer-install

composer.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
}
1010
},
1111
"require": {
12-
"behat/behat": "~3.0",
13-
"behat/mink": "~1.7",
14-
"behat/mink-browserkit-driver": "~1.2",
15-
"behat/mink-extension": "~2.0",
16-
"illuminate/console": ">=5",
17-
"illuminate/container": ">=5",
18-
"illuminate/support": ">=5",
1912
"php": ">=5.4",
2013
"symfony/browser-kit": "^4",
21-
"symfony/config": "^4",
22-
"symfony/dependency-injection": "^4",
23-
"symfony/event-dispatcher": "^4",
24-
"symfony/http-foundation": "^4",
25-
"symfony/http-kernel": "^4",
26-
"suin/phpcs-psr4-sniff": "^2.2"
14+
"symfony/config": "^5.1.5",
15+
"symfony/dependency-injection": "^5.1",
16+
"symfony/event-dispatcher": "^5.1",
17+
"symfony/http-foundation": "^5.1",
18+
"symfony/http-kernel": "^5.1",
19+
"suin/phpcs-psr4-sniff": "^2.2",
20+
"illuminate/console": "^7.0",
21+
"illuminate/container": "^7.0",
22+
"illuminate/support": "^7.0",
23+
"behat/behat": "^3.7.0",
24+
"friends-of-behat/mink": "^1.8.0",
25+
"friends-of-behat/mink-browserkit-driver": "^1.3.4",
26+
"friends-of-behat/mink-extension": "^2.4.0"
2727
},
2828
"require-dev": {
2929
"squizlabs/php_codesniffer": "3.4.*"

0 commit comments

Comments
 (0)