Merge pull request #100 from php-http/all-psr4

Use ::class constants

Author: dbu

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Changed
+
+- Use ::class constant instead of writing the class string. 
+
 ## 1.3.0 - 2017-08-03
 
 ### Added

src/ClassDiscovery.php

@@ -54,6 +54,7 @@ protected static function findOneByType($type)
                 $candidates = call_user_func($strategy.'::getCandidates', $type);
             } catch (StrategyUnavailableException $e) {
                 $exceptions[] = $e;
+
                 continue;
             }
 

src/Strategy/CommonClassesStrategy.php

@@ -3,8 +3,13 @@
 namespace Http\Discovery\Strategy;
 
 use GuzzleHttp\Psr7\Request as GuzzleRequest;
+use Http\Client\HttpAsyncClient;
+use Http\Client\HttpClient;
+use Http\Message\MessageFactory;
 use Http\Message\MessageFactory\GuzzleMessageFactory;
+use Http\Message\StreamFactory;
 use Http\Message\StreamFactory\GuzzleStreamFactory;
+use Http\Message\UriFactory;
 use Http\Message\UriFactory\GuzzleUriFactory;
 use Http\Message\MessageFactory\DiactorosMessageFactory;
 use Http\Message\StreamFactory\DiactorosStreamFactory;
@@ -35,27 +40,27 @@ final class CommonClassesStrategy implements DiscoveryStrategy
      * @var array
      */
     private static $classes = [
-        'Http\Message\MessageFactory' => [
+        MessageFactory::class => [
             ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]],
             ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]],
             ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]],
         ],
-        'Http\Message\StreamFactory' => [
+        StreamFactory::class => [
             ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]],
             ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]],
             ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]],
         ],
-        'Http\Message\UriFactory' => [
+        UriFactory::class => [
             ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]],
             ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]],
             ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]],
         ],
-        'Http\Client\HttpAsyncClient' => [
+        HttpAsyncClient::class => [
             ['class' => Guzzle6::class, 'condition' => Guzzle6::class],
             ['class' => Curl::class, 'condition' => Curl::class],
             ['class' => React::class, 'condition' => React::class],
         ],
-        'Http\Client\HttpClient' => [
+        HttpClient::class => [
             ['class' => Guzzle6::class, 'condition' => Guzzle6::class],
             ['class' => Guzzle5::class, 'condition' => Guzzle5::class],
             ['class' => Curl::class, 'condition' => Curl::class],