-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
194 additions
and
54 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
<?php | ||
|
||
namespace Nip\Router\Legacy\Route; | ||
|
||
/** | ||
* Trait AbstractRouteTrait | ||
* @package Nip\Router\Legacy\Route | ||
*/ | ||
trait AbstractRouteTrait | ||
{ | ||
/** | ||
* @param array $params | ||
* @deprecated Use setDefaults | ||
*/ | ||
public function setParams($params = []) | ||
{ | ||
$this->getParser()->setParams($params); | ||
$this->setDefaults($params); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<?php | ||
|
||
namespace Nip\Router\Legacy\Router\Traits; | ||
|
||
use Nip\Request; | ||
use Nip\Router\Route\Route; | ||
use Psr\Http\Message\ServerRequestInterface; | ||
|
||
/** | ||
* Trait HasMatcherTrait | ||
* @package Nip\Router\Legacy\Router\Traits | ||
*/ | ||
trait HasMatcherTrait | ||
{ | ||
/** | ||
* @param Request|ServerRequestInterface $request | ||
* @return array | ||
* @deprecated Use matchRequest($request) | ||
*/ | ||
public function route($request) | ||
{ | ||
$return = $this->matchRequest($request); | ||
return $return; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?php | ||
|
||
namespace Nip\Router\Tests\Legacy\Route; | ||
|
||
use Nip\Router\Route\Route; | ||
use Nip\Router\Tests\AbstractTest; | ||
|
||
/** | ||
* Class AbstractRouteTraitTest | ||
* @package Nip\Router\Tests\Legacy\Route | ||
*/ | ||
class AbstractRouteTraitTest extends AbstractTest | ||
{ | ||
public function testSetParams() | ||
{ | ||
$route = new Route(); | ||
self::assertSame([], $route->getDefaults()); | ||
|
||
$params = ['test' => 9]; | ||
$route->setParams($params); | ||
self::assertSame($params, $route->getDefaults()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
<?php | ||
|
||
namespace Nip\Router\Tests\Legacy\Router\Traits; | ||
|
||
use Nip\Request; | ||
use Nip\Router\Route\Route; | ||
use Nip\Router\RouteFactory; | ||
use Nip\Router\Router; | ||
use Nip\Router\Tests\AbstractTest; | ||
use Nip\Router\Tests\Fixtures\Application\Library\Router\Route\StandardRoute; | ||
use Symfony\Component\Routing\Exception\ResourceNotFoundException; | ||
|
||
/** | ||
* Class HasMatcherTraitTest | ||
* @package Nip\Router\Tests\Legacy\Router\Traits | ||
*/ | ||
class HasMatcherTraitTest extends AbstractTest | ||
{ | ||
|
||
public function testNotFound() | ||
{ | ||
$router = new Router(); | ||
self::expectException(ResourceNotFoundException::class); | ||
|
||
$request = Request::create('/404'); | ||
$router->route($request); | ||
} | ||
|
||
public function testRouteLiteral() | ||
{ | ||
$router = new Router(); | ||
$collection = $router->getRoutes(); | ||
|
||
RouteFactory::generateLiteralRoute($collection, "admin.index", Route::class, "/admin", "/index"); | ||
RouteFactory::generateLiteralRoute($collection, "api.index", Route::class, "/api", "/index"); | ||
|
||
$request = Request::create('/api/index'); | ||
$params = $router->route($request); | ||
self::assertEquals(['_route' => 'api.index'], $params); | ||
|
||
$currentRoute = $router->getCurrent(); | ||
self::assertInstanceOf(Route::class, $currentRoute); | ||
self::assertEquals('api.index', $currentRoute->getName()); | ||
|
||
$request = Request::create('/admin/index'); | ||
$router->route($request); | ||
self::assertEquals('admin.index', $router->getCurrent()->getName()); | ||
} | ||
|
||
public function testRouteDynamic() | ||
{ | ||
$router = new Router(); | ||
$collection = $router->getRoutes(); | ||
|
||
RouteFactory::generateStandardRoute($collection, "admin.standard", StandardRoute::class, "/admin", | ||
'/:controller/:action', ['module' => 'admin']); | ||
RouteFactory::generateStandardRoute($collection, "api.standard", StandardRoute::class, "/api", | ||
'/:controller/:action', ['module' => 'api']); | ||
|
||
$request = Request::create('/api/pages/delete'); | ||
self::assertEquals( | ||
['module' => 'api', 'controller' => 'pages', 'action' => 'delete','_route' => 'api.standard'], | ||
$router->route($request) | ||
); | ||
|
||
$request = Request::create('/admin/pages/delete'); | ||
self::assertEquals( | ||
['module' => 'admin', 'controller' => 'pages', 'action' => 'delete', '_route' => 'admin.standard'], | ||
$router->route($request) | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.