kitodo / kitodo-publication

Lib/ElasticSearchPhpClient/src/Elasticsearch/ConnectionPool/StaticConnectionPool.php

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             /** @var AbstractConnection $connection */
             $connection = $this->selector->select($this->connections);
             if ($connection->isAlive() === true) {
-               return $connection;
+                return $connection;
             }
 
             if ($this->readyToRevive($connection) === true) {

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      */
     public function nextConnection($force = false)
     {
-        $skipped = array();
+        $skipped = array ();
 
         $total = count($this->connections);
         while ($total--) {

Braces +5 added lines, -10 removed lines

@@ -13,13 +13,11 @@ 
 use Elasticsearch\Connections\AbstractConnection;
 use Elasticsearch\Connections\ConnectionFactory;
 
-class StaticConnectionPool extends AbstractConnectionPool
-{
+class StaticConnectionPool extends AbstractConnectionPool {
     private $pingTimeout    = 60;
     private $maxPingTimeout = 3600;
 
-    public function __construct($connections, SelectorInterface $selector, ConnectionFactory $factory, $connectionPoolParams)
-    {
+    public function __construct($connections, SelectorInterface $selector, ConnectionFactory $factory, $connectionPoolParams) {
         parent::__construct($connections, $selector, $factory, $connectionPoolParams);
         $this->scheduleCheck();
     }
@@ -31,8 +29,7 @@ 
      * @return AbstractConnection
      * @throws \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
-    public function nextConnection($force = false)
-    {
+    public function nextConnection($force = false) {
         $skipped = array();
 
         $total = count($this->connections);
@@ -62,8 +59,7 @@ 
         throw new NoNodesAvailableException("No alive nodes found in your cluster");
     }
 
-    public function scheduleCheck()
-    {
+    public function scheduleCheck() {
         foreach ($this->connections as $connection) {
             $connection->markDead();
         }
@@ -74,8 +70,7 @@ 
      *
      * @return bool
      */
-    private function readyToRevive(AbstractConnection $connection)
-    {
+    private function readyToRevive(AbstractConnection $connection) {
         $timeout = min(
             $this->pingTimeout * pow(2, $connection->getPingFailures()),
             $this->maxPingTimeout

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

@@ -31,7 +31,7 @@ 
      * @return AbstractConnection
      * @throws \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
-    public function nextConnection($force = false)
+    public function nextConnection($force = FALSE)
     {
         $skipped = array();
 
@@ -39,12 +39,12 @@ 
         while ($total--) {
             /** @var AbstractConnection $connection */
             $connection = $this->selector->select($this->connections);
-            if ($connection->isAlive() === true) {
+            if ($connection->isAlive() === TRUE) {
                return $connection;
             }
 
-            if ($this->readyToRevive($connection) === true) {
-                if ($connection->ping() === true) {
+            if ($this->readyToRevive($connection) === TRUE) {
+                if ($connection->ping() === TRUE) {
                     return $connection;
                 }
             } else {
@@ -54,7 +54,7 @@ 
 
         // All "alive" nodes failed, force pings on "dead" nodes
         foreach ($skipped as $connection) {
-            if ($connection->ping() === true) {
+            if ($connection->ping() === TRUE) {
                 return $connection;
             }
         }
@@ -82,9 +82,9 @@ 
         );
 
         if ($connection->getLastPing() + $timeout < time()) {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 }
\ No newline at end of file

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Connections/AbstractConnectionTest.php

Indentation +9 added lines, -9 removed lines

@@ -47,9 +47,9 @@ 
         $return = array('status' => 200);
 
         $stub->expects($this->once())
-             ->method('performRequest')
-             ->with('HEAD', '', null, null, $options)
-             ->will($this->returnValue($return));
+                ->method('performRequest')
+                ->with('HEAD', '', null, null, $options)
+                ->will($this->returnValue($return));
 
         /** @var AbstractConnection $stub */
         $ret = $stub->ping();
@@ -75,9 +75,9 @@ 
         $return = array('status' => 400);
 
         $stub->expects($this->once())
-             ->method('performRequest')
-             ->with('HEAD', '', null, null, $options)
-             ->will($this->returnValue($return));
+                ->method('performRequest')
+                ->with('HEAD', '', null, null, $options)
+                ->will($this->returnValue($return));
 
         /** @var AbstractConnection $stub */
         $ret = $stub->ping();
@@ -103,9 +103,9 @@ 
         $return = array('status' => 400);
 
         $stub->expects($this->once())
-             ->method('performRequest')
-             ->with('HEAD', '', null, null, $options)
-             ->will($this->throwException(new Elasticsearch\Common\Exceptions\Curl\OperationTimeoutException()));
+                ->method('performRequest')
+                ->with('HEAD', '', null, null, $options)
+                ->will($this->throwException(new Elasticsearch\Common\Exceptions\Curl\OperationTimeoutException()));
 
         /** @var AbstractConnection $stub */
         $ret = $stub->ping();

Spacing +18 added lines, -18 removed lines

@@ -35,16 +35,16 @@ 
 
         $stub = $this->getMockForAbstractClass(
             'Elasticsearch\Connections\AbstractConnection',
-            array(
-                array('host' => 'localhost', 'port' => 9200),
-                array(),
+            array (
+                array ('host' => 'localhost', 'port' => 9200),
+                array (),
                 $logger,
                 $logger
             )
         );
 
-        $options = array('timeout' => 1);
-        $return = array('status' => 200);
+        $options = array ('timeout' => 1);
+        $return = array ('status' => 200);
 
         $stub->expects($this->once())
              ->method('performRequest')
@@ -63,16 +63,16 @@ 
 
         $stub = $this->getMockForAbstractClass(
             'Elasticsearch\Connections\AbstractConnection',
-            array(
-                array('host' => 'localhost', 'port' => 9200),
-                array(),
+            array (
+                array ('host' => 'localhost', 'port' => 9200),
+                array (),
                 $logger,
                 $logger
             )
         );
 
-        $options = array('timeout' => 1);
-        $return = array('status' => 400);
+        $options = array ('timeout' => 1);
+        $return = array ('status' => 400);
 
         $stub->expects($this->once())
              ->method('performRequest')
@@ -91,16 +91,16 @@ 
         $logger = new Elasticsearch\Common\EmptyLogger();
         $stub = $this->getMockForAbstractClass(
             'Elasticsearch\Connections\AbstractConnection',
-            array(
-                array('host' => 'localhost', 'port' => 9200),
-                array(),
+            array (
+                array ('host' => 'localhost', 'port' => 9200),
+                array (),
                 $logger,
                 $logger
             )
         );
 
-        $options = array('timeout' => 1);
-        $return = array('status' => 400);
+        $options = array ('timeout' => 1);
+        $return = array ('status' => 400);
 
         $stub->expects($this->once())
              ->method('performRequest')
@@ -119,9 +119,9 @@ 
 
         $stub = $this->getMockForAbstractClass(
             'Elasticsearch\Connections\AbstractConnection',
-            array(
-                array('host' => 'localhost', 'port' => 9200, 'path' => '/prefix'),
-                array(),
+            array (
+                array ('host' => 'localhost', 'port' => 9200, 'path' => '/prefix'),
+                array (),
                 $logger,
                 $logger
             )

Braces +6 added lines, -12 removed lines

@@ -22,15 +22,12 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class AbstractConnectionTest extends \PHPUnit_Framework_TestCase
-{
-    public function tearDown()
-    {
+class AbstractConnectionTest extends \PHPUnit_Framework_TestCase {
+    public function tearDown() {
         m::close();
     }
 
-    public function testPing()
-    {
+    public function testPing() {
         $logger = new Elasticsearch\Common\EmptyLogger();
 
         $stub = $this->getMockForAbstractClass(
@@ -57,8 +54,7 @@ 
         $this->assertTrue($ret);
     }
 
-    public function testPingBadCode()
-    {
+    public function testPingBadCode() {
         $logger = new Elasticsearch\Common\EmptyLogger();
 
         $stub = $this->getMockForAbstractClass(
@@ -86,8 +82,7 @@ 
     }
 
 
-    public function testPingTimeout()
-    {
+    public function testPingTimeout() {
         $logger = new Elasticsearch\Common\EmptyLogger();
         $stub = $this->getMockForAbstractClass(
             'Elasticsearch\Connections\AbstractConnection',
@@ -113,8 +108,7 @@ 
         $this->assertFalse($ret);
     }
 
-    public function testURLPrefix()
-    {
+    public function testURLPrefix() {
         $logger = new Elasticsearch\Common\EmptyLogger();
 
         $stub = $this->getMockForAbstractClass(

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

@@ -48,7 +48,7 @@ 
 
         $stub->expects($this->once())
              ->method('performRequest')
-             ->with('HEAD', '', null, null, $options)
+             ->with('HEAD', '', NULL, NULL, $options)
              ->will($this->returnValue($return));
 
         /** @var AbstractConnection $stub */
@@ -76,7 +76,7 @@ 
 
         $stub->expects($this->once())
              ->method('performRequest')
-             ->with('HEAD', '', null, null, $options)
+             ->with('HEAD', '', NULL, NULL, $options)
              ->will($this->returnValue($return));
 
         /** @var AbstractConnection $stub */
@@ -104,7 +104,7 @@ 
 
         $stub->expects($this->once())
              ->method('performRequest')
-             ->with('HEAD', '', null, null, $options)
+             ->with('HEAD', '', NULL, NULL, $options)
              ->will($this->throwException(new Elasticsearch\Common\Exceptions\Curl\OperationTimeoutException()));
 
         /** @var AbstractConnection $stub */

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Connections/ConnectionFactoryTest.php

Indentation +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@
 
         // Eww...
         $mockPimple = m::mock('\Pimple\Container')
-                      ->shouldReceive('offsetGet')->with('connection')->andReturn($mockFunction)->getMock()
-                      ->shouldReceive('offsetGet')->with('connectionParamsShared')->andReturn(array())->getMock()
-                      ->shouldReceive('offsetGet')->with('logObject')->andReturn(array())->getMock()
-                      ->shouldReceive('offsetGet')->with('traceObject')->andReturn(array())->getMock();
+                        ->shouldReceive('offsetGet')->with('connection')->andReturn($mockFunction)->getMock()
+                        ->shouldReceive('offsetGet')->with('connectionParamsShared')->andReturn(array())->getMock()
+                        ->shouldReceive('offsetGet')->with('logObject')->andReturn(array())->getMock()
+                        ->shouldReceive('offsetGet')->with('traceObject')->andReturn(array())->getMock();
 
         $hostDetails = array(
             'host' => 'localhost',

Spacing +4 added lines, -4 removed lines

@@ -31,11 +31,11 @@
         // Eww...
         $mockPimple = m::mock('\Pimple\Container')
                       ->shouldReceive('offsetGet')->with('connection')->andReturn($mockFunction)->getMock()
-                      ->shouldReceive('offsetGet')->with('connectionParamsShared')->andReturn(array())->getMock()
-                      ->shouldReceive('offsetGet')->with('logObject')->andReturn(array())->getMock()
-                      ->shouldReceive('offsetGet')->with('traceObject')->andReturn(array())->getMock();
+                      ->shouldReceive('offsetGet')->with('connectionParamsShared')->andReturn(array ())->getMock()
+                      ->shouldReceive('offsetGet')->with('logObject')->andReturn(array ())->getMock()
+                      ->shouldReceive('offsetGet')->with('traceObject')->andReturn(array ())->getMock();
 
-        $hostDetails = array(
+        $hostDetails = array (
             'host' => 'localhost',
             'port' => 9200
         );

Braces +2 added lines, -4 removed lines

@@ -15,14 +15,12 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class ConnectionFactoryTest extends \PHPUnit_Framework_TestCase
-{
+class ConnectionFactoryTest extends \PHPUnit_Framework_TestCase {
     public function tearDown() {
         m::close();
     }
 
-    public function testCreate()
-    {
+    public function testCreate() {
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection');
         $mockFunction = function($hostDetails, $params, $log, $trace) use ($mockConnection) {
             return $mockConnection;

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/TransportTest.php

Indentation +108 added lines, -108 removed lines

@@ -48,8 +48,8 @@ 
     public function testSniffOnStart()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
 
@@ -69,13 +69,13 @@ 
 
         // Eww...
         $params = m::mock('\Pimple\Container')
-                      ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                      ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                      ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                      ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(true)->getMock()
-                      ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                      ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                      ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                        ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                        ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                        ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                        ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(true)->getMock()
+                        ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                        ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                        ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
@@ -83,13 +83,13 @@ 
     public function testSetRetries()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->once()->getMock();
+                                ->shouldReceive('scheduleCheck')->once()->getMock();
 
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
@@ -104,12 +104,12 @@ 
 
         // Eww...
         $params = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(true)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(true)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(2)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(true)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(true)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(2)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
@@ -117,13 +117,13 @@ 
     public function testNoSniffOnStart()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->never()->getMock();
+                                ->shouldReceive('scheduleCheck')->never()->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
@@ -137,13 +137,13 @@ 
 
         // Eww...
         $params = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
@@ -151,13 +151,13 @@ 
     public function testMixedHosts()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'), array('host' => 'localhost', 'port' => 9200));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->never()->getMock();
+                                ->shouldReceive('scheduleCheck')->never()->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
@@ -171,13 +171,13 @@ 
 
         // Eww...
         $params = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 1)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(2)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 1)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(2)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
@@ -185,8 +185,8 @@ 
     public function testPerformRequestNoBody()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
@@ -200,34 +200,34 @@ 
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
-                          ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
-                          ->shouldReceive('markAlive')->once()->getMock();
+                            ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
+                            ->shouldReceive('markAlive')->once()->getMock();
 
         $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
             return $mockConnection;
         };
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->never()->getMock()
-                              ->shouldReceive('nextConnection')->andReturn($mockConnection)->getMock();
+                                ->shouldReceive('scheduleCheck')->never()->getMock()
+                                ->shouldReceive('nextConnection')->andReturn($mockConnection)->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
+                            ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
 
 
 
         // Eww...
         $pimple = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
@@ -245,8 +245,8 @@ 
     public function testPerformRequestWithBody()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
@@ -262,35 +262,35 @@ 
 
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
-                          ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $serializedBody)->andReturn($response)->getMock()
-                          ->shouldReceive('markAlive')->once()->getMock();
+                            ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $serializedBody)->andReturn($response)->getMock()
+                            ->shouldReceive('markAlive')->once()->getMock();
 
         $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
             return $mockConnection;
         };
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->never()->getMock()
-                              ->shouldReceive('nextConnection')->andReturn($mockConnection)->getMock();
+                                ->shouldReceive('scheduleCheck')->never()->getMock()
+                                ->shouldReceive('nextConnection')->andReturn($mockConnection)->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('serialize')->with($body)->andReturn($serializedBody)->getMock()
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out_deserialize')->getMock();
+                            ->shouldReceive('serialize')->with($body)->andReturn($serializedBody)->getMock()
+                            ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out_deserialize')->getMock();
 
 
 
         // Eww...
         $pimple = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
@@ -307,8 +307,8 @@ 
     public function testPerformRequestTimeout()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
@@ -322,35 +322,35 @@ 
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
-                          ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andThrow(new Elasticsearch\Common\Exceptions\Curl\OperationTimeoutException())->getMock()
-                          ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
-                          ->shouldReceive('markAlive')->once()->getMock();
+                            ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andThrow(new Elasticsearch\Common\Exceptions\Curl\OperationTimeoutException())->getMock()
+                            ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
+                            ->shouldReceive('markAlive')->once()->getMock();
 
         $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
             return $mockConnection;
         };
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->once()->getMock()
-                              ->shouldReceive('nextConnection')->twice()->andReturn($mockConnection)->getMock();
+                                ->shouldReceive('scheduleCheck')->once()->getMock()
+                                ->shouldReceive('nextConnection')->twice()->andReturn($mockConnection)->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
+                            ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
 
 
 
         // Eww...
         $pimple = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
@@ -371,8 +371,8 @@ 
     public function testPerformRequestNoNodesAvailable()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
@@ -392,7 +392,7 @@ 
         };
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('nextConnection')->once()->andThrow(new Elasticsearch\Common\Exceptions\NoNodesAvailableException())->getMock();
+                                ->shouldReceive('nextConnection')->once()->andThrow(new Elasticsearch\Common\Exceptions\NoNodesAvailableException())->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
@@ -401,13 +401,13 @@ 
 
         // Eww...
         $pimple = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $transport->performRequest($method, $uri, $params, $body);
@@ -418,8 +418,8 @@ 
     public function testPerformRequestTransportException()
     {
         $log = $this->getMockBuilder('\Monolog\Logger')
-               ->disableOriginalConstructor()
-               ->getMock();
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
@@ -433,36 +433,36 @@ 
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
-                          ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andThrow(new Elasticsearch\Common\Exceptions\TransportException())->getMock()
-                          ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
-                          ->shouldReceive('markDead')->once()->getMock()
-                          ->shouldReceive('markAlive')->once()->getMock();
+                            ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andThrow(new Elasticsearch\Common\Exceptions\TransportException())->getMock()
+                            ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
+                            ->shouldReceive('markDead')->once()->getMock()
+                            ->shouldReceive('markAlive')->once()->getMock();
 
         $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
             return $mockConnection;
         };
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
-                              ->shouldReceive('scheduleCheck')->once()->getMock()
-                              ->shouldReceive('nextConnection')->twice()->andReturn($mockConnection)->getMock();
+                                ->shouldReceive('scheduleCheck')->once()->getMock()
+                                ->shouldReceive('nextConnection')->twice()->andReturn($mockConnection)->getMock();
         $mockConnectionPoolFxn = function($connections) use ($mockConnectionPool) {
             return $mockConnectionPool;
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
+                            ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
 
 
 
         // Eww...
         $pimple = m::mock('\Pimple\Container')
-                  ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
-                  ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
+                    ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
+                    ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
+                    ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                    ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
+                    ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);

Spacing +35 added lines, -35 removed lines

@@ -51,7 +51,7 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
                         ->shouldReceive('scheduleCheck')->once()->getMock();
@@ -86,7 +86,7 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
                               ->shouldReceive('scheduleCheck')->once()->getMock();
@@ -120,7 +120,7 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
                               ->shouldReceive('scheduleCheck')->never()->getMock();
@@ -131,7 +131,7 @@ 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface');
 
         $mockConnection = m::mock('\Elasticsearch\Connections\ConnectionInterface');
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -154,7 +154,7 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'), array('host' => 'localhost', 'port' => 9200));
+        $hosts = array (array ('host' => 'localhost'), array ('host' => 'localhost', 'port' => 9200));
 
         $mockConnectionPool = m::mock('\Elasticsearch\ConnectionPool\StaticConnectionPool')
                               ->shouldReceive('scheduleCheck')->never()->getMock();
@@ -165,7 +165,7 @@ 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface');
 
         $mockConnection = m::mock('\Elasticsearch\Connections\ConnectionInterface');
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -188,22 +188,22 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
         $params = null;
         $body   = null;
-        $response = array(
+        $response = array (
             'text' => 'texty text',
             'status'   => '200',
-            'info'     => array()
+            'info'     => array ()
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
                           ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -215,7 +215,7 @@ 
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
+                          ->shouldReceive('deserialize')->with($response['text'], array ())->andReturn('out')->getMock();
 
 
 
@@ -232,7 +232,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
 
-        $expected = array(
+        $expected = array (
             'status' => $response['status'],
             'data'   => 'out',
             'info'   => $response['info']
@@ -248,15 +248,15 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
         $params = null;
-        $body   = array('field' => 'value');
-        $response = array(
+        $body   = array ('field' => 'value');
+        $response = array (
             'text' => 'texty text',
             'status'   => '200',
-            'info'     => array()
+            'info'     => array ()
         );
         $serializedBody = 'out_serialized';
 
@@ -265,7 +265,7 @@ 
                           ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $serializedBody)->andReturn($response)->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -278,7 +278,7 @@ 
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
                           ->shouldReceive('serialize')->with($body)->andReturn($serializedBody)->getMock()
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out_deserialize')->getMock();
+                          ->shouldReceive('deserialize')->with($response['text'], array ())->andReturn('out_deserialize')->getMock();
 
 
 
@@ -295,7 +295,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
 
-        $expected = array(
+        $expected = array (
             'status' => $response['status'],
             'data'   => 'out_deserialize',
             'info'   => $response['info']
@@ -310,15 +310,15 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
         $params = null;
         $body   = null;
-        $response = array(
+        $response = array (
             'text' => 'texty text',
             'status'   => '200',
-            'info'     => array()
+            'info'     => array ()
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
@@ -326,7 +326,7 @@ 
                           ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -338,7 +338,7 @@ 
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
+                          ->shouldReceive('deserialize')->with($response['text'], array ())->andReturn('out')->getMock();
 
 
 
@@ -355,7 +355,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
 
-        $expected = array(
+        $expected = array (
             'status' => $response['status'],
             'data'   => 'out',
             'info'   => $response['info']
@@ -374,20 +374,20 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
         $params = null;
         $body   = null;
-        $response = array(
+        $response = array (
             'text' => 'texty text',
             'status'   => '200',
-            'info'     => array()
+            'info'     => array ()
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection');
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -421,15 +421,15 @@ 
                ->disableOriginalConstructor()
                ->getMock();
 
-        $hosts = array(array('host' => 'localhost'));
+        $hosts = array (array ('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
         $params = null;
         $body   = null;
-        $response = array(
+        $response = array (
             'text' => 'texty text',
             'status'   => '200',
-            'info'     => array()
+            'info'     => array ()
         );
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection')
@@ -438,7 +438,7 @@ 
                           ->shouldReceive('markDead')->once()->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -450,7 +450,7 @@ 
         };
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface')
-                          ->shouldReceive('deserialize')->with($response['text'], array())->andReturn('out')->getMock();
+                          ->shouldReceive('deserialize')->with($response['text'], array ())->andReturn('out')->getMock();
 
 
 
@@ -467,7 +467,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $pimple, $log);
         $ret = $transport->performRequest($method, $uri, $params, $body);
 
-        $expected = array(
+        $expected = array (
             'status' => $response['status'],
             'data'   => 'out',
             'info'   => $response['info']

Braces +12 added lines, -24 removed lines

@@ -15,11 +15,9 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class TransportTest extends \PHPUnit_Framework_TestCase
-{
+class TransportTest extends \PHPUnit_Framework_TestCase {
 
-    public function tearDown()
-    {
+    public function tearDown() {
         m::close();
     }
 
@@ -33,8 +31,7 @@ 
      * @covers \Elasticsearch\Transport::__construct
      * @return void
      */
-    public function testStringConstructor()
-    {
+    public function testStringConstructor() {
         $hosts     = 'arbitrary string';
         $params    = 'arbitrary string';
         $log = $this->getMockBuilder('\Monolog\Logger')
@@ -45,8 +42,7 @@ 
     }//end testStringConstructor()
 
 
-    public function testSniffOnStart()
-    {
+    public function testSniffOnStart() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -80,8 +76,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
 
-    public function testSetRetries()
-    {
+    public function testSetRetries() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -114,8 +109,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
 
-    public function testNoSniffOnStart()
-    {
+    public function testNoSniffOnStart() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -148,8 +142,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
 
-    public function testMixedHosts()
-    {
+    public function testMixedHosts() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -182,8 +175,7 @@ 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
     }
 
-    public function testPerformRequestNoBody()
-    {
+    public function testPerformRequestNoBody() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -242,8 +234,7 @@ 
 
     }
 
-    public function testPerformRequestWithBody()
-    {
+    public function testPerformRequestWithBody() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -304,8 +295,7 @@ 
         $this->assertEquals($expected, $ret);
     }
 
-    public function testPerformRequestTimeout()
-    {
+    public function testPerformRequestTimeout() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -368,8 +358,7 @@ 
     /**
      * @expectedException \Elasticsearch\Common\Exceptions\NoNodesAvailableException
      */
-    public function testPerformRequestNoNodesAvailable()
-    {
+    public function testPerformRequestNoNodesAvailable() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();
@@ -415,8 +404,7 @@ 
 
     }
 
-    public function testPerformRequestTransportException()
-    {
+    public function testPerformRequestTransportException() {
         $log = $this->getMockBuilder('\Monolog\Logger')
                ->disableOriginalConstructor()
                ->getMock();

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

@@ -63,7 +63,7 @@ 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface');
 
         $mockConnection = m::mock('\Elasticsearch\Connections\ConnectionInterface');
-        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -72,8 +72,8 @@ 
                       ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                       ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                       ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                      ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(true)->getMock()
-                      ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                      ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(TRUE)->getMock()
+                      ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                       ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                       ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
@@ -98,7 +98,7 @@ 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface');
 
         $mockConnection = m::mock('\Elasticsearch\Connections\ConnectionInterface');
-        $mockConnectionFxn = function($host, $port = null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port = NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -107,8 +107,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(true)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(true)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(TRUE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(TRUE)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(2)->getMock();
 
         $transport = new Elasticsearch\Transport($hosts, $params, $log);
@@ -131,7 +131,7 @@ 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface');
 
         $mockConnection = m::mock('\Elasticsearch\Connections\ConnectionInterface');
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -140,8 +140,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
@@ -165,7 +165,7 @@ 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\SerializerInterface');
 
         $mockConnection = m::mock('\Elasticsearch\Connections\ConnectionInterface');
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -174,8 +174,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 1)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(2)->getMock();
 
@@ -191,8 +191,8 @@ 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
-        $params = null;
-        $body   = null;
+        $params = NULL;
+        $body   = NULL;
         $response = array(
             'text' => 'texty text',
             'status'   => '200',
@@ -203,7 +203,7 @@ 
                           ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -224,8 +224,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
@@ -251,7 +251,7 @@ 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
-        $params = null;
+        $params = NULL;
         $body   = array('field' => 'value');
         $response = array(
             'text' => 'texty text',
@@ -265,7 +265,7 @@ 
                           ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $serializedBody)->andReturn($response)->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -287,8 +287,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
@@ -313,8 +313,8 @@ 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
-        $params = null;
-        $body   = null;
+        $params = NULL;
+        $body   = NULL;
         $response = array(
             'text' => 'texty text',
             'status'   => '200',
@@ -326,7 +326,7 @@ 
                           ->shouldReceive('performRequest')->once()->with($method, $uri, $params, $body)->andReturn($response)->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -347,8 +347,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
@@ -377,8 +377,8 @@ 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
-        $params = null;
-        $body   = null;
+        $params = NULL;
+        $body   = NULL;
         $response = array(
             'text' => 'texty text',
             'status'   => '200',
@@ -387,7 +387,7 @@ 
 
         $mockConnection = m::mock('\Elasticsearch\Connections\AbstractConnection');
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -404,8 +404,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 
@@ -424,8 +424,8 @@ 
         $hosts = array(array('host' => 'localhost'));
         $method = 'GET';
         $uri    = '/';
-        $params = null;
-        $body   = null;
+        $params = NULL;
+        $body   = NULL;
         $response = array(
             'text' => 'texty text',
             'status'   => '200',
@@ -438,7 +438,7 @@ 
                           ->shouldReceive('markDead')->once()->getMock()
                           ->shouldReceive('markAlive')->once()->getMock();
 
-        $mockConnectionFxn = function($host, $port=null) use ($mockConnection) {
+        $mockConnectionFxn = function($host, $port=NULL) use ($mockConnection) {
             return $mockConnection;
         };
 
@@ -459,8 +459,8 @@ 
                   ->shouldReceive('offsetGet')->with('connectionPool')->andReturn($mockConnectionPoolFxn)->getMock()
                   ->shouldReceive('offsetGet')->with('serializer')->andReturn($mockSerializer)->getMock()
                   ->shouldReceive('offsetGet')->with('connection')->andReturn($mockConnectionFxn)->getMock()
-                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(false)->getMock()
-                  ->shouldReceive('offsetExists')->with('retries')->andReturn(false)->getMock()
+                  ->shouldReceive('offsetGet')->with('sniffOnStart')->andReturn(FALSE)->getMock()
+                  ->shouldReceive('offsetExists')->with('retries')->andReturn(FALSE)->getMock()
                   ->shouldReceive('offsetSet')->with('retries', 0)->getMock()
                   ->shouldReceive('offsetGet')->with('retries')->andReturn(1)->getMock();
 

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Endpoints/SearchTest.php

Indentation +48 added lines, -48 removed lines

@@ -30,14 +30,14 @@ 
         $body = 'testQuery';
         $uri = '/_search';
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 $body
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    $body
+                                )
+                            ->getMock();
 
         $search = new Search($mockTransport);
         $search->setBody($body)
@@ -50,14 +50,14 @@ 
         $query['query'] = 'testQuery';
         $uri = '/_search';
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 $query
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    $query
+                                )
+                            ->getMock();
 
         $search = new Search($mockTransport);
         $search->setBody($query)
@@ -72,14 +72,14 @@ 
         $uri = '/_search';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $search = new Search($mockTransport);
         $search->performRequest();
@@ -91,14 +91,14 @@ 
         $uri = '/testIndex/_search';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $search = new Search($mockTransport);
         $search->setIndex('testIndex')
@@ -112,14 +112,14 @@ 
         $uri = '/_all/testType/_search';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $search = new Search($mockTransport);
         $search->setType('testType')
@@ -133,14 +133,14 @@ 
         $uri = '/testIndex/testType/_search';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $search = new Search($mockTransport);
         $search->setIndex('testIndex')

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  $body
                              )
                          ->getMock();
@@ -54,7 +54,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  $query
                              )
                          ->getMock();
@@ -76,7 +76,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -95,7 +95,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -116,7 +116,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -137,7 +137,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();

Braces +7 added lines, -14 removed lines

@@ -18,15 +18,13 @@ 
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class SearchTest extends \PHPUnit_Framework_TestCase
-{
+class SearchTest extends \PHPUnit_Framework_TestCase {
 
     public function tearDown() {
         m::close();
     }
 
-    public function testSetStringBody()
-    {
+    public function testSetStringBody() {
         $body = 'testQuery';
         $uri = '/_search';
         $mockTransport = m::mock('\Elasticsearch\Transport')
@@ -45,8 +43,7 @@ 
 
     }
 
-    public function testSetArrayQuery()
-    {
+    public function testSetArrayQuery() {
         $query['query'] = 'testQuery';
         $uri = '/_search';
         $mockTransport = m::mock('\Elasticsearch\Transport')
@@ -66,8 +63,7 @@ 
     }
 
 
-    public function testGetURIWithNoIndexOrType()
-    {
+    public function testGetURIWithNoIndexOrType() {
 
         $uri = '/_search';
 
@@ -86,8 +82,7 @@ 
 
     }
 
-    public function testGetURIWithIndexButNoType()
-    {
+    public function testGetURIWithIndexButNoType() {
         $uri = '/testIndex/_search';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
@@ -106,8 +101,7 @@ 
 
     }
 
-    public function testGetURIWithTypeButNoIndex()
-    {
+    public function testGetURIWithTypeButNoIndex() {
 
         $uri = '/_all/testType/_search';
 
@@ -127,8 +121,7 @@ 
 
     }
 
-    public function testGetURIWithBothTypeAndIndex()
-    {
+    public function testGetURIWithBothTypeAndIndex() {
 
         $uri = '/testIndex/testType/_search';
 

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Endpoints/DeleteTest.php

Indentation +8 added lines, -8 removed lines

@@ -80,14 +80,14 @@
     public function testValidDelete()
     {
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 'DELETE',
-                                 '/testIndex/testType/testID',
-                                 array(),
-                                 null
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    'DELETE',
+                                    '/testIndex/testType/testID',
+                                    array(),
+                                    null
+                                )
+                            ->getMock();
 
         $delete = new Delete($mockTransport);
         $delete->setIndex('testIndex')

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
                          ->with(
                                  'DELETE',
                                  '/testIndex/testType/testID',
-                                 array(),
+                                 array (),
                                  null
                              )
                          ->getMock();

Braces +6 added lines, -12 removed lines

@@ -18,8 +18,7 @@ 
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class DeleteTest extends \PHPUnit_Framework_TestCase
-{
+class DeleteTest extends \PHPUnit_Framework_TestCase {
     public function tearDown() {
         m::close();
     }
@@ -28,8 +27,7 @@ 
     /**
      * @expectedException RuntimeException
      */
-    public function testNoIndexTypeOrID()
-    {
+    public function testNoIndexTypeOrID() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport');
 
@@ -41,8 +39,7 @@ 
     /**
      * @expectedException RuntimeException
      */
-    public function testNoIndex()
-    {
+    public function testNoIndex() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport');
 
@@ -54,8 +51,7 @@ 
     /**
      * @expectedException RuntimeException
      */
-    public function testNoType()
-    {
+    public function testNoType() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport');
 
@@ -67,8 +63,7 @@ 
     /**
      * @expectedException RuntimeException
      */
-    public function testNoID()
-    {
+    public function testNoID() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport');
 
@@ -77,8 +72,7 @@ 
 
     }
 
-    public function testValidDelete()
-    {
+    public function testValidDelete() {
         $mockTransport = m::mock('\Elasticsearch\Transport')
                          ->shouldReceive('performRequest')->once()
                          ->with(

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

@@ -85,7 +85,7 @@
                                  'DELETE',
                                  '/testIndex/testType/testID',
                                  array(),
-                                 null
+                                 NULL
                              )
                          ->getMock();
 

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Endpoints/PercolateTest.php

Indentation +8 added lines, -8 removed lines

@@ -54,14 +54,14 @@
     {
         $body = 'abc';
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 'GET',
-                                 '/testIndex/testType/_percolate',
-                                 array(),
-                                 $body
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    'GET',
+                                    '/testIndex/testType/_percolate',
+                                    array(),
+                                    $body
+                                )
+                            ->getMock();
 
         $action = new Percolate($mockTransport);
         $action->setBody($body)->setIndex('testIndex')

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                          ->with(
                                  'GET',
                                  '/testIndex/testType/_percolate',
-                                 array(),
+                                 array (),
                                  $body
                              )
                          ->getMock();

Braces +4 added lines, -8 removed lines

@@ -18,8 +18,7 @@ 
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class PercolateTest extends \PHPUnit_Framework_TestCase
-{
+class PercolateTest extends \PHPUnit_Framework_TestCase {
     public function tearDown() {
         m::close();
     }
@@ -27,8 +26,7 @@ 
     /**
      * @expectedException RuntimeException
      */
-    public function testNoIndex()
-    {
+    public function testNoIndex() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport');
 
@@ -40,8 +38,7 @@ 
     /**
      * @expectedException RuntimeException
      */
-    public function testNoType()
-    {
+    public function testNoType() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport');
 
@@ -50,8 +47,7 @@ 
 
     }
 
-    public function testValidPercolate()
-    {
+    public function testValidPercolate() {
         $body = 'abc';
         $mockTransport = m::mock('\Elasticsearch\Transport')
                          ->shouldReceive('performRequest')->once()

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Endpoints/BulkTest.php

Indentation +40 added lines, -40 removed lines

@@ -29,14 +29,14 @@ 
     {
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()->once()
-                         ->with(
-                                 m::any(),
-                                 m::any(),
-                                 array(),
-                                 'bulk data'
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()->once()
+                            ->with(
+                                    m::any(),
+                                    m::any(),
+                                    array(),
+                                    'bulk data'
+                                )
+                            ->getMock();
 
         $mockSerializer = m::mock('\Elasticsearch\Serializers\ArrayToJSONSerializer');
 
@@ -53,14 +53,14 @@ 
         $uri = '/_all/_bulk';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
         $mockSerializer = m::mock('\Elasticsearch\Serializers\ArrayToJSONSerializer');
 
         $action = new Bulk($mockTransport, $mockSerializer);
@@ -73,14 +73,14 @@ 
         $uri = '/testIndex/_bulk';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
         $mockSerializer = m::mock('\Elasticsearch\Serializers\ArrayToJSONSerializer');
 
         $action = new Bulk($mockTransport, $mockSerializer);
@@ -95,14 +95,14 @@ 
         $uri = '/_all/testType/_bulk';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
         $mockSerializer = m::mock('\Elasticsearch\Serializers\ArrayToJSONSerializer');
 
         $action = new Bulk($mockTransport, $mockSerializer);
@@ -117,14 +117,14 @@ 
         $uri = '/testIndex/testType/_bulk';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
         $mockSerializer = m::mock('\Elasticsearch\Serializers\ArrayToJSONSerializer');
 
         $action = new Bulk($mockTransport, $mockSerializer);

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
                          ->with(
                                  m::any(),
                                  m::any(),
-                                 array(),
+                                 array (),
                                  'bulk data'
                              )
                          ->getMock();
@@ -57,7 +57,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -77,7 +77,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -99,7 +99,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -121,7 +121,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();

Braces +6 added lines, -12 removed lines

@@ -18,15 +18,13 @@ 
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class BulkTest extends \PHPUnit_Framework_TestCase
-{
+class BulkTest extends \PHPUnit_Framework_TestCase {
 
     public function tearDown() {
         m::close();
     }
 
-    public function testSetBody()
-    {
+    public function testSetBody() {
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
                          ->shouldReceive('performRequest')->once()->once()
@@ -47,8 +45,7 @@ 
     }
 
 
-    public function testGetURIWithNoIndexOrType()
-    {
+    public function testGetURIWithNoIndexOrType() {
 
         $uri = '/_all/_bulk';
 
@@ -68,8 +65,7 @@ 
 
     }
 
-    public function testGetURIWithIndexButNoType()
-    {
+    public function testGetURIWithIndexButNoType() {
         $uri = '/testIndex/_bulk';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
@@ -89,8 +85,7 @@ 
 
     }
 
-    public function testGetURIWithTypeButNoIndex()
-    {
+    public function testGetURIWithTypeButNoIndex() {
 
         $uri = '/_all/testType/_bulk';
 
@@ -111,8 +106,7 @@ 
 
     }
 
-    public function testGetURIWithBothTypeAndIndex()
-    {
+    public function testGetURIWithBothTypeAndIndex() {
 
         $uri = '/testIndex/testType/_bulk';
 

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Endpoints/CountTest.php

Indentation +40 added lines, -40 removed lines

@@ -30,14 +30,14 @@ 
         $uri = '/_count';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $action = new Count($mockTransport);
         $action->performRequest();
@@ -49,14 +49,14 @@ 
         $uri = '/testIndex/_count';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $action = new Count($mockTransport);
         $action->setIndex('testIndex')
@@ -70,14 +70,14 @@ 
         $uri = '/_all/testType/_count';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $action = new Count($mockTransport);
         $action->setType('testType')
@@ -91,14 +91,14 @@ 
         $uri = '/testIndex/testType/_count';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 m::any(),
-                                 $uri,
-                                 array(),
-                                 m::any()
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    m::any(),
+                                    $uri,
+                                    array(),
+                                    m::any()
+                                )
+                            ->getMock();
 
         $action = new Count($mockTransport);
         $action->setIndex('testIndex')
@@ -110,14 +110,14 @@ 
     public function testValidCount()
     {
         $mockTransport = m::mock('\Elasticsearch\Transport')
-                         ->shouldReceive('performRequest')->once()
-                         ->with(
-                                 'GET',
-                                 '/testIndex/testType/_count',
-                                 array(),
-                                 null
-                             )
-                         ->getMock();
+                            ->shouldReceive('performRequest')->once()
+                            ->with(
+                                    'GET',
+                                    '/testIndex/testType/_count',
+                                    array(),
+                                    null
+                                )
+                            ->getMock();
 
         $action = new Count($mockTransport);
         $action->setIndex('testIndex')

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -53,7 +53,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -74,7 +74,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -95,7 +95,7 @@ 
                          ->with(
                                  m::any(),
                                  $uri,
-                                 array(),
+                                 array (),
                                  m::any()
                              )
                          ->getMock();
@@ -114,7 +114,7 @@ 
                          ->with(
                                  'GET',
                                  '/testIndex/testType/_count',
-                                 array(),
+                                 array (),
                                  null
                              )
                          ->getMock();

Braces +6 added lines, -12 removed lines

@@ -17,15 +17,13 @@ 
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link    http://elasticsearch.org
  */
-class CountTest extends \PHPUnit_Framework_TestCase
-{
+class CountTest extends \PHPUnit_Framework_TestCase {
     public function tearDown() {
         m::close();
     }
 
 
-    public function testGetURIWithNoIndexOrType()
-    {
+    public function testGetURIWithNoIndexOrType() {
 
         $uri = '/_count';
 
@@ -44,8 +42,7 @@ 
 
     }
 
-    public function testGetURIWithIndexButNoType()
-    {
+    public function testGetURIWithIndexButNoType() {
         $uri = '/testIndex/_count';
 
         $mockTransport = m::mock('\Elasticsearch\Transport')
@@ -64,8 +61,7 @@ 
 
     }
 
-    public function testGetURIWithTypeButNoIndex()
-    {
+    public function testGetURIWithTypeButNoIndex() {
 
         $uri = '/_all/testType/_count';
 
@@ -85,8 +81,7 @@ 
 
     }
 
-    public function testGetURIWithBothTypeAndIndex()
-    {
+    public function testGetURIWithBothTypeAndIndex() {
 
         $uri = '/testIndex/testType/_count';
 
@@ -107,8 +102,7 @@ 
 
     }
 
-    public function testValidCount()
-    {
+    public function testValidCount() {
         $mockTransport = m::mock('\Elasticsearch\Transport')
                          ->shouldReceive('performRequest')->once()
                          ->with(

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

@@ -115,7 +115,7 @@
                                  'GET',
                                  '/testIndex/testType/_count',
                                  array(),
-                                 null
+                                 NULL
                              )
                          ->getMock();