Merge pull request #43 from nass600/fix-callable

Fixed callable check on addProvider
h4cc · Apr 13, 2015 · c857afb · c857afb
2 parents da710fc + fc3cd77
commit c857afb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Fixtures/FixtureManager.php b/Fixtures/FixtureManager.php
@@ -283,7 +283,7 @@ protected function configureLoader(LoaderInterface $loader)
                 $loader->setLogger($this->logger);
             }
         }
-        if (is_callable($loader, 'addProvider')) { // new in Alice 1.7.2
+        if (is_callable(array($loader, 'addProvider'))) { // new in Alice 1.7.2
             $loader->addProvider($this->providers);
         } else { // BC path
             $loader->setProviders($this->providers);

diff --git a/Tests/Fixture/FixtureManagerTest.php b/Tests/Fixture/FixtureManagerTest.php
@@ -188,7 +188,6 @@ public function testProviders()
           ->with('yaml', 'en_EN')->will($this->returnValue($this->yamlLoaderMock));
 
         $this->yamlLoaderMock->expects($this->once())->method('load')->will($this->returnValue(array()));
-        $this->yamlLoaderMock->expects($this->once())->method('setProviders');
 
         $provider = function () {
             return "foobar";