Bugfixes (#71)

* Prepend and append should handle FQN and not objects

* Bugfixes

* typo

* Added tests

Author: Nyholm

spec/ClassDiscoverySpec.php

@@ -11,6 +11,8 @@
 use Puli\Repository\Api\ResourceRepository;
 use PhpSpec\ObjectBehavior;
 use spec\Http\Discovery\Helper\DiscoveryHelper;
+use spec\Http\Discovery\Helper\FailedDiscoveryStrategy;
+use spec\Http\Discovery\Helper\SuccessfullDiscoveryStrategy;
 
 class ClassDiscoverySpec extends ObjectBehavior
 {
@@ -32,24 +34,53 @@ function it_throws_an_exception_when_no_candidate_found(DiscoveryStrategy $strat
         $this->shouldThrow(DiscoveryFailedException::class)->duringFind('NoCandidate');
     }
 
-    function it_returns_a_class(DiscoveryStrategy $strategy)
+    function it_returns_a_class()
     {
         $candidate = ['class' => 'ClassName', 'condition' => true];
         DiscoveryHelper::setClasses('Foobar', [$candidate]);
 
         $this->find('Foobar')->shouldReturn('ClassName');
     }
 
-    function it_validates_conditions(DiscoveryStrategy $strategy) {
+    function it_validates_conditions() {
         $c0 = ['class' => 'ClassName0', 'condition' => false];
         $c1 = ['class' => 'ClassName1', 'condition' => true];
         $c2 = ['class' => 'ClassName2', 'condition' => false];
         DiscoveryHelper::setClasses('Foobar', [$c0, $c1, $c2]);
 
         $this->find('Foobar')->shouldReturn('ClassName1');
     }
+
+    function it_prepends_strategies() {
+        $candidate = ['class' => 'Added'];
+        DiscoveryHelper::setClasses('Foobar', [$candidate]);
+
+        ClassDiscovery::setStrategies([SuccessfullDiscoveryStrategy::class]);
+        ClassDiscovery::prependStrategy(DiscoveryHelper::class);
+
+        $this->find('Foobar')->shouldReturn('Added');
+    }
+
+    function it_appends_strategies() {
+        $candidate = ['class' => 'Added'];
+        DiscoveryHelper::setClasses('Foobar', [$candidate]);
+
+        // Make sure our strategy is added to the list
+        ClassDiscovery::setStrategies([FailedDiscoveryStrategy::class]);
+        ClassDiscovery::appendStrategy(DiscoveryHelper::class);
+
+        $this->find('Foobar')->shouldReturn('Added');
+
+        // Make sure it is added last in the list
+        ClassDiscovery::setStrategies([SuccessfullDiscoveryStrategy::class]);
+        ClassDiscovery::appendStrategy(DiscoveryHelper::class);
+
+        $this->find('Foobar')->shouldReturn('Success');
+    }
 }
 
+
+
 class ClassDiscoveryStub extends ClassDiscovery
 {
     public static function find($type)

spec/Helper/FailedDiscoveryStrategy.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace spec\Http\Discovery\Helper;
+
+use Http\Discovery\Strategy\DiscoveryStrategy;
+
+/**
+ * This is a discovery helper used in tests. It will always pass an empty array of candidates.
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+class FailedDiscoveryStrategy implements DiscoveryStrategy
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getCandidates($type)
+    {
+        return [];
+    }
+}

spec/Helper/SuccessfullDiscoveryStrategy.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace spec\Http\Discovery\Helper;
+
+use Http\Discovery\Strategy\DiscoveryStrategy;
+
+/**
+ * This is a discovery helper used in tests. It will always pass a class named "Sucess"
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+class SuccessfullDiscoveryStrategy implements DiscoveryStrategy
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getCandidates($type)
+    {
+        return [['class'=>'Success']];
+    }
+}

src/ClassDiscovery.php

@@ -4,7 +4,6 @@
 
 use Http\Discovery\Exception\DiscoveryFailedException;
 use Http\Discovery\Exception\StrategyUnavailableException;
-use Http\Discovery\Strategy\DiscoveryStrategy;
 
 /**
  * Registry that based find results on class existence.
@@ -88,8 +87,10 @@ private static function getFromCache($type)
         }
 
         $candidate = self::$cache[$type];
-        if (!self::evaluateCondition($candidate['condition'])) {
-            return;
+        if (isset($candidate['condition'])) {
+            if (!self::evaluateCondition($candidate['condition'])) {
+                return;
+            }
         }
 
         return $candidate['class'];
@@ -109,7 +110,7 @@ private static function storeInCache($type, $class)
     /**
      * Set new strategies and clear the cache.
      *
-     * @param DiscoveryStrategy[] $strategies
+     * @param array $strategies string array of fully qualified class name to a DiscoveryStrategy
      */
     public static function setStrategies(array $strategies)
     {
@@ -120,9 +121,9 @@ public static function setStrategies(array $strategies)
     /**
      * Append a strategy at the end of the strategy queue.
      *
-     * @param DiscoveryStrategy $strategy
+     * @param string $strategy Fully qualified class name to a DiscoveryStrategy
      */
-    public static function appendStrategy(DiscoveryStrategy $strategy)
+    public static function appendStrategy($strategy)
     {
         self::$strategies[] = $strategy;
         self::clearCache();
@@ -131,11 +132,11 @@ public static function appendStrategy(DiscoveryStrategy $strategy)
     /**
      * Prepend a strategy at the beginning of the strategy queue.
      *
-     * @param DiscoveryStrategy $strategy
+     * @param string $strategy Fully qualified class name to a DiscoveryStrategy
      */
-    public static function prependStrategy(DiscoveryStrategy $strategy)
+    public static function prependStrategy($strategy)
     {
-        self::$strategies = array_unshift(self::$strategies, $strategy);
+        array_unshift(self::$strategies, $strategy);
         self::clearCache();
     }