Merge 2356744 into 4140c38

PHP-DI · Jul 14, 2016 · d6f7594 · d6f7594
2 parents 4140c38 + 2356744
commit d6f7594
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/src/CallableResolver.php b/src/CallableResolver.php
@@ -3,6 +3,7 @@
 namespace Invoker;
 
 use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\NotFoundException;
 use Invoker\Exception\NotCallableException;
 
 /**
@@ -70,29 +71,30 @@ private function resolveFromContainer($callable)
 
         // The callable is a container entry name
         if (is_string($callable)) {
-            if ($this->container->has($callable)) {
+            try {
                 return $this->container->get($callable);
-            } else {
+            } catch (NotFoundException $e) {
                 throw NotCallableException::fromInvalidCallable($callable, true);
             }
         }
 
         // The callable is an array whose first item is a container entry name
         // e.g. ['some-container-entry', 'methodToCall']
         if (is_array($callable) && is_string($callable[0])) {
-            if ($this->container->has($callable[0])) {
+            try {
                 // Replace the container entry name by the actual object
                 $callable[0] = $this->container->get($callable[0]);
                 return $callable;
-            } elseif ($isStaticCallToNonStaticMethod) {
-                throw new NotCallableException(sprintf(
-                    'Cannot call %s::%s() because %s() is not a static method and "%s" is not a container entry',
-                    $callable[0],
-                    $callable[1],
-                    $callable[1],
-                    $callable[0]
-                ));
-            } else {
+            } catch (NotFoundException $e) {
+                if ($isStaticCallToNonStaticMethod) {
+                    throw new NotCallableException(sprintf(
+                        'Cannot call %s::%s() because %s() is not a static method and "%s" is not a container entry',
+                        $callable[0],
+                        $callable[1],
+                        $callable[1],
+                        $callable[0]
+                    ));
+                }
                 throw new NotCallableException(sprintf(
                     'Cannot call %s on %s because it is not a class nor a valid container entry',
                     $callable[1],

diff --git a/tests/Mock/ArrayContainer.php b/tests/Mock/ArrayContainer.php
@@ -18,6 +18,10 @@ public function __construct(array $entries = array())
 
     public function get($id)
     {
+        if (!array_key_exists($id, $this->entries)) {
+            throw new NotFound;
+        }
+
         return $this->entries[$id];
     }
 

diff --git a/tests/Mock/NotFound.php b/tests/Mock/NotFound.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types = 1);
+
+namespace Invoker\Test\Mock;
+
+use Interop\Container\Exception\NotFoundException;
+
+class NotFound extends \Exception implements NotFoundException
+{
+}