formatting

taylorotwell · taylorotwell · commit 245a7125076e · 2021-04-12T10:26:57.000-05:00
diff --git a/src/Illuminate/Http/Client/PendingRequest.php b/src/Illuminate/Http/Client/PendingRequest.php
@@ -26,7 +26,7 @@ class PendingRequest
     protected $factory;
 
     /**
-     * The client instance.
+     * The Guzzle client instance.
      *
      * @var \GuzzleHttp\Client
      */
@@ -595,6 +595,27 @@ public function delete($url, $data = [])
         ]);
     }
 
+    /**
+     * Send a pool of asynchronous requests concurrently.
+     *
+     * @param  callable  $callback
+     * @return array
+     */
+    public function pool(callable $callback)
+    {
+        $results = [];
+
+        $requests = tap(new Pool($this->factory), $callback)->getRequests();
+
+        foreach ($requests as $key => $item) {
+            $results[$key] = $item instanceof static ? $item->getPromise()->wait() : $item->wait();
+        }
+
+        ksort($results);
+
+        return $results;
+    }
+
     /**
      * Send the request to the given URL.
      *
@@ -742,19 +763,6 @@ protected function populateResponse(Response $response)
         return $response;
     }
 
-    /**
-     * Set the client instance.
-     *
-     * @param  \GuzzleHttp\Client  $client
-     * @return $this
-     */
-    public function setClient(Client $client)
-    {
-        $this->client = $client;
-
-        return $this;
-    }
-
     /**
      * Build the Guzzle client.
      *
@@ -932,33 +940,25 @@ public function async(bool $async = true)
     }
 
     /**
-     * Send a pool of asynchronous requests concurrently.
+     * Retrieve the pending request promise.
      *
-     * @param  callable  $callback
-     * @return array
+     * @return \GuzzleHttp\Promise\PromiseInterface|null
      */
-    public function pool(callable $callback)
+    public function getPromise()
     {
-        $results = [];
-
-        $requests = tap(new Pool($this->factory), $callback)->getRequests();
-
-        foreach ($requests as $key => $item) {
-            $results[$key] = $item instanceof static ? $item->getPromise()->wait() : $item->wait();
-        }
-
-        ksort($results);
-
-        return $results;
+        return $this->promise;
     }
 
     /**
-     * Retrieve the pending request promise.
+     * Set the client instance.
      *
-     * @return \GuzzleHttp\Promise\PromiseInterface|null
+     * @param  \GuzzleHttp\Client  $client
+     * @return $this
      */
-    public function getPromise()
+    public function setClient(Client $client)
     {
-        return $this->promise;
+        $this->client = $client;
+
+        return $this;
     }
 }
diff --git a/src/Illuminate/Http/Client/Pool.php b/src/Illuminate/Http/Client/Pool.php
@@ -44,7 +44,7 @@ public function __construct(Factory $factory = null)
      * @param  string  $key
      * @return \Illuminate\Http\Client\PendingRequest
      */
-    public function add(string $key)
+    public function as(string $key)
     {
         return $this->pool[$key] = $this->asyncRequest();
     }
@@ -56,7 +56,6 @@ public function add(string $key)
      */
     protected function asyncRequest()
     {
-        // the same client instance needs to be shared across all async requests
         return $this->factory->setClient($this->client)->async();
     }
 
diff --git a/tests/Http/HttpClientTest.php b/tests/Http/HttpClientTest.php
@@ -892,9 +892,9 @@ public function testMultipleRequestsAreSentInThePoolWithKeys()
 
         $responses = $this->factory->pool(function (Pool $pool) {
             return [
-                $pool->add('test200')->get('200.com'),
-                $pool->add('test400')->get('400.com'),
-                $pool->add('test500')->get('500.com'),
+                $pool->as('test200')->get('200.com'),
+                $pool->as('test400')->get('400.com'),
+                $pool->as('test500')->get('500.com'),
             ];
         });
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(Factory $factory = null)`
`44`	`44`	`* @param string $key`
`45`	`45`	`* @return \Illuminate\Http\Client\PendingRequest`
`46`	`46`	`*/`
`47`		`- public function add(string $key)`
	`47`	`+ public function as(string $key)`
`48`	`48`	`{`
`49`	`49`	`return $this->pool[$key] = $this->asyncRequest();`
`50`	`50`	`}`
`@@ -56,7 +56,6 @@ public function add(string $key)`
`56`	`56`	`*/`
`57`	`57`	`protected function asyncRequest()`
`58`	`58`	`{`
`59`		`- // the same client instance needs to be shared across all async requests`
`60`	`59`	`return $this->factory->setClient($this->client)->async();`
`61`	`60`	`}`
`62`	`61`