Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.x] Drop Guzzle <7.2 #35313

Merged
merged 1 commit into from
Nov 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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).",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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).",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Http/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down