This commit is contained in:
2021-09-16 14:40:25 +08:00
parent 9bdb01799b
commit 7e7239be87
2 changed files with 47 additions and 49 deletions
+27 -28
View File
@@ -5,38 +5,37 @@ namespace Annotation\Route;
use Annotation\Attribute;
use Http\Route\MiddlewareManager;
use ReflectionException;
use Http\IInterface\MiddlewareInterface;
use Http\Route\MiddlewareManager;
/**
* Class Middleware
* @package Annotation\Route
*/
#[\Attribute(\Attribute::TARGET_METHOD)] class Middleware extends Attribute
#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Middleware extends Attribute
{
/**
* Interceptor constructor.
* @param string|array $middleware
* @throws
*/
public function __construct(public string|array $middleware)
{
if (is_string($this->middleware)) {
$this->middleware = [$this->middleware];
}
$array = [];
foreach ($this->middleware as $value) {
$sn = di($value);
if (!($sn instanceof MiddlewareInterface)) {
continue;
}
$array[] = [$sn, 'onHandler'];
}
$this->middleware = $array;
}
/**
* Interceptor constructor.
* @param string|array $middleware
* @throws
*/
public function __construct(public string|array $middleware)
{
if (is_string($this->middleware)) {
$this->middleware = [$this->middleware];
}
$array = [];
foreach ($this->middleware as $value) {
$sn = di($value);
if (!($sn instanceof MiddlewareInterface)) {
continue;
}
$array[] = [$sn, 'onHandler'];
}
$this->middleware = $array;
}
/**
@@ -44,11 +43,11 @@ use Http\IInterface\MiddlewareInterface;
* @param mixed|null $method
* @return $this
*/
public function execute(mixed $class, mixed $method = null): mixed
{
MiddlewareManager::add($class, $method, $this->middleware);
return parent::execute($class, $method);
}
public function execute(mixed $class, mixed $method = null): mixed
{
MiddlewareManager::add($class, $method, $this->middleware);
return parent::execute($class, $method);
}
}
+20 -21
View File
@@ -5,22 +5,21 @@ namespace Annotation\Route;
use Annotation\Attribute;
use Exception;
use Http\Route\Router;
use Kiri\Kiri;
#[\Attribute(\Attribute::TARGET_METHOD)] class Route extends Attribute
#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Route extends Attribute
{
/**
* Route constructor.
* @param string $uri
* @param string $method
* @param string $version
*/
public function __construct(public string $uri,public string $method,public string $version = 'v.1.0')
{
}
/**
* Route constructor.
* @param string $uri
* @param string $method
* @param string $version
*/
public function __construct(public string $uri, public string $method, public string $version = 'v.1.0')
{
}
/**
@@ -28,16 +27,16 @@ use Kiri\Kiri;
* @param mixed|null $method
* @return Router
*/
public function execute(mixed $class, mixed $method = null): Router
{
// TODO: Implement setHandler() method.
$router = Kiri::getDi()->get(Router::class);
if (is_string($class)) {
$class = di($class);
}
$router->addRoute($this->uri, [$class, $method], strtoupper($this->method));
return $router;
}
public function execute(mixed $class, mixed $method = null): Router
{
// TODO: Implement setHandler() method.
$router = Kiri::getDi()->get(Router::class);
if (is_string($class)) {
$class = di($class);
}
$router->addRoute($this->uri, [$class, $method], strtoupper($this->method));
return $router;
}
}