RoutingExtension: creates service 'routes' only when routes are defin…

…ed (BC break)
nette · Jul 12, 2020 · 806cba6 · 806cba6
1 parent 0ef0688
commit 806cba6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Bridges/ApplicationDI/RoutingExtension.php b/src/Bridges/ApplicationDI/RoutingExtension.php
@@ -43,6 +43,10 @@ public function __construct(bool $debugMode = false)
 
 	public function loadConfiguration()
 	{
+		if (!$this->config->routes) {
+			return;
+		}
+
 		$builder = $this->getContainerBuilder();
 
 		$router = $builder->addDefinition($this->prefix('router'))
@@ -86,7 +90,9 @@ public function beforeCompile()
 	public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
 		if ($this->config->cache) {
-			$method = $class->getMethod(Nette\DI\Container::getMethodName($this->prefix('router')));
+			$builder = $this->getContainerBuilder();
+			$def = $builder->getDefinitionByType(Nette\Routing\Router::class);
+			$method = $class->getMethod(Nette\DI\Container::getMethodName($def->getName()));
 			try {
 				$router = eval($method->getBody());
 				if ($router instanceof Nette\Application\Routers\RouteList) {