Updated phpcs and fixed CS violations

deseretdigital · Mar 9, 2015 · d6d511e · d6d511e
1 parent d7e8a81
commit d6d511e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -22,6 +22,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~4.3",
-        "squizlabs/php_codesniffer": "~1.5"
+        "squizlabs/php_codesniffer": "~2.0"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/Gelf/Logger.php b/src/Gelf/Logger.php
@@ -63,8 +63,7 @@ public function log($level, $rawMessage, array $context = array())
         $message = $this->initMessage($level, $rawMessage, $context);
 
         // add exception data if present
-        if (
-           isset($context['exception'])
+        if (isset($context['exception'])
            && $context['exception'] instanceof Exception
         ) {
             $this->initExceptionData($message, $context['exception']);

diff --git a/tests/Gelf/Test/Transport/HttpTransportTest.php b/tests/Gelf/Test/Transport/HttpTransportTest.php
@@ -132,11 +132,17 @@ public function testFromUrlConstructor()
         $this->validateTransport($transport, 'localhost', 443, '', $sslOptions, null);
     }
 
-    public function validateTransport(HttpTransport $transport, $host, $port, $path, $sslOptions = null, $authentication = null)
-    {
+    public function validateTransport(
+        HttpTransport $transport,
+        $host,
+        $port,
+        $path,
+        $sslOptions = null,
+        $authentication = null
+    ) {
         $r = new \ReflectionObject($transport);
 
-        foreach(array('host', 'port', 'path', 'sslOptions', 'authentication') as $test) {
+        foreach (array('host', 'port', 'path', 'sslOptions', 'authentication') as $test) {
             $p = $r->getProperty($test);
             $p->setAccessible(true);
             $this->assertEquals(${$test}, $p->getValue($transport));
@@ -216,7 +222,7 @@ public function testAuthentication()
         $test = $this;
         $this->socketClient->expects($this->once())
             ->method("write")
-            ->will($this->returnCallback(function($data) use ($test) {
+            ->will($this->returnCallback(function ($data) use ($test) {
                 $test->assertContains("Authorization: Basic " . base64_encode("test:test"), $data);
             }));