[9.x] Pusher Client instance initialization (#39924)

* Added support for client in Pusher instance

* Reverted accidental merge conflict changes

* formatting

Co-authored-by: Taylor Otwell <taylor@laravel.com>

Author: rennokki

composer.json

@@ -155,7 +155,7 @@
         "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).",
         "predis/predis": "Required to use the predis connector (^1.1.9).",
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0|^6.0|^7.0).",
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
         "symfony/amazon-mailer": "Required to enable support for the SES mail transport (^6.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
         "symfony/filesystem": "Required to enable support for relative symbolic links (^6.0).",

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -4,6 +4,7 @@
 
 use Ably\AblyRest;
 use Closure;
+use GuzzleHttp\Client as GuzzleClient;
 use Illuminate\Broadcasting\Broadcasters\AblyBroadcaster;
 use Illuminate\Broadcasting\Broadcasters\LogBroadcaster;
 use Illuminate\Broadcasting\Broadcasters\NullBroadcaster;
@@ -214,8 +215,13 @@ protected function callCustomCreator(array $config)
     protected function createPusherDriver(array $config)
     {
         $pusher = new Pusher(
-            $config['key'], $config['secret'],
-            $config['app_id'], $config['options'] ?? []
+            $config['key'],
+            $config['secret'],
+            $config['app_id'],
+            $config['options'] ?? [],
+            isset($config['client_options']) && ! empty($config['client_options'])
+                    ? new GuzzleClient($config['client_options'])
+                    : null,
         );
 
         if ($config['log'] ?? false) {

src/Illuminate/Broadcasting/composer.json

@@ -34,7 +34,7 @@
         }
     },
     "suggest": {
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0|^6.0|^7.0))."
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0)."
     },
     "config": {
         "sort-packages": true