Skip to content

Commit

Permalink
[BIP-3047]
Browse files Browse the repository at this point in the history
update guzzle to use version v7

NOTE: this also relaxes the PHP version to be >=7.4 so that we can still use it in PW master before we switch to php-8
  • Loading branch information
cjschneider2 committed May 10, 2024
1 parent f38c0c8 commit e57eac2
Show file tree
Hide file tree
Showing 3 changed files with 315 additions and 359 deletions.
23 changes: 13 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
DOCKER_PHP_SERVICE = php-fpm

.PHONY: docker-new docker-composer docker-up docker-kill docker-test
.PHONY: composer-install composer-update test new up kill

docker-new: docker-kill
docker-compose up -d --build --remove-orphans
make docker-composer-install

docker-composer-install:
composer-install:
docker-compose exec $(DOCKER_PHP_SERVICE) composer install --optimize-autoloader

docker-composer-update:
docker-compose exec $(DOCKER_PHP_SERVICE) composer update --lock
composer-update:
docker-compose exec $(DOCKER_PHP_SERVICE) composer update

test:
docker-compose exec $(DOCKER_PHP_SERVICE) composer test

new: kill
docker-compose up -d --build --remove-orphans
make docker-composer-install

docker-up:
up:
docker-compose up -d

docker-kill:
kill:
docker-compose kill
docker-compose down --volumes --remove-orphans
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"license": "MIT",
"authors": [
{
"name": "Randy Schütt",
"email": "r.schuett@demv.de"
"name": "Team Rocket",
"email": "team-rocket@demv.de"
}
],
"require": {
"php": "^8.1",
"guzzlehttp/guzzle": "^6.3",
"php": ">=7.4",
"guzzlehttp/guzzle": "^7",
"ext-json": "*"
},
"autoload": {
Expand Down
Loading

0 comments on commit e57eac2

Please sign in to comment.