Skip to content

Commit 34d3951

Browse files
committed
RoutingExtension: removed option 'routeClass' (BC break)
1 parent bfa8e59 commit 34d3951

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

src/Bridges/ApplicationDI/RoutingExtension.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(bool $debugMode = false)
3333
/** @var string[] */
3434
public $routes = [];
3535
/** @var ?string */
36-
public $routeClass = Nette\Application\Routers\Route::class;
36+
public $routeClass;
3737
/** @var bool */
3838
public $cache = false;
3939
};
@@ -48,8 +48,15 @@ public function loadConfiguration()
4848
->setType(Nette\Routing\Router::class)
4949
->setFactory(Nette\Application\Routers\RouteList::class);
5050

51-
foreach ($this->config->routes as $mask => $action) {
52-
$router->addSetup('$service[] = new ' . $this->config->routeClass . '(?, ?)', [$mask, $action]);
51+
if ($this->config->routeClass) {
52+
trigger_error('Option routing.routeClass is deprecated.', E_USER_DEPRECATED);
53+
foreach ($this->config->routes as $mask => $action) {
54+
$router->addSetup('$service[] = new ' . $this->config->routeClass . '(?, ?)', [$mask, $action]);
55+
}
56+
} else {
57+
foreach ($this->config->routes as $mask => $action) {
58+
$router->addSetup('$service->addRoute(?, ?)', [$mask, $action]);
59+
}
5360
}
5461

5562
if ($this->name === 'routing') {

tests/Bridges.DI/RoutingExtension.basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test('', function () {
5757

5858
$compiler = new DI\Compiler;
5959
$compiler->addExtension('routing', new RoutingExtension(false));
60-
$code = $compiler->addConfig($config)->setClassName('Container2')->compile();
60+
$code = @$compiler->addConfig($config)->setClassName('Container2')->compile(); // @ routingClass is deprecated
6161
eval($code);
6262

6363
$container = new Container2;

0 commit comments

Comments
 (0)