as2252258/kiri-router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

eee

Browse Source
This commit is contained in:
whwyy
2023-12-12 15:35:35 +08:00
parent 968d572e84
commit 65d41ab868
29 changed files with 646 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Annotate/Delete.php
+14 -15
View File
@@ -20,26 +20,25 @@ class Delete extends AbstractRequestMethod implements InjectRouteInterface
* @param string $version * @param string $version
*/ */
public function __construct(readonly public string $path, readonly public string $version = '') public function __construct(readonly public string $path, readonly public string $version = '')
{ {
} }
/** /**
* @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 {
{ // TODO: Implement dispatch() method.
// TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/');
$path = '/' . ltrim($this->path, '/');
if (!empty($this->version)) { if (!empty($this->version)) {
$path = '/' . trim($this->version) . $path; $path = '/' . trim($this->version) . $path;
} }
Router::addRoute(RequestMethod::REQUEST_DELETE, $path, [$class, $method]); Router::addRoute(RequestMethod::REQUEST_DELETE, $path, [$class, $method]);
} }
} }
src/Annotate/Get.php
+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
{ {
src/Annotate/Head.php
+15 -16
View File
@@ -18,27 +18,26 @@ class Head extends AbstractRequestMethod implements InjectRouteInterface
* @param string $path * @param string $path
* @param string $version * @param string $version
*/ */
public function __construct(readonly public string $path, readonly public string $version = '') public function __construct(readonly public string $path, readonly public string $version = '')
{ {
} }
/** /**
* @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 {
{ // TODO: Implement dispatch() method.
// TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/');
$path = '/' . ltrim($this->path, '/');
if (!empty($this->version)) { if (!empty($this->version)) {
$path = '/' . trim($this->version) . $path; $path = '/' . trim($this->version) . $path;
} }
Router::addRoute(RequestMethod::REQUEST_HEAD, $path, [$class, $method]); Router::addRoute(RequestMethod::REQUEST_HEAD, $path, [$class, $method]);
} }
} }
src/Annotate/Options.php
+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
{ {
src/Annotate/Post.php
+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
{ {
src/Annotate/Put.php
+15 -16
View File
@@ -19,26 +19,25 @@ class Put extends AbstractRequestMethod implements InjectRouteInterface
* @param string $path * @param string $path
* @param string $version * @param string $version
*/ */
public function __construct(readonly public string $path, readonly public string $version = '') public function __construct(readonly public string $path, readonly public string $version = '')
{ {
} }
/** /**
* @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 {
{ // TODO: Implement dispatch() method.
// TODO: Implement dispatch() method. $path = '/' . ltrim($this->path, '/');
$path = '/' . ltrim($this->path, '/');
if (!empty($this->version)) { if (!empty($this->version)) {
$path = '/' . trim($this->version) . $path; $path = '/' . trim($this->version) . $path;
} }
Router::addRoute(RequestMethod::REQUEST_PUT, $path, [$class, $method]); Router::addRoute(RequestMethod::REQUEST_PUT, $path, [$class, $method]);
} }
} }
src/Annotate/Route.php
-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
{ {
src/Base/AbstractHandler.php
+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
{ {
src/Base/CoreMiddleware.php
+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
{ {
src/Base/Middleware.php
+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
{ {
src/Constrict/ConstrictRequest.php
+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
src/Constrict/ConstrictResponse.php
+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
{ {
src/Constrict/Message.php
+294 -294
View File
@@ -11,327 +11,327 @@ use Psr\Http\Message\StreamInterface;
class Message extends Component implements MessageInterface class Message extends Component implements MessageInterface
{ {
/** /**
* @var string * @var string
*/ */
private string $version = '1.1'; private string $version = '1.1';
/** /**
* @var array * @var array
*/ */
private array $headers = []; private array $headers = [];
/** /**
* @var StreamInterface * @var StreamInterface
*/ */
public StreamInterface $stream; public StreamInterface $stream;
/** /**
* @var array * @var array
*/ */
private array $cookieParams = []; private array $cookieParams = [];
/** /**
* *
*/ */
public function __construct() public function __construct()
{ {
$this->stream = new Stream(); $this->stream = new Stream();
parent::__construct(); parent::__construct();
} }
/** /**
* Retrieve cookies. * Retrieve cookies.
* *
* Retrieves cookies sent by the client to the server. * Retrieves cookies sent by the client to the server.
* *
* The data MUST be compatible with the structure of the $_COOKIE * The data MUST be compatible with the structure of the $_COOKIE
* superglobal. * superglobal.
* *
* @return array * @return array
*/ */
public function getCookieParams(): array public function getCookieParams(): array
{ {
// TODO: Implement getCookieParams() method. // TODO: Implement getCookieParams() method.
return $this->cookieParams; return $this->cookieParams;
} }
/** /**
* Return an instance with the specified cookies. * Return an instance with the specified cookies.
* *
* The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
* be compatible with the structure of $_COOKIE. Typically, this data will * be compatible with the structure of $_COOKIE. Typically, this data will
* be injected at instantiation. * be injected at instantiation.
* *
* This method MUST NOT update the related Cookie header of the request * This method MUST NOT update the related Cookie header of the request
* instance, nor related values in the server params. * instance, nor related values in the server params.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* updated cookie values. * updated cookie values.
* *
* @param array $cookies Array of key/value pairs representing cookies. * @param array $cookies Array of key/value pairs representing cookies.
* @return static * @return static
*/ */
public function withCookieParams(array $cookies): static public function withCookieParams(array $cookies): static
{ {
// TODO: Implement withCookieParams() method. // TODO: Implement withCookieParams() method.
$this->cookieParams = $cookies; $this->cookieParams = $cookies;
return $this; return $this;
} }
/** /**
* Retrieves the HTTP protocol version as a string. * Retrieves the HTTP protocol version as a string.
* *
* The string MUST contain only the HTTP version number (e.g., "1.1", "1.0"). * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
* *
* @return string HTTP protocol version. * @return string HTTP protocol version.
*/ */
public function getProtocolVersion(): string public function getProtocolVersion(): string
{ {
// TODO: Implement getProtocolVersion() method. // TODO: Implement getProtocolVersion() method.
return $this->version; return $this->version;
} }
/** /**
* Return an instance with the specified HTTP protocol version. * Return an instance with the specified HTTP protocol version.
* *
* The version string MUST contain only the HTTP version number (e.g., * The version string MUST contain only the HTTP version number (e.g.,
* "1.1", "1.0"). * "1.1", "1.0").
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* new protocol version. * new protocol version.
* *
* @param string $version HTTP protocol version * @param string $version HTTP protocol version
* @return static * @return static
*/ */
public function withProtocolVersion(string $version): static public function withProtocolVersion(string $version): static
{ {
// TODO: Implement withProtocolVersion() method. // TODO: Implement withProtocolVersion() method.
$this->version = $version; $this->version = $version;
return $this; return $this;
} }
/** /**
* Retrieves all message header values. * Retrieves all message header values.
* *
* The keys represent the header name as it will be sent over the wire, and * The keys represent the header name as it will be sent over the wire, and
* each value is an array of strings associated with the header. * each value is an array of strings associated with the header.
* *
* // Represent the headers as a string * // Represent the headers as a string
* foreach ($message->getHeaders() as $name => $values) { * foreach ($message->getHeaders() as $name => $values) {
* echo $name . ": " . implode(", ", $values); * echo $name . ": " . implode(", ", $values);
* } * }
* *
* // Emit headers iteratively: * // Emit headers iteratively:
* foreach ($message->getHeaders() as $name => $values) { * foreach ($message->getHeaders() as $name => $values) {
* foreach ($values as $value) { * foreach ($values as $value) {
* header(sprintf('%s: %s', $name, $value), false); * header(sprintf('%s: %s', $name, $value), false);
* } * }
* } * }
* *
* While header names are not case-sensitive, getHeaders() will preserve the * While header names are not case-sensitive, getHeaders() will preserve the
* exact case in which headers were originally specified. * exact case in which headers were originally specified.
* *
* @return string[][] Returns an associative array of the message's headers. Each * @return string[][] Returns an associative array of the message's headers. Each
* key MUST be a header name, and each value MUST be an array of strings * key MUST be a header name, and each value MUST be an array of strings
* for that header. * for that header.
*/ */
public function getHeaders(): array public function getHeaders(): array
{ {
// TODO: Implement getHeaders() method. // TODO: Implement getHeaders() method.
return $this->headers; return $this->headers;
} }
/** /**
* Checks if a header exists by the given case-insensitive name. * Checks if a header exists by the given case-insensitive name.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @return bool Returns true if any header names match the given header * @return bool Returns true if any header names match the given header
* name using a case-insensitive string comparison. Returns false if * name using a case-insensitive string comparison. Returns false if
* no matching header name is found in the message. * no matching header name is found in the message.
*/ */
public function hasHeader(string $name): bool public function hasHeader(string $name): bool
{ {
// TODO: Implement hasHeader() method. // TODO: Implement hasHeader() method.
return isset($this->headers[$name]) && $this->headers[$name] !== null; return isset($this->headers[$name]) && $this->headers[$name] !== null;
} }
/** /**
* Retrieves a message header value by the given case-insensitive name. * Retrieves a message header value by the given case-insensitive name.
* *
* This method returns an array of all the header values of the given * This method returns an array of all the header values of the given
* case-insensitive header name. * case-insensitive header name.
* *
* If the header does not appear in the message, this method MUST return an * If the header does not appear in the message, this method MUST return an
* empty array. * empty array.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @return string[] An array of string values as provided for the given * @return string[] An array of string values as provided for the given
* header. If the header does not appear in the message, this method MUST * header. If the header does not appear in the message, this method MUST
* return an empty array. * return an empty array.
*/ */
public function getHeader(string $name): array public function getHeader(string $name): array
{ {
// TODO: Implement getHeader() method. // TODO: Implement getHeader() method.
if (isset($this->headers[$name])) { if (isset($this->headers[$name])) {
$header = $this->headers[$name]; $header = $this->headers[$name];
return \is_string($header) ? [$header] : $header; return \is_string($header) ? [$header] : $header;
} }
return []; return [];
} }
/** /**
* Retrieves a comma-separated string of the values for a single header. * Retrieves a comma-separated string of the values for a single header.
* *
* This method returns all the header values of the given * This method returns all the header values of the given
* case-insensitive header name as a string concatenated together using * case-insensitive header name as a string concatenated together using
* a comma. * a comma.
* *
* NOTE: Not all header values may be appropriately represented using * NOTE: Not all header values may be appropriately represented using
* comma concatenation. For such headers, use getHeader() instead * comma concatenation. For such headers, use getHeader() instead
* and supply your own delimiter when concatenating. * and supply your own delimiter when concatenating.
* *
* If the header does not appear in the message, this method MUST return * If the header does not appear in the message, this method MUST return
* an empty string. * an empty string.
* *
* @param string $name Case-insensitive header field name. * @param string $name Case-insensitive header field name.
* @return string A string of values as provided for the given header * @return string A string of values as provided for the given header
* concatenated together using a comma. If the header does not appear in * concatenated together using a comma. If the header does not appear in
* the message, this method MUST return an empty string. * the message, this method MUST return an empty string.
*/ */
public function getHeaderLine(string $name): string public function getHeaderLine(string $name): string
{ {
// TODO: Implement getHeaderLine() method. // TODO: Implement getHeaderLine() method.
return \implode(';', $this->getHeader($name)); return \implode(';', $this->getHeader($name));
} }
/** /**
* @param string $name * @param string $name
* @param string|null $default * @param string|null $default
* @return string|null * @return string|null
*/ */
public function header(string $name, ?string $default = null): ?string public function header(string $name, ?string $default = null): ?string
{ {
if (!$this->hasHeader($name)) { if (!$this->hasHeader($name)) {
return $default; return $default;
} }
return $this->getHeaderLine($name); return $this->getHeaderLine($name);
} }
/** /**
* Return an instance with the provided value replacing the specified header. * Return an instance with the provided value replacing the specified header.
* *
* While header names are case-insensitive, the casing of the header will * While header names are case-insensitive, the casing of the header will
* be preserved by this function, and returned from getHeaders(). * be preserved by this function, and returned from getHeaders().
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* new and/or updated header and value. * new and/or updated header and value.
* *
* @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
{ {
// TODO: Implement withAddedHeader() method. // TODO: Implement withAddedHeader() method.
$this->headers[$name] = $value; $this->headers[$name] = $value;
return $this; return $this;
} }
/** /**
* @param array $headers * @param array $headers
* @return $this * @return $this
*/ */
public function withHeaders(array $headers): static public function withHeaders(array $headers): static
{ {
$this->headers = $headers; $this->headers = $headers;
return $this; return $this;
} }
/** /**
* Return an instance with the specified header appended with the given value. * Return an instance with the specified header appended with the given value.
* *
* Existing values for the specified header will be maintained. The new * Existing values for the specified header will be maintained. The new
* value(s) will be appended to the existing list. If the header did not * value(s) will be appended to the existing list. If the header did not
* exist previously, it will be added. * exist previously, it will be added.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that has the * immutability of the message, and MUST return an instance that has the
* new header and/or value. * new header and/or value.
* *
* @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
{ {
// TODO: Implement withAddedHeader() method. // TODO: Implement withAddedHeader() method.
$this->headers[$name] = $value; $this->headers[$name] = $value;
return $this; return $this;
} }
/** /**
* Return an instance without the specified header. * Return an instance without the specified header.
* *
* Header resolution MUST be done without case-sensitivity. * Header resolution MUST be done without case-sensitivity.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return an instance that removes * immutability of the message, and MUST return an instance that removes
* the named header. * the named header.
* *
* @param string $name Case-insensitive header field name to remove. * @param string $name Case-insensitive header field name to remove.
* @return static * @return static
*/ */
public function withoutHeader(string $name): static public function withoutHeader(string $name): static
{ {
// TODO: Implement withoutHeader() method. // TODO: Implement withoutHeader() method.
unset($this->headers[$name]); unset($this->headers[$name]);
return $this; return $this;
} }
/** /**
* Gets the body of the message. * Gets the body of the message.
* *
* @return StreamInterface Returns the body as a stream. * @return StreamInterface Returns the body as a stream.
*/ */
public function getBody(): StreamInterface public function getBody(): StreamInterface
{ {
// TODO: Implement getBody() method. // TODO: Implement getBody() method.
return $this->stream; return $this->stream;
} }
/** /**
* Return an instance with the specified message body. * Return an instance with the specified message body.
* *
* The body MUST be a StreamInterface object. * The body MUST be a StreamInterface object.
* *
* This method MUST be implemented in such a way as to retain the * This method MUST be implemented in such a way as to retain the
* immutability of the message, and MUST return a new instance that has the * immutability of the message, and MUST return a new instance that has the
* new body stream. * new body stream.
* *
* @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
{ {
// TODO: Implement withBody() method. // TODO: Implement withBody() method.
$this->stream = $body; $this->stream = $body;
return $this; return $this;
} }
} }
src/Constrict/Stream.php
+226 -227
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
{ {
@@ -13,255 +12,255 @@ class Stream implements StreamInterface
/** /**
* @var resource|string * @var resource|string
*/ */
public mixed $content = ''; public mixed $content = '';
/** /**
* @var int * @var int
*/ */
public int $size = 0; public int $size = 0;
/** /**
* @param mixed $content * @param mixed $content
*/ */
public function __construct(mixed $content = '') public function __construct(mixed $content = '')
{ {
$this->content = $content; $this->content = $content;
} }
/** /**
* Reads all data from the stream into a string, from the beginning to end. * Reads all data from the stream into a string, from the beginning to end.
* *
* This method MUST attempt to seek to the beginning of the stream before * This method MUST attempt to seek to the beginning of the stream before
* reading data and read the stream until the end is reached. * reading data and read the stream until the end is reached.
* *
* Warning: This could attempt to load a large amount of data into memory. * Warning: This could attempt to load a large amount of data into memory.
* *
* This method MUST NOT raise an exception in order to conform with PHP's * This method MUST NOT raise an exception in order to conform with PHP's
* string casting operations. * string casting operations.
* *
* @see http://php.net/manual/en/language.oop5.magic.php#object.tostring * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
* @return string * @return string
*/ */
public function __toString() public function __toString()
{ {
// TODO: Implement __toString() method. // TODO: Implement __toString() method.
return $this->content; return $this->content;
} }
/** /**
* Closes the stream and any underlying resources. * Closes the stream and any underlying resources.
* *
* @return void * @return void
*/ */
public function close(): void public function close(): void
{ {
// TODO: Implement close() method. // TODO: Implement close() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
fclose($this->content); fclose($this->content);
} else { } else {
$this->content = ''; $this->content = '';
} }
} }
/** /**
* Separates any underlying resources from the stream. * Separates any underlying resources from the stream.
* *
* After the stream has been detached, the stream is in an unusable state. * After the stream has been detached, the stream is in an unusable state.
* *
* @return resource|null Underlying PHP stream, if any * @return resource|null Underlying PHP stream, if any
*/ */
public function detach(): mixed public function detach(): mixed
{ {
// TODO: Implement detach() method. // TODO: Implement detach() method.
return null; return null;
} }
/** /**
* Get the size of the stream if known. * Get the size of the stream if known.
* *
* @return int|null Returns the size in bytes if known, or null if unknown. * @return int|null Returns the size in bytes if known, or null if unknown.
*/ */
public function getSize(): ?int public function getSize(): ?int
{ {
// TODO: Implement getSize() method. // TODO: Implement getSize() method.
return $this->size; return $this->size;
} }
/** /**
* 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
{ {
// TODO: Implement tell() method. // TODO: Implement tell() method.
return 0; return 0;
} }
/** /**
* Returns true if the stream is at the end of the stream. * Returns true if the stream is at the end of the stream.
* *
* @return bool * @return bool
*/ */
public function eof(): bool public function eof(): bool
{ {
// TODO: Implement eof() method. // TODO: Implement eof() method.
return false; return false;
} }
/** /**
* Returns whether or not the stream is seekable. * Returns whether or not the stream is seekable.
* *
* @return bool * @return bool
*/ */
public function isSeekable(): bool public function isSeekable(): bool
{ {
// TODO: Implement isSeekable() method. // TODO: Implement isSeekable() method.
return true; return true;
} }
/** /**
* Seek to a position in the stream. * Seek to a position in the stream.
* *
* @link http://www.php.net/manual/en/function.fseek.php * @link http://www.php.net/manual/en/function.fseek.php
* @param int $offset Stream offset * @param int $offset Stream offset
* @param int $whence Specifies how the cursor position will be calculated * @param int $whence Specifies how the cursor position will be calculated
* based on the seek offset. Valid values are identical to the built-in * based on the seek offset. Valid values are identical to the built-in
* 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
{ {
// TODO: Implement seek() method. // TODO: Implement seek() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
fseek($this->content, $offset, $whence); fseek($this->content, $offset, $whence);
} }
} }
/** /**
* Seek to the beginning of the stream. * Seek to the beginning of the stream.
* *
* 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()
*/ */
public function rewind(): void public function rewind(): void
{ {
// TODO: Implement rewind() method. // TODO: Implement rewind() method.
$this->seek(0); $this->seek(0);
} }
/** /**
* Returns whether or not the stream is writable. * Returns whether or not the stream is writable.
* *
* @return bool * @return bool
*/ */
public function isWritable(): bool public function isWritable(): bool
{ {
// TODO: Implement isWritable() method. // TODO: Implement isWritable() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
return is_writable($this->content); return is_writable($this->content);
} }
return true; return true;
} }
/** /**
* Write data to the stream. * Write data to the stream.
* *
* @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
{ {
// TODO: Implement write() method. // TODO: Implement write() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
$this->content = fopen($string, 'wr'); $this->content = fopen($string, 'wr');
// $this->size = filesize($string); // $this->size = filesize($string);
} else { } else {
$this->content = $string; $this->content = $string;
// $this->size = mb_strlen($string); // $this->size = mb_strlen($string);
} }
return $this->size; return $this->size;
} }
/** /**
* Returns whether or not the stream is readable. * Returns whether or not the stream is readable.
* *
* @return bool * @return bool
*/ */
public function isReadable(): bool public function isReadable(): bool
{ {
// TODO: Implement isReadable() method. // TODO: Implement isReadable() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
return is_readable($this->content); return is_readable($this->content);
} }
return true; return true;
} }
/** /**
* Read data from the stream. * Read data from the stream.
* *
* @param int $length Read up to $length bytes from the object and return * @param int $length Read up to $length bytes from the object and return
* them. Fewer than $length bytes may be returned if underlying stream * them. Fewer than $length bytes may be returned if underlying stream
* 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
{ {
// TODO: Implement read() method. // TODO: Implement read() method.
if (!is_resource($this->content)) { if (!is_resource($this->content)) {
return mb_substr($this->content, 0, $length); return mb_substr($this->content, 0, $length);
} else { } else {
return fread($this->content, $length); return fread($this->content, $length);
} }
} }
/** /**
* 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
{ {
// TODO: Implement getContents() method. // TODO: Implement getContents() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
return fread($this->content, $this->getSize()); return fread($this->content, $this->getSize());
} }
return $this->content; return $this->content;
} }
/** /**
* Get stream metadata as an associative array or retrieve a specific key. * Get stream metadata as an associative array or retrieve a specific key.
* *
* The keys returned are identical to the keys returned from PHP's * The keys returned are identical to the keys returned from PHP's
* stream_get_meta_data() function. * stream_get_meta_data() function.
* *
* @link http://php.net/manual/en/function.stream-get-meta-data.php * @link http://php.net/manual/en/function.stream-get-meta-data.php
* @param string|null $key Specific metadata to retrieve. * @param string|null $key Specific metadata to retrieve.
* @return array|mixed|null Returns an associative array if no key is * @return array|mixed|null Returns an associative array if no key is
* provided. Returns a specific key value if a key is provided and the * provided. Returns a specific key value if a key is provided and the
* value is found, or null if the key is not found. * value is found, or null if the key is not found.
*/ */
public function getMetadata(?string $key = null): mixed public function getMetadata(?string $key = null): mixed
{ {
// TODO: Implement getMetadata() method. // TODO: Implement getMetadata() method.
if (is_resource($this->content)) { if (is_resource($this->content)) {
return stream_get_meta_data($this->content); return stream_get_meta_data($this->content);
} }
return null; return null;
} }
} }
src/Constrict/Uri.php
+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
{ {
src/ControllerInterpreter.php
+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
{ {
src/DataGrip.php
+13 -14
View File
@@ -4,26 +4,25 @@ declare(strict_types=1);
namespace Kiri\Router; namespace Kiri\Router;
use Kiri; use Kiri;
use ReflectionException;
class DataGrip class DataGrip
{ {
private array $servers = []; private array $servers = [];
/** /**
* @param $type * @param $type
* @return RouterCollector * @return RouterCollector
* @throws ReflectionException * @throws
*/ */
public function get($type): RouterCollector public function get($type): RouterCollector
{ {
if (!isset($this->servers[$type])) { if (!isset($this->servers[$type])) {
$this->servers[$type] = Kiri::getDi()->make(RouterCollector::class); $this->servers[$type] = Kiri::getDi()->make(RouterCollector::class);
} }
return $this->servers[$type]; return $this->servers[$type];
} }
} }
src/Handler.php
+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
{ {
src/HttpRequestHandler.php
+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
{ {
src/Request.php
+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
src/Response.php
+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
{ {
src/Router.php
+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
{ {
src/RouterCollector.php
+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
{ {
src/StreamResponse.php
+13 -15
View File
@@ -15,27 +15,25 @@ use ReflectionException;
class StreamResponse extends Response class StreamResponse extends Response
{ {
public int $limit; public int $limit;
/** /**
* @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
{ {
$body = $this->getBody(); $body = $this->getBody();
$total = ceil($this->limit / $body->getSize()); $total = ceil($this->limit / $body->getSize());
$response->header('Content-Length', [$body->getSize()]); $response->header('Content-Length', [$body->getSize()]);
for ($i = 0; $i < $total; $i++) { for ($i = 0; $i < $total; $i++) {
$body->seek($i); $body->seek($i);
$response->write($body->read($this->limit)); $response->write($body->read($this->limit));
} }
$response->end(); $response->end();
} }
} }
src/SwooleHttpResponseEmitter.php
+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
{ {
src/SwowHttpResponseEmitter.php
+5 -7
View File
@@ -57,14 +57,12 @@ 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
{ {
// TODO: Implement sender() method. // TODO: Implement sender() method.
$proxy->withHeader('Server', 'Swow'); $proxy->withHeader('Server', 'Swow');
$proxy->withHeader('Run-Time', $this->getRunTime($request)); $proxy->withHeader('Run-Time', $this->getRunTime($request));
$response->sendHttpResponse($proxy); $response->sendHttpResponse($proxy);
src/Validator/BindForm.php
+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
{ {
src/Validator/Validator.php
+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
{ {
src/Validator/ValidatorMiddleware.php
+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
{ {