kitodo / kitodo-publication

Lib/Vendor/Httpful/Httpful.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 class Httpful {
     const VERSION = '0.2.18';
 
-    private static $mimeRegistrar = array();
+    private static $mimeRegistrar = array ();
     private static $default = null;
 
     /**

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
      * @param string $mime_type
      * @param MimeHandlerAdapter $handler
      */
-    public static function register($mimeType, \Httpful\Handlers\MimeHandlerAdapter $handler)
-    {
+    public static function register($mimeType, \Httpful\Handlers\MimeHandlerAdapter $handler) {
         self::$mimeRegistrar[$mimeType] = $handler;
     }
 
@@ -21,8 +20,7 @@ 
      * @param string $mime_type defaults to MimeHandlerAdapter
      * @return MimeHandlerAdapter
      */
-    public static function get($mimeType = null)
-    {
+    public static function get($mimeType = null) {
         if (isset(self::$mimeRegistrar[$mimeType])) {
             return self::$mimeRegistrar[$mimeType];
         }
@@ -39,8 +37,7 @@ 
      * for it?
      * @return bool
      */
-    public static function hasParserRegistered($mimeType)
-    {
+    public static function hasParserRegistered($mimeType) {
         return isset(self::$mimeRegistrar[$mimeType]);
     }
 }

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

@@ -6,7 +6,7 @@ 
     const VERSION = '0.2.18';
 
     private static $mimeRegistrar = array();
-    private static $default = null;
+    private static $default = NULL;
 
     /**
      * @param string $mime_type
@@ -21,7 +21,7 @@ 
      * @param string $mime_type defaults to MimeHandlerAdapter
      * @return MimeHandlerAdapter
      */
-    public static function get($mimeType = null)
+    public static function get($mimeType = NULL)
     {
         if (isset(self::$mimeRegistrar[$mimeType])) {
             return self::$mimeRegistrar[$mimeType];

Lib/Vendor/Httpful/Bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
      */
     public static function init()
     {
-        spl_autoload_register(array('\Httpful\Bootstrap', 'autoload'));
+        spl_autoload_register(array ('\Httpful\Bootstrap', 'autoload'));
         self::registerHandlers();
     }
 
@@ -40,7 +40,7 @@ 
      */
     public static function pharInit()
     {
-        spl_autoload_register(array('\Httpful\Bootstrap', 'pharAutoload'));
+        spl_autoload_register(array ('\Httpful\Bootstrap', 'pharAutoload'));
         self::registerHandlers();
     }
 
@@ -78,7 +78,7 @@ 
 
         // @todo check a conf file to load from that instead of
         // hardcoding into the library?
-        $handlers = array(
+        $handlers = array (
             \Httpful\Mime::JSON => new \Httpful\Handlers\JsonHandler(),
             \Httpful\Mime::XML  => new \Httpful\Handlers\XmlHandler(),
             \Httpful\Mime::FORM => new \Httpful\Handlers\FormHandler(),

Braces +10 added lines, -16 removed lines

@@ -8,8 +8,7 @@ 
  *
  * @author Nate Good <me@nategood.com>
  */
-class Bootstrap
-{
+class Bootstrap {
 
     const DIR_GLUE = DIRECTORY_SEPARATOR;
     const NS_GLUE = '\\';
@@ -19,8 +18,7 @@ 
     /**
      * Register the autoloader and any other setup needed
      */
-    public static function init()
-    {
+    public static function init() {
         spl_autoload_register(array('\Httpful\Bootstrap', 'autoload'));
         self::registerHandlers();
     }
@@ -30,16 +28,14 @@ 
      *
      * @param string $classname
      */
-    public static function autoload($classname)
-    {
+    public static function autoload($classname) {
         self::_autoload(dirname(dirname(__FILE__)), $classname);
     }
 
     /**
      * Register the autoloader and any other setup needed
      */
-    public static function pharInit()
-    {
+    public static function pharInit() {
         spl_autoload_register(array('\Httpful\Bootstrap', 'pharAutoload'));
         self::registerHandlers();
     }
@@ -49,8 +45,7 @@ 
      *
      * @param string $classname
      */
-    public static function pharAutoload($classname)
-    {
+    public static function pharAutoload($classname) {
         self::_autoload('phar://httpful.phar', $classname);
     }
 
@@ -58,8 +53,7 @@ 
      * @param string base
      * @param string classname
      */
-    private static function _autoload($base, $classname)
-    {
+    private static function _autoload($base, $classname) {
         $parts      = explode(self::NS_GLUE, $classname);
         $path       = $base . self::DIR_GLUE . implode(self::DIR_GLUE, $parts) . '.php';
 
@@ -70,8 +64,7 @@ 
     /**
      * Register default mime handlers.  Is idempotent.
      */
-    public static function registerHandlers()
-    {
+    public static function registerHandlers() {
         if (self::$registered === true) {
             return;
         }
@@ -87,8 +80,9 @@ 
 
         foreach ($handlers as $mime => $handler) {
             // Don't overwrite if the handler has already been registered
-            if (Httpful::hasParserRegistered($mime))
-                continue;
+            if (Httpful::hasParserRegistered($mime)) {
+                            continue;
+            }
             Httpful::register($mime, $handler);
         }
 

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

@@ -14,7 +14,7 @@ 
     const DIR_GLUE = DIRECTORY_SEPARATOR;
     const NS_GLUE = '\\';
 
-    public static $registered = false;
+    public static $registered = FALSE;
 
     /**
      * Register the autoloader and any other setup needed
@@ -72,7 +72,7 @@ 
      */
     public static function registerHandlers()
     {
-        if (self::$registered === true) {
+        if (self::$registered === TRUE) {
             return;
         }
 
@@ -92,6 +92,6 @@ 
             Httpful::register($mime, $handler);
         }
 
-        self::$registered = true;
+        self::$registered = TRUE;
     }
 }

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class SniffingConnectionPoolIntegrationTest extends \PHPUnit_Framework_TestCase
-{
+class SniffingConnectionPoolIntegrationTest extends \PHPUnit_Framework_TestCase {
     public function testSniff() {
         $params['connectionPoolClass'] = '\Elasticsearch\ConnectionPool\SniffingConnectionPool';
         $params['connectionPoolParams']['sniffingInterval'] = -10;

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php

Spacing +9 added lines, -9 removed lines

@@ -27,14 +27,14 @@ 
     {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\RoundRobinSelector();
 
-        $mockConnections = array();
-        foreach (range(0,10) as $index) {
+        $mockConnections = array ();
+        foreach (range(0, 10) as $index) {
             $mockConnections[$index] = $this->getMockBuilder('\Elasticsearch\Connections\CurlMultiConnection')
                 ->disableOriginalConstructor()
                 ->getMock();
         }
 
-        foreach (range(0,15) as $index) {
+        foreach (range(0, 15) as $index) {
             $retConnection = $roundRobin->select($mockConnections);
 
             $nextIndex = ($index % 10) + 1;
@@ -56,17 +56,17 @@ 
     {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\RoundRobinSelector();
 
-        $mockConnections = array();
-        foreach (range(0,10) as $index) {
+        $mockConnections = array ();
+        foreach (range(0, 10) as $index) {
             $mockConnections[$index] = $this->getMockBuilder('\Elasticsearch\Connections\CurlMultiConnection')
                 ->disableOriginalConstructor()
                 ->getMock();
         }
 
-        foreach (range(0,4) as $index) {
+        foreach (range(0, 4) as $index) {
             $retConnection = $roundRobin->select($mockConnections);
 
-            $nextIndex = ($index % (count($mockConnections)-1)) + 1;
+            $nextIndex = ($index % (count($mockConnections) - 1)) + 1;
             $this->assertEquals($mockConnections[$nextIndex], $retConnection);
         }
 
@@ -74,10 +74,10 @@ 
         unset($mockConnections[9]);
         unset($mockConnections[10]);
 
-        foreach (range(5,15) as $index) {
+        foreach (range(5, 15) as $index) {
             $retConnection = $roundRobin->select($mockConnections);
 
-            $nextIndex = ($index % (count($mockConnections)-1)) + 1;
+            $nextIndex = ($index % (count($mockConnections) - 1)) + 1;
             $this->assertEquals($mockConnections[$nextIndex], $retConnection);
         }
 

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class RoundRobinSelectorTest extends \PHPUnit_Framework_TestCase
-{
+class RoundRobinSelectorTest extends \PHPUnit_Framework_TestCase {
 
     /**
      * Add Ten connections, select 15 to verify round robin
@@ -23,8 +22,7 @@ 
      *
      * @return void
      */
-    public function testTenConnections()
-    {
+    public function testTenConnections() {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\RoundRobinSelector();
 
         $mockConnections = array();
@@ -52,8 +50,7 @@ 
      *
      * @return void
      */
-    public function testAddTenConnectionsestFiveTRemoveThree()
-    {
+    public function testAddTenConnectionsestFiveTRemoveThree() {
         $roundRobin = new Elasticsearch\ConnectionPool\Selectors\RoundRobinSelector();
 
         $mockConnections = array();

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Serializers/EverythingToJSONSerializerTest.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
     public function testSerializeArray()
     {
         $serializer = new EverythingToJSONSerializer();
-        $body = array('value' => 'field');
+        $body = array ('value' => 'field');
 
         $ret = $serializer->serialize($body);
 
@@ -31,7 +31,7 @@ 
     {
         $serializer = new EverythingToJSONSerializer();
 
-        $ret = $serializer->serialize(array());
+        $ret = $serializer->serialize(array ());
 
         $this->assertEquals('{}', $ret);
     }
@@ -54,7 +54,7 @@ 
     {
         $serializer = new EverythingToJSONSerializer();
 
-        $body = array("value" => "\xB1\x31"); // invalid UTF-8 byte sequence
+        $body = array ("value" => "\xB1\x31"); // invalid UTF-8 byte sequence
 
         $serializer->serialize($body);
     }
@@ -64,7 +64,7 @@ 
         $serializer = new EverythingToJSONSerializer();
         $body = '{"field":"value"}';
 
-        $ret = $serializer->deserialize($body, array());
+        $ret = $serializer->deserialize($body, array ());
 
         $body = json_decode($body, true);
         $this->assertEquals($body, $ret);
@@ -78,6 +78,6 @@ 
         $serializer = new EverythingToJSONSerializer();
         $body = '{"field":}';
 
-        $serializer->deserialize($body, array());
+        $serializer->deserialize($body, array ());
     }
 }

Braces +7 added lines, -14 removed lines

@@ -14,10 +14,8 @@ 
  * Class EverythingToJSONSerializerTest
  * @package Elasticsearch\Tests\Serializers
  */
-class EverythingToJSONSerializerTest extends PHPUnit_Framework_TestCase
-{
-    public function testSerializeArray()
-    {
+class EverythingToJSONSerializerTest extends PHPUnit_Framework_TestCase {
+    public function testSerializeArray() {
         $serializer = new EverythingToJSONSerializer();
         $body = array('value' => 'field');
 
@@ -27,8 +25,7 @@ 
         $this->assertEquals($body, $ret);
     }
 
-    public function testSerializeEmptyArrayReturnsEmptyJsonObject()
-    {
+    public function testSerializeEmptyArrayReturnsEmptyJsonObject() {
         $serializer = new EverythingToJSONSerializer();
 
         $ret = $serializer->serialize(array());
@@ -36,8 +33,7 @@ 
         $this->assertEquals('{}', $ret);
     }
 
-    public function testSerializeString()
-    {
+    public function testSerializeString() {
         $serializer = new EverythingToJSONSerializer();
         $body = 'abc';
 
@@ -50,8 +46,7 @@ 
     /**
      * @expectedException Elasticsearch\Common\Exceptions\Serializer\JsonSerializationError
      */
-    public function testSerializeArrayWithInvalidUtf8ThrowsException()
-    {
+    public function testSerializeArrayWithInvalidUtf8ThrowsException() {
         $serializer = new EverythingToJSONSerializer();
 
         $body = array("value" => "\xB1\x31"); // invalid UTF-8 byte sequence
@@ -59,8 +54,7 @@ 
         $serializer->serialize($body);
     }
 
-    public function testDeserializeJSON()
-    {
+    public function testDeserializeJSON() {
         $serializer = new EverythingToJSONSerializer();
         $body = '{"field":"value"}';
 
@@ -73,8 +67,7 @@ 
     /**
      * @expectedException Elasticsearch\Common\Exceptions\Serializer\JsonDeserializationError
      */
-    public function testDeserializeWithInvalidJsonThrowsException()
-    {
+    public function testDeserializeWithInvalidJsonThrowsException() {
         $serializer = new EverythingToJSONSerializer();
         $body = '{"field":}';
 

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

@@ -66,7 +66,7 @@
 
         $ret = $serializer->deserialize($body, array());
 
-        $body = json_decode($body, true);
+        $body = json_decode($body, TRUE);
         $this->assertEquals($body, $ret);
     }
 

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Serializers/SmartSerializerTest.php

Spacing +3 added lines, -3 removed lines

@@ -22,14 +22,14 @@ 
     {
         $body = '<some-tag>content</some-tag>';
 
-        $result = $this->serializer->deserialize($body, array('content_type' => 'application/xml'));
+        $result = $this->serializer->deserialize($body, array ('content_type' => 'application/xml'));
 
         $this->assertEquals($body, $result);
     }
 
     public function testDeserializeWithJsonContentTypeReturnsDecodedJson()
     {
-        $result = $this->serializer->deserialize('{"one": "two"}', array('content_type' => 'application/json'));
+        $result = $this->serializer->deserialize('{"one": "two"}', array ('content_type' => 'application/json'));
 
         $this->assertInternalType('array', $result);
         $this->assertArrayHasKeY('one', $result);
@@ -37,7 +37,7 @@ 
 
     public function testDeserializeWithoutContentTypeReturnsDecodedJson()
     {
-        $result = $this->serializer->deserialize('{"one": "two"}', array());
+        $result = $this->serializer->deserialize('{"one": "two"}', array ());
 
         $this->assertInternalType('array', $result);
         $this->assertArrayHasKeY('one', $result);

Braces +5 added lines, -10 removed lines

@@ -14,12 +14,10 @@ 
  * Class SmartSerializerTest
  * @package Elasticsearch\Tests\Serializers
  */
-class SmartSerializerTest extends PHPUnit_Framework_TestCase
-{
+class SmartSerializerTest extends PHPUnit_Framework_TestCase {
     private $serializer;
 
-    public function testDeserializeWithNonJsonContentTypeReturnsRawDataString()
-    {
+    public function testDeserializeWithNonJsonContentTypeReturnsRawDataString() {
         $body = '<some-tag>content</some-tag>';
 
         $result = $this->serializer->deserialize($body, array('content_type' => 'application/xml'));
@@ -27,24 +25,21 @@ 
         $this->assertEquals($body, $result);
     }
 
-    public function testDeserializeWithJsonContentTypeReturnsDecodedJson()
-    {
+    public function testDeserializeWithJsonContentTypeReturnsDecodedJson() {
         $result = $this->serializer->deserialize('{"one": "two"}', array('content_type' => 'application/json'));
 
         $this->assertInternalType('array', $result);
         $this->assertArrayHasKeY('one', $result);
     }
 
-    public function testDeserializeWithoutContentTypeReturnsDecodedJson()
-    {
+    public function testDeserializeWithoutContentTypeReturnsDecodedJson() {
         $result = $this->serializer->deserialize('{"one": "two"}', array());
 
         $this->assertInternalType('array', $result);
         $this->assertArrayHasKeY('one', $result);
     }
 
-    protected function setUp()
-    {
+    protected function setUp() {
         $this->serializer = new SmartSerializer();
     }
 }

Lib/ElasticSearchPhpClient/tests/Elasticsearch/Tests/Serializers/ArrayToJSONSerializerTest.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     public function testSerializeArray()
     {
         $serializer = new ArrayToJSONSerializer();
-        $body = array('value' => 'field');
+        $body = array ('value' => 'field');
 
         $ret = $serializer->serialize($body);
 
@@ -42,7 +42,7 @@ 
         $serializer = new ArrayToJSONSerializer();
         $body = '{"field":"value"}';
 
-        $ret = $serializer->deserialize($body, array());
+        $ret = $serializer->deserialize($body, array ());
 
         $body = json_decode($body, true);
         $this->assertEquals($body, $ret);

Braces +4 added lines, -8 removed lines

@@ -14,10 +14,8 @@ 
  * Class ArrayToJSONSerializerTest
  * @package Elasticsearch\Tests\Serializers
  */
-class ArrayToJSONSerializerTest extends PHPUnit_Framework_TestCase
-{
-    public function testSerializeArray()
-    {
+class ArrayToJSONSerializerTest extends PHPUnit_Framework_TestCase {
+    public function testSerializeArray() {
         $serializer = new ArrayToJSONSerializer();
         $body = array('value' => 'field');
 
@@ -27,8 +25,7 @@ 
         $this->assertEquals($body, $ret);
     }
 
-    public function testSerializeString()
-    {
+    public function testSerializeString() {
         $serializer = new ArrayToJSONSerializer();
         $body = 'abc';
 
@@ -37,8 +34,7 @@ 
         $this->assertEquals($body, $ret);
     }
 
-    public function testDeserializeJSON()
-    {
+    public function testDeserializeJSON() {
         $serializer = new ArrayToJSONSerializer();
         $body = '{"field":"value"}';
 

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

@@ -44,7 +44,7 @@
 
         $ret = $serializer->deserialize($body, array());
 
-        $body = json_decode($body, true);
+        $body = json_decode($body, TRUE);
         $this->assertEquals($body, $ret);
     }
 }

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

Spacing +43 added lines, -43 removed lines

@@ -51,7 +51,7 @@ 
     public static function getHostEnvVar()
     {
         if (isset($_SERVER['ES_TEST_HOST']) === true) {
-            echo "Test Host: ".$_SERVER['ES_TEST_HOST']."\n";
+            echo "Test Host: " . $_SERVER['ES_TEST_HOST'] . "\n";
             return $_SERVER['ES_TEST_HOST'];
         } else {
             echo 'Environment variable for elasticsearch test cluster (ES_TEST_HOST) not defined. Exiting yaml test';
@@ -73,7 +73,7 @@ 
 
         $response = json_decode($response, true);
         YamlRunnerTest::$esVersion = $response['version']['number'];
-        echo "ES Version: ".YamlRunnerTest::$esVersion."\n";
+        echo "ES Version: " . YamlRunnerTest::$esVersion . "\n";
     }
 
     public function setUp()
@@ -81,7 +81,7 @@ 
         $this->yaml = new Parser();
         $uri = parse_url($host = YamlRunnerTest::getHostEnvVar());
 
-        $params['hosts'] = array($uri['host'].':'.$uri['port']);
+        $params['hosts'] = array ($uri['host'] . ':' . $uri['port']);
         $params['connectionParams']['timeout'] = 10000;
         $params['logging'] = true;
         $params['logLevel'] = \Psr\Log\LogLevel::DEBUG;
@@ -93,7 +93,7 @@ 
     {
         echo "\n>>>CLEARING<<<\n";
         $host = YamlRunnerTest::getHostEnvVar();
-        $ch = curl_init($host."/*");
+        $ch = curl_init($host . "/*");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
@@ -101,7 +101,7 @@ 
         $response = curl_exec($ch);
         curl_close($ch);
 
-        $ch = curl_init($host."/_template/*");
+        $ch = curl_init($host . "/_template/*");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
@@ -114,19 +114,19 @@ 
 
     private function assertTruthy($value)
     {
-        echo "\n         |assertTruthy: ".json_encode($value)."\n";
+        echo "\n         |assertTruthy: " . json_encode($value) . "\n";
         ob_flush();
         if (isset($value) === false || $value === 0 || $value === false || $value === null || $value === '') {
-            $this->fail("Value is not truthy: ".print_r($value, true));
+            $this->fail("Value is not truthy: " . print_r($value, true));
         }
     }
 
     private function assertFalsey($value)
     {
-        echo "\n         |assertFalsey: ".json_encode($value)."\n";
+        echo "\n         |assertFalsey: " . json_encode($value) . "\n";
         ob_flush();
         if (!(isset($value) === false || $value === 0 || $value === false || $value === null || $value === '')) {
-            $this->fail("Value is not falsey: ".print_r($value, true));
+            $this->fail("Value is not falsey: " . print_r($value, true));
         }
     }
 
@@ -134,7 +134,7 @@ 
         $pattern = trim($pattern);
 
         // PHP doesn't like unescaped forward slashes
-        $pattern = substr($pattern, 1, strlen($pattern)-2);
+        $pattern = substr($pattern, 1, strlen($pattern) - 2);
         $pattern = str_replace('/', '\/', $pattern);
         $pattern = "/$pattern/mx";
         echo "\n         |> actual: $actual\n";
@@ -173,20 +173,20 @@ 
 
     public static function provider()
     {
-        $path = dirname(__FILE__).'/../../../util/elasticsearch/rest-api-spec/test/';
+        $path = dirname(__FILE__) . '/../../../util/elasticsearch/rest-api-spec/test/';
 
-        $files = array();
+        $files = array ();
         $objects = new RecursiveIteratorIterator(
             new RecursiveDirectoryIterator($path),
             RecursiveIteratorIterator::SELF_FIRST
         );
 
-        foreach($objects as $object) {
+        foreach ($objects as $object) {
 
             /** @var FilesystemIterator $object */
             if ($object->isFile() === true && $object->getFilename() !== 'README.asciidoc' && $object->getFilename() !== 'TODO.txt') {
-                $path = $object->getPathInfo()->getRealPath()."/".$object->getBasename();
-                $files[] = array($path);
+                $path = $object->getPathInfo()->getRealPath() . "/" . $object->getBasename();
+                $files[] = array ($path);
             }
         }
 
@@ -224,11 +224,11 @@ 
             $fileData = file_get_contents($testFile);
             $documents = array_filter(explode("---", $fileData));
 
-            $yamlDocs = array();
+            $yamlDocs = array ();
             $setup = null;
             foreach ($documents as $document) {
                 try {
-                    $tDoc = array();
+                    $tDoc = array ();
                     $tDoc['document'] = $this->checkForTimestamp($testFile, $document);
                     $tDoc['document'] = $this->checkForEmptyProperty($testFile, $tDoc['document']);
                     $tDoc['values'] = $this->yaml->parse($tDoc['document'], false, false, true);
@@ -246,7 +246,7 @@ 
 
             foreach ($yamlDocs as $doc) {
                 $ts = date('c');
-                echo "   ".key($doc['values'])." [$ts]\n";
+                echo "   " . key($doc['values']) . " [$ts]\n";
                 ob_flush();
 
                 $this->clearCluster();
@@ -255,7 +255,7 @@ 
                     try {
                         $this->executeTestCase($setup, $testFile);
                     } catch (SetupSkipException $e) {
-                        break;  //exit this test since we skipped in the setup
+                        break; //exit this test since we skipped in the setup
                     }
 
                 }
@@ -296,8 +296,8 @@ 
 
     private function executeTestCase($test, $testFile)
     {
-        $stash = array();
-        $response = array();
+        $stash = array ();
+        $response = array ();
         reset($test);
         $key = key($test);
 
@@ -331,9 +331,9 @@ 
 
 
                     try {
-                        echo "         |".json_encode($hash)."\n";
+                        echo "         |" . json_encode($hash) . "\n";
                         $response = $this->callMethod($method, $hash);
-                        echo "         |".json_encode($response)."\n";
+                        echo "         |" . json_encode($response) . "\n";
                         ob_flush();
 
                         //$this->waitForYellow();
@@ -341,13 +341,13 @@ 
                         if (isset($expectedError) === true) {
                             $this->fail("Expected Exception not thrown: $expectedError");
                         }
-                    } catch (Missing404Exception $exception){
+                    } catch (Missing404Exception $exception) {
                         if ($expectedError === 'missing') {
                             $this->assertTrue(true);
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
 
                     } catch (Conflict409Exception $exception) {
@@ -356,7 +356,7 @@ 
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
                     } catch (Forbidden403Exception $exception) {
                         if ($expectedError === 'forbidden') {
@@ -364,9 +364,9 @@ 
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
-                    } catch (BadRequest400Exception $exception){
+                    } catch (BadRequest400Exception $exception) {
                         if ($expectedError === 'request') {
                             $this->assertTrue(true);
                         } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
@@ -374,9 +374,9 @@ 
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
-                    } catch (ServerErrorResponseException $exception){
+                    } catch (ServerErrorResponseException $exception) {
                         if ($expectedError === 'request') {
                             $this->assertTrue(true);
                         } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
@@ -384,9 +384,9 @@ 
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
-                    } catch (Elasticsearch\Common\Exceptions\RuntimeException $exception){
+                    } catch (Elasticsearch\Common\Exceptions\RuntimeException $exception) {
                         if ($expectedError === 'param') {
                             $this->assertTrue(true);
                         } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
@@ -394,7 +394,7 @@ 
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
                     } catch (\Exception $exception) {
                         if ($expectedError === null) {
@@ -404,11 +404,11 @@ 
                         } else {
                             $this->fail($exception->getMessage());
                         }
-                        $response = array();
+                        $response = array ();
 
                     }
 
-                } elseif($operator === 'match') {
+                } elseif ($operator === 'match') {
 
                     $expected = $this->getValue($settings, key($settings));
                     if (key($settings) === '') {
@@ -416,7 +416,7 @@ 
                     } else if (key($settings) === '$body') {
                         $actual = $response;
                     } else {
-                        $actual   = $this->getNestedVar($response, key($settings));
+                        $actual = $this->getNestedVar($response, key($settings));
 
                     }
 
@@ -495,7 +495,7 @@ 
                         $version = explode("-", $version);
                         if (version_compare(YamlRunnerTest::$esVersion, $version[0]) >= 0
                             && version_compare($version[1], YamlRunnerTest::$esVersion) >= 0) {
-                            echo "Skipping: ".$settings['reason']."\n";
+                            echo "Skipping: " . $settings['reason'] . "\n";
 
                             if ($key == 'setup') {
                                 throw new SetupSkipException();
@@ -504,7 +504,7 @@ 
                         }
                     } else if (isset($settings['features']) === true) {
                         $feature = $settings['features'];
-                        $whitelist = array('gtelte');
+                        $whitelist = array ('gtelte');
 
                         if (array_search($feature, $whitelist) === false) {
                             echo "Unsupported optional feature: $feature\n";
@@ -520,7 +520,7 @@ 
 
     private function callMethod($method, $hash)
     {
-        $ret = array();
+        $ret = array ();
 
         $methodParts = explode(".", $method);
 
@@ -540,7 +540,7 @@ 
     private function getValue($a, $key) {
         if (is_array($a)) {
             return $a[$key];
-        } elseif(is_object($a)) {
+        } elseif (is_object($a)) {
             return $a->$key;
         } else {
             die('non-array, non-object in getValue()');
@@ -579,7 +579,7 @@ 
     {
         $isMatch = preg_match($this->getTimestampRegex(), $document, $matches);
         if ($isMatch) {
-            $newTime = new \DateTime($matches[0].'GMT');
+            $newTime = new \DateTime($matches[0] . 'GMT');
             $document = preg_replace($this->getTimestampRegex(), $newTime->format('U') * 1000, $document);
         }
 
@@ -628,7 +628,7 @@ 
 
     private function skipTest($path)
     {//all_path_options
-        $skipList = array(
+        $skipList = array (
             'indices.delete_mapping/all_path_options.yaml',
             'indices.exists_type/10_basic.yaml',
             'indices.get_mapping/10_basic.yaml',
@@ -647,7 +647,7 @@ 
         if (version_compare(YamlRunnerTest::$esVersion, "1.4.0", "<")) {
 
             // Breaking changes in null alias
-            $skipList = array(
+            $skipList = array (
                 'indices.delete_alias/all_path_options.yaml',
                 'indices.put_alias/all_path_options.yaml'
             );

Braces +25 added lines, -39 removed lines

@@ -33,8 +33,7 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class YamlRunnerTest extends \PHPUnit_Framework_TestCase
-{
+class YamlRunnerTest extends \PHPUnit_Framework_TestCase {
     /** @var  Parser */
     private $yaml;
 
@@ -48,8 +47,7 @@ 
     /**
      * @return mixed
      */
-    public static function getHostEnvVar()
-    {
+    public static function getHostEnvVar() {
         if (isset($_SERVER['ES_TEST_HOST']) === true) {
             echo "Test Host: ".$_SERVER['ES_TEST_HOST']."\n";
             return $_SERVER['ES_TEST_HOST'];
@@ -60,8 +58,7 @@ 
     }
 
 
-    public static function setUpBeforeClass()
-    {
+    public static function setUpBeforeClass() {
         $host = YamlRunnerTest::getHostEnvVar();
         $ch = curl_init($host);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -76,8 +73,7 @@ 
         echo "ES Version: ".YamlRunnerTest::$esVersion."\n";
     }
 
-    public function setUp()
-    {
+    public function setUp() {
         $this->yaml = new Parser();
         $uri = parse_url($host = YamlRunnerTest::getHostEnvVar());
 
@@ -89,8 +85,7 @@ 
 
     }
 
-    private function clearCluster()
-    {
+    private function clearCluster() {
         echo "\n>>>CLEARING<<<\n";
         $host = YamlRunnerTest::getHostEnvVar();
         $ch = curl_init($host."/*");
@@ -112,8 +107,7 @@ 
         $this->waitForYellow();
     }
 
-    private function assertTruthy($value)
-    {
+    private function assertTruthy($value) {
         echo "\n         |assertTruthy: ".json_encode($value)."\n";
         ob_flush();
         if (isset($value) === false || $value === 0 || $value === false || $value === null || $value === '') {
@@ -121,8 +115,7 @@ 
         }
     }
 
-    private function assertFalsey($value)
-    {
+    private function assertFalsey($value) {
         echo "\n         |assertFalsey: ".json_encode($value)."\n";
         ob_flush();
         if (!(isset($value) === false || $value === 0 || $value === false || $value === null || $value === '')) {
@@ -145,8 +138,7 @@ 
 
     }
 
-    private function waitForYellow()
-    {
+    private function waitForYellow() {
         $host = YamlRunnerTest::getHostEnvVar();
         $ch = curl_init("$host/_cluster/health?wait_for_status=yellow&timeout=50s");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -171,8 +163,7 @@ 
     }
 
 
-    public static function provider()
-    {
+    public static function provider() {
         $path = dirname(__FILE__).'/../../../util/elasticsearch/rest-api-spec/test/';
 
         $files = array();
@@ -197,7 +188,9 @@ 
 
     private static function recursiveSort(&$array) {
         foreach ($array as &$value) {
-            if (is_array($value)) YamlRunnerTest::recursiveSort($value);
+            if (is_array($value)) {
+                YamlRunnerTest::recursiveSort($value);
+            }
         }
         return sort($array);
     }
@@ -207,8 +200,7 @@ 
      * @dataProvider provider
      * @group yaml
      */
-    public function testYaml()
-    {
+    public function testYaml() {
         //* @runInSeparateProcess
 
         $files = func_get_args();
@@ -269,8 +261,7 @@ 
 
     }
 
-    private function replaceWithStash($values, $stash)
-    {
+    private function replaceWithStash($values, $stash) {
         if (count($stash) === 0) {
             return $values;
         }
@@ -294,8 +285,7 @@ 
         return $values;
     }
 
-    private function executeTestCase($test, $testFile)
-    {
+    private function executeTestCase($test, $testFile) {
         $stash = array();
         $response = array();
         reset($test);
@@ -341,7 +331,7 @@ 
                         if (isset($expectedError) === true) {
                             $this->fail("Expected Exception not thrown: $expectedError");
                         }
-                    } catch (Missing404Exception $exception){
+                    } catch (Missing404Exception $exception) {
                         if ($expectedError === 'missing') {
                             $this->assertTrue(true);
                         } else {
@@ -366,7 +356,7 @@ 
                         }
                         $response = array();
 
-                    } catch (BadRequest400Exception $exception){
+                    } catch (BadRequest400Exception $exception) {
                         if ($expectedError === 'request') {
                             $this->assertTrue(true);
                         } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
@@ -376,7 +366,7 @@ 
                         }
                         $response = array();
 
-                    } catch (ServerErrorResponseException $exception){
+                    } catch (ServerErrorResponseException $exception) {
                         if ($expectedError === 'request') {
                             $this->assertTrue(true);
                         } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
@@ -386,7 +376,7 @@ 
                         }
                         $response = array();
 
-                    } catch (Elasticsearch\Common\Exceptions\RuntimeException $exception){
+                    } catch (Elasticsearch\Common\Exceptions\RuntimeException $exception) {
                         if ($expectedError === 'param') {
                             $this->assertTrue(true);
                         } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
@@ -518,8 +508,7 @@ 
         }
     }
 
-    private function callMethod($method, $hash)
-    {
+    private function callMethod($method, $hash) {
         $ret = array();
 
         $methodParts = explode(".", $method);
@@ -575,8 +564,7 @@ 
      *
      * @return mixed
      */
-    private function checkForTimestamp($file, $document)
-    {
+    private function checkForTimestamp($file, $document) {
         $isMatch = preg_match($this->getTimestampRegex(), $document, $matches);
         if ($isMatch) {
             $newTime = new \DateTime($matches[0].'GMT');
@@ -608,8 +596,7 @@ 
         }
     }
 
-    private function getTimestampRegex()
-    {
+    private function getTimestampRegex() {
         return <<<EOF
         ~
         (?P<year>[0-9][0-9][0-9][0-9])
@@ -626,8 +613,8 @@ 
 EOF;
     }
 
-    private function skipTest($path)
-    {//all_path_options
+    private function skipTest($path) {
+//all_path_options
         $skipList = array(
             'indices.delete_mapping/all_path_options.yaml',
             'indices.exists_type/10_basic.yaml',
@@ -664,6 +651,5 @@ 
 
 }
 
-class SetupSkipException extends \Exception
-{
+class SetupSkipException extends \Exception {
 }
\ No newline at end of file

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

@@ -50,7 +50,7 @@ 
      */
     public static function getHostEnvVar()
     {
-        if (isset($_SERVER['ES_TEST_HOST']) === true) {
+        if (isset($_SERVER['ES_TEST_HOST']) === TRUE) {
             echo "Test Host: ".$_SERVER['ES_TEST_HOST']."\n";
             return $_SERVER['ES_TEST_HOST'];
         } else {
@@ -64,14 +64,14 @@ 
     {
         $host = YamlRunnerTest::getHostEnvVar();
         $ch = curl_init($host);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 
         $response = curl_exec($ch);
         curl_close($ch);
 
-        $response = json_decode($response, true);
+        $response = json_decode($response, TRUE);
         YamlRunnerTest::$esVersion = $response['version']['number'];
         echo "ES Version: ".YamlRunnerTest::$esVersion."\n";
     }
@@ -83,7 +83,7 @@ 
 
         $params['hosts'] = array($uri['host'].':'.$uri['port']);
         $params['connectionParams']['timeout'] = 10000;
-        $params['logging'] = true;
+        $params['logging'] = TRUE;
         $params['logLevel'] = \Psr\Log\LogLevel::DEBUG;
         $this->client = new Elasticsearch\Client($params);
 
@@ -94,7 +94,7 @@ 
         echo "\n>>>CLEARING<<<\n";
         $host = YamlRunnerTest::getHostEnvVar();
         $ch = curl_init($host."/*");
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 
@@ -102,7 +102,7 @@ 
         curl_close($ch);
 
         $ch = curl_init($host."/_template/*");
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE");
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 
@@ -116,8 +116,8 @@ 
     {
         echo "\n         |assertTruthy: ".json_encode($value)."\n";
         ob_flush();
-        if (isset($value) === false || $value === 0 || $value === false || $value === null || $value === '') {
-            $this->fail("Value is not truthy: ".print_r($value, true));
+        if (isset($value) === FALSE || $value === 0 || $value === FALSE || $value === NULL || $value === '') {
+            $this->fail("Value is not truthy: ".print_r($value, TRUE));
         }
     }
 
@@ -125,8 +125,8 @@ 
     {
         echo "\n         |assertFalsey: ".json_encode($value)."\n";
         ob_flush();
-        if (!(isset($value) === false || $value === 0 || $value === false || $value === null || $value === '')) {
-            $this->fail("Value is not falsey: ".print_r($value, true));
+        if (!(isset($value) === FALSE || $value === 0 || $value === FALSE || $value === NULL || $value === '')) {
+            $this->fail("Value is not falsey: ".print_r($value, TRUE));
         }
     }
 
@@ -149,16 +149,16 @@ 
     {
         $host = YamlRunnerTest::getHostEnvVar();
         $ch = curl_init("$host/_cluster/health?wait_for_status=yellow&timeout=50s");
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 
-        $response = json_decode(curl_exec($ch), true);
+        $response = json_decode(curl_exec($ch), TRUE);
 
         $counter = 0;
         while ($response['status'] === 'red') {
             sleep(0.5);
-            $response = json_decode(curl_exec($ch), true);
+            $response = json_decode(curl_exec($ch), TRUE);
             ++$counter;
 
             if ($counter > 10) {
@@ -184,7 +184,7 @@ 
         foreach($objects as $object) {
 
             /** @var FilesystemIterator $object */
-            if ($object->isFile() === true && $object->getFilename() !== 'README.asciidoc' && $object->getFilename() !== 'TODO.txt') {
+            if ($object->isFile() === TRUE && $object->getFilename() !== 'README.asciidoc' && $object->getFilename() !== 'TODO.txt') {
                 $path = $object->getPathInfo()->getRealPath()."/".$object->getBasename();
                 $files[] = array($path);
             }
@@ -217,7 +217,7 @@ 
             echo "$testFile\n";
             ob_flush();
 
-            if ($this->skipTest($testFile) === true) {
+            if ($this->skipTest($testFile) === TRUE) {
                 $this->markTestSkipped('Skipped due to skip-list');
             }
 
@@ -225,13 +225,13 @@ 
             $documents = array_filter(explode("---", $fileData));
 
             $yamlDocs = array();
-            $setup = null;
+            $setup = NULL;
             foreach ($documents as $document) {
                 try {
                     $tDoc = array();
                     $tDoc['document'] = $this->checkForTimestamp($testFile, $document);
                     $tDoc['document'] = $this->checkForEmptyProperty($testFile, $tDoc['document']);
-                    $tDoc['values'] = $this->yaml->parse($tDoc['document'], false, false, true);
+                    $tDoc['values'] = $this->yaml->parse($tDoc['document'], FALSE, FALSE, TRUE);
 
                     if (key($tDoc['values']) === 'setup') {
                         $setup = $tDoc['values'];
@@ -251,7 +251,7 @@ 
 
                 $this->clearCluster();
 
-                if ($setup !== null) {
+                if ($setup !== NULL) {
                     try {
                         $this->executeTestCase($setup, $testFile);
                     } catch (SetupSkipException $e) {
@@ -275,17 +275,17 @@ 
             return $values;
         }
 
-        if (is_array($values) === true) {
+        if (is_array($values) === TRUE) {
             array_walk_recursive($values, function(&$item, $key) use ($stash) {
-                if (is_string($item) === true || is_numeric($item) === true) {
-                    if (array_key_exists($item, $stash) == true) {
+                if (is_string($item) === TRUE || is_numeric($item) === TRUE) {
+                    if (array_key_exists($item, $stash) == TRUE) {
                         $item = $stash[$item];
                     }
                 }
 
             });
         } elseif (is_string($values) || is_numeric($values)) {
-            if (array_key_exists($values, $stash) == true) {
+            if (array_key_exists($values, $stash) == TRUE) {
                 $values = $stash[$values];
             }
         }
@@ -317,7 +317,7 @@ 
                         echo "(catch: $expectedError) ";
                         ob_flush();
                     } else {
-                        $expectedError = null;
+                        $expectedError = NULL;
                     }
 
                     $method = key($settings);
@@ -338,12 +338,12 @@ 
 
                         //$this->waitForYellow();
 
-                        if (isset($expectedError) === true) {
+                        if (isset($expectedError) === TRUE) {
                             $this->fail("Expected Exception not thrown: $expectedError");
                         }
                     } catch (Missing404Exception $exception){
                         if ($expectedError === 'missing') {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
@@ -352,7 +352,7 @@ 
 
                     } catch (Conflict409Exception $exception) {
                         if ($expectedError === 'conflict') {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
@@ -360,7 +360,7 @@ 
 
                     } catch (Forbidden403Exception $exception) {
                         if ($expectedError === 'forbidden') {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
@@ -368,9 +368,9 @@ 
 
                     } catch (BadRequest400Exception $exception){
                         if ($expectedError === 'request') {
-                            $this->assertTrue(true);
-                        } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
+                        } elseif (isset($expectedError) === TRUE && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
@@ -378,9 +378,9 @@ 
 
                     } catch (ServerErrorResponseException $exception){
                         if ($expectedError === 'request') {
-                            $this->assertTrue(true);
-                        } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
+                        } elseif (isset($expectedError) === TRUE && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
@@ -388,19 +388,19 @@ 
 
                     } catch (Elasticsearch\Common\Exceptions\RuntimeException $exception){
                         if ($expectedError === 'param') {
-                            $this->assertTrue(true);
-                        } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
+                        } elseif (isset($expectedError) === TRUE && preg_match("/$expectedError/", $exception->getMessage()) === 1) {
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
                         $response = array();
 
                     } catch (\Exception $exception) {
-                        if ($expectedError === null) {
+                        if ($expectedError === NULL) {
                             $this->fail($exception->getMessage());
                         } elseif (preg_match("/$expectedError/", $exception->getMessage()) === 1) {
-                            $this->assertTrue(true);
+                            $this->assertTrue(TRUE);
                         } else {
                             $this->fail($exception->getMessage());
                         }
@@ -433,7 +433,7 @@ 
                         $expected = json_decode(json_encode($expected));
                     }
 
-                    if ($this->checkForRegex($expected) === true) {
+                    if ($this->checkForRegex($expected) === TRUE) {
                         $this->assertRegex($expected, $actual);
                     } else {
                         $this->assertEquals($expected, $actual);
@@ -444,7 +444,7 @@ 
                     echo "\n";
 
                 } elseif ($operator === "is_true") {
-                    if (empty($settings) === true) {
+                    if (empty($settings) === TRUE) {
                         $response = $this->replaceWithStash($response, $stash);
                         $this->assertTruthy($response);
 
@@ -457,7 +457,7 @@ 
                     echo "\n";
 
                 } elseif ($operator === "is_false") {
-                    if (empty($settings) === true) {
+                    if (empty($settings) === TRUE) {
                         $response = $this->replaceWithStash($response, $stash);
                         $this->assertFalsey($response);
                     } else {
@@ -489,7 +489,7 @@ 
                     $this->assertGreaterThan($expectedCount, $this->getNestedVar($response, key($settings)));
                     echo "\n";
                 } elseif ($operator === "skip") {
-                    if (isset($settings['version']) === true) {
+                    if (isset($settings['version']) === TRUE) {
                         $version = $settings['version'];
                         $version = str_replace(" ", "", $version);
                         $version = explode("-", $version);
@@ -502,11 +502,11 @@ 
                             }
                             return;
                         }
-                    } else if (isset($settings['features']) === true) {
+                    } else if (isset($settings['features']) === TRUE) {
                         $feature = $settings['features'];
                         $whitelist = array('gtelte');
 
-                        if (array_search($feature, $whitelist) === false) {
+                        if (array_search($feature, $whitelist) === FALSE) {
                             echo "Unsupported optional feature: $feature\n";
                             return;
                         }
@@ -557,7 +557,7 @@ 
             $piece = str_replace('\.', '.', $piece);
             if (!is_array($context) || !array_key_exists($piece, $context)) {
                 // error occurred
-                return null;
+                return NULL;
             }
             $context = &$context[$piece];
         }
@@ -596,15 +596,15 @@ 
     }
 
     private function checkForRegex($value) {
-        if (is_string($value) !== true) {
-            return false;
+        if (is_string($value) !== TRUE) {
+            return FALSE;
         }
 
         $value = trim($value);
         if (substr($value, 0, 1) === '/' && substr($value, strlen($value) - 1, 1) === '/') {
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -623,7 +623,7 @@ 
         (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
         (?::(?P<tz_minute>[0-9][0-9]))?))?)?
         ~x
-EOF;
+eof;
     }
 
     private function skipTest($path)
@@ -638,8 +638,8 @@ 
         );
 
         foreach ($skipList as $skip) {
-            if (strpos($path, $skip) !== false) {
-                return true;
+            if (strpos($path, $skip) !== FALSE) {
+                return TRUE;
             }
         }
 
@@ -653,13 +653,13 @@ 
             );
 
             foreach ($skipList as $skip) {
-                if (strpos($path, $skip) !== false) {
-                    return true;
+                if (strpos($path, $skip) !== FALSE) {
+                    return TRUE;
                 }
             }
         }
 
-        return false;
+        return FALSE;
     }
 
 }

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

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public function test5xxErrorBadHost()
     {
-        $hostDetails = array('host' => 'localhost5', 'port' => 9200);
+        $hostDetails = array ('host' => 'localhost5', 'port' => 9200);
 
         $connectionParams['guzzleClient'] = new Client();
 

Braces +3 added lines, -6 removed lines

@@ -23,10 +23,8 @@ 
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class GuzzleConnectionIntegrationTest extends \PHPUnit_Framework_TestCase
-{
-    public function tearDown()
-    {
+class GuzzleConnectionIntegrationTest extends \PHPUnit_Framework_TestCase {
+    public function tearDown() {
         m::close();
     }
 
@@ -34,8 +32,7 @@ 
     /**
      * @expectedException Elasticsearch\Common\Exceptions\Curl\CouldNotResolveHostException
      */
-    public function test5xxErrorBadHost()
-    {
+    public function test5xxErrorBadHost() {
         $hostDetails = array('host' => 'localhost5', 'port' => 9200);
 
         $connectionParams['guzzleClient'] = new Client();