From 5c798138d1dec53f2dde7c9963f741a653e26b7e Mon Sep 17 00:00:00 2001 From: Valentin Clavreul Date: Fri, 13 Oct 2023 09:56:57 +0200 Subject: [PATCH] feat: update all dependencies to latest supported versions --- .github/workflows/ci.yml | 6 ++--- README.md | 2 +- composer.json | 24 +++++++++---------- .../M6WebGuzzleHttpExtension.php | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dae661..20217d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,12 +13,12 @@ jobs: - run: composer install --prefer-dist --no-interaction - run: bin/php-cs-fixer fix --ansi --dry-run --using-cache=no --verbose - tests: - name: Tests + atoum-tests: + name: Atoum tests runs-on: ubuntu-20.04 strategy: matrix: - version: [ '7.4', '8.0', '8.1' ] + version: [ 8.1, 8.2 ] flags: [ '', '--prefer-lowest' ] fail-fast: false steps: diff --git a/README.md b/README.md index 3c64bfd..6167e33 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ try { 'second' => $client->getAsync('http://domain.tld/path/to/other/resource') ]; - $result = \GuzzleHttp\Promise\unwrap($promises); + $result = \GuzzleHttp\Promise\Utils::unwrap($promises); } catch(\GuzzleHttp\Exception\ConnectException $e) { // connection problem like timeout } diff --git a/composer.json b/composer.json index 8f5240b..6e13dbe 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "m6web/guzzle-http-bundle", "type" : "symfony-bundle", - "description": "Symfony2 bundle on top of guzzle 6", + "description": "Symfony bundle on top of Guzzle", "keywords": ["bundle", "http", "client", "HTTP client"], "license" : "MIT", "authors": [ @@ -12,21 +12,21 @@ } ], "require": { - "php": ">=7.4", + "php": ">=8.1", "ext-curl": "*", - "guzzlehttp/guzzle": "^6.3||^7.0", - "symfony/config" : "^4.4||^5.0||^6.0", - "symfony/dependency-injection": "^4.4||^5.0||^6.0", - "symfony/event-dispatcher": "^4.4||^5.0||^6.0", - "symfony/http-kernel": "^4.4||^5.0||^6.0", - "symfony/yaml" : "^4.4||^5.0||^6.0" + "guzzlehttp/guzzle": "^7", + "symfony/config" : "^5.4||^6.0", + "symfony/dependency-injection": "^5.4||^6.0", + "symfony/event-dispatcher": "^5.4||^6.0", + "symfony/http-kernel": "^5.4||^6.0", + "symfony/yaml" : "^5.4||^6.0" }, "require-dev": { - "atoum/atoum": "4.0.3", + "atoum/atoum": "4.2.0", "atoum/stubs": "*", - "m6web/php-cs-fixer-config": "2.0.0", - "friendsofphp/php-cs-fixer": "3.34.1", - "guzzlehttp/promises": "^1" + "m6web/php-cs-fixer-config": "3.2.0", + "friendsofphp/php-cs-fixer": "3.35.1", + "guzzlehttp/promises": "^2" }, "autoload": { "psr-4": {"M6Web\\Bundle\\GuzzleHttpBundle\\": "src/"} diff --git a/tests/Units/DependencyInjection/M6WebGuzzleHttpExtension.php b/tests/Units/DependencyInjection/M6WebGuzzleHttpExtension.php index 97761f6..42211c4 100644 --- a/tests/Units/DependencyInjection/M6WebGuzzleHttpExtension.php +++ b/tests/Units/DependencyInjection/M6WebGuzzleHttpExtension.php @@ -382,7 +382,7 @@ public function testEventDispatcherMiddleWare() 'test' => $client->getAsync('http://httpbin.org'), 'test2' => $client->getAsync('http://httpbin.org/ip'), ]) - ->and($rep = Promise\unwrap($promises)) + ->and($rep = Promise\Utils::unwrap($promises)) ->then ->mock($container->get('event_dispatcher')) ->call('dispatch') @@ -402,7 +402,7 @@ public function testEventDispatcherMultiClient() 'test' => $client->getAsync('http://httpbin.org'), 'test2' => $client->getAsync('http://httpbin.org/ip'), ]) - ->and($rep = Promise\unwrap($promises)) + ->and($rep = Promise\Utils::unwrap($promises)) ->and($client2->get('http://httpbin.org')) ->then ->mock($container->get('event_dispatcher'))