Merge pull request #1428 from silentworks/feature/lazy-resolve-callable

Lazily resolve the callable for better performance
slimphp · Aug 11, 2015 · b671071 · b671071
2 parents 4bd179c + d7693b0
commit b671071
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Slim/App.php b/Slim/App.php
@@ -233,7 +233,6 @@ public function any($pattern, $callable)
      */
     public function map(array $methods, $pattern, $callable)
     {
-        $callable = is_string($callable) ? $this->resolveCallable($callable) : $callable;
         if ($callable instanceof Closure) {
             $callable = $callable->bindTo($this);
         }

diff --git a/Slim/Route.php b/Slim/Route.php
@@ -302,6 +302,10 @@ public function run(ServerRequestInterface $request, ResponseInterface $response
      */
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
     {
+        if (is_string($this->callable)) {
+            $this->callable = $this->resolveCallable($this->callable);
+        }
+
         /** @var InvocationStrategyInterface $handler */
         $handler = isset($this->container) ? $this->container->get('foundHandler') : new RequestResponse();