Merge branch 'send_received_event_in_async' into 8.x

Author: taylorotwell

src/Illuminate/Http/Client/PendingRequest.php

@@ -790,20 +790,42 @@ protected function populateResponse(Response $response)
      */
     public function buildClient()
     {
-        return $this->client = $this->client ?: new Client([
-            'handler' => $this->buildHandlerStack(),
+        return $this->client = $this->client ?: $this->createClient($this->buildHandlerStack());
+    }
+
+    /**
+     * Create new Guzzle client.
+     *
+     * @param  \GuzzleHttp\HandlerStack  $handlerStack
+     * @return \GuzzleHttp\Client
+     */
+    public function createClient($handlerStack)
+    {
+        return new Client([
+            'handler' => $handlerStack,
             'cookies' => true,
         ]);
     }
 
     /**
-     * Build the before sending handler stack.
+     * Build the Guzzle client handler stack.
      *
      * @return \GuzzleHttp\HandlerStack
      */
     public function buildHandlerStack()
     {
-        return tap(HandlerStack::create(), function ($stack) {
+        return $this->pushHandlers(HandlerStack::create());
+    }
+
+    /**
+     * Add the necessary handlers to the given handler stack.
+     *
+     * @param  \GuzzleHttp\HandlerStack  $handlerStack
+     * @return \GuzzleHttp\HandlerStack
+     */
+    public function pushHandlers($handlerStack)
+    {
+        return tap($handlerStack, function ($stack) {
             $stack->push($this->buildBeforeSendingHandler());
             $stack->push($this->buildRecorderHandler());
             $stack->push($this->buildStubHandler());
@@ -1022,4 +1044,19 @@ public function setClient(Client $client)
 
         return $this;
     }
+
+    /**
+     * Create a new client instance using the given handler.
+     *
+     * @param  callable  $handler
+     * @return $this
+     */
+    public function setHandler($handler)
+    {
+        $this->client = $this->createClient(
+            $this->pushHandlers(HandlerStack::create($handler))
+        );
+
+        return $this;
+    }
 }

src/Illuminate/Http/Client/Pool.php

@@ -2,6 +2,8 @@
 
 namespace Illuminate\Http\Client;
 
+use GuzzleHttp\Utils;
+
 /**
  * @mixin \Illuminate\Http\Client\Factory
  */
@@ -15,11 +17,11 @@ class Pool
     protected $factory;
 
     /**
-     * The client instance.
+     * The handler function for the Guzzle client.
      *
-     * @var \GuzzleHttp\Client
+     * @var callable
      */
-    protected $client;
+    protected $handler;
 
     /**
      * The pool of requests.
@@ -38,7 +40,11 @@ public function __construct(Factory $factory = null)
     {
         $this->factory = $factory ?: new Factory();
 
-        $this->client = $this->factory->buildClient();
+        if (method_exists(Utils::class, 'chooseHandler')) {
+            $this->handler = Utils::chooseHandler();
+        } else {
+            $this->handler = \GuzzleHttp\choose_handler();
+        }
     }
 
     /**
@@ -59,7 +65,7 @@ public function as(string $key)
      */
     protected function asyncRequest()
     {
-        return $this->factory->setClient($this->client)->async();
+        return $this->factory->setHandler($this->handler)->async();
     }
 
     /**

tests/Http/HttpClientTest.php

@@ -940,6 +940,27 @@ public function testTheRequestSendingAndResponseReceivedEventsAreFiredWhenAReque
         m::close();
     }
 
+    public function testTheRequestSendingAndResponseReceivedEventsAreFiredWhenARequestIsSentAsync()
+    {
+        $events = m::mock(Dispatcher::class);
+        $events->shouldReceive('dispatch')->times(5)->with(m::type(RequestSending::class));
+        $events->shouldReceive('dispatch')->times(5)->with(m::type(ResponseReceived::class));
+
+        $factory = new Factory($events);
+        $factory->fake();
+        $factory->pool(function (Pool $pool) {
+            return [
+                $pool->get('https://example.com'),
+                $pool->head('https://example.com'),
+                $pool->post('https://example.com'),
+                $pool->patch('https://example.com'),
+                $pool->delete('https://example.com'),
+            ];
+        });
+
+        m::close();
+    }
+
     public function testTheTransferStatsAreCalledSafelyWhenFakingTheRequest()
     {
         $this->factory->fake(['https://example.com' => ['world' => 'Hello world']]);