Merge pull request #8 from php-http/priority

Name replaced with priority (Fix #5)

Author: sagikazarmark

README.md

@@ -19,65 +19,9 @@ $ composer require php-http/discovery
 ```
 
 
-## Usage
+## Documentation
 
-Static containers to ease the auto initialization of objects.
-
-Currently the following discovery strategies are available:
-
-- Http Adapter discovery
-- Message Factory discovery
-- URI Factory discovery
-
-
-### Http Adapter discovery
-
-HTTP Adapters provided by us are registered in the discovery by default.
-
-``` php
-use Http\Discovery\HttpAdapterDiscovery;
-
-HttpAdapterDiscovery::register('my_adapter', 'My\Adapter\Class');
-
-$adapter = HttpAdapterDiscovery::find();
-```
-
-
-### Message Factory discovery
-
-Two common message factories are bundled with this package. ([Guzzle](https://github.com/guzzle/psr7) and [Diactoros](https://github.com/zendframework/zend-diactoros))
-
-``` php
-use Http\Discovery\MessageFactoryDiscovery;
-
-MessageFactoryDiscovery::register('my_factory', 'My\Factory\Class', 'Psr\Request\Implementation\Class');
-
-$factory = MessageFactoryDiscovery::find();
-```
-
-
-### URI Factory discovery
-
-Two common URI factories are bundled with this package: ([Guzzle](https://github.com/guzzle/psr7) and [Diactoros](https://github.com/zendframework/zend-diactoros)).
-
-``` php
-use Http\Discovery\UriFactoryDiscovery;
-
-MessageFactoryDiscovery::register('my_factory', 'My\Factory\Class', 'Psr\Uri\Implementation\Class');
-
-$factory = UriFactoryDiscovery::find();
-```
-
-
-### Custom conditions
-
-You can use various types of conditions to check for a class:
-
-- string (checked for class existence)
-- callable
-- boolean
-
-Any further types are treated as invalid and evaulated to false boolean value.
+Please see the [official documentation](http://php-http.readthedocs.org/en/latest/discovery/).
 
 
 ## Testing

spec/ClassDiscoverySpec.php

@@ -21,7 +21,7 @@ function it_registers_a_class()
     {
         $this->reset();
 
-        $this->register('class1', 'spec\Http\Discovery\AnotherClassToFind');
+        $this->register('spec\Http\Discovery\AnotherClassToFind');
 
         $this->find()->shouldHaveType('spec\Http\Discovery\AnotherClassToFind');
     }
@@ -30,8 +30,8 @@ function it_registers_a_class_with_a_condition()
     {
         $this->reset();
 
-        $this->register('class1', 'spec\Http\Discovery\ClassToFind', false);
-        $this->register('class2', 'spec\Http\Discovery\AnotherClassToFind', 'spec\Http\Discovery\TestClass');
+        $this->register('spec\Http\Discovery\AnotherClassToFind', 'spec\Http\Discovery\TestClass');
+        $this->register('spec\Http\Discovery\ClassToFind', false);
 
         $this->find()->shouldHaveType('spec\Http\Discovery\AnotherClassToFind');
     }
@@ -40,8 +40,8 @@ function it_registers_a_class_with_a_callable_condition()
     {
         $this->reset();
 
-        $this->register('class1', 'spec\Http\Discovery\ClassToFind', false);
-        $this->register('class2', 'spec\Http\Discovery\AnotherClassToFind', function() { return true; });
+        $this->register('spec\Http\Discovery\AnotherClassToFind', function() { return true; });
+        $this->register('spec\Http\Discovery\ClassToFind', false);
 
         $this->find()->shouldHaveType('spec\Http\Discovery\AnotherClassToFind');
     }
@@ -50,8 +50,8 @@ function it_registers_a_class_with_a_boolean_condition()
     {
         $this->reset();
 
-        $this->register('class1', 'spec\Http\Discovery\ClassToFind', false);
-        $this->register('class2', 'spec\Http\Discovery\AnotherClassToFind', true);
+        $this->register('spec\Http\Discovery\AnotherClassToFind', true);
+        $this->register('spec\Http\Discovery\ClassToFind', false);
 
         $this->find()->shouldHaveType('spec\Http\Discovery\AnotherClassToFind');
     }
@@ -60,8 +60,8 @@ function it_registers_a_class_with_an_invalid_condition()
     {
         $this->reset();
 
-        $this->register('class1', 'spec\Http\Discovery\ClassToFind', new \stdClass);
-        $this->register('class2', 'spec\Http\Discovery\AnotherClassToFind', true);
+        $this->register('spec\Http\Discovery\AnotherClassToFind', true);
+        $this->register('spec\Http\Discovery\ClassToFind', new \stdClass);
 
         $this->find()->shouldHaveType('spec\Http\Discovery\AnotherClassToFind');
     }
@@ -72,7 +72,7 @@ function it_resets_cache_when_a_class_is_registered()
 
         $this->find()->shouldHaveType('spec\Http\Discovery\ClassToFind');
 
-        $this->register('class1', 'spec\Http\Discovery\AnotherClassToFind');
+        $this->register('spec\Http\Discovery\AnotherClassToFind');
 
         $this->find()->shouldHaveType('spec\Http\Discovery\AnotherClassToFind');
     }
@@ -83,16 +83,14 @@ function it_caches_a_found_class()
 
         $this->find()->shouldHaveType('spec\Http\Discovery\ClassToFind');
 
-        $this->registerWithoutCacheReset('class1', 'spec\Http\Discovery\AnotherClassToFind');
+        $this->registerWithoutCacheReset('spec\Http\Discovery\AnotherClassToFind');
 
         $this->find()->shouldhaveType('spec\Http\Discovery\ClassToFind');
     }
 
     function it_throws_an_exception_when_no_class_is_found()
     {
-        $this->reset();
-
-        $this->register('class1', 'invalid');
+        $this->resetEmpty();
 
         $this->shouldThrow('Http\Discovery\NotFoundException')->duringFind();
     }
@@ -115,19 +113,28 @@ public function reset()
         static::$cache = null;
 
         static::$classes = [
-            'class1' => [
+            [
                 'class'     => 'spec\Http\Discovery\ClassToFind',
                 'condition' => 'spec\Http\Discovery\ClassToFind'
             ],
         ];
     }
 
-    public function registerWithoutCacheReset($name, $class, $condition = null)
+    public function registerWithoutCacheReset($class, $condition = null)
     {
-        static::$classes[$name] = [
+        $definition = [
             'class'     => $class,
-            'condition' => $condition ?: $class,
+            'condition' => isset($condition) ? $condition : $class,
         ];
+
+        array_unshift(static::$classes, $definition);
+    }
+
+    public function resetEmpty()
+    {
+        static::$cache = null;
+
+        static::$classes = [];
     }
 }
 

spec/MessageFactoryDiscoverySpec.php

@@ -16,14 +16,8 @@ function it_is_a_class_discovery()
         $this->shouldHaveType('Http\Discovery\ClassDiscovery');
     }
 
-    function it_finds_guzzle_then_zend_by_default()
+    function it_finds_an_http_message_factory()
     {
-        $this->find()->shouldHaveType('Http\Discovery\MessageFactory\GuzzleFactory');
-
-        $this->register('guzzle', 'invalid', '');
-
-        if (class_exists('Zend\Diactoros\Request')) {
-            $this->find()->shouldHaveType('Http\Discovery\MessageFactory\DiactorosFactory');
-        }
+        $this->find()->shouldHaveType('Http\Message\MessageFactory');
     }
 }

spec/UriFactoryDiscoverySpec.php

@@ -3,7 +3,6 @@
 namespace spec\Http\Discovery;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class UriFactoryDiscoverySpec extends ObjectBehavior
 {
@@ -17,14 +16,8 @@ function it_is_a_class_discovery()
         $this->shouldHaveType('Http\Discovery\ClassDiscovery');
     }
 
-    function it_finds_guzzle_then_zend_by_default()
+    function it_finds_an_http_uri_factory()
     {
-        $this->find()->shouldHaveType('Http\Discovery\UriFactory\GuzzleFactory');
-
-        $this->register('guzzle', 'invalid', '');
-
-        if (class_exists('Zend\Diactoros\Request')) {
-            $this->find()->shouldHaveType('Http\Discovery\UriFactory\DiactorosFactory');
-        }
+        $this->find()->shouldHaveType('Http\Message\UriFactory');
     }
 }

src/ClassDiscovery.php

@@ -21,18 +21,19 @@ abstract class ClassDiscovery
     /**
      * Add a class (and condition) to the discovery registry
      *
-     * @param string $name
      * @param string $class     Class that will be instantiated if found
      * @param string $condition Optional other class to check for existence
      */
-    public static function register($name, $class, $condition = null)
+    public static function register($class, $condition = null)
     {
         static::$cache = null;
 
-        static::$classes[$name] = [
+        $definition = [
             'class'     => $class,
             'condition' => isset($condition) ? $condition : $class,
         ];
+
+        array_unshift(static::$classes, $definition);
     }
 
     /**