This commit is contained in:
2023-12-12 15:35:35 +08:00
parent 968d572e84
commit 65d41ab868
29 changed files with 646 additions and 701 deletions
+1 -2
View File
@@ -28,8 +28,7 @@ class Delete extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
+1 -2
View File
@@ -28,8 +28,7 @@ class Get extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
+1 -2
View File
@@ -27,8 +27,7 @@ class Head extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
+1 -2
View File
@@ -27,8 +27,7 @@ class Options extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
+1 -2
View File
@@ -28,8 +28,7 @@ class Post extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
+1 -2
View File
@@ -28,8 +28,7 @@ class Put extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
-1
View File
@@ -26,7 +26,6 @@ class Route extends AbstractRequestMethod implements InjectRouteInterface
* @param object $class * @param object $class
* @param string $method * @param string $method
* @return void * @return void
* @throws ReflectionException
*/ */
public function dispatch(object $class, string $method): void public function dispatch(object $class, string $method): void
{ {
+2 -3
View File
@@ -7,7 +7,6 @@ use Kiri\Router\Handler;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\MiddlewareInterface;
use ReflectionException;
abstract class AbstractHandler abstract class AbstractHandler
{ {
@@ -21,7 +20,7 @@ abstract class AbstractHandler
/** /**
* @param array $middlewares * @param array $middlewares
* @param Handler $handler * @param Handler $handler
* @throws ReflectionException * @throws
*/ */
public function __construct(array $middlewares, public Handler $handler) public function __construct(array $middlewares, public Handler $handler)
{ {
@@ -33,7 +32,7 @@ abstract class AbstractHandler
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws ReflectionException * @throws
*/ */
public function execute(ServerRequestInterface $request): ResponseInterface public function execute(ServerRequestInterface $request): ResponseInterface
{ {
+1 -2
View File
@@ -3,7 +3,6 @@ declare(strict_types=1);
namespace Kiri\Router\Base; namespace Kiri\Router\Base;
use Exception;
use Kiri\Di\Inject\Container; use Kiri\Di\Inject\Container;
use Kiri\Router\Request; use Kiri\Router\Request;
use Kiri\Router\Response; use Kiri\Router\Response;
@@ -31,7 +30,7 @@ class CoreMiddleware implements MiddlewareInterface
* @param Request $request * @param Request $request
* @param RequestHandlerInterface $handler * @param RequestHandlerInterface $handler
* @return ResponseInterface * @return ResponseInterface
* @throws Exception * @throws
*/ */
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{ {
+1 -3
View File
@@ -3,8 +3,6 @@ declare(strict_types=1);
namespace Kiri\Router\Base; namespace Kiri\Router\Base;
use Exception;
use Kiri\Core\HashMap;
use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\MiddlewareInterface;
class Middleware class Middleware
@@ -30,7 +28,7 @@ class Middleware
* @param string $method * @param string $method
* @param string|object $middleware * @param string|object $middleware
* @return void * @return void
* @throws Exception * @throws
*/ */
public function set(string $className, string $method, string|object $middleware): void public function set(string $className, string $method, string|object $middleware): void
{ {
+3 -3
View File
@@ -172,7 +172,7 @@ class ConstrictRequest extends Message implements RequestInterface, ServerReques
* *
* @param string $method Case-sensitive method. * @param string $method Case-sensitive method.
* @return static * @return static
* @throws \InvalidArgumentException for invalid HTTP methods. * @throws
*/ */
public function withMethod(string $method): static public function withMethod(string $method): static
{ {
@@ -357,7 +357,7 @@ class ConstrictRequest extends Message implements RequestInterface, ServerReques
* *
* @param array $uploadedFiles An array tree of UploadedFileInterface instances. * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
* @return static * @return static
* @throws \InvalidArgumentException if an invalid structure is provided. * @throws
*/ */
public function withUploadedFiles(array $uploadedFiles): static public function withUploadedFiles(array $uploadedFiles): static
{ {
@@ -415,7 +415,7 @@ class ConstrictRequest extends Message implements RequestInterface, ServerReques
* @param null|array|object|Request $data The deserialized body data. This will * @param null|array|object|Request $data The deserialized body data. This will
* typically be in an array or object. * typically be in an array or object.
* @return static * @return static
* @throws \InvalidArgumentException if an unsupported argument type is * @throws
* provided. * provided.
*/ */
public function withParsedBody($data): static public function withParsedBody($data): static
+1 -2
View File
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Kiri\Router\Constrict; namespace Kiri\Router\Constrict;
use Kiri\Core\Help; use Kiri\Core\Help;
use Kiri\Core\Xml;
use Kiri\Router\ContentType; use Kiri\Router\ContentType;
use Kiri\Router\StreamResponse; use Kiri\Router\StreamResponse;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
@@ -152,7 +151,7 @@ class ConstrictResponse extends Message implements ResponseInterface
* provided status code; if none is provided, implementations MAY * provided status code; if none is provided, implementations MAY
* use the defaults as suggested in the HTTP specification. * use the defaults as suggested in the HTTP specification.
* @return static * @return static
* @throws \InvalidArgumentException For invalid status code arguments. * @throws
*/ */
public function withStatus(int $code, string $reasonPhrase = ''): static public function withStatus(int $code, string $reasonPhrase = ''): static
{ {
+3 -3
View File
@@ -242,7 +242,7 @@ class Message extends Component implements MessageInterface
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static * @return static
* @throws InvalidArgumentException for invalid header names or values. * @throws
*/ */
public function withHeader(string $name, $value): static public function withHeader(string $name, $value): static
{ {
@@ -276,7 +276,7 @@ class Message extends Component implements MessageInterface
* @param string $name Case-insensitive header field name to add. * @param string $name Case-insensitive header field name to add.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static * @return static
* @throws InvalidArgumentException for invalid header names or values. * @throws
*/ */
public function withAddedHeader(string $name, $value): static public function withAddedHeader(string $name, $value): static
{ {
@@ -326,7 +326,7 @@ class Message extends Component implements MessageInterface
* *
* @param StreamInterface $body Body. * @param StreamInterface $body Body.
* @return static * @return static
* @throws InvalidArgumentException When the body is not valid. * @throws
*/ */
public function withBody(StreamInterface $body): static public function withBody(StreamInterface $body): static
{ {
+6 -7
View File
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Kiri\Router\Constrict; namespace Kiri\Router\Constrict;
use Psr\Http\Message\StreamInterface; use Psr\Http\Message\StreamInterface;
use RuntimeException;
class Stream implements StreamInterface class Stream implements StreamInterface
{ {
@@ -94,7 +93,7 @@ class Stream implements StreamInterface
* Returns the current position of the file read/write pointer * Returns the current position of the file read/write pointer
* *
* @return int Position of the file pointer * @return int Position of the file pointer
* @throws RuntimeException on error. * @throws
*/ */
public function tell(): int public function tell(): int
{ {
@@ -134,7 +133,7 @@ class Stream implements StreamInterface
* PHP $whence values for `fseek()`. SEEK_SET: Set position equal to * PHP $whence values for `fseek()`. SEEK_SET: Set position equal to
* offset bytes SEEK_CUR: Set position to current location plus offset * offset bytes SEEK_CUR: Set position to current location plus offset
* SEEK_END: Set position to end-of-stream plus offset. * SEEK_END: Set position to end-of-stream plus offset.
* @throws RuntimeException on failure. * @throws
*/ */
public function seek(int $offset, int $whence = SEEK_SET): void public function seek(int $offset, int $whence = SEEK_SET): void
{ {
@@ -150,7 +149,7 @@ class Stream implements StreamInterface
* If the stream is not seekable, this method will raise an exception; * If the stream is not seekable, this method will raise an exception;
* otherwise, it will perform a seek(0). * otherwise, it will perform a seek(0).
* *
* @throws RuntimeException on failure. * @throws
* @link http://www.php.net/manual/en/function.fseek.php * @link http://www.php.net/manual/en/function.fseek.php
* @see seek() * @see seek()
*/ */
@@ -179,7 +178,7 @@ class Stream implements StreamInterface
* *
* @param string $string The string that is to be written. * @param string $string The string that is to be written.
* @return int Returns the number of bytes written to the stream. * @return int Returns the number of bytes written to the stream.
* @throws RuntimeException on failure. * @throws
*/ */
public function write(string $string): int public function write(string $string): int
{ {
@@ -216,7 +215,7 @@ class Stream implements StreamInterface
* call returns fewer bytes. * call returns fewer bytes.
* @return string Returns the data read from the stream, or an empty string * @return string Returns the data read from the stream, or an empty string
* if no bytes are available. * if no bytes are available.
* @throws RuntimeException if an error occurs. * @throws
*/ */
public function read(int $length): string public function read(int $length): string
{ {
@@ -232,7 +231,7 @@ class Stream implements StreamInterface
* Returns the remaining contents in a string * Returns the remaining contents in a string
* *
* @return string * @return string
* @throws RuntimeException if unable to read or an error occurs while * @throws
* reading. * reading.
*/ */
public function getContents(): string public function getContents(): string
+5 -5
View File
@@ -224,7 +224,7 @@ class Uri implements UriInterface
* *
* @param string $scheme The scheme to use with the new instance. * @param string $scheme The scheme to use with the new instance.
* @return static A new instance with the specified scheme. * @return static A new instance with the specified scheme.
* @throws \InvalidArgumentException for invalid or unsupported schemes. * @throws
*/ */
public function withScheme(string $scheme): static public function withScheme(string $scheme): static
{ {
@@ -260,7 +260,7 @@ class Uri implements UriInterface
* *
* @param string $host The hostname to use with the new instance. * @param string $host The hostname to use with the new instance.
* @return static A new instance with the specified host. * @return static A new instance with the specified host.
* @throws \InvalidArgumentException for invalid hostnames. * @throws
*/ */
public function withHost(string $host): static public function withHost(string $host): static
{ {
@@ -283,7 +283,7 @@ class Uri implements UriInterface
* @param null|int $port The port to use with the new instance; a null value * @param null|int $port The port to use with the new instance; a null value
* removes the port information. * removes the port information.
* @return static A new instance with the specified port. * @return static A new instance with the specified port.
* @throws \InvalidArgumentException for invalid ports. * @throws
*/ */
public function withPort(?int $port): static public function withPort(?int $port): static
{ {
@@ -311,7 +311,7 @@ class Uri implements UriInterface
* *
* @param string $path The path to use with the new instance. * @param string $path The path to use with the new instance.
* @return static A new instance with the specified path. * @return static A new instance with the specified path.
* @throws \InvalidArgumentException for invalid paths. * @throws
*/ */
public function withPath(string $path): static public function withPath(string $path): static
{ {
@@ -332,7 +332,7 @@ class Uri implements UriInterface
* *
* @param string $query The query string to use with the new instance. * @param string $query The query string to use with the new instance.
* @return static A new instance with the specified query string. * @return static A new instance with the specified query string.
* @throws \InvalidArgumentException for invalid query strings. * @throws
*/ */
public function withQuery(string $query): static public function withQuery(string $query): static
{ {
+4 -16
View File
@@ -5,11 +5,8 @@ namespace Kiri\Router;
use Closure; use Closure;
use Exception; use Exception;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use ReflectionClass; use ReflectionClass;
use ReflectionException;
use ReflectionMethod; use ReflectionMethod;
class ControllerInterpreter class ControllerInterpreter
@@ -29,9 +26,7 @@ class ControllerInterpreter
* @param string|ReflectionMethod $method * @param string|ReflectionMethod $method
* @param ReflectionClass|null $reflection * @param ReflectionClass|null $reflection
* @return Handler * @return Handler
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function addRouteByString(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler public function addRouteByString(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler
{ {
@@ -45,9 +40,7 @@ class ControllerInterpreter
/** /**
* @param Closure $method * @param Closure $method
* @return Handler * @return Handler
* @throws ReflectionException * @throws
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/ */
public function addRouteByClosure(Closure $method): Handler public function addRouteByClosure(Closure $method): Handler
{ {
@@ -64,9 +57,7 @@ class ControllerInterpreter
* @param string|ReflectionMethod $method * @param string|ReflectionMethod $method
* @param ReflectionClass|null $reflection * @param ReflectionClass|null $reflection
* @return Handler * @return Handler
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function addRouteByObject(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler public function addRouteByObject(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler
{ {
@@ -82,10 +73,7 @@ class ControllerInterpreter
* @param string|ReflectionMethod $reflectionMethod * @param string|ReflectionMethod $reflectionMethod
* @param ReflectionClass $reflectionClass * @param ReflectionClass $reflectionClass
* @return Handler * @return Handler
* @throws ReflectionException * @throws
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/ */
public function resolveMethod(object $class, string|\ReflectionMethod $reflectionMethod, ReflectionClass $reflectionClass): Handler public function resolveMethod(object $class, string|\ReflectionMethod $reflectionMethod, ReflectionClass $reflectionClass): Handler
{ {
+1 -2
View File
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Kiri\Router; namespace Kiri\Router;
use Kiri; use Kiri;
use ReflectionException;
class DataGrip class DataGrip
{ {
@@ -15,7 +14,7 @@ class DataGrip
/** /**
* @param $type * @param $type
* @return RouterCollector * @return RouterCollector
* @throws ReflectionException * @throws
*/ */
public function get($type): RouterCollector public function get($type): RouterCollector
{ {
+3 -8
View File
@@ -11,13 +11,10 @@ use Kiri\Router\Format\NoBody;
use Kiri\Router\Format\OtherFormat; use Kiri\Router\Format\OtherFormat;
use Kiri\Router\Format\ResponseFormat; use Kiri\Router\Format\ResponseFormat;
use Kiri\Router\Format\VoidFormat; use Kiri\Router\Format\VoidFormat;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface; use Psr\Http\Server\RequestHandlerInterface;
use ReflectionException;
use ReflectionNamedType; use ReflectionNamedType;
class Handler implements RequestHandlerInterface class Handler implements RequestHandlerInterface
@@ -42,8 +39,7 @@ class Handler implements RequestHandlerInterface
* @param array|Closure $handler * @param array|Closure $handler
* @param array $parameter * @param array $parameter
* @param ReflectionNamedType|null $reflectionType * @param ReflectionNamedType|null $reflectionType
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
*/ */
public function __construct(public array|Closure $handler, public array $parameter, public ?ReflectionNamedType $reflectionType) public function __construct(public array|Closure $handler, public array $parameter, public ?ReflectionNamedType $reflectionType)
{ {
@@ -74,8 +70,7 @@ class Handler implements RequestHandlerInterface
/** /**
* @param string $method * @param string $method
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
*/ */
public function setRequestMethod(string $method): void public function setRequestMethod(string $method): void
{ {
@@ -134,7 +129,7 @@ class Handler implements RequestHandlerInterface
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws ReflectionException * @throws
*/ */
public function handle(ServerRequestInterface $request): ResponseInterface public function handle(ServerRequestInterface $request): ResponseInterface
{ {
+2 -2
View File
@@ -16,7 +16,7 @@ class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterf
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws ReflectionException * @throws
*/ */
public function run(ServerRequestInterface $request): ResponseInterface public function run(ServerRequestInterface $request): ResponseInterface
{ {
@@ -27,7 +27,7 @@ class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterf
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws ReflectionException * @throws
*/ */
public function handle(ServerRequestInterface $request): ResponseInterface public function handle(ServerRequestInterface $request): ResponseInterface
{ {
+6 -6
View File
@@ -224,7 +224,7 @@ class Request implements ServerRequestInterface
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static * @return static
* @throws \InvalidArgumentException for invalid header names or values. * @throws
*/ */
public function withHeader(string $name, $value): ServerRequestInterface public function withHeader(string $name, $value): ServerRequestInterface
{ {
@@ -278,7 +278,7 @@ class Request implements ServerRequestInterface
* @param string $name Case-insensitive header field name to add. * @param string $name Case-insensitive header field name to add.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static * @return static
* @throws \InvalidArgumentException for invalid header names or values. * @throws
*/ */
public function withAddedHeader(string $name, $value): ServerRequestInterface public function withAddedHeader(string $name, $value): ServerRequestInterface
{ {
@@ -339,7 +339,7 @@ class Request implements ServerRequestInterface
* *
* @param StreamInterface $body Body. * @param StreamInterface $body Body.
* @return static * @return static
* @throws \InvalidArgumentException When the body is not valid. * @throws
*/ */
public function withBody(StreamInterface $body): ServerRequestInterface public function withBody(StreamInterface $body): ServerRequestInterface
{ {
@@ -416,7 +416,7 @@ class Request implements ServerRequestInterface
* *
* @param string $method Case-sensitive method. * @param string $method Case-sensitive method.
* @return static * @return static
* @throws \InvalidArgumentException for invalid HTTP methods. * @throws
*/ */
public function withMethod(string $method): ServerRequestInterface public function withMethod(string $method): ServerRequestInterface
{ {
@@ -602,7 +602,7 @@ class Request implements ServerRequestInterface
* *
* @param array $uploadedFiles An array tree of UploadedFileInterface instances. * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
* @return static * @return static
* @throws \InvalidArgumentException if an invalid structure is provided. * @throws
*/ */
public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
{ {
@@ -704,7 +704,7 @@ class Request implements ServerRequestInterface
* @param null|array|object $data The deserialized body data. This will * @param null|array|object $data The deserialized body data. This will
* typically be in an array or object. * typically be in an array or object.
* @return static * @return static
* @throws \InvalidArgumentException if an unsupported argument type is * @throws
* provided. * provided.
*/ */
public function withParsedBody($data): ServerRequestInterface public function withParsedBody($data): ServerRequestInterface
+5 -7
View File
@@ -3,11 +3,9 @@ declare(strict_types=1);
namespace Kiri\Router; namespace Kiri\Router;
use InvalidArgumentException;
use Kiri\Di\Interface\ResponseEmitterInterface; use Kiri\Di\Interface\ResponseEmitterInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface; use Psr\Http\Message\StreamInterface;
use ReflectionException;
/** /**
@@ -40,7 +38,7 @@ class Response implements ResponseInterface
/** /**
* @return void * @return void
* @throws ReflectionException * @throws
*/ */
public function init(): void public function init(): void
{ {
@@ -281,7 +279,7 @@ class Response implements ResponseInterface
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static * @return static
* @throws InvalidArgumentException for invalid header names or values. * @throws
*/ */
public function withHeader(string $name, $value): ResponseInterface public function withHeader(string $name, $value): ResponseInterface
{ {
@@ -313,7 +311,7 @@ class Response implements ResponseInterface
* @param string $name Case-insensitive header field name to add. * @param string $name Case-insensitive header field name to add.
* @param string|string[] $value Header value(s). * @param string|string[] $value Header value(s).
* @return static * @return static
* @throws InvalidArgumentException for invalid header names or values. * @throws
*/ */
public function withAddedHeader(string $name, $value): ResponseInterface public function withAddedHeader(string $name, $value): ResponseInterface
{ {
@@ -361,7 +359,7 @@ class Response implements ResponseInterface
* *
* @param StreamInterface $body Body. * @param StreamInterface $body Body.
* @return static * @return static
* @throws InvalidArgumentException When the body is not valid. * @throws
*/ */
public function withBody(StreamInterface $body): ResponseInterface public function withBody(StreamInterface $body): ResponseInterface
{ {
@@ -413,7 +411,7 @@ class Response implements ResponseInterface
* provided status code; if none is provided, implementations MAY * provided status code; if none is provided, implementations MAY
* use the defaults as suggested in the HTTP specification. * use the defaults as suggested in the HTTP specification.
* @return static * @return static
* @throws InvalidArgumentException For invalid status code arguments. * @throws
*/ */
public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface
{ {
+3 -7
View File
@@ -4,14 +4,10 @@ declare(strict_types=1);
namespace Kiri\Router; namespace Kiri\Router;
use Closure; use Closure;
use Exception;
use Kiri; use Kiri;
use Kiri\Router\Base\Middleware as MiddlewareManager; use Kiri\Router\Base\Middleware as MiddlewareManager;
use Kiri\Router\Constrict\RequestMethod; use Kiri\Router\Constrict\RequestMethod;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
use ReflectionException;
/** /**
* *
@@ -26,7 +22,7 @@ class Router
{ {
const METHODS = [RequestMethod::REQUEST_POST, RequestMethod::REQUEST_GET, RequestMethod::REQUEST_OPTIONS, RequestMethod::REQUEST_DELETE, RequestMethod::REQUEST_PUT, RequestMethod::REQUEST_HEAD]; const array METHODS = [RequestMethod::REQUEST_POST, RequestMethod::REQUEST_GET, RequestMethod::REQUEST_OPTIONS, RequestMethod::REQUEST_DELETE, RequestMethod::REQUEST_PUT, RequestMethod::REQUEST_HEAD];
/** /**
@@ -207,7 +203,7 @@ class Router
/** /**
* @param $path * @param $path
* @return void * @return void
* @throws Exception * @throws
*/ */
private function read_dir_file($path): void private function read_dir_file($path): void
{ {
@@ -225,7 +221,7 @@ class Router
/** /**
* @param $files * @param $files
* @throws Exception * @throws
*/ */
private function resolve_file($files): void private function resolve_file($files): void
{ {
+5 -9
View File
@@ -79,9 +79,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
/** /**
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function __construct() public function __construct()
{ {
@@ -172,9 +170,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
* @param string|array $closure * @param string|array $closure
* @param ControllerInterpreter $interpreter * @param ControllerInterpreter $interpreter
* @return Handler * @return Handler
* @throws ReflectionException * @throws
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/ */
private function resolve(string|array $closure, ControllerInterpreter $interpreter): Handler private function resolve(string|array $closure, ControllerInterpreter $interpreter): Handler
{ {
@@ -209,7 +205,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
* @param string $method * @param string $method
* @param Handler $handler * @param Handler $handler
* @return void * @return void
* @throws Exception * @throws
*/ */
public function register(string $path, string $method, Handler $handler): void public function register(string $path, string $method, Handler $handler): void
{ {
@@ -222,7 +218,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
* @param string $class * @param string $class
* @param string $method * @param string $method
* @return void * @return void
* @throws Exception * @throws
*/ */
public function registerMiddleware(string $class, string $method): void public function registerMiddleware(string $class, string $method): void
{ {
@@ -261,7 +257,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
* @param string $path * @param string $path
* @param string $method * @param string $method
* @return HttpRequestHandler * @return HttpRequestHandler
* @throws ReflectionException * @throws
*/ */
public function query(string $path, string $method): HttpRequestHandler public function query(string $path, string $method): HttpRequestHandler
{ {
+1 -3
View File
@@ -21,9 +21,7 @@ class StreamResponse extends Response
/** /**
* @param object $response * @param object $response
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function end(object $response): void public function end(object $response): void
{ {
+1 -3
View File
@@ -49,9 +49,7 @@ class SwooleHttpResponseEmitter implements ResponseEmitterInterface
* @param object $response * @param object $response
* @param object $request * @param object $request
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function response(ResponseInterface $proxy, object $response, object $request): void public function response(ResponseInterface $proxy, object $response, object $request): void
{ {
+1 -3
View File
@@ -57,9 +57,7 @@ class SwowHttpResponseEmitter implements ResponseEmitterInterface
* @param object $response * @param object $response
* @param object $request * @param object $request
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function response(ResponseInterface $proxy, object $response, object $request): void public function response(ResponseInterface $proxy, object $response, object $request): void
{ {
+3 -8
View File
@@ -28,8 +28,7 @@ class BindForm implements InjectParameterInterface
* @param string $class * @param string $class
* @param string $method * @param string $method
* @return mixed * @return mixed
* @throws ReflectionException * @throws
* @throws Exception
*/ */
public function dispatch(string $class, string $method): object public function dispatch(string $class, string $method): object
{ {
@@ -38,10 +37,6 @@ class BindForm implements InjectParameterInterface
$reflect = $container->getReflectionClass($this->formValidate); $reflect = $container->getReflectionClass($this->formValidate);
$object = $validator->setFormData($reflect->newInstanceWithoutConstructor()); $object = $validator->setFormData($reflect->newInstanceWithoutConstructor());
foreach ($reflect->getProperties() as $property) { foreach ($reflect->getProperties() as $property) {
// $binding = $property->getAttributes(Binding::class);
// if (count($binding) < 1) {
// continue;
// }
foreach ($property->getAttributes() as $attribute) { foreach ($property->getAttributes() as $attribute) {
if (!class_exists($attribute->getName())) { if (!class_exists($attribute->getName())) {
continue; continue;
@@ -70,7 +65,7 @@ class BindForm implements InjectParameterInterface
* @param object $object * @param object $object
* @param string $property * @param string $property
* @return void * @return void
* @throws Exception * @throws
*/ */
private function insertDefaultValue(ReflectionNamedType|ReflectionUnionType $reflectionProperty, object $object, string $property): void private function insertDefaultValue(ReflectionNamedType|ReflectionUnionType $reflectionProperty, object $object, string $property): void
{ {
@@ -87,7 +82,7 @@ class BindForm implements InjectParameterInterface
/** /**
* @param ReflectionNamedType $type * @param ReflectionNamedType $type
* @return array|false|int|string * @return array|false|int|string
* @throws Exception * @throws
*/ */
private function defaultValue(ReflectionNamedType $type): array|false|int|string private function defaultValue(ReflectionNamedType $type): array|false|int|string
{ {
+1 -3
View File
@@ -3,7 +3,6 @@ declare(strict_types=1);
namespace Kiri\Router\Validator; namespace Kiri\Router\Validator;
use Kiri;
use Kiri\Router\Constrict\ConstrictRequest; use Kiri\Router\Constrict\ConstrictRequest;
use Kiri\Router\Interface\ValidatorInterface; use Kiri\Router\Interface\ValidatorInterface;
use Psr\Http\Message\RequestInterface; use Psr\Http\Message\RequestInterface;
@@ -91,8 +90,7 @@ class Validator
/** /**
* @param RequestInterface|ServerRequestInterface|ConstrictRequest $request * @param RequestInterface|ServerRequestInterface|ConstrictRequest $request
* @return bool * @return bool
* @throws ReflectionException * @throws
* @throws \Exception
*/ */
public function run(RequestInterface|ServerRequestInterface|ConstrictRequest $request): bool public function run(RequestInterface|ServerRequestInterface|ConstrictRequest $request): bool
{ {
+1 -2
View File
@@ -3,7 +3,6 @@ declare(strict_types=1);
namespace Kiri\Router\Validator; namespace Kiri\Router\Validator;
use Exception;
use Kiri\Di\Inject\Container; use Kiri\Di\Inject\Container;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
@@ -31,7 +30,7 @@ class ValidatorMiddleware implements MiddlewareInterface
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @param RequestHandlerInterface $handler * @param RequestHandlerInterface $handler
* @return ResponseInterface * @return ResponseInterface
* @throws Exception * @throws
*/ */
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{ {