1 files changed, 73 insertions, 73 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Transport/Guzzle.php b/vendor/ruflin/elastica/lib/Elastica/Transport/Guzzle.php
index 96ad8971..5c98d83b 100644
--- a/vendor/ruflin/elastica/lib/Elastica/Transport/Guzzle.php
+++ b/vendor/ruflin/elastica/lib/Elastica/Transport/Guzzle.php
@@ -1,133 +1,132 @@
 <?php
-
 namespace Elastica\Transport;
 
-use Elastica\Exception\Connection\HttpException;
+use Elastica\Connection;
 use Elastica\Exception\Connection\GuzzleException;
 use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
-use Elastica\Exception\InvalidException;
-use Elastica\Connection;
+use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
-use Elastica\JSON;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
-use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Stream\Stream;
 
 /**
- * Elastica Guzzle Transport object
+ * Elastica Guzzle Transport object.
  *
- * @package Elastica
  * @author Milan Magudia <milan@magudia.com>
  */
 class Guzzle extends AbstractTransport
 {
     /**
-     * Http scheme
+     * Http scheme.
      *
      * @var string Http scheme
      */
     protected $_scheme = 'http';
 
     /**
-     * Curl resource to reuse
+     * Curl resource to reuse.
      *
      * @var resource Guzzle resource to reuse
      */
     protected static $_guzzleClientConnection = null;
 
     /**
-     * Makes calls to the elasticsearch server
+     * Makes calls to the elasticsearch server.
      *
      * All calls that are made to the server are done through this function
      *
-     * @param  \Elastica\Request $request
-     * @param  array $params Host, Port, ...
+     * @param \Elastica\Request $request
+     * @param array             $params  Host, Port, ...
+     *
      * @throws \Elastica\Exception\ConnectionException
      * @throws \Elastica\Exception\ResponseException
      * @throws \Elastica\Exception\Connection\HttpException
-     * @return \Elastica\Response                    Response object
+     *
+     * @return \Elastica\Response Response object
      */
     public function exec(Request $request, array $params)
     {
         $connection = $this->getConnection();
 
-        try {
-            $client = $this->_getGuzzleClient($this->_getBaseUrl($connection), $connection->isPersistent());
+        $client = $this->_getGuzzleClient($this->_getBaseUrl($connection), $connection->isPersistent());
 
-            $options = array();
-            if ($connection->getTimeout()) {
-                $options['timeout'] = $connection->getTimeout();
-            }
+        $options = array(
+            'exceptions' => false, // 4xx and 5xx is expected and NOT an exceptions in this context
+        );
+        if ($connection->getTimeout()) {
+            $options['timeout'] = $connection->getTimeout();
+        }
 
-            if ($connection->getProxy()) {
-                $options['proxy'] = $connection->getProxy();
-            }
+        $proxy = $connection->getProxy();
 
-            $req = $client->createRequest($request->getMethod(), $this->_getActionPath($request), $options);
-            $req->setHeaders($connection->hasConfig('headers') ?: array());
+        // See: https://github.com/facebook/hhvm/issues/4875
+        if (is_null($proxy) && defined('HHVM_VERSION')) {
+            $proxy = getenv('http_proxy') ?: null;
+        }
+
+        if (!is_null($proxy)) {
+            $options['proxy'] = $proxy;
+        }
 
-            $data = $request->getData();
-            if (!empty($data) || '0' === $data) {
+        $req = $client->createRequest($request->getMethod(), $this->_getActionPath($request), $options);
+        $req->setHeaders($connection->hasConfig('headers') ? $connection->getConfig('headers') : array());
 
-                if ($req->getMethod() == Request::GET) {
-                    $req->setMethod(Request::POST);
-                }
+        $data = $request->getData();
+        if (!empty($data) || '0' === $data) {
+            if ($req->getMethod() == Request::GET) {
+                $req->setMethod(Request::POST);
+            }
 
-                if ($this->hasParam('postWithRequestBody') && $this->getParam('postWithRequestBody') == true) {
-                    $request->setMethod(Request::POST);
-                    $req->setMethod(Request::POST);
-                }
+            if ($this->hasParam('postWithRequestBody') && $this->getParam('postWithRequestBody') == true) {
+                $request->setMethod(Request::POST);
+                $req->setMethod(Request::POST);
+            }
 
-                if (is_array($data)) {
-                    $content = JSON::stringify($data, 'JSON_ELASTICSEARCH');
-                } else {
-                    $content = $data;
-                }
-                $req->setBody(Stream::factory($content));
+            if (is_array($data)) {
+                $content = JSON::stringify($data, 'JSON_ELASTICSEARCH');
+            } else {
+                $content = $data;
             }
+            $req->setBody(Stream::factory($content));
+        }
 
+        try {
             $start = microtime(true);
             $res = $client->send($req);
             $end = microtime(true);
+        } catch (TransferException $ex) {
+            throw new GuzzleException($ex, $request, new Response($ex->getMessage()));
+        }
 
-            $response = new Response((string)$res->getBody(), $res->getStatusCode());
-
-            if (defined('DEBUG') && DEBUG) {
-                $response->setQueryTime($end - $start);
-            }
-
-            $response->setTransferInfo(
-                array(
-                    'request_header' => $request->getMethod(),
-                    'http_code' => $res->getStatusCode()
-                )
-            );
-
-            if ($response->hasError()) {
-                throw new ResponseException($request, $response);
-            }
+        $response = new Response((string) $res->getBody(), $res->getStatusCode());
+        $response->setQueryTime($end - $start);
 
-            if ($response->hasFailedShards()) {
-                throw new PartialShardFailureException($request, $response);
-            }
+        $response->setTransferInfo(
+            array(
+                'request_header' => $request->getMethod(),
+                'http_code' => $res->getStatusCode(),
+            )
+        );
 
-            return $response;
+        if ($response->hasError()) {
+            throw new ResponseException($request, $response);
+        }
 
-        } catch (ClientException $e) {
-            // ignore 4xx errors
-        } catch (TransferException $e) {
-            throw new GuzzleException($e, $request, new Response($e->getMessage()));
+        if ($response->hasFailedShards()) {
+            throw new PartialShardFailureException($request, $response);
         }
 
+        return $response;
     }
 
     /**
-     * Return Guzzle resource
+     * Return Guzzle resource.
+     *
+     * @param bool $persistent False if not persistent connection
      *
-     * @param  bool $persistent False if not persistent connection
      * @return resource Connection resource
      */
     protected function _getGuzzleClient($baseUrl, $persistent = true)
@@ -140,9 +139,9 @@ class Guzzle extends AbstractTransport
     }
 
     /**
-     * Builds the base url for the guzzle connection
+     * Builds the base url for the guzzle connection.
      *
-     * @param  \Elastica\Connection $connection
+     * @param \Elastica\Connection $connection
      */
     protected function _getBaseUrl(Connection $connection)
     {
@@ -152,26 +151,27 @@ class Guzzle extends AbstractTransport
         if (!empty($url)) {
             $baseUri = $url;
         } else {
-            $baseUri = $this->_scheme . '://' . $connection->getHost() . ':' . $connection->getPort() . '/' . $connection->getPath();
+            $baseUri = $this->_scheme.'://'.$connection->getHost().':'.$connection->getPort().'/'.$connection->getPath();
         }
+
         return rtrim($baseUri, '/');
     }
 
     /**
-     * Builds the action path url for each request
+     * Builds the action path url for each request.
      *
-     * @param  \Elastica\Request $request
+     * @param \Elastica\Request $request
      */
     protected function _getActionPath(Request $request)
     {
         $action = $request->getPath();
         if ($action) {
-            $action = '/'. ltrim($action, '/');
+            $action = '/'.ltrim($action, '/');
         }
         $query = $request->getQuery();
 
         if (!empty($query)) {
-            $action .= '?' . http_build_query($query);
+            $action .= '?'.http_build_query($query);
         }
 
         return $action;