Merge pull request #31 from php-http/analysis-8bnWl8

Applied fixes from StyleCI

Author: sagikazarmark

src/ClassDiscovery.php

@@ -20,7 +20,7 @@ public static function register($class, $condition = null)
         static::$cache = null;
 
         $definition = [
-            'class'     => $class,
+            'class' => $class,
             'condition' => isset($condition) ? $condition : $class,
         ];
 
@@ -38,14 +38,14 @@ public static function find()
     {
         // We have a cache
         if (isset(static::$cache)) {
-            return new static::$cache;
+            return new static::$cache();
         }
 
         foreach (static::$classes as $name => $definition) {
             if (static::evaluateCondition($definition['condition'])) {
                 static::$cache = $definition['class'];
 
-                return new $definition['class'];
+                return new $definition['class']();
             }
         }
 
@@ -57,7 +57,7 @@ public static function find()
      *
      * @param mixed $condition
      *
-     * @return boolean
+     * @return bool
      */
     protected static function evaluateCondition($condition)
     {
@@ -72,7 +72,7 @@ protected static function evaluateCondition($condition)
             $evaluatedCondition = true;
 
             // Immediately stop execution if the condition is false
-            for ($i = 0; $i < count($condition) && false !== $evaluatedCondition; $i++) {
+            for ($i = 0; $i < count($condition) && false !== $evaluatedCondition; ++$i) {
                 $evaluatedCondition &= static::evaluateCondition($condition[$i]);
             }
 

src/HttpAsyncClientDiscovery.php

@@ -21,7 +21,7 @@ final class HttpAsyncClientDiscovery extends ClassDiscovery
      */
     protected static $classes = [
         'guzzle6' => [
-            'class'     => 'Http\Adapter\Guzzle6HttpAdapter',
+            'class' => 'Http\Adapter\Guzzle6HttpAdapter',
             'condition' => 'Http\Adapter\Guzzle6HttpAdapter',
         ],
     ];

src/HttpClientDiscovery.php

@@ -21,11 +21,11 @@ final class HttpClientDiscovery extends ClassDiscovery
      */
     protected static $classes = [
         'guzzle6' => [
-            'class'     => 'Http\Adapter\Guzzle6HttpAdapter',
+            'class' => 'Http\Adapter\Guzzle6HttpAdapter',
             'condition' => 'Http\Adapter\Guzzle6HttpAdapter',
         ],
         'guzzle5' => [
-            'class'     => 'Http\Adapter\Guzzle5HttpAdapter',
+            'class' => 'Http\Adapter\Guzzle5HttpAdapter',
             'condition' => 'Http\Adapter\Guzzle5HttpAdapter',
         ],
     ];

src/MessageFactoryDiscovery.php

@@ -21,14 +21,14 @@ final class MessageFactoryDiscovery extends FactoryDiscovery
      */
     protected static $classes = [
         'guzzle' => [
-            'class'     => 'Http\Client\Utils\MessageFactory\GuzzleMessageFactory',
+            'class' => 'Http\Client\Utils\MessageFactory\GuzzleMessageFactory',
             'condition' => [
                 'Http\Client\Utils\MessageFactory\GuzzleMessageFactory',
                 'GuzzleHttp\Psr7\Request',
             ],
         ],
         'diactoros' => [
-            'class'     => 'Http\Client\Utils\MessageFactory\DiactorosMessageFactory',
+            'class' => 'Http\Client\Utils\MessageFactory\DiactorosMessageFactory',
             'condition' => [
                 'Http\Client\Utils\MessageFactory\DiactorosMessageFactory',
                 'Zend\Diactoros\Request',

src/StreamFactoryDiscovery.php

@@ -21,14 +21,14 @@ final class StreamFactoryDiscovery extends FactoryDiscovery
      */
     protected static $classes = [
         'guzzle' => [
-            'class'     => 'Http\Client\Utils\StreamFactory\GuzzleStreamFactory',
+            'class' => 'Http\Client\Utils\StreamFactory\GuzzleStreamFactory',
             'condition' => [
                 'Http\Client\Utils\StreamFactory\GuzzleStreamFactory',
                 'GuzzleHttp\Psr7\Stream',
             ],
         ],
         'diactoros' => [
-            'class'     => 'Http\Client\Utils\StreamFactory\DiactorosStreamFactory',
+            'class' => 'Http\Client\Utils\StreamFactory\DiactorosStreamFactory',
             'condition' => [
                 'Http\Client\Utils\StreamFactory\DiactorosStreamFactory',
                 'Zend\Diactoros\Stream',

src/UriFactoryDiscovery.php

@@ -21,14 +21,14 @@ final class UriFactoryDiscovery extends FactoryDiscovery
      */
     protected static $classes = [
         'guzzle' => [
-            'class'     => 'Http\Client\Utils\UriFactory\GuzzleUriFactory',
+            'class' => 'Http\Client\Utils\UriFactory\GuzzleUriFactory',
             'condition' => [
                 'Http\Client\Utils\UriFactory\GuzzleUriFactory',
                 'GuzzleHttp\Psr7\Uri',
             ],
         ],
         'diactoros' => [
-            'class'     => 'Http\Client\Utils\UriFactory\DiactorosUriFactory',
+            'class' => 'Http\Client\Utils\UriFactory\DiactorosUriFactory',
             'condition' => [
                 'Http\Client\Utils\UriFactory\DiactorosUriFactory',
                 'Zend\Diactoros\Uri',