Do not modify current router, wrap it instead

[Closes #38]
Kdyby · May 1, 2016 · 5fddef9 · 5fddef9
1 parent 0c752d1
commit 5fddef9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/src/Kdyby/Console/CliRouter.php b/src/Kdyby/Console/CliRouter.php
@@ -113,34 +113,4 @@ public function constructUrl(Request $appRequest, Nette\Http\Url $refUrl)
 		return NULL;
 	}
 
-
-
-	/**
-	 * @param \Nette\Application\IRouter $router
-	 * @param CliRouter $cliRouter
-	 * @throws \Nette\Utils\AssertionException
-	 * @return \Nette\Application\Routers\RouteList
-	 */
-	public static function prependTo(Nette\Application\IRouter &$router, self $cliRouter)
-	{
-		if (!$router instanceof RouteList || $router->getModule()) {
-			throw new Nette\Utils\AssertionException(
-				'If you want to use Kdyby/Console then your main router ' .
-				'must be an instance of Nette\Application\Routers\RouteList without module'
-			);
-		}
-
-		$router[] = $cliRouter; // need to increase the array size
-
-		$lastKey = count($router) - 1;
-		foreach ($router as $i => $route) {
-			if ($i === $lastKey) {
-				break;
-			}
-			$router[$i + 1] = $route;
-		}
-
-		$router[0] = $cliRouter;
-	}
-
 }
diff --git a/src/Kdyby/Console/DI/ConsoleExtension.php b/src/Kdyby/Console/DI/ConsoleExtension.php
@@ -192,8 +192,16 @@ protected function beforeCompileHookApplication(array $config)
 					'}', [FALSE, 254, $this->prefix('application')]);
 		}
 
-		$builder->getDefinition($builder->getByType('Nette\Application\IRouter') ?: 'router')
-			->addSetup('Kdyby\Console\CliRouter::prependTo($service, ?)', [$this->prefix('@router')]);
+		$routerServiceName = $builder->getByType('Nette\Application\IRouter') ?: 'router';
+		$builder->addDefinition($this->prefix('originalRouter'), $builder->getDefinition($routerServiceName))
+			->setAutowired(FALSE);
+
+		$builder->removeDefinition($routerServiceName);
+
+		$builder->addDefinition($routerServiceName)
+			->setClass('Nette\Application\Routers\RouteList')
+			->addSetup('offsetSet', [NULL, $this->prefix('@router')])
+			->addSetup('offsetSet', [NULL, $this->prefix('@originalRouter')]);
 
 		$builder->getDefinition($builder->getByType('Nette\Application\IPresenterFactory') ?: 'nette.presenterFactory')
 			->addSetup('if (method_exists($service, ?)) { $service->setMapping([? => ?]); } ' .