Skip to content

Commit 5068e10

Browse files
dgdg
committed
Nette\Application\IRouter -> Nette\Routing\Router
1 parent 5bdedc1 commit 5068e10

File tree

9 files changed

+32
-29
lines changed

9 files changed

+32
-29
lines changed

‎src/Application/Application.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace Nette\Application;
1111

1212
use Nette;
13+
use Nette\Routing\Router;
1314

1415

1516
/**
@@ -61,11 +62,11 @@ class Application
6162
/** @var IPresenterFactory */
6263
private $presenterFactory;
6364

64-
/** @var IRouter */
65+
/** @var Router */
6566
private $router;
6667

6768

68-
public function __construct(IPresenterFactory $presenterFactory, IRouter $router, Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse)
69+
public function __construct(IPresenterFactory $presenterFactory, Router $router, Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse)
6970
{
7071
$this->httpRequest = $httpRequest;
7172
$this->httpResponse = $httpResponse;
@@ -204,7 +205,7 @@ final public function getPresenter(): ?IPresenter
204205
/**
205206
* Returns router.
206207
*/
207-
public function getRouter(): IRouter
208+
public function getRouter(): Router
208209
{
209210
return $this->router;
210211
}

‎src/Application/LinkGenerator.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace Nette\Application;
1111

1212
use Nette;
13+
use Nette\Routing\Router;
1314

1415

1516
/**
@@ -19,7 +20,7 @@ final class LinkGenerator
1920
{
2021
use Nette\SmartObject;
2122

22-
/** @var IRouter */
23+
/** @var Router */
2324
private $router;
2425

2526
/** @var Nette\Http\UrlScript */
@@ -29,7 +30,7 @@ final class LinkGenerator
2930
private $presenterFactory;
3031

3132

32-
public function __construct(IRouter $router, Nette\Http\UrlScript $refUrl, IPresenterFactory $presenterFactory = null)
33+
public function __construct(Router $router, Nette\Http\UrlScript $refUrl, IPresenterFactory $presenterFactory = null)
3334
{
3435
$this->router = $router;
3536
$this->refUrl = $refUrl;

‎src/Application/MicroPresenter.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Nette\Application;
1515
use Nette\Application\Responses;
1616
use Nette\Http;
17+
use Nette\Routing\Router;
1718

1819

1920
/**
@@ -29,14 +30,14 @@ final class MicroPresenter implements Application\IPresenter
2930
/** @var Nette\Http\IRequest|null */
3031
private $httpRequest;
3132

32-
/** @var Application\IRouter|null */
33+
/** @var Router|null */
3334
private $router;
3435

3536
/** @var Application\Request|null */
3637
private $request;
3738

3839

39-
public function __construct(Nette\DI\Container $context = null, Http\IRequest $httpRequest = null, Application\IRouter $router = null)
40+
public function __construct(Nette\DI\Container $context = null, Http\IRequest $httpRequest = null, Router $router = null)
4041
{
4142
$this->context = $context;
4243
$this->httpRequest = $httpRequest;

‎src/Application/UI/Presenter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ abstract class Presenter extends Control implements Application\IPresenter
120120
/** @var Nette\Application\IPresenterFactory */
121121
private $presenterFactory;
122122

123-
/** @var Nette\Application\IRouter */
123+
/** @var Nette\Routing\Router */
124124
private $router;
125125

126126
/** @var Nette\Security\User */
@@ -1264,7 +1264,7 @@ public function getFlashSession(): Http\SessionSection
12641264
/********************* services ****************d*g**/
12651265

12661266

1267-
final public function injectPrimary(Nette\DI\Container $context = null, Application\IPresenterFactory $presenterFactory = null, Application\IRouter $router = null,
1267+
final public function injectPrimary(Nette\DI\Container $context = null, Application\IPresenterFactory $presenterFactory = null, Nette\Routing\Router $router = null,
12681268
Http\IRequest $httpRequest, Http\IResponse $httpResponse, Http\Session $session = null, Nette\Security\User $user = null, ITemplateFactory $templateFactory = null)
12691269
{
12701270
if ($this->presenterFactory !== null) {

‎src/Bridges/ApplicationDI/RoutingExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function loadConfiguration()
4242
$builder = $this->getContainerBuilder();
4343

4444
$router = $builder->addDefinition($this->prefix('router'))
45-
->setType(Nette\Application\IRouter::class)
45+
->setType(Nette\Routing\Router::class)
4646
->setFactory(Nette\Application\Routers\RouteList::class)
4747
->setExported();
4848

‎src/Bridges/ApplicationTracy/RoutingPanel.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class RoutingPanel implements Tracy\IBarPanel
2323
{
2424
use Nette\SmartObject;
2525

26-
/** @var Nette\Application\IRouter */
26+
/** @var Nette\Routing\Router */
2727
private $router;
2828

2929
/** @var Nette\Http\IRequest */
@@ -54,7 +54,7 @@ public static function initializePanel(Nette\Application\Application $applicatio
5454
}
5555

5656

57-
public function __construct(Nette\Application\IRouter $router, Nette\Http\IRequest $httpRequest, Nette\Application\IPresenterFactory $presenterFactory)
57+
public function __construct(Nette\Routing\Router $router, Nette\Http\IRequest $httpRequest, Nette\Application\IPresenterFactory $presenterFactory)
5858
{
5959
$this->router = $router;
6060
$this->httpRequest = $httpRequest;
@@ -95,7 +95,7 @@ public function getPanel(): string
9595
/**
9696
* Analyses simple route.
9797
*/
98-
private function analyse(Nette\Application\IRouter $router, string $module = ''): void
98+
private function analyse(Nette\Routing\Router $router, string $module = ''): void
9999
{
100100
if ($router instanceof Routers\RouteList) {
101101
foreach ($router as $subRouter) {

‎tests/Application/Application.run.phpt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use Nette\Application\ApplicationException;
77
use Nette\Application\BadRequestException;
88
use Nette\Application\IPresenterFactory;
99
use Nette\Application\IResponse;
10-
use Nette\Application\IRouter;
1110
use Nette\Application\Request;
1211
use Nette\Application\Responses\ForwardResponse;
1312
use Nette\Application\Responses\TextResponse;
13+
use Nette\Routing\Router;
1414
use Tester\Assert;
1515

1616

@@ -79,7 +79,7 @@ $httpResponse->shouldIgnoreMissing();
7979
// no route without error presenter
8080
Assert::exception(function () use ($httpRequest, $httpResponse) {
8181
$presenterFactory = Mockery::mock(IPresenterFactory::class);
82-
$router = Mockery::mock(IRouter::class);
82+
$router = Mockery::mock(Router::class);
8383
$router->shouldReceive('match')->andReturn(null);
8484

8585
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -94,7 +94,7 @@ test(function () use ($httpRequest, $httpResponse) {
9494
$presenterFactory = Mockery::mock(IPresenterFactory::class);
9595
$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
9696

97-
$router = Mockery::mock(IRouter::class);
97+
$router = Mockery::mock(Router::class);
9898
$router->shouldReceive('match')->andReturn(null);
9999

100100
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -120,7 +120,7 @@ test(function () use ($httpRequest, $httpResponse) {
120120
$presenterFactory = Mockery::mock(IPresenterFactory::class);
121121
$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
122122

123-
$router = Mockery::mock(IRouter::class);
123+
$router = Mockery::mock(Router::class);
124124
$router->shouldReceive('match')->andReturn(['presenter' => 'Error']);
125125

126126
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -146,7 +146,7 @@ Assert::exception(function () use ($httpRequest, $httpResponse) {
146146
$presenterFactory = Mockery::mock(IPresenterFactory::class);
147147
$presenterFactory->shouldReceive('createPresenter')->with('Missing')->andThrow(Nette\Application\InvalidPresenterException::class);
148148

149-
$router = Mockery::mock(IRouter::class);
149+
$router = Mockery::mock(Router::class);
150150
$router->shouldReceive('match')->andReturn(['presenter' => 'Missing']);
151151

152152
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -162,7 +162,7 @@ test(function () use ($httpRequest, $httpResponse) {
162162
$presenterFactory->shouldReceive('createPresenter')->with('Missing')->andThrow(Nette\Application\InvalidPresenterException::class);
163163
$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
164164

165-
$router = Mockery::mock(IRouter::class);
165+
$router = Mockery::mock(Router::class);
166166
$router->shouldReceive('match')->andReturn(['presenter' => 'Missing']);
167167

168168
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -188,7 +188,7 @@ Assert::exception(function () use ($httpRequest, $httpResponse) {
188188
$presenterFactory = Mockery::mock(IPresenterFactory::class);
189189
$presenterFactory->shouldReceive('createPresenter')->with('Bad')->andReturn(new BadPresenter);
190190

191-
$router = Mockery::mock(IRouter::class);
191+
$router = Mockery::mock(Router::class);
192192
$router->shouldReceive('match')->andReturn(['presenter' => 'Bad']);
193193

194194
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -204,7 +204,7 @@ test(function () use ($httpRequest, $httpResponse) {
204204
$presenterFactory->shouldReceive('createPresenter')->with('Bad')->andReturn(new BadPresenter);
205205
$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
206206

207-
$router = Mockery::mock(IRouter::class);
207+
$router = Mockery::mock(Router::class);
208208
$router->shouldReceive('match')->andReturn(['presenter' => 'Bad']);
209209

210210
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -232,7 +232,7 @@ Assert::noError(function () use ($httpRequest, $httpResponse) {
232232
$presenterFactory = Mockery::mock(IPresenterFactory::class);
233233
$presenterFactory->shouldReceive('createPresenter')->with('Good')->andReturn($presenter);
234234

235-
$router = Mockery::mock(IRouter::class);
235+
$router = Mockery::mock(Router::class);
236236
$router->shouldReceive('match')->andReturn(['presenter' => 'Good']);
237237

238238
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -256,7 +256,7 @@ Assert::noError(function () use ($httpRequest, $httpResponse) {
256256
$presenterFactory->shouldReceive('createPresenter')->with('Good')->andReturn($presenter);
257257
$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($errorPresenter);
258258

259-
$router = Mockery::mock(IRouter::class);
259+
$router = Mockery::mock(Router::class);
260260
$router->shouldReceive('match')->andReturn(['presenter' => 'Good']);
261261

262262
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);
@@ -281,7 +281,7 @@ Assert::noError(function () use ($httpRequest, $httpResponse) {
281281
$presenterFactory = Mockery::mock(IPresenterFactory::class);
282282
$presenterFactory->shouldReceive('createPresenter')->with('Error')->andReturn($presenter);
283283

284-
$router = Mockery::mock(IRouter::class);
284+
$router = Mockery::mock(Router::class);
285285

286286
$errors = [];
287287

@@ -315,7 +315,7 @@ Assert::noError(function () use ($httpRequest, $httpResponse) {
315315
$presenterFactory = Mockery::mock(IPresenterFactory::class);
316316
$presenterFactory->shouldReceive('createPresenter')->with('Infinity')->andReturn($presenter);
317317

318-
$router = Mockery::mock(IRouter::class);
318+
$router = Mockery::mock(Router::class);
319319
$router->shouldReceive('match')->andReturn(['presenter' => 'Infinity']);
320320

321321
$app = new Application($presenterFactory, $router, $httpRequest, $httpResponse);

‎tests/Bridges.DI/RoutingExtension.cache.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use Tester\Assert;
1515
require __DIR__ . '/../bootstrap.php';
1616

1717

18-
class MyRouter implements Nette\Application\IRouter
18+
class MyRouter implements Nette\Routing\Router
1919
{
2020
public $woken;
2121

@@ -78,7 +78,7 @@ test(function () {
7878

7979
Assert::exception(function () {
8080

81-
/** @return Nette\Application\IRouter */
81+
/** @return Nette\Routing\Router */
8282
function myRouterFactory()
8383
{
8484
return new Route('path', function () {});

‎tests/Routers/Route.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Tester\Assert;
1010

1111

12-
function testRouteIn(Nette\Application\IRouter $route, string $url, array $expectedParams = null, string $expectedUrl = null): void
12+
function testRouteIn(Nette\Routing\Router $route, string $url, array $expectedParams = null, string $expectedUrl = null): void
1313
{
1414
$urlBuilder = new Nette\Http\Url("http://example.com$url");
1515
$urlBuilder->appendQuery([
@@ -38,7 +38,7 @@ function testRouteIn(Nette\Application\IRouter $route, string $url, array $expec
3838
}
3939

4040

41-
function testRouteOut(Nette\Application\IRouter $route, array $params = []): ?string
41+
function testRouteOut(Nette\Routing\Router $route, array $params = []): ?string
4242
{
4343
$url = new Nette\Http\UrlScript('http://example.com');
4444
return $route->constructUrl($params, $url);

0 commit comments

Comments
 (0)