Make sure CallableResolver throws an exception if the callable cannot…

… be resolved
slimphp · Aug 18, 2015 · ba08a05 · ba08a05
1 parent e87d996
commit ba08a05
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Slim/CallableResolver.php b/Slim/CallableResolver.php
@@ -64,15 +64,13 @@ public function resolve($toResolve)
                 }
                 $resolved = [new $class, $method];
             }
-
-            if (!is_callable($resolved)) {
-                throw new RuntimeException(sprintf('%s is not resolvable', $toResolve));
-            }
         } else {
             $resolved = $toResolve;
         }
 
-        if ($resolved instanceof \Closure) {
+        if (!is_callable($resolved)) {
+            throw new RuntimeException(sprintf('%s is not resolvable', $toResolve));
+        } elseif ($resolved instanceof \Closure) {
             $resolved = $resolved->bindTo($this->container);
         }