flash/index
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow repeat Route attributes.

Browse source
This commit is contained in:
flash 2023-09-07 22:37:04 +00:00
parent 0710597062
commit a4e39d5e56
3 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
0.2309.72221 0.2309.72236

6
src/Routing/Route.php
View file

@ -7,12 +7,11 @@ namespace Index\Routing;
use Attribute; use Attribute;
use ReflectionObject; use ReflectionObject;
use UnexpectedValueException;
/** /**
* Provides an attribute for marking methods in a class as routes. * Provides an attribute for marking methods in a class as routes.
*/ */
#[Attribute] #[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
class Route { class Route {
/** @internal */ /** @internal */
public function __construct( public function __construct(
@ -52,9 +51,6 @@ class Route {
$attrInfos = $methodInfo->getAttributes(Route::class); $attrInfos = $methodInfo->getAttributes(Route::class);
foreach($attrInfos as $attrInfo) { foreach($attrInfos as $attrInfo) {
if($attrInfo->isRepeated())
throw new UnexpectedValueException('Only one instance of the Route attribute should be used per method.');
$routeInfo = $attrInfo->newInstance(); $routeInfo = $attrInfo->newInstance();
$router->add( $router->add(
$routeInfo->getMethod(), $routeInfo->getMethod(),

26
tests/RouterTest.php
View file

@ -6,10 +6,8 @@
declare(strict_types=1); declare(strict_types=1);
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Index\Routing\IRouteHandler;
use Index\Routing\Route; use Index\Routing\Route;
use Index\Routing\RouteHandler; use Index\Routing\RouteHandler;
use Index\Routing\RouteHandlerTrait;
use Index\Routing\Router; use Index\Routing\Router;
/** /**
@ -118,9 +116,7 @@ final class RouterTest extends TestCase {
public function testAttribute(): void { public function testAttribute(): void {
$router = new Router; $router = new Router;
$handler = new class implements IRouteHandler { $handler = new class extends RouteHandler {
use RouteHandlerTrait;
#[Route('GET', '/')] #[Route('GET', '/')]
public function getIndex() { public function getIndex() {
return 'index'; return 'index';
@ -136,24 +132,22 @@ final class RouterTest extends TestCase {
return 'static'; return 'static';
} }
public function hasNoAttr() { #[Route('GET', '/meow')]
#[Route('POST', '/meow')]
public function multiple() {
return 'meow'; return 'meow';
} }
public function hasNoAttr() {
return 'not a route';
}
}; };
$router->register($handler); $router->register($handler);
$this->assertEquals('index', $router->resolve('GET', '/')->run()); $this->assertEquals('index', $router->resolve('GET', '/')->run());
$this->assertEquals('avatar', $router->resolve('POST', '/avatar')->run()); $this->assertEquals('avatar', $router->resolve('POST', '/avatar')->run());
$this->assertEquals('static', $router->resolve('PUT', '/static')->run()); $this->assertEquals('static', $router->resolve('PUT', '/static')->run());
$this->assertEquals('meow', $router->resolve('GET', '/meow')->run());
$badHandler = new class extends RouteHandler { $this->assertEquals('meow', $router->resolve('POST', '/meow')->run());
#[Route('GET', '/')]
#[Route('POST', '/meow')]
public function getPostBad() {
return 'this is bad';
}
};
$this->expectException(UnexpectedValueException::class);
$router->register($badHandler);
} }
} }