Merge branch 'mathmarques-lazy-route-finalize' into 3.x

Closes #1632

Slim/App.php

@@ -293,9 +293,8 @@ public function run($silent = false)
         $request = $this->container->get('request');
         $response = $this->container->get('response');
 
-        // Finalize routes here for middleware stack & ensure basePath is set
+        // Ensure basePath is set
         $router = $this->container->get('router');
-        $router->finalize();
         if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
             $router->setBasePath($request->getUri()->getBasePath());
         }

Slim/Interfaces/RouterInterface.php

@@ -31,14 +31,6 @@ interface RouterInterface
      */
     public function map($methods, $pattern, $handler);
 
-
-    /**
-     * Finalize registered routes in preparation for dispatching
-     *
-     * NOTE: The routes can only be finalized once.
-     */
-    public function finalize();
-
     /**
      * Dispatch router for HTTP request
      *

Slim/Route.php

@@ -51,6 +51,8 @@ class Route extends Routable implements RouteInterface
      */
     protected $groups;
 
+    private $finalized = false;
+
     /**
      * Output buffering mode
      *
@@ -89,6 +91,10 @@ public function __construct($methods, $pattern, $callable, $groups = [], $identi
      */
     public function finalize()
     {
+        if ($this->finalized) {
+            return;
+        }
+
         $groupMiddleware = [];
         foreach ($this->getGroups() as $group) {
             $groupMiddleware = array_merge($group->getMiddleware(), $groupMiddleware);
@@ -99,6 +105,8 @@ public function finalize()
         foreach ($this->getMiddleware() as $middleware) {
             $this->addMiddleware($middleware);
         }
+
+        $this->finalized = true;
     }
 
     /**
@@ -281,6 +289,9 @@ public function prepare(ServerRequestInterface $request, array $arguments)
      */
     public function run(ServerRequestInterface $request, ResponseInterface $response)
     {
+        // Finalise route now that we are about to run it
+        $this->finalize();
+
         // Traverse middleware stack and fetch updated response
         return $this->callMiddlewareStack($request, $response);
     }

Slim/Router.php

@@ -71,8 +71,6 @@ class Router implements RouterInterface
      */
     protected $routeGroups = [];
 
-    private $finalized = false;
-
     /**
      * @var \FastRoute\Dispatcher
      */
@@ -139,21 +137,6 @@ public function map($methods, $pattern, $handler)
         return $route;
     }
 
-    /**
-     * Finalize registered routes in preparation for dispatching
-     *
-     * NOTE: The routes can only be finalized once.
-     */
-    public function finalize()
-    {
-        if (!$this->finalized) {
-            foreach ($this->getRoutes() as $route) {
-                $route->finalize();
-            }
-            $this->finalized = true;
-        }
-    }
-
     /**
      * Dispatch router for HTTP request
      *
@@ -165,7 +148,6 @@ public function finalize()
      */
     public function dispatch(ServerRequestInterface $request)
     {
-        $this->finalize();
         $uri = '/' . ltrim($request->getUri()->getPath(), '/');
 
         return $this->createDispatcher()->dispatch(