Merge branch 'Setitch-3.x' into 3.x

Closes slimphp#1907
L0cutus · Jul 26, 2016 · 3bd204e · 3bd204e
2 parents 049de06 + 7234b5a
commit 3bd204e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Slim/CallableResolver.php b/Slim/CallableResolver.php
@@ -79,9 +79,9 @@ public function resolve($toResolve)
         }
 
         if (!is_callable($resolved)) {
-            throw new RuntimeException(sprintf('%s is not resolvable', $toResolve));
+            throw new RuntimeException(sprintf('%s is not resolvable', is_array($toResolve) || is_object($toResolve) ? json_encode($toResolve) : $toResolve));
         }
-
+        
         return $resolved;
     }
 }
diff --git a/tests/CallableResolverTest.php b/tests/CallableResolverTest.php
@@ -128,4 +128,11 @@ public function testClassNotFoundThrowException()
         $this->setExpectedException('\RuntimeException', 'Callable Unknown does not exist');
         $resolver->resolve('Unknown:notFound');
     }
+
+    public function testCallableClassNotFoundThrowException()
+    {
+        $resolver = new CallableResolver($this->container);
+        $this->setExpectedException('\RuntimeException', 'is not resolvable');
+        $resolver->resolve(['Unknown', 'notFound']);
+    }
 }