Skip to content

Commit

Permalink
[master] Updated all dependencies to support Illuminate 7 and Symfony 5
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Smith committed Sep 29, 2020
1 parent 66a8c88 commit 9994a2b
Show file tree
Hide file tree
Showing 3 changed files with 827 additions and 773 deletions.
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ xuidentity:

# Composer

.PHONY: composer-install composer-update composer-install-dev composer-dump-auto
.SILENT: composer-install composer-update composer-install-dev composer-dump-auto
.PHONY: composer-install composer-update composer-install-dev composer-dump-auto composer-interactive
.SILENT: composer-install composer-update composer-install-dev composer-dump-auto composer-interactive

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

composer-interactive:
docker run --rm --interactive --tty \
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
--env-file .env \
--user $(id -u):$(id -g) \
composer /bin/bash
rm -f auth.json

# CICD

.PHONY: cicd-composer-install
Expand Down
26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
}
},
"require": {
"behat/behat": "~3.0",
"behat/mink": "~1.7",
"behat/mink-browserkit-driver": "~1.2",
"behat/mink-extension": "~2.0",
"illuminate/console": ">=5",
"illuminate/container": ">=5",
"illuminate/support": ">=5",
"php": ">=5.4",
"symfony/browser-kit": "^4",
"symfony/config": "^4",
"symfony/dependency-injection": "^4",
"symfony/event-dispatcher": "^4",
"symfony/http-foundation": "^4",
"symfony/http-kernel": "^4",
"suin/phpcs-psr4-sniff": "^2.2"
"symfony/config": "^5.1.5",
"symfony/dependency-injection": "^5.1",
"symfony/event-dispatcher": "^5.1",
"symfony/http-foundation": "^5.1",
"symfony/http-kernel": "^5.1",
"suin/phpcs-psr4-sniff": "^2.2",
"illuminate/console": "^7.0",
"illuminate/container": "^7.0",
"illuminate/support": "^7.0",
"behat/behat": "^3.7.0",
"friends-of-behat/mink": "^1.8.0",
"friends-of-behat/mink-browserkit-driver": "^1.3.4",
"friends-of-behat/mink-extension": "^2.4.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "3.4.*"
Expand Down
Loading

0 comments on commit 9994a2b

Please sign in to comment.