From 80840c1b827f269b765752b527d7919791c6d742 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 21 Nov 2020 14:42:15 +0000 Subject: [PATCH] Drop Guzzle <7.2 --- .github/workflows/tests.yml | 16 ---------------- composer.json | 4 ++-- src/Illuminate/Console/composer.json | 2 +- src/Illuminate/Http/composer.json | 2 +- src/Illuminate/Mail/composer.json | 2 +- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 42fe7239751e..9062d28dbd93 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,14 +50,6 @@ jobs: - name: Setup problem matchers run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Set Minimum Guzzle Version - uses: nick-invision/retry@v1 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update - if: matrix.php >= 8 - - name: Install dependencies uses: nick-invision/retry@v1 with: @@ -102,14 +94,6 @@ jobs: - name: Setup problem matchers run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Set Minimum Guzzle Version - uses: nick-invision/retry@v1 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update - if: matrix.php >= 8 - - name: Install dependencies uses: nick-invision/retry@v1 with: diff --git a/composer.json b/composer.json index 033f878c7b54..7aa57c27ffa8 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,7 @@ "aws/aws-sdk-php": "^3.155", "doctrine/dbal": "^2.6|^3.0", "filp/whoops": "^2.8", - "guzzlehttp/guzzle": "^6.5.5|^7.0.1", + "guzzlehttp/guzzle": "^7.2", "league/flysystem-cached-adapter": "^1.0", "mockery/mockery": "^1.4.2", "orchestra/testbench-core": "^7.0", @@ -132,7 +132,7 @@ "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).", "filp/whoops": "Required for friendly error pages in development (^2.8).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", - "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).", + "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^7.2).", "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index d954bf195656..b3fae079a42c 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -34,7 +34,7 @@ }, "suggest": { "dragonmantank/cron-expression": "Required to use scheduler (^3.0.2).", - "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.5.5|^7.0.1).", + "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.2).", "illuminate/bus": "Required to use the scheduled job dispatcher (^9.0).", "illuminate/container": "Required to use the scheduler (^9.0).", "illuminate/filesystem": "Required to use the generator command (^9.0).", diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 59dc22c6727d..24092e35692d 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -31,7 +31,7 @@ }, "suggest": { "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", - "guzzlehttp/guzzle": "Required to use the HTTP Client (^6.5.5|^7.0.1)." + "guzzlehttp/guzzle": "Required to use the HTTP Client (^7.2)." }, "extra": { "branch-alias": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 379cc1f113b2..5f782e13dc5c 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -38,7 +38,7 @@ }, "suggest": { "aws/aws-sdk-php": "Required to use the SES mail driver (^3.155).", - "guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^6.5.5|^7.0.1).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^7.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "config": {