Skip to content

Commit c58a7b1

Browse files
author
Chris Smith
authored
Updated to Symfony 5 (#9)
1 parent 9543b33 commit c58a7b1

File tree

4 files changed

+129
-131
lines changed

4 files changed

+129
-131
lines changed

Makefile

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,55 @@
11
# Composer
22

3-
.PHONY: composer-install composer-update composer-install-dev composer-dump-auto composer-add-dep composer-add-dev-dep
4-
.SILENT: composer-install composer-update composer-install-dev composer-dump-auto composer-add-dep composer-add-dev-dep
3+
.PHONY: composer-install composer-update composer-install-dev composer-dump-auto composer-add-dep composer-add-dev-dep composer-interactive
4+
.SILENT: composer-install composer-update composer-install-dev composer-dump-auto composer-add-dep composer-add-dev-dep composer-interactive
55

66
composer-install:
77
docker run --rm \
88
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
99
--user $(id -u):$(id -g) \
10-
xediltd/composer install --ignore-platform-reqs --no-scripts ${DOWNLOAD_PROGRESS}
10+
composer install --ignore-platform-reqs --no-scripts ${DOWNLOAD_PROGRESS}
1111
rm -f auth.json
1212

1313
composer-update:
1414
docker run --rm --interactive --tty \
1515
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
1616
--user $(id -u):$(id -g) \
17-
xediltd/composer update --ignore-platform-reqs --no-scripts ${DOWNLOAD_PROGRESS}
17+
composer update --ignore-platform-reqs --no-scripts ${DOWNLOAD_PROGRESS}
1818
rm -f auth.json
1919

2020
composer-install-dev:
2121
docker run --rm --interactive --tty \
2222
-v $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
2323
--user $(id -u):$(id -g) \
24-
xediltd/composer install --ignore-platform-reqs --no-scripts --dev ${DOWNLOAD_PROGRESS}
24+
composer install --ignore-platform-reqs --no-scripts --dev ${DOWNLOAD_PROGRESS}
2525
rm -f auth.json
2626

2727
composer-dump-auto:
2828
docker run --rm \
2929
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
3030
--user $(id -u):$(id -g) \
31-
xediltd/composer dump-autoload
31+
composer dump-autoload
3232
rm -f auth.json
3333

3434
composer-add-dep:
3535
docker run --rm --interactive --tty \
3636
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
3737
--user $(id -u):$(id -g) \
38-
xediltd/composer /bin/bash -ci "composer require $(module) $(version) --ignore-platform-reqs --no-scripts"
38+
composer /bin/bash -ci "composer require $(module) $(version) --ignore-platform-reqs --no-scripts"
3939
rm -f auth.json
4040

4141
composer-add-dev-dep:
4242
docker run --rm --interactive --tty \
4343
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
4444
--user $(id -u):$(id -g) \
45-
xediltd/composer /bin/bash -ci "composer require $(module) $(version) --dev --ignore-platform-reqs --no-scripts"
45+
composer /bin/bash -ci "composer require $(module) $(version) --dev --ignore-platform-reqs --no-scripts"
46+
rm -f auth.json
47+
48+
composer-interactive:
49+
docker run --rm --interactive --tty \
50+
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
51+
--user $(id -u):$(id -g) \
52+
composer /bin/bash
4653
rm -f auth.json
4754

4855
# Static Analysis

ci.Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ composer-install:
77
docker run --rm \
88
--volume $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))):/app \
99
--user $(id -u):$(id -g) \
10-
xediltd/composer install --ignore-platform-reqs --no-scripts --no-progress
10+
composer install --ignore-platform-reqs --no-scripts --no-progress
1111
rm -f auth.json
1212

1313
# Static Analysis

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"php": "^7.1.3",
77
"guzzlehttp/guzzle": "^6.3",
88
"illuminate/support": ">=5",
9-
"symfony/http-foundation": "^4.3.8",
10-
"symfony/mime": "^4.3.8"
9+
"symfony/http-foundation": "^5.0"
1110
},
1211
"require-dev": {
1312
"phpunit/phpunit": "^7.5",

0 commit comments

Comments
 (0)