Merge pull request #168 from RWOverdijk/hotfix/BC-interface-fix

Reverted BC change

Author: RWOverdijk

src/AssetManager/Resolver/AggregateResolver.php

@@ -60,6 +60,10 @@ public function collect()
         $collection = array();
 
         foreach ($this->queue as $resolver) {
+            if (!method_exists($resolver, 'collect')) {
+                continue;
+            }
+
             $collection = array_merge($resolver->collect(), $collection);
         }
 

src/AssetManager/Resolver/ResolverInterface.php

@@ -12,10 +12,4 @@ interface ResolverInterface
      * @return  \Assetic\Asset\AssetInterface|null Asset instance when found, null when not.
      */
     public function resolve($path);
-
-    /**
-     * Collect all assets - used for warm up and for asset extraction
-     * @return \Assetic\Asset\AssetInterface[]
-     */
-    public function collect();
 }

tests/AssetManagerTest/Resolver/AggregateResolverTest.php

@@ -44,11 +44,10 @@ public function testResolve()
         $this->assertSame('second', $resolver->resolve('to-be-resolved'));
     }
 
-    public function testCollect()
+    public function testCollectWithCollectMethod()
     {
-        $resolver = new AggregateResolver();
-
-        $lowPriority = $this->getMock('AssetManager\Resolver\ResolverInterface');
+        $resolver    = new AggregateResolver();
+        $lowPriority = $this->getMock('AssetManager\Resolver\ResolverInterface', array('resolve', 'collect'));
         $lowPriority
             ->expects($this->exactly(2))
             ->method('collect')
@@ -57,7 +56,7 @@ public function testCollect()
 
         $this->assertContains('one', $resolver->collect());
 
-        $highPriority = $this->getMock('AssetManager\Resolver\ResolverInterface');
+        $highPriority = $this->getMock('AssetManager\Resolver\ResolverInterface', array('resolve', 'collect'));
         $highPriority
             ->expects($this->once())
             ->method('collect')
@@ -70,4 +69,22 @@ public function testCollect()
 
         $this->assertCount(3, $collection);
     }
+
+    public function testCollectWithoutCollectMethod()
+    {
+        $resolver    = new AggregateResolver();
+        $lowPriority = $this->getMock('AssetManager\Resolver\ResolverInterface');
+
+        $resolver->attach($lowPriority);
+
+        $this->assertEquals(array(), $resolver->collect());
+
+        $highPriority = $this->getMock('AssetManager\Resolver\ResolverInterface');
+        $resolver->attach($highPriority, 1000);
+
+        $collection = $resolver->collect();
+        $this->assertEquals(array(), $collection);
+
+        $this->assertCount(0, $collection);
+    }
 }