Skip to content

Commit

Permalink
[6.x] Added Guzzle 7 support (#31484)
Browse files Browse the repository at this point in the history
* Added Guzzle 7 support

* Apply fixes from StyleCI (#31483)
  • Loading branch information
GrahamCampbell authored Feb 15, 2020
1 parent 8ec8628 commit 482a817
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"aws/aws-sdk-php": "^3.0",
"doctrine/dbal": "^2.6",
"filp/whoops": "^2.4",
"guzzlehttp/guzzle": "^6.3",
"guzzlehttp/guzzle": "^6.3|^7.0",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.3.1",
"moontoast/math": "^1.1",
Expand Down Expand Up @@ -121,7 +121,7 @@
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"filp/whoops": "Required for friendly error pages in development (^2.4).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).",
"guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0).",
"guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0|^7.0).",
"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
3 changes: 2 additions & 1 deletion src/Illuminate/Console/Scheduling/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Date;
use Illuminate\Support\Traits\Macroable;
use Psr\Http\Client\ClientExceptionInterface;
use Symfony\Component\Process\Process;

class Event
Expand Down Expand Up @@ -562,7 +563,7 @@ protected function pingCallback($url)
return function (Container $container, HttpClient $http) use ($url) {
try {
$http->get($url);
} catch (TransferException $e) {
} catch (ClientExceptionInterface | TransferException $e) {
$container->make(ExceptionHandler::class)->report($e);
}
};
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 @@ -32,7 +32,7 @@
},
"suggest": {
"dragonmantank/cron-expression": "Required to use scheduling component (^2.0).",
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.0).",
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.0|^7.0).",
"illuminate/filesystem": "Required to use the generator command (^6.0)"
},
"config": {
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 @@ -36,7 +36,7 @@
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SES mail driver (^3.0).",
"guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^6.0).",
"guzzlehttp/guzzle": "Required to use the Mailgun mail driver (^6.0|^7.0).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"config": {
Expand Down

0 comments on commit 482a817

Please sign in to comment.