kitodo / kitodo-publication

Lib/ElasticSearchPhpClient/src/Elasticsearch/Connections/CurlMultiConnection.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
         $this->log->debug("Curl Options:", $opts);
 
         $this->lastRequest = array('request' =>
-                                   array(
+                                    array(
                                         'uri'     => $uri,
                                         'body'    => $body,
                                         'options' => $options,

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
 
     private $curlOpts;
 
-    private $lastRequest = array();
+    private $lastRequest = array ();
 
 
     /**
@@ -116,11 +116,11 @@ 
      * @throws \Elasticsearch\Common\Exceptions\ServerErrorResponseException
      * @return array
      */
-    public function performRequest($method, $uri, $params = null, $body = null, $options = array())
+    public function performRequest($method, $uri, $params = null, $body = null, $options = array ())
     {
         $curlHandle = curl_init();
         $opts = $this->curlOpts;
-        $perRequestCurlOpts = array();
+        $perRequestCurlOpts = array ();
 
         if (isset($params['curlOpts']) === true) {
             $perRequestCurlOpts = $params['curlOpts'];
@@ -132,7 +132,7 @@ 
         $opts[CURLOPT_URL] = $uri;
 
         if (isset($opts[CURLOPT_CUSTOMREQUEST]) !== true) {
-            $opts[CURLOPT_CUSTOMREQUEST]= $method;
+            $opts[CURLOPT_CUSTOMREQUEST] = $method;
         }
 
         if (count($options) > 0) {
@@ -151,12 +151,12 @@ 
         }
 
         // Add in our custom per-request curl opts after everything is generated
-        $opts = $perRequestCurlOpts + $opts;    // Left-hand takes precedence over right-hand
+        $opts = $perRequestCurlOpts + $opts; // Left-hand takes precedence over right-hand
 
         $this->log->debug("Curl Options:", $opts);
 
-        $this->lastRequest = array('request' =>
-                                   array(
+        $this->lastRequest = array ('request' =>
+                                   array (
                                         'uri'     => $uri,
                                         'body'    => $body,
                                         'options' => $options,
@@ -167,7 +167,7 @@ 
         curl_setopt_array($curlHandle, $opts);
         curl_multi_add_handle($this->multiHandle, $curlHandle);
 
-        $response = array();
+        $response = array ();
 
 
         do {
@@ -232,7 +232,7 @@ 
             $method,
             $uri,
             $body,
-            "",  //TODO FIX THIS
+            "", //TODO FIX THIS
             $response['requestInfo']['http_code'],
             $response['responseText'],
             $response['requestInfo']['total_time']
@@ -240,7 +240,7 @@ 
 
 
 
-        return array(
+        return array (
             'status' => $response['requestInfo']['http_code'],
             'text'   => $response['responseText'],
             'info'   => $response['requestInfo'],
@@ -290,7 +290,7 @@ 
         } elseif ($statusCode === 409) {
             throw new Conflict409Exception($responseBody, $statusCode);
         } elseif ($statusCode === 400 && strpos($responseBody, 'script_lang not supported') !== false) {
-            throw new ScriptLangNotSupportedException($responseBody. $statusCode);
+            throw new ScriptLangNotSupportedException($responseBody . $statusCode);
         } elseif ($statusCode === 400) {
             throw new BadRequest400Exception($responseBody, $statusCode);
         }
@@ -320,7 +320,7 @@ 
 
         if ($statusCode === 500 && strpos($responseBody, "RoutingMissingException") !== false) {
             throw new RoutingMissingException($responseBody, $statusCode);
-        } elseif ($statusCode === 500 && preg_match('/ActionRequestValidationException.+ no documents to get/',$responseBody) === 1) {
+        } elseif ($statusCode === 500 && preg_match('/ActionRequestValidationException.+ no documents to get/', $responseBody) === 1) {
             throw new NoDocumentsToGetException($responseBody, $statusCode);
         } elseif ($statusCode === 500 && strpos($responseBody, 'NoShardAvailableActionException') !== false) {
             throw new NoShardAvailableException($responseBody, $statusCode);
@@ -424,7 +424,7 @@ 
 
     private function generateCurlOpts($connectionParams)
     {
-        $opts = array(
+        $opts = array (
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT_MS     => 1000,
             CURLOPT_CONNECTTIMEOUT_MS => 1000,
@@ -445,7 +445,7 @@ 
 
         if (isset($connectionParams['curlOpts'])) {
             //MUST use union operator, array_merge rekeys numeric
-            $opts = $connectionParams['curlOpts'] +  $opts;
+            $opts = $connectionParams['curlOpts'] + $opts;
         }
 
         return $opts;
@@ -453,7 +453,7 @@ 
 
     private function reconcileOptions($options)
     {
-        $opts = array();
+        $opts = array ();
         if (isset($options['timeout']) === true) {
             $opts[CURLOPT_TIMEOUT_MS] = $options['timeout'];
             $opts[CURLOPT_CONNECTTIMEOUT_MS] = $options['timeout'];

Braces +13 added lines, -26 removed lines

@@ -33,8 +33,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-class CurlMultiConnection extends AbstractConnection implements ConnectionInterface
-{
+class CurlMultiConnection extends AbstractConnection implements ConnectionInterface {
 
     /**
      * @var Resource
@@ -60,8 +59,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\InvalidArgumentException
      * @return CurlMultiConnection
      */
-    public function __construct($hostDetails, $connectionParams, LoggerInterface $log, LoggerInterface $trace)
-    {
+    public function __construct($hostDetails, $connectionParams, LoggerInterface $log, LoggerInterface $trace) {
         parent::__construct($hostDetails, $connectionParams, $log, $trace);
 
         if (extension_loaded('curl') !== true) {
@@ -96,8 +94,7 @@ 
      *
      * @return string
      */
-    public function getTransportSchema()
-    {
+    public function getTransportSchema() {
         return $this->transportSchema;
 
     }
@@ -116,8 +113,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\ServerErrorResponseException
      * @return array
      */
-    public function performRequest($method, $uri, $params = null, $body = null, $options = array())
-    {
+    public function performRequest($method, $uri, $params = null, $body = null, $options = array()) {
         $curlHandle = curl_init();
         $opts = $this->curlOpts;
         $perRequestCurlOpts = array();
@@ -252,8 +248,7 @@ 
     /**
      * @return array
      */
-    public function getLastRequestInfo()
-    {
+    public function getLastRequestInfo() {
         return $this->lastRequest;
     }
 
@@ -269,8 +264,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\Missing404Exception
      * @throws \Elasticsearch\Common\Exceptions\AlreadyExpiredException
      */
-    private function process4xxError($method, $uri, $request, $response)
-    {
+    private function process4xxError($method, $uri, $request, $response) {
         $this->logErrorDueToFailure($method, $uri, $request, $response);
 
         $statusCode    = $response['requestInfo']['http_code'];
@@ -307,8 +301,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\NoDocumentsToGetException
      * @throws \Elasticsearch\Common\Exceptions\ServerErrorResponseException
      */
-    private function process5xxError($method, $uri, $request, $response)
-    {
+    private function process5xxError($method, $uri, $request, $response) {
         $this->logErrorDueToFailure($method, $uri, $request, $response);
 
         $statusCode    = $response['requestInfo']['http_code'];
@@ -337,8 +330,7 @@ 
      * @param $uri
      * @param $response
      */
-    private function processCurlError($method, $uri, $response)
-    {
+    private function processCurlError($method, $uri, $response) {
         $error = 'Curl error: ' . $response['error'];
         $this->log->error($error);
         $this->throwCurlException($response['errorNumber'], $response['error']);
@@ -351,8 +343,7 @@ 
      * @param $request
      * @param $response
      */
-    private function logErrorDueToFailure($method, $uri, $request, $response)
-    {
+    private function logErrorDueToFailure($method, $uri, $request, $response) {
         $this->logRequestFail(
             $method,
             $uri,
@@ -370,8 +361,7 @@ 
      * @param array $connectionParams
      * @return array
      */
-    private function transformAuth($connectionParams)
-    {
+    private function transformAuth($connectionParams) {
         if (isset($connectionParams['auth']) !== true) {
             return $connectionParams;
         }
@@ -411,8 +401,7 @@ 
      *
      * @return string
      */
-    private function getURI($uri, $params)
-    {
+    private function getURI($uri, $params) {
         $uri = $this->host . $uri;
 
         if (isset($params) === true) {
@@ -422,8 +411,7 @@ 
         return $uri;
     }
 
-    private function generateCurlOpts($connectionParams)
-    {
+    private function generateCurlOpts($connectionParams) {
         $opts = array(
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT_MS     => 1000,
@@ -451,8 +439,7 @@ 
         return $opts;
     }
 
-    private function reconcileOptions($options)
-    {
+    private function reconcileOptions($options) {
         $opts = array();
         if (isset($options['timeout']) === true) {
             $opts[CURLOPT_TIMEOUT_MS] = $options['timeout'];

Upper-Lower-Casing +22 added lines, -22 removed lines

@@ -64,21 +64,21 @@ 
     {
         parent::__construct($hostDetails, $connectionParams, $log, $trace);
 
-        if (extension_loaded('curl') !== true) {
+        if (extension_loaded('curl') !== TRUE) {
             $log->critical('Curl library/extension is required for CurlMultiConnection.');
             throw new RuntimeException('Curl library/extension is required for CurlMultiConnection.');
         }
 
-        if (isset($connectionParams['curlMultiHandle']) !== true) {
+        if (isset($connectionParams['curlMultiHandle']) !== TRUE) {
             $log->critical('curlMultiHandle must be set in connectionParams');
             throw new InvalidArgumentException('curlMultiHandle must be set in connectionParams');
         }
 
-        if (isset($hostDetails['port']) !== true) {
+        if (isset($hostDetails['port']) !== TRUE) {
             $hostDetails['port'] = 9200;
         }
 
-        if (isset($hostDetails['scheme']) !== true) {
+        if (isset($hostDetails['scheme']) !== TRUE) {
             $hostDetails['scheme'] = 'http';
         }
 
@@ -116,13 +116,13 @@ 
      * @throws \Elasticsearch\Common\Exceptions\ServerErrorResponseException
      * @return array
      */
-    public function performRequest($method, $uri, $params = null, $body = null, $options = array())
+    public function performRequest($method, $uri, $params = NULL, $body = NULL, $options = array())
     {
         $curlHandle = curl_init();
         $opts = $this->curlOpts;
         $perRequestCurlOpts = array();
 
-        if (isset($params['curlOpts']) === true) {
+        if (isset($params['curlOpts']) === TRUE) {
             $perRequestCurlOpts = $params['curlOpts'];
             unset($params['curlOpts']);
         }
@@ -131,7 +131,7 @@ 
 
         $opts[CURLOPT_URL] = $uri;
 
-        if (isset($opts[CURLOPT_CUSTOMREQUEST]) !== true) {
+        if (isset($opts[CURLOPT_CUSTOMREQUEST]) !== TRUE) {
             $opts[CURLOPT_CUSTOMREQUEST]= $method;
         }
 
@@ -141,12 +141,12 @@ 
 
         if ($method === 'GET') {
             //Force these since Curl won't reset by itself
-            $opts[CURLOPT_NOBODY] = false;
+            $opts[CURLOPT_NOBODY] = FALSE;
         } else if ($method === 'HEAD') {
-            $opts[CURLOPT_NOBODY] = true;
+            $opts[CURLOPT_NOBODY] = TRUE;
         }
 
-        if (isset($body) === true) {
+        if (isset($body) === TRUE) {
             $opts[CURLOPT_POSTFIELDS] = $body;
         }
 
@@ -279,7 +279,7 @@ 
 
         $exceptionText = "$statusCode Server Exception: $exceptionText\n$responseBody";
 
-        if ($statusCode === 400 && strpos($responseBody, "AlreadyExpiredException") !== false) {
+        if ($statusCode === 400 && strpos($responseBody, "AlreadyExpiredException") !== FALSE) {
             throw new AlreadyExpiredException($responseBody, $statusCode);
         } elseif ($statusCode === 401) {
             throw new Authentication401Exception($responseBody, $statusCode);
@@ -289,7 +289,7 @@ 
             throw new Missing404Exception($responseBody, $statusCode);
         } elseif ($statusCode === 409) {
             throw new Conflict409Exception($responseBody, $statusCode);
-        } elseif ($statusCode === 400 && strpos($responseBody, 'script_lang not supported') !== false) {
+        } elseif ($statusCode === 400 && strpos($responseBody, 'script_lang not supported') !== FALSE) {
             throw new ScriptLangNotSupportedException($responseBody. $statusCode);
         } elseif ($statusCode === 400) {
             throw new BadRequest400Exception($responseBody, $statusCode);
@@ -318,11 +318,11 @@ 
         $exceptionText = "$statusCode Server Exception: $exceptionText\n$responseBody";
         $this->log->error($exceptionText);
 
-        if ($statusCode === 500 && strpos($responseBody, "RoutingMissingException") !== false) {
+        if ($statusCode === 500 && strpos($responseBody, "RoutingMissingException") !== FALSE) {
             throw new RoutingMissingException($responseBody, $statusCode);
         } elseif ($statusCode === 500 && preg_match('/ActionRequestValidationException.+ no documents to get/',$responseBody) === 1) {
             throw new NoDocumentsToGetException($responseBody, $statusCode);
-        } elseif ($statusCode === 500 && strpos($responseBody, 'NoShardAvailableActionException') !== false) {
+        } elseif ($statusCode === 500 && strpos($responseBody, 'NoShardAvailableActionException') !== FALSE) {
             throw new NoShardAvailableException($responseBody, $statusCode);
         } else {
             throw new ServerErrorResponseException($responseBody, $statusCode);
@@ -372,7 +372,7 @@ 
      */
     private function transformAuth($connectionParams)
     {
-        if (isset($connectionParams['auth']) !== true) {
+        if (isset($connectionParams['auth']) !== TRUE) {
             return $connectionParams;
         }
 
@@ -415,7 +415,7 @@ 
     {
         $uri = $this->host . $uri;
 
-        if (isset($params) === true) {
+        if (isset($params) === TRUE) {
             $uri .= '?' . http_build_query($params);
         }
 
@@ -425,20 +425,20 @@ 
     private function generateCurlOpts($connectionParams)
     {
         $opts = array(
-            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_RETURNTRANSFER => TRUE,
             CURLOPT_TIMEOUT_MS     => 1000,
             CURLOPT_CONNECTTIMEOUT_MS => 1000,
-            CURLOPT_HEADER         => false,
-            CURLOPT_SSL_VERIFYPEER => true,
+            CURLOPT_HEADER         => FALSE,
+            CURLOPT_SSL_VERIFYPEER => TRUE,
             CURLOPT_SSL_VERIFYHOST => 2,
-            CURLOPT_TCP_NODELAY    => false
+            CURLOPT_TCP_NODELAY    => FALSE
         );
 
         if (isset($this->headers) && count($this->headers) > 0) {
             $opts[CURLOPT_HTTPHEADER] = $this->headers;
         }
 
-        if (isset($connectionParams['timeout']) === true) {
+        if (isset($connectionParams['timeout']) === TRUE) {
             $opts[CURLOPT_TIMEOUT_MS] = $connectionParams['timeout'];
             $opts[CURLOPT_CONNECTTIMEOUT_MS] = $connectionParams['timeout'];
         }
@@ -454,7 +454,7 @@ 
     private function reconcileOptions($options)
     {
         $opts = array();
-        if (isset($options['timeout']) === true) {
+        if (isset($options['timeout']) === TRUE) {
             $opts[CURLOPT_TIMEOUT_MS] = $options['timeout'];
             $opts[CURLOPT_CONNECTTIMEOUT_MS] = $options['timeout'];
         }

Lib/ElasticSearchPhpClient/src/Elasticsearch/Connections/GuzzleConnection.php

Indentation +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
             $this->process4xxError($request, $exception, $body);
 
         } catch (CurlException $exception) {
-           $this->processCurlError($exception);
+            $this->processCurlError($exception);
 
         } catch (\Exception $exception) {
             $error = 'Unexpected error: ' . $exception->getMessage();

Spacing +12 added lines, -12 removed lines

@@ -34,7 +34,7 @@ 
     /** @var  Client */
     private $guzzle;
 
-    private $lastRequest = array();
+    private $lastRequest = array ();
 
 
     /**
@@ -94,7 +94,7 @@ 
      *
      * @return array
      */
-    public function performRequest($method, $uri, $params = null, $body = null, $options = array())
+    public function performRequest($method, $uri, $params = null, $body = null, $options = array ())
     {
 
         $uri = $this->getURI($uri, $params);
@@ -103,7 +103,7 @@ 
         $request = $this->buildGuzzleRequest($method, $uri, $body, $options);
         $response = $this->sendRequest($request, $body);
 
-        return array(
+        return array (
             'status' => $response->getStatusCode(),
             'text'   => $response->getBody(true),
             'info'   => $response->getInfo(),
@@ -147,14 +147,14 @@ 
      *
      * @return Request
      */
-    private function buildGuzzleRequest($method, $uri, $body, $options = array())
+    private function buildGuzzleRequest($method, $uri, $body, $options = array ())
     {
         if ($method === 'GET' && isset($body) === true) {
             $method = 'POST';
         }
 
         if (isset($body) === true) {
-            $this->lastRequest = array( 'request' => array(
+            $this->lastRequest = array ('request' => array (
                 'uri'     => $uri,
                 'body'    => $body,
                 'options' => $options,
@@ -162,21 +162,21 @@ 
             ));
 
             /** @var EntityEnclosingRequest $request */
-            $request = $this->guzzle->$method($uri, array('content-type' => 'application/json'), $body, $options);
+            $request = $this->guzzle->$method($uri, array ('content-type' => 'application/json'), $body, $options);
             if (isset($options['auth'])) {
-                $request->setAuth($options['auth'][0],$options['auth'][1],$options['auth'][2]);
+                $request->setAuth($options['auth'][0], $options['auth'][1], $options['auth'][2]);
             }
 
         } else {
-            $this->lastRequest = array( 'request' => array(
+            $this->lastRequest = array ('request' => array (
                 'uri'     => $uri,
                 'body'    => null,
                 'options' => $options,
                 'method'  => $method
             ));
-            $request = $this->guzzle->$method($uri, array(), array(), $options);
+            $request = $this->guzzle->$method($uri, array (), array (), $options);
             if (isset($options['auth'])) {
-                $request->setAuth($options['auth'][0],$options['auth'][1],$options['auth'][2]);
+                $request->setAuth($options['auth'][0], $options['auth'][1], $options['auth'][2]);
             }
         }
 
@@ -239,7 +239,7 @@ 
 
         if ($statusCode === 500 && strpos($responseBody, "RoutingMissingException") !== false) {
             throw new RoutingMissingException($responseBody, $statusCode, $exception);
-        } elseif ($statusCode === 500 && preg_match('/ActionRequestValidationException.+ no documents to get/',$responseBody) === 1) {
+        } elseif ($statusCode === 500 && preg_match('/ActionRequestValidationException.+ no documents to get/', $responseBody) === 1) {
             throw new NoDocumentsToGetException($responseBody, $statusCode, $exception);
         } elseif ($statusCode === 500 && strpos($responseBody, 'NoShardAvailableActionException') !== false) {
             throw new NoShardAvailableException($responseBody, $statusCode, $exception);
@@ -272,7 +272,7 @@ 
         } elseif ($statusCode === 409) {
             throw new Conflict409Exception($responseBody, $statusCode, $exception);
         } elseif ($statusCode === 400 && strpos($responseBody, 'script_lang not supported') !== false) {
-            throw new ScriptLangNotSupportedException($responseBody. $statusCode);
+            throw new ScriptLangNotSupportedException($responseBody . $statusCode);
         } elseif ($statusCode === 400) {
             throw new BadRequest400Exception($responseBody, $statusCode, $exception);
         }

Braces +13 added lines, -26 removed lines

@@ -29,8 +29,7 @@ 
 use Guzzle\Http\Message\Response;
 use Psr\Log\LoggerInterface;
 
-class GuzzleConnection extends AbstractConnection implements ConnectionInterface
-{
+class GuzzleConnection extends AbstractConnection implements ConnectionInterface {
     /** @var  Client */
     private $guzzle;
 
@@ -46,8 +45,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\InvalidArgumentException
      * @return \Elasticsearch\Connections\GuzzleConnection
      */
-    public function __construct($hostDetails, $connectionParams, LoggerInterface $log, LoggerInterface $trace)
-    {
+    public function __construct($hostDetails, $connectionParams, LoggerInterface $log, LoggerInterface $trace) {
         if (isset($connectionParams['guzzleClient']) !== true) {
             $log->critical('guzzleClient must be set in connectionParams');
             throw new InvalidArgumentException('guzzleClient must be set in connectionParams');
@@ -77,8 +75,7 @@ 
      *
      * @return string
      */
-    public function getTransportSchema()
-    {
+    public function getTransportSchema() {
         return $this->transportSchema;
     }
 
@@ -94,8 +91,7 @@ 
      *
      * @return array
      */
-    public function performRequest($method, $uri, $params = null, $body = null, $options = array())
-    {
+    public function performRequest($method, $uri, $params = null, $body = null, $options = array()) {
 
         $uri = $this->getURI($uri, $params);
 
@@ -115,8 +111,7 @@ 
     /**
      * @return array
      */
-    public function getLastRequestInfo()
-    {
+    public function getLastRequestInfo() {
         return $this->lastRequest;
     }
 
@@ -127,8 +122,7 @@ 
      *
      * @return string
      */
-    private function getURI($uri, $params)
-    {
+    private function getURI($uri, $params) {
         $uri = $this->host . $uri;
 
         if (isset($params) === true) {
@@ -147,8 +141,7 @@ 
      *
      * @return Request
      */
-    private function buildGuzzleRequest($method, $uri, $body, $options = array())
-    {
+    private function buildGuzzleRequest($method, $uri, $body, $options = array()) {
         if ($method === 'GET' && isset($body) === true) {
             $method = 'POST';
         }
@@ -192,8 +185,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\TransportException
      * @return \Guzzle\Http\Message\Response
      */
-    private function sendRequest(Request $request, $body)
-    {
+    private function sendRequest(Request $request, $body) {
         try {
             $request->send();
         } catch (ServerErrorResponseException $exception) {
@@ -226,8 +218,7 @@ 
      * @throws \Guzzle\Http\Exception\ServerErrorResponseException
      * @throws \Elasticsearch\Common\Exceptions\NoDocumentsToGetException
      */
-    private function process5xxError(Request $request, ServerErrorResponseException $exception, $body)
-    {
+    private function process5xxError(Request $request, ServerErrorResponseException $exception, $body) {
         $this->logErrorDueToFailure($request, $exception, $body);
 
         $statusCode    = $request->getResponse()->getStatusCode();
@@ -251,8 +242,7 @@ 
     }
 
 
-    private function process4xxError(Request $request, ClientErrorResponseException $exception, $body)
-    {
+    private function process4xxError(Request $request, ClientErrorResponseException $exception, $body) {
         $this->logErrorDueToFailure($request, $exception, $body);
 
         $statusCode    = $request->getResponse()->getStatusCode();
@@ -284,8 +274,7 @@ 
      * @param \Exception $exception
      * @param string     $body
      */
-    private function logErrorDueToFailure(Request $request, \Exception $exception, $body)
-    {
+    private function logErrorDueToFailure(Request $request, \Exception $exception, $body) {
         $response     = $request->getResponse();
         $headers      = $request->getHeaders()->getAll();
         $info         = $response->getInfo();
@@ -312,8 +301,7 @@ 
     /**
      * @param CurlException $exception\
      */
-    private function processCurlError(CurlException $exception)
-    {
+    private function processCurlError(CurlException $exception) {
         $error = 'Curl error: ' . $exception->getMessage();
         $this->log->error($error);
         $this->throwCurlException($exception->getErrorNo(), $exception->getError());
@@ -323,8 +311,7 @@ 
      * @param Request $request
      * @param string  $body
      */
-    private function processSuccessfulRequest(Request $request, $body)
-    {
+    private function processSuccessfulRequest(Request $request, $body) {
         $response     = $request->getResponse();
         $headers      = $request->getHeaders()->getAll();
         $responseBody = $response->getBody(true);

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -48,16 +48,16 @@ 
      */
     public function __construct($hostDetails, $connectionParams, LoggerInterface $log, LoggerInterface $trace)
     {
-        if (isset($connectionParams['guzzleClient']) !== true) {
+        if (isset($connectionParams['guzzleClient']) !== TRUE) {
             $log->critical('guzzleClient must be set in connectionParams');
             throw new InvalidArgumentException('guzzleClient must be set in connectionParams');
         }
 
-        if (isset($hostDetails['port']) !== true) {
+        if (isset($hostDetails['port']) !== TRUE) {
             $hostDetails['port'] = 9200;
         }
 
-        if (isset($hostDetails['scheme']) !== true) {
+        if (isset($hostDetails['scheme']) !== TRUE) {
             $hostDetails['scheme'] = 'http';
         }
 
@@ -94,7 +94,7 @@ 
      *
      * @return array
      */
-    public function performRequest($method, $uri, $params = null, $body = null, $options = array())
+    public function performRequest($method, $uri, $params = NULL, $body = NULL, $options = array())
     {
 
         $uri = $this->getURI($uri, $params);
@@ -105,7 +105,7 @@ 
 
         return array(
             'status' => $response->getStatusCode(),
-            'text'   => $response->getBody(true),
+            'text'   => $response->getBody(TRUE),
             'info'   => $response->getInfo(),
         );
 
@@ -131,7 +131,7 @@ 
     {
         $uri = $this->host . $uri;
 
-        if (isset($params) === true) {
+        if (isset($params) === TRUE) {
             $uri .= '?' . http_build_query($params);
         }
 
@@ -149,11 +149,11 @@ 
      */
     private function buildGuzzleRequest($method, $uri, $body, $options = array())
     {
-        if ($method === 'GET' && isset($body) === true) {
+        if ($method === 'GET' && isset($body) === TRUE) {
             $method = 'POST';
         }
 
-        if (isset($body) === true) {
+        if (isset($body) === TRUE) {
             $this->lastRequest = array( 'request' => array(
                 'uri'     => $uri,
                 'body'    => $body,
@@ -170,7 +170,7 @@ 
         } else {
             $this->lastRequest = array( 'request' => array(
                 'uri'     => $uri,
-                'body'    => null,
+                'body'    => NULL,
                 'options' => $options,
                 'method'  => $method
             ));
@@ -232,16 +232,16 @@ 
 
         $statusCode    = $request->getResponse()->getStatusCode();
         $exceptionText = $exception->getMessage();
-        $responseBody  = $request->getResponse()->getBody(true);
+        $responseBody  = $request->getResponse()->getBody(TRUE);
 
         $exceptionText = "$statusCode Server Exception: $exceptionText\n$responseBody";
         $this->log->error($exceptionText);
 
-        if ($statusCode === 500 && strpos($responseBody, "RoutingMissingException") !== false) {
+        if ($statusCode === 500 && strpos($responseBody, "RoutingMissingException") !== FALSE) {
             throw new RoutingMissingException($responseBody, $statusCode, $exception);
         } elseif ($statusCode === 500 && preg_match('/ActionRequestValidationException.+ no documents to get/',$responseBody) === 1) {
             throw new NoDocumentsToGetException($responseBody, $statusCode, $exception);
-        } elseif ($statusCode === 500 && strpos($responseBody, 'NoShardAvailableActionException') !== false) {
+        } elseif ($statusCode === 500 && strpos($responseBody, 'NoShardAvailableActionException') !== FALSE) {
             throw new NoShardAvailableException($responseBody, $statusCode, $exception);
         } else {
             throw new \Elasticsearch\Common\Exceptions\ServerErrorResponseException($responseBody, $statusCode, $exception);
@@ -257,11 +257,11 @@ 
 
         $statusCode    = $request->getResponse()->getStatusCode();
         $exceptionText = $exception->getMessage();
-        $responseBody  = $request->getResponse()->getBody(true);
+        $responseBody  = $request->getResponse()->getBody(TRUE);
 
         $exceptionText = "$statusCode Server Exception: $exceptionText\n$responseBody";
 
-        if ($statusCode === 400 && strpos($responseBody, "AlreadyExpiredException") !== false) {
+        if ($statusCode === 400 && strpos($responseBody, "AlreadyExpiredException") !== FALSE) {
             throw new AlreadyExpiredException($responseBody, $statusCode, $exception);
         } elseif ($statusCode === 401) {
             throw new Authentication401Exception($responseBody, $statusCode, $exception);
@@ -271,7 +271,7 @@ 
             throw new Missing404Exception($responseBody, $statusCode, $exception);
         } elseif ($statusCode === 409) {
             throw new Conflict409Exception($responseBody, $statusCode, $exception);
-        } elseif ($statusCode === 400 && strpos($responseBody, 'script_lang not supported') !== false) {
+        } elseif ($statusCode === 400 && strpos($responseBody, 'script_lang not supported') !== FALSE) {
             throw new ScriptLangNotSupportedException($responseBody. $statusCode);
         } elseif ($statusCode === 400) {
             throw new BadRequest400Exception($responseBody, $statusCode, $exception);
@@ -289,7 +289,7 @@ 
         $response     = $request->getResponse();
         $headers      = $request->getHeaders()->getAll();
         $info         = $response->getInfo();
-        $responseBody = $response->getBody(true);
+        $responseBody = $response->getBody(TRUE);
         $status       = $response->getStatusCode();
 
         $this->lastRequest['response']['body']    = $responseBody;
@@ -327,7 +327,7 @@ 
     {
         $response     = $request->getResponse();
         $headers      = $request->getHeaders()->getAll();
-        $responseBody = $response->getBody(true);
+        $responseBody = $response->getBody(TRUE);
         $status       = $response->getStatusCode();
 
         $this->lastRequest['response']['body']    = $responseBody;

Lib/ElasticSearchPhpClient/src/Elasticsearch/Namespaces/SnapshotNamespace.php

Indentation +17 added lines, -17 removed lines

@@ -38,9 +38,9 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Create $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Create');
         $endpoint->setRepository($repository)
-                 ->setSnapshot($snapshot)
-                 ->setParams($params)
-                 ->setBody($body);
+                    ->setSnapshot($snapshot)
+                    ->setParams($params)
+                    ->setBody($body);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -65,8 +65,8 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Repository\Create $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Repository\Create');
         $endpoint->setRepository($repository)
-                 ->setBody($body)
-                 ->setParams($params);
+                    ->setBody($body)
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -90,8 +90,8 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Delete $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Delete');
         $endpoint->setRepository($repository)
-                 ->setSnapshot($snapshot)
-                 ->setParams($params);
+                    ->setSnapshot($snapshot)
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -115,7 +115,7 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Repository\Delete $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Repository\Delete');
         $endpoint->setRepository($repository)
-                 ->setParams($params);
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -141,8 +141,8 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Get $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Get');
         $endpoint->setRepository($repository)
-                 ->setSnapshot($snapshot)
-                 ->setParams($params);
+                    ->setSnapshot($snapshot)
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -166,7 +166,7 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Repository\Get $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Repository\Get');
         $endpoint->setRepository($repository)
-                 ->setParams($params);
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -192,9 +192,9 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Restore $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Restore');
         $endpoint->setRepository($repository)
-                 ->setSnapshot($snapshot)
-                 ->setParams($params)
-                 ->setBody($body);
+                    ->setSnapshot($snapshot)
+                    ->setParams($params)
+                    ->setBody($body);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -217,8 +217,8 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Status $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Status');
         $endpoint->setRepository($repository)
-                 ->setSnapshot($snapshot)
-                 ->setParams($params);
+                    ->setSnapshot($snapshot)
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -241,7 +241,7 @@ 
         /** @var \Elasticsearch\Endpoints\Snapshot\Repository\Verify $endpoint */
         $endpoint = $endpointBuilder('Snapshot\Repository\Verify');
         $endpoint->setRepository($repository)
-                 ->setParams($params);
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
      *
      * @return array
      */
-    public function create($params = array())
+    public function create($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
@@ -54,7 +54,7 @@ 
      *
      * @return array
      */
-    public function createRepository($params = array())
+    public function createRepository($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
         $body = $this->extractArgument($params, 'body');
@@ -79,7 +79,7 @@ 
      *
      * @return array
      */
-    public function delete($params = array())
+    public function delete($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
@@ -105,7 +105,7 @@ 
      *
      * @return array
      */
-    public function deleteRepository($params = array())
+    public function deleteRepository($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
 
@@ -128,7 +128,7 @@ 
      *
      * @return array
      */
-    public function get($params = array())
+    public function get($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
@@ -156,7 +156,7 @@ 
      *
      * @return array
      */
-    public function getRepository($params = array())
+    public function getRepository($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
 
@@ -180,7 +180,7 @@ 
      *
      * @return array
      */
-    public function restore($params = array())
+    public function restore($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
@@ -206,7 +206,7 @@ 
      *
      * @return array
      */
-    public function status($params = array())
+    public function status($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
@@ -231,7 +231,7 @@ 
      *
      * @return array
      */
-    public function verifyRepository($params = array())
+    public function verifyRepository($params = array ())
     {
         $repository = $this->extractArgument($params, 'repository');
 

Braces +10 added lines, -20 removed lines

@@ -16,8 +16,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-class SnapshotNamespace extends AbstractNamespace
-{
+class SnapshotNamespace extends AbstractNamespace {
     /**
      * $params['master_timeout'] = (time) Explicit operation timeout for connection to master node
      *        ['wait_for_completion'] = (bool) Should this request wait until the operation has completed before returning
@@ -26,8 +25,7 @@ 
      *
      * @return array
      */
-    public function create($params = array())
-    {
+    public function create($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
         $body = $this->extractArgument($params, 'body');
@@ -54,8 +52,7 @@ 
      *
      * @return array
      */
-    public function createRepository($params = array())
-    {
+    public function createRepository($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
         $body = $this->extractArgument($params, 'body');
 
@@ -79,8 +76,7 @@ 
      *
      * @return array
      */
-    public function delete($params = array())
-    {
+    public function delete($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
 
@@ -105,8 +101,7 @@ 
      *
      * @return array
      */
-    public function deleteRepository($params = array())
-    {
+    public function deleteRepository($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
 
         /** @var callback $endpointBuilder */
@@ -128,8 +123,7 @@ 
      *
      * @return array
      */
-    public function get($params = array())
-    {
+    public function get($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
         
@@ -156,8 +150,7 @@ 
      *
      * @return array
      */
-    public function getRepository($params = array())
-    {
+    public function getRepository($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
 
         /** @var callback $endpointBuilder */
@@ -180,8 +173,7 @@ 
      *
      * @return array
      */
-    public function restore($params = array())
-    {
+    public function restore($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
         $body = $this->extractArgument($params, 'body');
@@ -206,8 +198,7 @@ 
      *
      * @return array
      */
-    public function status($params = array())
-    {
+    public function status($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
         $snapshot = $this->extractArgument($params, 'snapshot');
 
@@ -231,8 +222,7 @@ 
      *
      * @return array
      */
-    public function verifyRepository($params = array())
-    {
+    public function verifyRepository($params = array()) {
         $repository = $this->extractArgument($params, 'repository');
 
         /** @var callback $endpointBuilder */

Lib/ElasticSearchPhpClient/src/Elasticsearch/Namespaces/AbstractNamespace.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     public function extractArgument(&$params, $arg)
     {
         if (is_object($params) === true) {
-            $params = (array)$params;
+            $params = (array) $params;
         }
 
         if (isset($params[$arg]) === true) {

Braces +3 added lines, -6 removed lines

@@ -19,8 +19,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-abstract class AbstractNamespace
-{
+abstract class AbstractNamespace {
     /** @var \Elasticsearch\Transport  */
     protected $transport;
 
@@ -34,8 +33,7 @@ 
      * @param Transport $transport Transport object
      * @param           $dicEndpoints
      */
-    public function __construct($transport, $dicEndpoints)
-    {
+    public function __construct($transport, $dicEndpoints) {
         $this->transport = $transport;
         $this->dicEndpoints = $dicEndpoints;
     }
@@ -47,8 +45,7 @@ 
      *
      * @return null|mixed
      */
-    public function extractArgument(&$params, $arg)
-    {
+    public function extractArgument(&$params, $arg) {
         if (is_object($params) === true) {
             $params = (array)$params;
         }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -49,16 +49,16 @@
      */
     public function extractArgument(&$params, $arg)
     {
-        if (is_object($params) === true) {
+        if (is_object($params) === TRUE) {
             $params = (array)$params;
         }
 
-        if (isset($params[$arg]) === true) {
+        if (isset($params[$arg]) === TRUE) {
             $val = $params[$arg];
             unset($params[$arg]);
             return $val;
         } else {
-            return null;
+            return NULL;
         }
     }
 

Lib/ElasticSearchPhpClient/src/Elasticsearch/Namespaces/IndicesNamespace.php

Indentation +31 added lines, -31 removed lines

@@ -79,8 +79,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Get $endpoint */
         $endpoint = $endpointBuilder('Indices\Get');
         $endpoint->setIndex($index)
-                 ->setFeature($feature)
-                 ->setParams($params);
+                    ->setFeature($feature)
+                    ->setParams($params);
 
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -169,8 +169,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Warmer\Delete $endpoint */
         $endpoint = $endpointBuilder('Indices\Warmer\Delete');
         $endpoint->setIndex($index)
-                 ->setName($name)
-                 ->setType($type);
+                    ->setName($name)
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -242,7 +242,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Stats $endpoint */
         $endpoint = $endpointBuilder('Indices\Stats');
         $endpoint->setIndex($index)
-                 ->setMetric($metric);
+                    ->setMetric($metric);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -272,7 +272,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Settings\Put $endpoint */
         $endpoint = $endpointBuilder('Indices\Settings\Put');
         $endpoint->setIndex($index)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -330,7 +330,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Mapping\Get $endpoint */
         $endpoint = $endpointBuilder('Indices\Mapping\Get');
         $endpoint->setIndex($index)
-                 ->setType($type);
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -361,8 +361,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Mapping\GetField $endpoint */
         $endpoint = $endpointBuilder('Indices\Mapping\GetField');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setField($field);
+                    ->setType($type)
+                    ->setField($field);
 
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
@@ -481,7 +481,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Type\Exists $endpoint */
         $endpoint = $endpointBuilder('Indices\Type\Exists');
         $endpoint->setIndex($index)
-                 ->setType($type);
+                    ->setType($type);
         $endpoint->setParams($params);
 
         try {
@@ -527,8 +527,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Alias\Put $endpoint */
         $endpoint = $endpointBuilder('Indices\Alias\Put');
         $endpoint->setIndex($index)
-                 ->setName($name)
-                 ->setBody($body);
+                    ->setName($name)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -562,8 +562,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Warmer\Get $endpoint */
         $endpoint = $endpointBuilder('Indices\Warmer\Get');
         $endpoint->setIndex($index)
-                 ->setName($name)
-                 ->setType($type);
+                    ->setName($name)
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -601,9 +601,9 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Warmer\Put $endpoint */
         $endpoint = $endpointBuilder('Indices\Warmer\Put');
         $endpoint->setIndex($index)
-                 ->setName($name)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setName($name)
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -636,7 +636,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Template\Put $endpoint */
         $endpoint = $endpointBuilder('Indices\Template\Put');
         $endpoint->setName($name)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -674,8 +674,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Validate\Query $endpoint */
         $endpoint = $endpointBuilder('Indices\Validate\Query');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -707,7 +707,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Alias\Get $endpoint */
         $endpoint = $endpointBuilder('Indices\Alias\Get');
         $endpoint->setIndex($index)
-                 ->setName($name);
+                    ->setName($name);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -742,8 +742,8 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Mapping\Put $endpoint */
         $endpoint = $endpointBuilder('Indices\Mapping\Put');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -773,7 +773,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Mapping\Delete $endpoint */
         $endpoint = $endpointBuilder('Indices\Mapping\Delete');
         $endpoint->setIndex($index)
-                 ->setType($type);
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -865,7 +865,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Create $endpoint */
         $endpoint = $endpointBuilder('Indices\Create');
         $endpoint->setIndex($index)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -930,7 +930,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Alias\Delete $endpoint */
         $endpoint = $endpointBuilder('Indices\Alias\Delete');
         $endpoint->setIndex($index)
-                 ->setName($name);
+                    ->setName($name);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -993,7 +993,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Analyze $endpoint */
         $endpoint = $endpointBuilder('Indices\Analyze');
         $endpoint->setIndex($index)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1061,7 +1061,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Aliases\Update $endpoint */
         $endpoint = $endpointBuilder('Indices\Aliases\Update');
         $endpoint->setIndex($index)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1090,7 +1090,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Aliases\Get $endpoint */
         $endpoint = $endpointBuilder('Indices\Aliases\Get');
         $endpoint->setIndex($index)
-                 ->setName($name);
+                    ->setName($name);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1123,7 +1123,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Alias\Exists $endpoint */
         $endpoint = $endpointBuilder('Indices\Alias\Exists');
         $endpoint->setIndex($index)
-                 ->setName($name);
+                    ->setName($name);
         $endpoint->setParams($params);
 
         try {
@@ -1192,7 +1192,7 @@ 
         /** @var \Elasticsearch\Endpoints\Indices\Settings\Get $endpoint */
         $endpoint = $endpointBuilder('Indices\Settings\Get');
         $endpoint->setIndex($index)
-                 ->setName($name);
+                    ->setName($name);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];

Spacing +19 added lines, -19 removed lines

@@ -98,7 +98,7 @@ 
      *
      * @return array
      */
-    public function segments($params = array())
+    public function segments($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -185,7 +185,7 @@ 
      *
      * @return array
      */
-    public function delete($params = array())
+    public function delete($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -230,7 +230,7 @@ 
      *
      * @return array
      */
-    public function stats($params = array())
+    public function stats($params = array ())
     {
         $metric = $this->extractArgument($params, 'metric');
 
@@ -257,7 +257,7 @@ 
      *
      * @return array
      */
-    public function putSettings($params = array())
+    public function putSettings($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -289,7 +289,7 @@ 
      *
      * @return array
      */
-    public function snapshotIndex($params = array())
+    public function snapshotIndex($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -315,7 +315,7 @@ 
      *
      * @return array
      */
-    public function getMapping($params = array())
+    public function getMapping($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -346,7 +346,7 @@ 
      *
      * @return array
      */
-    public function getFieldMapping($params = array())
+    public function getFieldMapping($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -383,7 +383,7 @@ 
      *
      * @return array
      */
-    public function flush($params = array())
+    public function flush($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -412,7 +412,7 @@ 
      *
      * @return array
      */
-    public function refresh($params = array())
+    public function refresh($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -439,7 +439,7 @@ 
      *
      * @return array
      */
-    public function recovery($params = array())
+    public function recovery($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -509,7 +509,7 @@ 
      *
      * @return array
      */
-    public function putAlias($params = array())
+    public function putAlias($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -656,7 +656,7 @@ 
      *
      * @return array
      */
-    public function validateQuery($params = array())
+    public function validateQuery($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -888,7 +888,7 @@ 
      *
      * @return array
      */
-    public function optimize($params = array())
+    public function optimize($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -978,7 +978,7 @@ 
      *
      * @return array
      */
-    public function analyze($params = array())
+    public function analyze($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -1019,7 +1019,7 @@ 
      *
      * @return array
      */
-    public function clearCache($params = array())
+    public function clearCache($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -1046,7 +1046,7 @@ 
      *
      * @return array
      */
-    public function updateAliases($params = array())
+    public function updateAliases($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -1076,7 +1076,7 @@ 
      *
      * @return array
      */
-    public function getAliases($params = array())
+    public function getAliases($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -1152,7 +1152,7 @@ 
      *
      * @return array
      */
-    public function status($params = array())
+    public function status($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -1177,7 +1177,7 @@ 
      *
      * @return array
      */
-    public function getSettings($params = array())
+    public function getSettings($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 

Braces +38 added lines, -76 removed lines

@@ -18,8 +18,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-class IndicesNamespace extends AbstractNamespace
-{
+class IndicesNamespace extends AbstractNamespace {
     /**
      * $params['index'] = (list) A comma-separated list of indices to check (Required)
      *
@@ -27,8 +26,7 @@ 
      *
      * @return bool
      */
-    public function exists($params)
-    {
+    public function exists($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -68,8 +66,7 @@ 
      *
      * @return bool
      */
-    public function get($params)
-    {
+    public function get($params) {
         $index = $this->extractArgument($params, 'index');
         $feature = $this->extractArgument($params, 'feature');
 
@@ -98,8 +95,7 @@ 
      *
      * @return array
      */
-    public function segments($params = array())
-    {
+    public function segments($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -124,8 +120,7 @@ 
      *
      * @return array
      */
-    public function deleteTemplate($params)
-    {
+    public function deleteTemplate($params) {
         $name = $this->extractArgument($params, 'name');
 
 
@@ -151,8 +146,7 @@ 
      *
      * @return array
      */
-    public function deleteWarmer($params)
-    {
+    public function deleteWarmer($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -185,8 +179,7 @@ 
      *
      * @return array
      */
-    public function delete($params = array())
-    {
+    public function delete($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -230,8 +223,7 @@ 
      *
      * @return array
      */
-    public function stats($params = array())
-    {
+    public function stats($params = array()) {
         $metric = $this->extractArgument($params, 'metric');
 
         $index = $this->extractArgument($params, 'index');
@@ -257,8 +249,7 @@ 
      *
      * @return array
      */
-    public function putSettings($params = array())
-    {
+    public function putSettings($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -289,8 +280,7 @@ 
      *
      * @return array
      */
-    public function snapshotIndex($params = array())
-    {
+    public function snapshotIndex($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -315,8 +305,7 @@ 
      *
      * @return array
      */
-    public function getMapping($params = array())
-    {
+    public function getMapping($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -346,8 +335,7 @@ 
      *
      * @return array
      */
-    public function getFieldMapping($params = array())
-    {
+    public function getFieldMapping($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
         $type = $this->extractArgument($params, 'type');
@@ -383,8 +371,7 @@ 
      *
      * @return array
      */
-    public function flush($params = array())
-    {
+    public function flush($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -412,8 +399,7 @@ 
      *
      * @return array
      */
-    public function refresh($params = array())
-    {
+    public function refresh($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -439,8 +425,7 @@ 
      *
      * @return array
      */
-    public function recovery($params = array())
-    {
+    public function recovery($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
         /** @var callback $endpointBuilder */
@@ -466,8 +451,7 @@ 
      *
      * @return array
      */
-    public function existsType($params)
-    {
+    public function existsType($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -509,8 +493,7 @@ 
      *
      * @return array
      */
-    public function putAlias($params = array())
-    {
+    public function putAlias($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -544,8 +527,7 @@ 
      *
      * @return array
      */
-    public function getWarmer($params)
-    {
+    public function getWarmer($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -580,8 +562,7 @@ 
      *
      * @return array
      */
-    public function putWarmer($params)
-    {
+    public function putWarmer($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -621,8 +602,7 @@ 
      *
      * @return array
      */
-    public function putTemplate($params)
-    {
+    public function putTemplate($params) {
         $name = $this->extractArgument($params, 'name');
 
 
@@ -656,8 +636,7 @@ 
      *
      * @return array
      */
-    public function validateQuery($params = array())
-    {
+    public function validateQuery($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -692,8 +671,7 @@ 
      *
      * @return array
      */
-    public function getAlias($params)
-    {
+    public function getAlias($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -725,8 +703,7 @@ 
      *
      * @return array
      */
-    public function putMapping($params)
-    {
+    public function putMapping($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -758,8 +735,7 @@ 
      *
      * @return array
      */
-    public function deleteMapping($params)
-    {
+    public function deleteMapping($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -787,8 +763,7 @@ 
      *
      * @return array
      */
-    public function getTemplate($params)
-    {
+    public function getTemplate($params) {
         $name = $this->extractArgument($params, 'name');
 
 
@@ -812,8 +787,7 @@ 
      *
      * @return array
      */
-    public function existsTemplate($params)
-    {
+    public function existsTemplate($params) {
         $name = $this->extractArgument($params, 'name');
 
 
@@ -850,8 +824,7 @@ 
      *
      * @return array
      */
-    public function create($params)
-    {
+    public function create($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -888,8 +861,7 @@ 
      *
      * @return array
      */
-    public function optimize($params = array())
-    {
+    public function optimize($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -915,8 +887,7 @@ 
      *
      * @return array
      */
-    public function deleteAlias($params)
-    {
+    public function deleteAlias($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -945,8 +916,7 @@ 
      *
      * @return array
      */
-    public function open($params)
-    {
+    public function open($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -978,8 +948,7 @@ 
      *
      * @return array
      */
-    public function analyze($params = array())
-    {
+    public function analyze($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1019,8 +988,7 @@ 
      *
      * @return array
      */
-    public function clearCache($params = array())
-    {
+    public function clearCache($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1046,8 +1014,7 @@ 
      *
      * @return array
      */
-    public function updateAliases($params = array())
-    {
+    public function updateAliases($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1076,8 +1043,7 @@ 
      *
      * @return array
      */
-    public function getAliases($params = array())
-    {
+    public function getAliases($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1108,8 +1074,7 @@ 
      *
      * @return array
      */
-    public function existsAlias($params)
-    {
+    public function existsAlias($params) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1152,8 +1117,7 @@ 
      *
      * @return array
      */
-    public function status($params = array())
-    {
+    public function status($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1177,8 +1141,7 @@ 
      *
      * @return array
      */
-    public function getSettings($params = array())
-    {
+    public function getSettings($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1207,8 +1170,7 @@ 
      *
      * @return array
      */
-    public function close($params)
-    {
+    public function close($params) {
         $index = $this->extractArgument($params, 'index');
 
 

Upper-Lower-Casing +12 added lines, -12 removed lines

@@ -44,14 +44,14 @@ 
         try {
             $response = $endpoint->performRequest();
         } catch (Missing404Exception $exception) {
-            return false;
+            return FALSE;
         }
 
 
         if ($response['status'] === 200) {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -487,14 +487,14 @@ 
         try {
             $response = $endpoint->performRequest();
         } catch (Missing404Exception $exception) {
-            return false;
+            return FALSE;
         }
 
 
         if ($response['status'] === 200) {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -829,14 +829,14 @@ 
         try {
             $response = $endpoint->performRequest();
         } catch (Missing404Exception $exception) {
-            return false;
+            return FALSE;
         }
 
 
         if ($response['status'] === 200) {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -1129,14 +1129,14 @@ 
         try {
             $response = $endpoint->performRequest();
         } catch (Missing404Exception $exception) {
-            return false;
+            return FALSE;
         }
 
 
         if ($response['status'] === 200) {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 

Lib/ElasticSearchPhpClient/src/Elasticsearch/Namespaces/NodesNamespace.php

Indentation +3 added lines, -4 removed lines

@@ -54,9 +54,9 @@ 
         /** @var \Elasticsearch\Endpoints\Cluster\Nodes\Stats $endpoint */
         $endpoint = $endpointBuilder('Cluster\Nodes\Stats');
         $endpoint->setNodeID($nodeID)
-                 ->setMetric($metric)
-                 ->setIndexMetric($index_metric)
-                 ->setParams($params);
+                    ->setMetric($metric)
+                    ->setIndexMetric($index_metric)
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -66,7 +66,6 @@ 
      *        ['metric']        = (list) A comma-separated list of metrics you wish returned. Leave empty to return all.
      *        ['flat_settings'] = (boolean) Return settings in flat format (default: false)
      *        ['human']         = (boolean) Whether to return time and byte values in human-readable format.
-
      *
      * @param $params array Associative array of parameters
      *

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
      *
      * @return array
      */
-    public function stats($params = array())
+    public function stats($params = array ())
     {
         $nodeID = $this->extractArgument($params, 'node_id');
 
@@ -72,7 +72,7 @@ 
      *
      * @return array
      */
-    public function info($params = array())
+    public function info($params = array ())
     {
         $nodeID = $this->extractArgument($params, 'node_id');
         $metric = $this->extractArgument($params, 'metric');
@@ -99,7 +99,7 @@ 
      *
      * @return array
      */
-    public function hotThreads($params = array())
+    public function hotThreads($params = array ())
     {
         $nodeID = $this->extractArgument($params, 'node_id');
 
@@ -124,7 +124,7 @@ 
      *
      * @return array
      */
-    public function shutdown($params = array())
+    public function shutdown($params = array ())
     {
         $nodeID = $this->extractArgument($params, 'node_id');
 

Braces +5 added lines, -10 removed lines

@@ -16,8 +16,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-class NodesNamespace extends AbstractNamespace
-{
+class NodesNamespace extends AbstractNamespace {
     /**
      * $params['fields']        = (list) A comma-separated list of fields for `fielddata` metric (supports wildcards)
      *        ['metric_family'] = (enum) Limit the information returned to a certain metric family
@@ -39,8 +38,7 @@ 
      *
      * @return array
      */
-    public function stats($params = array())
-    {
+    public function stats($params = array()) {
         $nodeID = $this->extractArgument($params, 'node_id');
 
         $metric = $this->extractArgument($params, 'metric');
@@ -72,8 +70,7 @@ 
      *
      * @return array
      */
-    public function info($params = array())
-    {
+    public function info($params = array()) {
         $nodeID = $this->extractArgument($params, 'node_id');
         $metric = $this->extractArgument($params, 'metric');
 
@@ -99,8 +96,7 @@ 
      *
      * @return array
      */
-    public function hotThreads($params = array())
-    {
+    public function hotThreads($params = array()) {
         $nodeID = $this->extractArgument($params, 'node_id');
 
 
@@ -124,8 +120,7 @@ 
      *
      * @return array
      */
-    public function shutdown($params = array())
-    {
+    public function shutdown($params = array()) {
         $nodeID = $this->extractArgument($params, 'node_id');
 
 

Lib/ElasticSearchPhpClient/src/Elasticsearch/Namespaces/ClusterNamespace.php

Indentation +3 added lines, -3 removed lines

@@ -104,8 +104,8 @@ 
         /** @var \Elasticsearch\Endpoints\Cluster\State $endpoint */
         $endpoint = $endpointBuilder('Cluster\State');
         $endpoint->setParams($params)
-                 ->setIndex($index)
-                 ->setMetric($metric);
+                    ->setIndex($index)
+                    ->setMetric($metric);
         $response = $endpoint->performRequest();
         return $response['data'];
     }
@@ -128,7 +128,7 @@ 
         /** @var \Elasticsearch\Endpoints\Cluster\Stats $endpoint */
         $endpoint = $endpointBuilder('Cluster\Stats');
         $endpoint->setNodeID($nodeID)
-                 ->setParams($params);
+                    ->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
     }

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      *
      * @return array
      */
-    public function health($params = array())
+    public function health($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -62,7 +62,7 @@ 
      *
      * @return array
      */
-    public function reroute($params = array())
+    public function reroute($params = array ())
     {
         $body = $this->extractArgument($params, 'body');
 
@@ -93,7 +93,7 @@ 
      *
      * @return array
      */
-    public function state($params = array())
+    public function state($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $metric = $this->extractArgument($params, 'metric');
@@ -118,7 +118,7 @@ 
      *
      * @return array
      */
-    public function stats($params = array())
+    public function stats($params = array ())
     {
         $nodeID = $this->extractArgument($params, 'node_id');
 
@@ -141,7 +141,7 @@ 
      *
      * @return array
      */
-    public function putSettings($params = array())
+    public function putSettings($params = array ())
     {
         $body = $this->extractArgument($params, 'body');
 
@@ -164,7 +164,7 @@ 
      *
      * @return array
      */
-    public function getSettings($params = array())
+    public function getSettings($params = array ())
     {
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->dicEndpoints;
@@ -185,7 +185,7 @@ 
      *
      * @return array
      */
-    public function pendingTasks($params = array())
+    public function pendingTasks($params = array ())
     {
 
         /** @var callback $endpointBuilder */

Braces +8 added lines, -16 removed lines

@@ -16,8 +16,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-class ClusterNamespace extends AbstractNamespace
-{
+class ClusterNamespace extends AbstractNamespace {
 
     /**
      * $params['index']                      = (string) Limit the information returned to a specific index
@@ -34,8 +33,7 @@ 
      *
      * @return array
      */
-    public function health($params = array())
-    {
+    public function health($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -62,8 +60,7 @@ 
      *
      * @return array
      */
-    public function reroute($params = array())
-    {
+    public function reroute($params = array()) {
         $body = $this->extractArgument($params, 'body');
 
 
@@ -93,8 +90,7 @@ 
      *
      * @return array
      */
-    public function state($params = array())
-    {
+    public function state($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $metric = $this->extractArgument($params, 'metric');
 
@@ -118,8 +114,7 @@ 
      *
      * @return array
      */
-    public function stats($params = array())
-    {
+    public function stats($params = array()) {
         $nodeID = $this->extractArgument($params, 'node_id');
 
         /** @var callback $endpointBuilder */
@@ -141,8 +136,7 @@ 
      *
      * @return array
      */
-    public function putSettings($params = array())
-    {
+    public function putSettings($params = array()) {
         $body = $this->extractArgument($params, 'body');
 
 
@@ -164,8 +158,7 @@ 
      *
      * @return array
      */
-    public function getSettings($params = array())
-    {
+    public function getSettings($params = array()) {
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->dicEndpoints;
 
@@ -185,8 +178,7 @@ 
      *
      * @return array
      */
-    public function pendingTasks($params = array())
-    {
+    public function pendingTasks($params = array()) {
 
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->dicEndpoints;

Lib/ElasticSearchPhpClient/src/Elasticsearch/Client.php

Indentation +61 added lines, -61 removed lines

@@ -171,8 +171,8 @@ 
         /** @var \Elasticsearch\Endpoints\Get $endpoint */
         $endpoint = $endpointBuilder('Get');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type);
+                    ->setIndex($index)
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -212,9 +212,9 @@ 
         /** @var \Elasticsearch\Endpoints\Get $endpoint */
         $endpoint = $endpointBuilder('Get');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type)
-                 ->returnOnlySource();
+                    ->setIndex($index)
+                    ->setType($type)
+                    ->returnOnlySource();
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -255,8 +255,8 @@ 
         /** @var \Elasticsearch\Endpoints\Delete $endpoint */
         $endpoint = $endpointBuilder('Delete');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type);
+                    ->setIndex($index)
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -334,8 +334,8 @@ 
         /** @var \Elasticsearch\Endpoints\Count $endpoint */
         $endpoint = $endpointBuilder('Count');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -373,9 +373,9 @@ 
         /** @var \Elasticsearch\Endpoints\CountPercolate $endpoint */
         $endpoint = $endpointBuilder('CountPercolate');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setID($id)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setID($id)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -407,9 +407,9 @@ 
         /** @var \Elasticsearch\Endpoints\Percolate $endpoint */
         $endpoint = $endpointBuilder('Percolate');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setID($id)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setID($id)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -440,8 +440,8 @@ 
         /** @var \Elasticsearch\Endpoints\MPercolate $endpoint */
         $endpoint = $endpointBuilder('MPercolate');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -479,9 +479,9 @@ 
         /** @var \Elasticsearch\Endpoints\TermVectors $endpoint */
         $endpoint = $endpointBuilder('TermVectors');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setID($id)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setID($id)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -519,8 +519,8 @@ 
         /** @var \Elasticsearch\Endpoints\MTermVectors $endpoint */
         $endpoint = $endpointBuilder('MTermVectors');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -559,8 +559,8 @@ 
         /** @var \Elasticsearch\Endpoints\Exists $endpoint */
         $endpoint = $endpointBuilder('Exists');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type);
+                    ->setIndex($index)
+                    ->setType($type);
         $endpoint->setParams($params);
 
         try {
@@ -630,9 +630,9 @@ 
         /** @var \Elasticsearch\Endpoints\Mlt $endpoint */
         $endpoint = $endpointBuilder('Mlt');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setIndex($index)
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -675,8 +675,8 @@ 
         /** @var \Elasticsearch\Endpoints\Mget $endpoint */
         $endpoint = $endpointBuilder('Mget');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -711,8 +711,8 @@ 
         /** @var \Elasticsearch\Endpoints\Msearch $endpoint */
         $endpoint = $endpointBuilder('Msearch');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -761,10 +761,10 @@ 
         /** @var \Elasticsearch\Endpoints\Index $endpoint */
         $endpoint = $endpointBuilder('Index');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body)
-                 ->createIfAbsent();
+                    ->setIndex($index)
+                    ->setType($type)
+                    ->setBody($body)
+                    ->createIfAbsent();
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -801,8 +801,8 @@ 
         /** @var \Elasticsearch\Endpoints\Bulk $endpoint */
         $endpoint = $endpointBuilder('Bulk');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -852,9 +852,9 @@ 
         /** @var \Elasticsearch\Endpoints\Index $endpoint */
         $endpoint = $endpointBuilder('Index');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setIndex($index)
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -888,7 +888,7 @@ 
         /** @var \Elasticsearch\Endpoints\Suggest $endpoint */
         $endpoint = $endpointBuilder('Suggest');
         $endpoint->setIndex($index)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -941,9 +941,9 @@ 
         /** @var \Elasticsearch\Endpoints\Explain $endpoint */
         $endpoint = $endpointBuilder('Explain');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setIndex($index)
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1006,8 +1006,8 @@ 
         /** @var \Elasticsearch\Endpoints\Search $endpoint */
         $endpoint = $endpointBuilder('Search');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1039,7 +1039,7 @@ 
         /** @var \Elasticsearch\Endpoints\SearchShards $endpoint */
         $endpoint = $endpointBuilder('SearchShards');
         $endpoint->setIndex($index)
-                 ->setType($type);
+                    ->setType($type);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1066,8 +1066,8 @@ 
         /** @var \Elasticsearch\Endpoints\Search $endpoint */
         $endpoint = $endpointBuilder('SearchTemplate');
         $endpoint->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1095,7 +1095,7 @@ 
         /** @var \Elasticsearch\Endpoints\Scroll $endpoint */
         $endpoint = $endpointBuilder('Scroll');
         $endpoint->setScrollID($scrollID)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1123,8 +1123,8 @@ 
         /** @var \Elasticsearch\Endpoints\Scroll $endpoint */
         $endpoint = $endpointBuilder('Scroll');
         $endpoint->setScrollID($scrollID)
-                 ->setBody($body)
-                 ->setClearScroll(true);
+                    ->setBody($body)
+                    ->setClearScroll(true);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1176,9 +1176,9 @@ 
         /** @var \Elasticsearch\Endpoints\Update $endpoint */
         $endpoint = $endpointBuilder('Update');
         $endpoint->setID($id)
-                 ->setIndex($index)
-                 ->setType($type)
-                 ->setBody($body);
+                    ->setIndex($index)
+                    ->setType($type)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1204,7 +1204,7 @@ 
         /** @var \Elasticsearch\Endpoints\Script\Get $endpoint */
         $endpoint = $endpointBuilder('Script\Get');
         $endpoint->setID($id)
-                 ->setLang($lang);
+                    ->setLang($lang);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1229,7 +1229,7 @@ 
         /** @var \Elasticsearch\Endpoints\Script\Delete $endpoint */
         $endpoint = $endpointBuilder('Script\Delete');
         $endpoint->setID($id)
-                 ->setLang($lang);
+                    ->setLang($lang);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1255,8 +1255,8 @@ 
         /** @var \Elasticsearch\Endpoints\Script\Put $endpoint */
         $endpoint = $endpointBuilder('Script\Put');
         $endpoint->setID($id)
-                 ->setLang($lang)
-                 ->setBody($body);
+                    ->setLang($lang)
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1324,7 +1324,7 @@ 
         /** @var \Elasticsearch\Endpoints\Template\Put $endpoint */
         $endpoint = $endpointBuilder('Template\Put');
         $endpoint->setID($id)
-                 ->setBody($body);
+                    ->setBody($body);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1436,7 +1436,7 @@ 
         }
 
         if ($this->params['logObject'] === null) {
-           $this->setDefaultLogger();
+            $this->setDefaultLogger();
         }
 
         if ($this->params['traceObject'] === null) {

Spacing +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
      *
      * @param array $params Array of injectable parameters
      */
-    public function __construct($params = array())
+    public function __construct($params = array ())
     {
         $this->setParams($params);
         $this->setLogging();
@@ -274,7 +274,7 @@ 
      *
      * @return array
      */
-    public function deleteByQuery($params = array())
+    public function deleteByQuery($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -316,7 +316,7 @@ 
      *
      * @return array
      */
-    public function count($params = array())
+    public function count($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -360,7 +360,7 @@ 
      *
      * @return array
      */
-    public function countPercolate($params = array())
+    public function countPercolate($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
@@ -427,7 +427,7 @@ 
      *
      * @return array
      */
-    public function mpercolate($params = array())
+    public function mpercolate($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $type = $this->extractArgument($params, 'type');
@@ -466,7 +466,7 @@ 
      *
      * @return array
      */
-    public function termvectors($params = array())
+    public function termvectors($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
@@ -507,7 +507,7 @@ 
      *
      * @return array
      */
-    public function mtermvectors($params = array())
+    public function mtermvectors($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
@@ -657,7 +657,7 @@ 
      *
      * @return array
      */
-    public function mget($params = array())
+    public function mget($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -693,7 +693,7 @@ 
      *
      * @return array
      */
-    public function msearch($params = array())
+    public function msearch($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -783,7 +783,7 @@ 
      *
      * @return array
      */
-    public function bulk($params = array())
+    public function bulk($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -873,7 +873,7 @@ 
      *
      * @return array
      */
-    public function suggest($params = array())
+    public function suggest($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -988,7 +988,7 @@ 
      *
      * @return array
      */
-    public function search($params = array())
+    public function search($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
 
@@ -1027,7 +1027,7 @@ 
      *
      * @return array
      */
-    public function searchShards($params = array())
+    public function searchShards($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $type = $this->extractArgument($params, 'type');
@@ -1054,7 +1054,7 @@ 
      *
      * @return array
      */
-    public function searchTemplate($params = array())
+    public function searchTemplate($params = array ())
     {
         $index = $this->extractArgument($params, 'index');
         $type = $this->extractArgument($params, 'type');
@@ -1083,7 +1083,7 @@ 
      *
      * @return array
      */
-    public function scroll($params = array())
+    public function scroll($params = array ())
     {
         $scrollID = $this->extractArgument($params, 'scroll_id');
 
@@ -1111,7 +1111,7 @@ 
      *
      * @return array
      */
-    public function clearScroll($params = array())
+    public function clearScroll($params = array ())
     {
         $scrollID = $this->extractArgument($params, 'scroll_id');
 
@@ -1409,7 +1409,7 @@ 
         }
 
         if (isset($params['dic']) !== true) {
-            $dicBuilder =  new DICBuilder($hosts, $params);
+            $dicBuilder = new DICBuilder($hosts, $params);
         } else {
             $dicBuilder = $params['dic']($hosts, $params);
             unset($params['dic']);
@@ -1489,7 +1489,7 @@ 
      */
     private function getDefaultHost()
     {
-        return array(array('host' => 'localhost', 'port' => 9200));
+        return array (array ('host' => 'localhost', 'port' => 9200));
     }
 
 
@@ -1505,7 +1505,7 @@ 
             throw new Exceptions\InvalidArgumentException('Hosts parameter must be an array of strings');
         }
 
-        $finalHosts = array();
+        $finalHosts = array ();
         foreach ($hosts as $host) {
             $host = $this->prependMissingScheme($host);
             $finalHosts[] = $this->extractURIParts($host);
@@ -1559,7 +1559,7 @@ 
     public function extractArgument(&$params, $arg)
     {
         if (is_object($params) === true) {
-            $params = (array)$params;
+            $params = (array) $params;
         }
 
         if (isset($params[$arg]) === true) {

Braces +49 added lines, -98 removed lines

@@ -32,8 +32,7 @@ 
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link     http://elasticsearch.org
  */
-class Client
-{
+class Client {
 
     /**
      * @var Transport
@@ -79,8 +78,7 @@ 
      *
      * @param array $params Array of injectable parameters
      */
-    public function __construct($params = array())
-    {
+    public function __construct($params = array()) {
         $this->setParams($params);
         $this->setLogging();
         $this->transport    = $this->params['transport'];
@@ -98,8 +96,7 @@ 
      *
      * @return array
      */
-    public function info()
-    {
+    public function info() {
 
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->dicEndpoints;
@@ -111,8 +108,7 @@ 
     }
 
 
-    public function ping()
-    {
+    public function ping() {
 
         /** @var callback $endpointBuilder */
         $endpointBuilder = $this->dicEndpoints;
@@ -153,8 +149,7 @@ 
      *
      * @return array
      */
-    public function get($params)
-    {
+    public function get($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -194,8 +189,7 @@ 
      *
      * @return array
      */
-    public function getSource($params)
-    {
+    public function getSource($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -237,8 +231,7 @@ 
      *
      * @return array
      */
-    public function delete($params)
-    {
+    public function delete($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -274,8 +267,7 @@ 
      *
      * @return array
      */
-    public function deleteByQuery($params = array())
-    {
+    public function deleteByQuery($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -316,8 +308,7 @@ 
      *
      * @return array
      */
-    public function count($params = array())
-    {
+    public function count($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -360,8 +351,7 @@ 
      *
      * @return array
      */
-    public function countPercolate($params = array())
-    {
+    public function countPercolate($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
         $id    = $this->extractArgument($params, 'id');
@@ -392,8 +382,7 @@ 
      *
      * @return array
      */
-    public function percolate($params)
-    {
+    public function percolate($params) {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
         $id    = $this->extractArgument($params, 'id');
@@ -427,8 +416,7 @@ 
      *
      * @return array
      */
-    public function mpercolate($params = array())
-    {
+    public function mpercolate($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $type = $this->extractArgument($params, 'type');
         $body = $this->extractArgument($params, 'body');
@@ -466,8 +454,7 @@ 
      *
      * @return array
      */
-    public function termvectors($params = array())
-    {
+    public function termvectors($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
         $id    = $this->extractArgument($params, 'id');
@@ -507,8 +494,7 @@ 
      *
      * @return array
      */
-    public function mtermvectors($params = array())
-    {
+    public function mtermvectors($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $type  = $this->extractArgument($params, 'type');
         $body  = $this->extractArgument($params, 'body');
@@ -541,8 +527,7 @@ 
      *
      * @return array
      */
-    public function exists($params)
-    {
+    public function exists($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -609,8 +594,7 @@ 
      *
      * @return array
      */
-    public function mlt($params)
-    {
+    public function mlt($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -657,8 +641,7 @@ 
      *
      * @return array
      */
-    public function mget($params = array())
-    {
+    public function mget($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -693,8 +676,7 @@ 
      *
      * @return array
      */
-    public function msearch($params = array())
-    {
+    public function msearch($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -740,8 +722,7 @@ 
      *
      * @return array
      */
-    public function create($params)
-    {
+    public function create($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -783,8 +764,7 @@ 
      *
      * @return array
      */
-    public function bulk($params = array())
-    {
+    public function bulk($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -831,8 +811,7 @@ 
      *
      * @return array
      */
-    public function index($params)
-    {
+    public function index($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -873,8 +852,7 @@ 
      *
      * @return array
      */
-    public function suggest($params = array())
-    {
+    public function suggest($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -920,8 +898,7 @@ 
      *
      * @return array
      */
-    public function explain($params)
-    {
+    public function explain($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -988,8 +965,7 @@ 
      *
      * @return array
      */
-    public function search($params = array())
-    {
+    public function search($params = array()) {
         $index = $this->extractArgument($params, 'index');
 
 
@@ -1027,8 +1003,7 @@ 
      *
      * @return array
      */
-    public function searchShards($params = array())
-    {
+    public function searchShards($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $type = $this->extractArgument($params, 'type');
 
@@ -1054,8 +1029,7 @@ 
      *
      * @return array
      */
-    public function searchTemplate($params = array())
-    {
+    public function searchTemplate($params = array()) {
         $index = $this->extractArgument($params, 'index');
         $type = $this->extractArgument($params, 'type');
         $body = $this->extractArgument($params, 'body');
@@ -1083,8 +1057,7 @@ 
      *
      * @return array
      */
-    public function scroll($params = array())
-    {
+    public function scroll($params = array()) {
         $scrollID = $this->extractArgument($params, 'scroll_id');
 
         $body = $this->extractArgument($params, 'body');
@@ -1111,8 +1084,7 @@ 
      *
      * @return array
      */
-    public function clearScroll($params = array())
-    {
+    public function clearScroll($params = array()) {
         $scrollID = $this->extractArgument($params, 'scroll_id');
 
         $body = $this->extractArgument($params, 'body');
@@ -1155,8 +1127,7 @@ 
      *
      * @return array
      */
-    public function update($params)
-    {
+    public function update($params) {
         $id = $this->extractArgument($params, 'id');
 
 
@@ -1193,8 +1164,7 @@ 
      *
      * @return array
      */
-    public function getScript($params)
-    {
+    public function getScript($params) {
         $id = $this->extractArgument($params, 'id');
         $lang = $this->extractArgument($params, 'lang');
 
@@ -1218,8 +1188,7 @@ 
      *
      * @return array
      */
-    public function deleteScript($params)
-    {
+    public function deleteScript($params) {
         $id = $this->extractArgument($params, 'id');
         $lang = $this->extractArgument($params, 'lang');
 
@@ -1243,8 +1212,7 @@ 
      *
      * @return array
      */
-    public function putScript($params)
-    {
+    public function putScript($params) {
         $id   = $this->extractArgument($params, 'id');
         $lang = $this->extractArgument($params, 'lang');
         $body = $this->extractArgument($params, 'body');
@@ -1269,8 +1237,7 @@ 
      *
      * @return array
      */
-    public function getTemplate($params)
-    {
+    public function getTemplate($params) {
         $id = $this->extractArgument($params, 'id');
 
         /** @var callback $endpointBuilder */
@@ -1291,8 +1258,7 @@ 
      *
      * @return array
      */
-    public function deleteTemplate($params)
-    {
+    public function deleteTemplate($params) {
         $id = $this->extractArgument($params, 'id');
 
         /** @var callback $endpointBuilder */
@@ -1313,8 +1279,7 @@ 
      *
      * @return array
      */
-    public function putTemplate($params)
-    {
+    public function putTemplate($params) {
         $id   = $this->extractArgument($params, 'id');
         $body = $this->extractArgument($params, 'body');
 
@@ -1337,8 +1302,7 @@ 
      *
      * @return IndicesNamespace
      */
-    public function indices()
-    {
+    public function indices() {
         return $this->indices;
     }
 
@@ -1348,8 +1312,7 @@ 
      *
      * @return ClusterNamespace
      */
-    public function cluster()
-    {
+    public function cluster() {
         return $this->cluster;
     }
 
@@ -1359,8 +1322,7 @@ 
      *
      * @return NodesNamespace
      */
-    public function nodes()
-    {
+    public function nodes() {
         return $this->nodes;
     }
 
@@ -1370,8 +1332,7 @@ 
      *
      * @return SnapshotNamespace
      */
-    public function snapshot()
-    {
+    public function snapshot() {
         return $this->snapshot;
     }
 
@@ -1381,8 +1342,7 @@ 
      *
      * @return CatNamespace
      */
-    public function cat()
-    {
+    public function cat() {
         return $this->cat;
     }
 
@@ -1398,8 +1358,7 @@ 
      * @internal param array $hosts Array of hosts
      * @return void
      */
-    private function setParams($params)
-    {
+    private function setParams($params) {
 
         if (isset($params['hosts']) === true) {
             $hosts = $this->buildHostsFromSeed($params['hosts']);
@@ -1428,8 +1387,7 @@ 
      *
      * @return void
      */
-    private function setLogging()
-    {
+    private function setLogging() {
         if ($this->params['logging'] !== true) {
             $this->setEmptyLogger();
             return;
@@ -1445,14 +1403,12 @@ 
 
     }
 
-    private function setEmptyLogger()
-    {
+    private function setEmptyLogger() {
         $this->params['logObject'] = new EmptyLogger();
         $this->params['traceObject'] = new EmptyLogger();
     }
 
-    private function setDefaultLogger()
-    {
+    private function setDefaultLogger() {
         $log       = new Logger('log');
         $handler   = new StreamHandler(
             $this->params['logPath'],
@@ -1468,8 +1424,7 @@ 
         $this->params['logObject'] = $log;
     }
 
-    private function setDefaultTracer()
-    {
+    private function setDefaultTracer() {
         $trace        = new Logger('trace');
         $traceHandler = new StreamHandler(
             $this->params['tracePath'],
@@ -1487,8 +1442,7 @@ 
     /**
      * @return array
      */
-    private function getDefaultHost()
-    {
+    private function getDefaultHost() {
         return array(array('host' => 'localhost', 'port' => 9200));
     }
 
@@ -1499,8 +1453,7 @@ 
      * @return array
      * @throws Common\Exceptions\InvalidArgumentException
      */
-    private function buildHostsFromSeed($hosts)
-    {
+    private function buildHostsFromSeed($hosts) {
         if (is_array($hosts) === false) {
             throw new Exceptions\InvalidArgumentException('Hosts parameter must be an array of strings');
         }
@@ -1521,8 +1474,7 @@ 
      * @return array
      * @throws Common\Exceptions\InvalidArgumentException
      */
-    private function extractURIParts($host)
-    {
+    private function extractURIParts($host) {
 
         $parts = parse_url($host);
 
@@ -1556,8 +1508,7 @@ 
      *
      * @return null|mixed
      */
-    public function extractArgument(&$params, $arg)
-    {
+    public function extractArgument(&$params, $arg) {
         if (is_object($params) === true) {
             $params = (array)$params;
         }

Upper-Lower-Casing +20 added lines, -20 removed lines

@@ -123,13 +123,13 @@ 
         try {
             $response = $endpoint->performRequest();
         } catch (Missing404Exception $exception) {
-            return false;
+            return FALSE;
         }
 
-        if (isset($response['status']) === true && $response['status'] === 200) {
-            return true;
+        if (isset($response['status']) === TRUE && $response['status'] === 200) {
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -566,16 +566,16 @@ 
         try {
             $response = $endpoint->performRequest();
         } catch (Missing404Exception $exception) {
-            return false;
+            return FALSE;
         } catch (RoutingMissingException $exception) {
-            return false;
+            return FALSE;
         }
 
 
         if ($response['status'] === 200) {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -1124,7 +1124,7 @@ 
         $endpoint = $endpointBuilder('Scroll');
         $endpoint->setScrollID($scrollID)
                  ->setBody($body)
-                 ->setClearScroll(true);
+                 ->setClearScroll(TRUE);
         $endpoint->setParams($params);
         $response = $endpoint->performRequest();
         return $response['data'];
@@ -1401,14 +1401,14 @@ 
     private function setParams($params)
     {
 
-        if (isset($params['hosts']) === true) {
+        if (isset($params['hosts']) === TRUE) {
             $hosts = $this->buildHostsFromSeed($params['hosts']);
             unset($params['hosts']);
         } else {
             $hosts = $this->getDefaultHost();
         }
 
-        if (isset($params['dic']) !== true) {
+        if (isset($params['dic']) !== TRUE) {
             $dicBuilder =  new DICBuilder($hosts, $params);
         } else {
             $dicBuilder = $params['dic']($hosts, $params);
@@ -1430,16 +1430,16 @@ 
      */
     private function setLogging()
     {
-        if ($this->params['logging'] !== true) {
+        if ($this->params['logging'] !== TRUE) {
             $this->setEmptyLogger();
             return;
         }
 
-        if ($this->params['logObject'] === null) {
+        if ($this->params['logObject'] === NULL) {
            $this->setDefaultLogger();
         }
 
-        if ($this->params['traceObject'] === null) {
+        if ($this->params['traceObject'] === NULL) {
             $this->setDefaultTracer();
         }
 
@@ -1501,7 +1501,7 @@ 
      */
     private function buildHostsFromSeed($hosts)
     {
-        if (is_array($hosts) === false) {
+        if (is_array($hosts) === FALSE) {
             throw new Exceptions\InvalidArgumentException('Hosts parameter must be an array of strings');
         }
 
@@ -1526,11 +1526,11 @@ 
 
         $parts = parse_url($host);
 
-        if ($parts === false) {
+        if ($parts === FALSE) {
             throw new Exceptions\InvalidArgumentException("Could not parse URI");
         }
 
-        if (isset($parts['port']) !== true) {
+        if (isset($parts['port']) !== TRUE) {
             $parts['port'] = 9200;
         }
 
@@ -1558,16 +1558,16 @@ 
      */
     public function extractArgument(&$params, $arg)
     {
-        if (is_object($params) === true) {
+        if (is_object($params) === TRUE) {
             $params = (array)$params;
         }
 
-        if (isset($params[$arg]) === true) {
+        if (isset($params[$arg]) === TRUE) {
             $val = $params[$arg];
             unset($params[$arg]);
             return $val;
         } else {
-            return null;
+            return NULL;
         }
     }
 

Lib/ElasticSearchPhpClient/src/Elasticsearch/Endpoints/AbstractEndpoint.php

Indentation +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
         $uri[] = $endpoint;
         $uri =  array_filter($uri);
 
-       return '/' . implode('/', $uri);
+        return '/' . implode('/', $uri);
     }
 
 

Spacing +11 added lines, -11 removed lines

@@ -18,7 +18,7 @@ 
 abstract class AbstractEndpoint
 {
     /** @var array  */
-    protected $params = array();
+    protected $params = array ();
 
     /** @var  string */
     protected $index = null;
@@ -75,10 +75,10 @@ 
      */
     public function performRequest()
     {
-        $result = array();
+        $result = array ();
 
         try {
-            $result =  $this->transport->performRequest(
+            $result = $this->transport->performRequest(
                 $this->getMethod(),
                 $this->getURI(),
                 $this->params,
@@ -92,7 +92,7 @@ 
                 throw $exception;
             } else {
                 //TODO return null or dedicated object here instead?
-                return array('data' => $exception->getMessage());
+                return array ('data' => $exception->getMessage());
             }
         }
 
@@ -109,7 +109,7 @@ 
     public function setParams($params)
     {
         if (is_object($params) === true) {
-            $params = (array)$params;
+            $params = (array) $params;
         }
 
         $this->checkUserParams($params);
@@ -194,11 +194,11 @@ 
      */
     protected function getOptionalURI($endpoint)
     {
-        $uri = array();
+        $uri = array ();
         $uri[] = $this->getOptionalIndex();
         $uri[] = $this->getOptionalType();
         $uri[] = $endpoint;
-        $uri =  array_filter($uri);
+        $uri = array_filter($uri);
 
        return '/' . implode('/', $uri);
     }
@@ -209,7 +209,7 @@ 
      */
     private function getOptionalIndex()
     {
-        if (isset($this->index) === true){
+        if (isset($this->index) === true) {
             return $this->index;
         } else {
             return '_all';
@@ -222,7 +222,7 @@ 
      */
     private function getOptionalType()
     {
-        if (isset($this->type) === true){
+        if (isset($this->type) === true) {
             return $this->type;
         } else {
             return '';
@@ -259,7 +259,7 @@ 
             return; //no params, just return.
         }
 
-        $whitelist = array_merge($this->getParamWhitelist(), array('ignore', 'custom', 'curlOpts'));
+        $whitelist = array_merge($this->getParamWhitelist(), array ('ignore', 'custom', 'curlOpts'));
 
         foreach ($params as $key => $value) {
             if (array_search($key, $whitelist) === false) {
@@ -298,7 +298,7 @@ 
     {
         foreach ($params as &$param) {
             if (is_array($param) === true) {
-                if ($this->isNestedArray($param) !== true){
+                if ($this->isNestedArray($param) !== true) {
                     $param = implode(",", $param);
                 }
 

Braces +19 added lines, -35 removed lines

@@ -15,8 +15,7 @@ 
  * Class AbstractEndpoint
  * @package Elasticsearch\Endpoints
  */
-abstract class AbstractEndpoint
-{
+abstract class AbstractEndpoint {
     /** @var array  */
     protected $params = array();
 
@@ -62,8 +61,7 @@ 
     /**
      * @param Transport $transport
      */
-    public function __construct($transport)
-    {
+    public function __construct($transport) {
         $this->transport = $transport;
     }
 
@@ -73,8 +71,7 @@ 
      * @throws \Exception
      * @return array
      */
-    public function performRequest()
-    {
+    public function performRequest() {
         $result = array();
 
         try {
@@ -106,8 +103,7 @@ 
      * @param string[] $params Array of parameters
      * @return $this
      */
-    public function setParams($params)
-    {
+    public function setParams($params) {
         if (is_object($params) === true) {
             $params = (array)$params;
         }
@@ -125,8 +121,7 @@ 
      *
      * @return $this
      */
-    public function setIndex($index)
-    {
+    public function setIndex($index) {
         if ($index === null) {
             return $this;
         }
@@ -146,8 +141,7 @@ 
      *
      * @return $this
      */
-    public function setType($type)
-    {
+    public function setType($type) {
         if ($type === null) {
             return $this;
         }
@@ -167,8 +161,7 @@ 
      *
      * @return $this
      */
-    public function setID($docID)
-    {
+    public function setID($docID) {
         if ($docID === null) {
             return $this;
         }
@@ -181,8 +174,7 @@ 
     /**
      * @return array
      */
-    protected function getBody()
-    {
+    protected function getBody() {
         return $this->body;
     }
 
@@ -192,8 +184,7 @@ 
      *
      * @return string
      */
-    protected function getOptionalURI($endpoint)
-    {
+    protected function getOptionalURI($endpoint) {
         $uri = array();
         $uri[] = $this->getOptionalIndex();
         $uri[] = $this->getOptionalType();
@@ -207,9 +198,8 @@ 
     /**
      * @return string
      */
-    private function getOptionalIndex()
-    {
-        if (isset($this->index) === true){
+    private function getOptionalIndex() {
+        if (isset($this->index) === true) {
             return $this->index;
         } else {
             return '_all';
@@ -220,9 +210,8 @@ 
     /**
      * @return string
      */
-    private function getOptionalType()
-    {
-        if (isset($this->type) === true){
+    private function getOptionalType() {
+        if (isset($this->type) === true) {
             return $this->type;
         } else {
             return '';
@@ -236,8 +225,7 @@ 
      *
      * @throws \Elasticsearch\Common\Exceptions\UnexpectedValueException
      */
-    private function checkUserParams($params)
-    {
+    private function checkUserParams($params) {
         try {
             $this->ifParamsInvalidThrowException($params);
         } catch (UnexpectedValueException $exception) {
@@ -253,8 +241,7 @@ 
      * @throws \Elasticsearch\Common\Exceptions\UnexpectedValueException
      *
      */
-    private function ifParamsInvalidThrowException($params)
-    {
+    private function ifParamsInvalidThrowException($params) {
         if (isset($params) !== true) {
             return; //no params, just return.
         }
@@ -274,16 +261,14 @@ 
     }
 
 
-    private function extractIgnore()
-    {
+    private function extractIgnore() {
         if (isset($this->params['ignore']) === true) {
             $this->ignore = explode(",", $this->params['ignore']);
             unset($this->params['ignore']);
         }
     }
 
-    private function convertCustom($params)
-    {
+    private function convertCustom($params) {
         if (isset($params['custom']) === true) {
             foreach ($params['custom'] as $k => $v) {
                 $params[$k] = $v;
@@ -294,11 +279,10 @@ 
     }
 
 
-    private function convertArraysToStrings($params)
-    {
+    private function convertArraysToStrings($params) {
         foreach ($params as &$param) {
             if (is_array($param) === true) {
-                if ($this->isNestedArray($param) !== true){
+                if ($this->isNestedArray($param) !== true) {
                     $param = implode(",", $param);
                 }
 

Upper-Lower-Casing +25 added lines, -25 removed lines

@@ -21,25 +21,25 @@ 
     protected $params = array();
 
     /** @var  string */
-    protected $index = null;
+    protected $index = NULL;
 
     /** @var  string */
-    protected $type = null;
+    protected $type = NULL;
 
     /** @var  string|int */
-    protected $id = null;
+    protected $id = NULL;
 
     /** @var  string */
-    protected $method = null;
+    protected $method = NULL;
 
     /** @var  array */
-    protected $body = null;
+    protected $body = NULL;
 
     /** @var \Elasticsearch\Transport  */
-    private $transport = null;
+    private $transport = NULL;
 
     /** @var array  */
-    private $ignore = null;
+    private $ignore = NULL;
 
 
     /**
@@ -86,9 +86,9 @@ 
             );
         } catch (\Exception $exception) {
             $code = $exception->getCode();
-            if ($this->ignore === null) {
+            if ($this->ignore === NULL) {
                 throw $exception;
-            } else if (array_search($code, $this->ignore) === false) {
+            } else if (array_search($code, $this->ignore) === FALSE) {
                 throw $exception;
             } else {
                 //TODO return null or dedicated object here instead?
@@ -108,7 +108,7 @@ 
      */
     public function setParams($params)
     {
-        if (is_object($params) === true) {
+        if (is_object($params) === TRUE) {
             $params = (array)$params;
         }
 
@@ -127,11 +127,11 @@ 
      */
     public function setIndex($index)
     {
-        if ($index === null) {
+        if ($index === NULL) {
             return $this;
         }
 
-        if (is_array($index) === true) {
+        if (is_array($index) === TRUE) {
             $index = array_map('trim', $index);
             $index = implode(",", $index);
         }
@@ -148,11 +148,11 @@ 
      */
     public function setType($type)
     {
-        if ($type === null) {
+        if ($type === NULL) {
             return $this;
         }
 
-        if (is_array($type) === true) {
+        if (is_array($type) === TRUE) {
             $type = array_map('trim', $type);
             $type = implode(",", $type);
         }
@@ -169,7 +169,7 @@ 
      */
     public function setID($docID)
     {
-        if ($docID === null) {
+        if ($docID === NULL) {
             return $this;
         }
 
@@ -209,7 +209,7 @@ 
      */
     private function getOptionalIndex()
     {
-        if (isset($this->index) === true){
+        if (isset($this->index) === TRUE){
             return $this->index;
         } else {
             return '_all';
@@ -222,7 +222,7 @@ 
      */
     private function getOptionalType()
     {
-        if (isset($this->type) === true){
+        if (isset($this->type) === TRUE){
             return $this->type;
         } else {
             return '';
@@ -255,14 +255,14 @@ 
      */
     private function ifParamsInvalidThrowException($params)
     {
-        if (isset($params) !== true) {
+        if (isset($params) !== TRUE) {
             return; //no params, just return.
         }
 
         $whitelist = array_merge($this->getParamWhitelist(), array('ignore', 'custom', 'curlOpts'));
 
         foreach ($params as $key => $value) {
-            if (array_search($key, $whitelist) === false) {
+            if (array_search($key, $whitelist) === FALSE) {
                 throw new UnexpectedValueException(sprintf(
                     '"%s" is not a valid parameter. Allowed parameters are: "%s"',
                     $key,
@@ -276,7 +276,7 @@ 
 
     private function extractIgnore()
     {
-        if (isset($this->params['ignore']) === true) {
+        if (isset($this->params['ignore']) === TRUE) {
             $this->ignore = explode(",", $this->params['ignore']);
             unset($this->params['ignore']);
         }
@@ -284,7 +284,7 @@ 
 
     private function convertCustom($params)
     {
-        if (isset($params['custom']) === true) {
+        if (isset($params['custom']) === TRUE) {
             foreach ($params['custom'] as $k => $v) {
                 $params[$k] = $v;
             }
@@ -297,8 +297,8 @@ 
     private function convertArraysToStrings($params)
     {
         foreach ($params as &$param) {
-            if (is_array($param) === true) {
-                if ($this->isNestedArray($param) !== true){
+            if (is_array($param) === TRUE) {
+                if ($this->isNestedArray($param) !== TRUE){
                     $param = implode(",", $param);
                 }
 
@@ -311,10 +311,10 @@ 
     private function isNestedArray($a) {
         foreach ($a as $v) {
             if (is_array($v)) {
-                return true;
+                return TRUE;
             }
         }
-        return false;
+        return FALSE;
     }
 
 }
\ No newline at end of file