RouteList: added warmupCache()

dg · dg · commit bd834c6a97a8 · 2016-04-06T12:25:42.000+02:00
diff --git a/src/Application/Routers/RouteList.php b/src/Application/Routers/RouteList.php
@@ -55,22 +55,7 @@ public function match(Nette\Http\IRequest $httpRequest)
 	public function constructUrl(Nette\Application\Request $appRequest, Nette\Http\Url $refUrl)
 	{
 		if ($this->cachedRoutes === NULL) {
-			$routes = array();
-			$routes['*'] = array();
-
-			foreach ($this as $route) {
-				$presenters = $route instanceof Route && is_array($tmp = $route->getTargetPresenters())
-					? $tmp : array_keys($routes);
-
-				foreach ($presenters as $presenter) {
-					if (!isset($routes[$presenter])) {
-						$routes[$presenter] = $routes['*'];
-					}
-					$routes[$presenter][] = $route;
-				}
-			}
-
-			$this->cachedRoutes = $routes;
+			$this->warmupCache();
 		}
 
 		if ($this->module) {
@@ -98,6 +83,29 @@ public function constructUrl(Nette\Application\Request $appRequest, Nette\Http\U
 	}
 
 
+	/** @internal */
+	public function warmupCache()
+	{
+		$routes = array();
+		$routes['*'] = array();
+
+		foreach ($this as $route) {
+			$presenters = $route instanceof Route && is_array($tmp = $route->getTargetPresenters())
+				? $tmp
+				: array_keys($routes);
+
+			foreach ($presenters as $presenter) {
+				if (!isset($routes[$presenter])) {
+					$routes[$presenter] = $routes['*'];
+				}
+				$routes[$presenter][] = $route;
+			}
+		}
+
+		$this->cachedRoutes = $routes;
+	}
+
+
 	/**
 	 * Adds the router.
 	 * @param  mixed
diff --git a/src/Bridges/ApplicationDI/RoutingExtension.php b/src/Bridges/ApplicationDI/RoutingExtension.php
@@ -68,13 +68,17 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		if (!empty($this->config['cache'])) {
 			$method = $class->getMethod(Nette\DI\Container::getMethodName($this->prefix('router')));
 			try {
-				$router = serialize(eval($method->getBody()));
+				$router = eval($method->getBody());
+				if ($router instanceof Nette\Application\Routers\RouteList) {
+					$router->warmupCache();
+				}
+				$s = serialize($router);
 			} catch (\Throwable $e) {
 				throw new Nette\DI\ServiceCreationException('Unable to cache router due to error: ' . $e->getMessage(), 0, $e);
 			} catch (\Exception $e) {
 				throw new Nette\DI\ServiceCreationException('Unable to cache router due to error: ' . $e->getMessage(), 0, $e);
 			}
-			$method->setBody('return unserialize(?);', array($router));
+			$method->setBody('return unserialize(?);', array($s));
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,17 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)`
`68`	`68`	`if (!empty($this->config['cache'])) {`
`69`	`69`	`$method = $class->getMethod(Nette\DI\Container::getMethodName($this->prefix('router')));`
`70`	`70`	`try {`
`71`		`- $router = serialize(eval($method->getBody()));`
	`71`	`+ $router = eval($method->getBody());`
	`72`	`+ if ($router instanceof Nette\Application\Routers\RouteList) {`
	`73`	`+ $router->warmupCache();`
	`74`	`+ }`
	`75`	`+ $s = serialize($router);`
`72`	`76`	`} catch (\Throwable $e) {`
`73`	`77`	`throw new Nette\DI\ServiceCreationException('Unable to cache router due to error: ' . $e->getMessage(), 0, $e);`
`74`	`78`	`} catch (\Exception $e) {`
`75`	`79`	`throw new Nette\DI\ServiceCreationException('Unable to cache router due to error: ' . $e->getMessage(), 0, $e);`
`76`	`80`	`}`
`77`		`- $method->setBody('return unserialize(?);', array($router));`
	`81`	`+ $method->setBody('return unserialize(?);', array($s));`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`