add request access logic

Author: Douglas Greenshields

src/AsyncPlugin.php

@@ -11,8 +11,9 @@
 use Http\Message\RequestFactory;
 use Http\Promise\Promise;
 use Psr\Http\Message\ResponseInterface;
-use Solarium\Core\Client\Adapter\Guzzle;
+use Solarium\Core\Client\Adapter\Guzzle as GuzzleAdapter;
 use Solarium\Core\Client\Endpoint;
+use Solarium\Core\Client\Request;
 use Solarium\Core\Client\Response;
 use Solarium\Core\Plugin\AbstractPlugin;
 use Solarium\Core\Query\AbstractQuery;
@@ -36,15 +37,7 @@ class AsyncPlugin extends AbstractPlugin
      */
     public function queryAsync($query, $endpoint = null)
     {
-        if (null !== $this->asyncClient) {
-            $asyncClient = $this->asyncClient;
-            $usingGuzzle = false;
-        } else {
-            $existingSolariumAdapter = $this->client->getAdapter(false);
-            $this->client->setAdapter(Guzzle::class);
-            $asyncClient = new Guzzle6Adapter($this->client->getAdapter()->getGuzzleClient());
-            $usingGuzzle = true;
-        }
+        $asyncClient = $this->asyncClient ?: new Guzzle6Adapter($this->client->getAdapter()->getGuzzleClient());
         $request = $this->client->createRequest($query);
         $method = $request->getMethod();
         $endpoint = $this->client->getEndpoint($endpoint);
@@ -64,7 +57,7 @@ public function queryAsync($query, $endpoint = null)
             $asyncClient = new PluginClient($asyncClient, [$authenticationPlugin]);
         }
 
-        $promise = $asyncClient->sendAsyncRequest($request)
+        return $asyncClient->sendAsyncRequest($request)
             ->then(
                 function (ResponseInterface $response) {
                     $responseHeaders = [
@@ -79,13 +72,6 @@ function (ResponseInterface $response) {
                     return new Response((string) $response->getBody(), $responseHeaders);
                 }
             );
-
-        if ($usingGuzzle) {
-            //set the solarium adapter state back
-            $this->client->setAdapter($existingSolariumAdapter);
-        }
-
-        return $promise;
     }
 
     public function setAsyncClient(HttpAsyncClient $asyncClient)
@@ -101,4 +87,43 @@ public function setRequestFactory(RequestFactory $requestFactory)
 
         return $this;
     }
+
+    protected function initPluginType()
+    {
+        $this->client->setAdapter(GuzzleAdapter::class);
+    }
+
+    private function getRequestBody(Request $request)
+    {
+        if ($request->getMethod() !== 'POST') {
+            return null;
+        }
+
+        if ($request->getFileUpload()) {
+            return fopen($request->getFileUpload(), 'r');
+        }
+
+        return $request->getRawData();
+    }
+
+    private function getRequestHeaders(Request $request)
+    {
+        $headers = [];
+        foreach ($request->getHeaders() as $headerLine) {
+            list($header, $value) = explode(':', $headerLine);
+            if ($header = trim($header)) {
+                $headers[$header] = trim($value);
+            }
+        }
+
+        if (!isset($headers['Content-Type'])) {
+            if ($request->getMethod() == Request::METHOD_GET) {
+                $headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+            } else {
+                $headers['Content-Type'] = 'application/xml; charset=utf-8';
+            }
+        }
+
+        return $headers;
+    }
 }