eee
This commit is contained in:
+14
-15
@@ -20,26 +20,25 @@ class Delete extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param string $version
|
||||
*/
|
||||
public function __construct(readonly public string $path, readonly public string $version = '')
|
||||
{
|
||||
}
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
// TODO: Implement dispatch() method.
|
||||
$path = '/' . ltrim($this->path, '/');
|
||||
/**
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
// TODO: Implement dispatch() method.
|
||||
$path = '/' . ltrim($this->path, '/');
|
||||
if (!empty($this->version)) {
|
||||
$path = '/' . trim($this->version) . $path;
|
||||
}
|
||||
Router::addRoute(RequestMethod::REQUEST_DELETE, $path, [$class, $method]);
|
||||
}
|
||||
Router::addRoute(RequestMethod::REQUEST_DELETE, $path, [$class, $method]);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -28,8 +28,7 @@ class Get extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
|
||||
+15
-16
@@ -18,27 +18,26 @@ class Head extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param string $path
|
||||
* @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 string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
// TODO: Implement dispatch() method.
|
||||
$path = '/' . ltrim($this->path, '/');
|
||||
/**
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
// TODO: Implement dispatch() method.
|
||||
$path = '/' . ltrim($this->path, '/');
|
||||
if (!empty($this->version)) {
|
||||
$path = '/' . trim($this->version) . $path;
|
||||
}
|
||||
Router::addRoute(RequestMethod::REQUEST_HEAD, $path, [$class, $method]);
|
||||
}
|
||||
Router::addRoute(RequestMethod::REQUEST_HEAD, $path, [$class, $method]);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -27,8 +27,7 @@ class Options extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
|
||||
@@ -28,8 +28,7 @@ class Post extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
|
||||
+15
-16
@@ -19,26 +19,25 @@ class Put extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param string $path
|
||||
* @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 string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
// TODO: Implement dispatch() method.
|
||||
$path = '/' . ltrim($this->path, '/');
|
||||
/**
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
// TODO: Implement dispatch() method.
|
||||
$path = '/' . ltrim($this->path, '/');
|
||||
if (!empty($this->version)) {
|
||||
$path = '/' . trim($this->version) . $path;
|
||||
}
|
||||
Router::addRoute(RequestMethod::REQUEST_PUT, $path, [$class, $method]);
|
||||
}
|
||||
Router::addRoute(RequestMethod::REQUEST_PUT, $path, [$class, $method]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -26,7 +26,6 @@ class Route extends AbstractRequestMethod implements InjectRouteInterface
|
||||
* @param object $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function dispatch(object $class, string $method): void
|
||||
{
|
||||
|
||||
@@ -7,7 +7,6 @@ use Kiri\Router\Handler;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Http\Server\MiddlewareInterface;
|
||||
use ReflectionException;
|
||||
|
||||
abstract class AbstractHandler
|
||||
{
|
||||
@@ -21,7 +20,7 @@ abstract class AbstractHandler
|
||||
/**
|
||||
* @param array $middlewares
|
||||
* @param Handler $handler
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function __construct(array $middlewares, public Handler $handler)
|
||||
{
|
||||
@@ -33,7 +32,7 @@ abstract class AbstractHandler
|
||||
/**
|
||||
* @param ServerRequestInterface $request
|
||||
* @return ResponseInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function execute(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Router\Base;
|
||||
|
||||
use Exception;
|
||||
use Kiri\Di\Inject\Container;
|
||||
use Kiri\Router\Request;
|
||||
use Kiri\Router\Response;
|
||||
@@ -31,7 +30,7 @@ class CoreMiddleware implements MiddlewareInterface
|
||||
* @param Request $request
|
||||
* @param RequestHandlerInterface $handler
|
||||
* @return ResponseInterface
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
||||
{
|
||||
|
||||
@@ -3,8 +3,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Router\Base;
|
||||
|
||||
use Exception;
|
||||
use Kiri\Core\HashMap;
|
||||
use Psr\Http\Server\MiddlewareInterface;
|
||||
|
||||
class Middleware
|
||||
@@ -30,7 +28,7 @@ class Middleware
|
||||
* @param string $method
|
||||
* @param string|object $middleware
|
||||
* @return void
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function set(string $className, string $method, string|object $middleware): void
|
||||
{
|
||||
|
||||
@@ -172,7 +172,7 @@ class ConstrictRequest extends Message implements RequestInterface, ServerReques
|
||||
*
|
||||
* @param string $method Case-sensitive method.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException for invalid HTTP methods.
|
||||
* @throws
|
||||
*/
|
||||
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.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException if an invalid structure is provided.
|
||||
* @throws
|
||||
*/
|
||||
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
|
||||
* typically be in an array or object.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException if an unsupported argument type is
|
||||
* @throws
|
||||
* provided.
|
||||
*/
|
||||
public function withParsedBody($data): static
|
||||
|
||||
@@ -4,7 +4,6 @@ declare(strict_types=1);
|
||||
namespace Kiri\Router\Constrict;
|
||||
|
||||
use Kiri\Core\Help;
|
||||
use Kiri\Core\Xml;
|
||||
use Kiri\Router\ContentType;
|
||||
use Kiri\Router\StreamResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
@@ -152,7 +151,7 @@ class ConstrictResponse extends Message implements ResponseInterface
|
||||
* provided status code; if none is provided, implementations MAY
|
||||
* use the defaults as suggested in the HTTP specification.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException For invalid status code arguments.
|
||||
* @throws
|
||||
*/
|
||||
public function withStatus(int $code, string $reasonPhrase = ''): static
|
||||
{
|
||||
|
||||
+294
-294
@@ -11,327 +11,327 @@ use Psr\Http\Message\StreamInterface;
|
||||
class Message extends Component implements MessageInterface
|
||||
{
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private string $version = '1.1';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private string $version = '1.1';
|
||||
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private array $headers = [];
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private array $headers = [];
|
||||
|
||||
|
||||
/**
|
||||
* @var StreamInterface
|
||||
*/
|
||||
public StreamInterface $stream;
|
||||
/**
|
||||
* @var StreamInterface
|
||||
*/
|
||||
public StreamInterface $stream;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private array $cookieParams = [];
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private array $cookieParams = [];
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->stream = new Stream();
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->stream = new Stream();
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Retrieve cookies.
|
||||
*
|
||||
* Retrieves cookies sent by the client to the server.
|
||||
*
|
||||
* The data MUST be compatible with the structure of the $_COOKIE
|
||||
* superglobal.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getCookieParams(): array
|
||||
{
|
||||
// TODO: Implement getCookieParams() method.
|
||||
return $this->cookieParams;
|
||||
}
|
||||
/**
|
||||
* Retrieve cookies.
|
||||
*
|
||||
* Retrieves cookies sent by the client to the server.
|
||||
*
|
||||
* The data MUST be compatible with the structure of the $_COOKIE
|
||||
* superglobal.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getCookieParams(): array
|
||||
{
|
||||
// TODO: Implement getCookieParams() method.
|
||||
return $this->cookieParams;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return an instance with the specified cookies.
|
||||
*
|
||||
* 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 injected at instantiation.
|
||||
*
|
||||
* This method MUST NOT update the related Cookie header of the request
|
||||
* instance, nor related values in the server params.
|
||||
*
|
||||
* 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
|
||||
* updated cookie values.
|
||||
*
|
||||
* @param array $cookies Array of key/value pairs representing cookies.
|
||||
* @return static
|
||||
*/
|
||||
public function withCookieParams(array $cookies): static
|
||||
{
|
||||
// TODO: Implement withCookieParams() method.
|
||||
$this->cookieParams = $cookies;
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* Return an instance with the specified cookies.
|
||||
*
|
||||
* 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 injected at instantiation.
|
||||
*
|
||||
* This method MUST NOT update the related Cookie header of the request
|
||||
* instance, nor related values in the server params.
|
||||
*
|
||||
* 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
|
||||
* updated cookie values.
|
||||
*
|
||||
* @param array $cookies Array of key/value pairs representing cookies.
|
||||
* @return static
|
||||
*/
|
||||
public function withCookieParams(array $cookies): static
|
||||
{
|
||||
// TODO: Implement withCookieParams() method.
|
||||
$this->cookieParams = $cookies;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Retrieves the HTTP protocol version as a string.
|
||||
*
|
||||
* The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
|
||||
*
|
||||
* @return string HTTP protocol version.
|
||||
*/
|
||||
public function getProtocolVersion(): string
|
||||
{
|
||||
// TODO: Implement getProtocolVersion() method.
|
||||
return $this->version;
|
||||
}
|
||||
/**
|
||||
* Retrieves the HTTP protocol version as a string.
|
||||
*
|
||||
* The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
|
||||
*
|
||||
* @return string HTTP protocol version.
|
||||
*/
|
||||
public function getProtocolVersion(): string
|
||||
{
|
||||
// TODO: Implement getProtocolVersion() method.
|
||||
return $this->version;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an instance with the specified HTTP protocol version.
|
||||
*
|
||||
* The version string MUST contain only the HTTP version number (e.g.,
|
||||
* "1.1", "1.0").
|
||||
*
|
||||
* 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
|
||||
* new protocol version.
|
||||
*
|
||||
* @param string $version HTTP protocol version
|
||||
* @return static
|
||||
*/
|
||||
public function withProtocolVersion(string $version): static
|
||||
{
|
||||
// TODO: Implement withProtocolVersion() method.
|
||||
$this->version = $version;
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* Return an instance with the specified HTTP protocol version.
|
||||
*
|
||||
* The version string MUST contain only the HTTP version number (e.g.,
|
||||
* "1.1", "1.0").
|
||||
*
|
||||
* 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
|
||||
* new protocol version.
|
||||
*
|
||||
* @param string $version HTTP protocol version
|
||||
* @return static
|
||||
*/
|
||||
public function withProtocolVersion(string $version): static
|
||||
{
|
||||
// TODO: Implement withProtocolVersion() method.
|
||||
$this->version = $version;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves all message header values.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* // Represent the headers as a string
|
||||
* foreach ($message->getHeaders() as $name => $values) {
|
||||
* echo $name . ": " . implode(", ", $values);
|
||||
* }
|
||||
*
|
||||
* // Emit headers iteratively:
|
||||
* foreach ($message->getHeaders() as $name => $values) {
|
||||
* foreach ($values as $value) {
|
||||
* header(sprintf('%s: %s', $name, $value), false);
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* While header names are not case-sensitive, getHeaders() will preserve the
|
||||
* exact case in which headers were originally specified.
|
||||
*
|
||||
* @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
|
||||
* for that header.
|
||||
*/
|
||||
public function getHeaders(): array
|
||||
{
|
||||
// TODO: Implement getHeaders() method.
|
||||
return $this->headers;
|
||||
}
|
||||
/**
|
||||
* Retrieves all message header values.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* // Represent the headers as a string
|
||||
* foreach ($message->getHeaders() as $name => $values) {
|
||||
* echo $name . ": " . implode(", ", $values);
|
||||
* }
|
||||
*
|
||||
* // Emit headers iteratively:
|
||||
* foreach ($message->getHeaders() as $name => $values) {
|
||||
* foreach ($values as $value) {
|
||||
* header(sprintf('%s: %s', $name, $value), false);
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* While header names are not case-sensitive, getHeaders() will preserve the
|
||||
* exact case in which headers were originally specified.
|
||||
*
|
||||
* @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
|
||||
* for that header.
|
||||
*/
|
||||
public function getHeaders(): array
|
||||
{
|
||||
// TODO: Implement getHeaders() method.
|
||||
return $this->headers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a header exists by the given case-insensitive name.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @return bool Returns true if any header names match the given header
|
||||
* name using a case-insensitive string comparison. Returns false if
|
||||
* no matching header name is found in the message.
|
||||
*/
|
||||
public function hasHeader(string $name): bool
|
||||
{
|
||||
// TODO: Implement hasHeader() method.
|
||||
return isset($this->headers[$name]) && $this->headers[$name] !== null;
|
||||
}
|
||||
/**
|
||||
* Checks if a header exists by the given case-insensitive name.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @return bool Returns true if any header names match the given header
|
||||
* name using a case-insensitive string comparison. Returns false if
|
||||
* no matching header name is found in the message.
|
||||
*/
|
||||
public function hasHeader(string $name): bool
|
||||
{
|
||||
// TODO: Implement hasHeader() method.
|
||||
return isset($this->headers[$name]) && $this->headers[$name] !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves a message header value by the given case-insensitive name.
|
||||
*
|
||||
* This method returns an array of all the header values of the given
|
||||
* case-insensitive header name.
|
||||
*
|
||||
* If the header does not appear in the message, this method MUST return an
|
||||
* empty array.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @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
|
||||
* return an empty array.
|
||||
*/
|
||||
public function getHeader(string $name): array
|
||||
{
|
||||
// TODO: Implement getHeader() method.
|
||||
if (isset($this->headers[$name])) {
|
||||
$header = $this->headers[$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
|
||||
* case-insensitive header name.
|
||||
*
|
||||
* If the header does not appear in the message, this method MUST return an
|
||||
* empty array.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @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
|
||||
* return an empty array.
|
||||
*/
|
||||
public function getHeader(string $name): array
|
||||
{
|
||||
// TODO: Implement getHeader() method.
|
||||
if (isset($this->headers[$name])) {
|
||||
$header = $this->headers[$name];
|
||||
|
||||
return \is_string($header) ? [$header] : $header;
|
||||
}
|
||||
return [];
|
||||
}
|
||||
return \is_string($header) ? [$header] : $header;
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves a comma-separated string of the values for a single header.
|
||||
*
|
||||
* This method returns all the header values of the given
|
||||
* case-insensitive header name as a string concatenated together using
|
||||
* a comma.
|
||||
*
|
||||
* NOTE: Not all header values may be appropriately represented using
|
||||
* comma concatenation. For such headers, use getHeader() instead
|
||||
* and supply your own delimiter when concatenating.
|
||||
*
|
||||
* If the header does not appear in the message, this method MUST return
|
||||
* an empty string.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @return string A string of values as provided for the given header
|
||||
* concatenated together using a comma. If the header does not appear in
|
||||
* the message, this method MUST return an empty string.
|
||||
*/
|
||||
public function getHeaderLine(string $name): string
|
||||
{
|
||||
// TODO: Implement getHeaderLine() method.
|
||||
return \implode(';', $this->getHeader($name));
|
||||
}
|
||||
/**
|
||||
* Retrieves a comma-separated string of the values for a single header.
|
||||
*
|
||||
* This method returns all the header values of the given
|
||||
* case-insensitive header name as a string concatenated together using
|
||||
* a comma.
|
||||
*
|
||||
* NOTE: Not all header values may be appropriately represented using
|
||||
* comma concatenation. For such headers, use getHeader() instead
|
||||
* and supply your own delimiter when concatenating.
|
||||
*
|
||||
* If the header does not appear in the message, this method MUST return
|
||||
* an empty string.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @return string A string of values as provided for the given header
|
||||
* concatenated together using a comma. If the header does not appear in
|
||||
* the message, this method MUST return an empty string.
|
||||
*/
|
||||
public function getHeaderLine(string $name): string
|
||||
{
|
||||
// TODO: Implement getHeaderLine() method.
|
||||
return \implode(';', $this->getHeader($name));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param string $name
|
||||
* @param string|null $default
|
||||
* @return string|null
|
||||
*/
|
||||
public function header(string $name, ?string $default = null): ?string
|
||||
{
|
||||
if (!$this->hasHeader($name)) {
|
||||
return $default;
|
||||
}
|
||||
return $this->getHeaderLine($name);
|
||||
}
|
||||
/**
|
||||
* @param string $name
|
||||
* @param string|null $default
|
||||
* @return string|null
|
||||
*/
|
||||
public function header(string $name, ?string $default = null): ?string
|
||||
{
|
||||
if (!$this->hasHeader($name)) {
|
||||
return $default;
|
||||
}
|
||||
return $this->getHeaderLine($name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an instance with the provided value replacing the specified header.
|
||||
*
|
||||
* While header names are case-insensitive, the casing of the header will
|
||||
* be preserved by this function, and returned from getHeaders().
|
||||
*
|
||||
* 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
|
||||
* new and/or updated header and value.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @param string|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws InvalidArgumentException for invalid header names or values.
|
||||
*/
|
||||
public function withHeader(string $name, $value): static
|
||||
{
|
||||
// TODO: Implement withAddedHeader() method.
|
||||
$this->headers[$name] = $value;
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* Return an instance with the provided value replacing the specified header.
|
||||
*
|
||||
* While header names are case-insensitive, the casing of the header will
|
||||
* be preserved by this function, and returned from getHeaders().
|
||||
*
|
||||
* 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
|
||||
* new and/or updated header and value.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @param string|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws
|
||||
*/
|
||||
public function withHeader(string $name, $value): static
|
||||
{
|
||||
// TODO: Implement withAddedHeader() method.
|
||||
$this->headers[$name] = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param array $headers
|
||||
* @return $this
|
||||
*/
|
||||
public function withHeaders(array $headers): static
|
||||
{
|
||||
$this->headers = $headers;
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* @param array $headers
|
||||
* @return $this
|
||||
*/
|
||||
public function withHeaders(array $headers): static
|
||||
{
|
||||
$this->headers = $headers;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an instance with the specified header appended with the given value.
|
||||
*
|
||||
* 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
|
||||
* exist previously, it will be added.
|
||||
*
|
||||
* 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
|
||||
* new header and/or value.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name to add.
|
||||
* @param string|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws InvalidArgumentException for invalid header names or values.
|
||||
*/
|
||||
public function withAddedHeader(string $name, $value): static
|
||||
{
|
||||
// TODO: Implement withAddedHeader() method.
|
||||
$this->headers[$name] = $value;
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* Return an instance with the specified header appended with the given value.
|
||||
*
|
||||
* 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
|
||||
* exist previously, it will be added.
|
||||
*
|
||||
* 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
|
||||
* new header and/or value.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name to add.
|
||||
* @param string|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws
|
||||
*/
|
||||
public function withAddedHeader(string $name, $value): static
|
||||
{
|
||||
// TODO: Implement withAddedHeader() method.
|
||||
$this->headers[$name] = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an instance without the specified header.
|
||||
*
|
||||
* Header resolution MUST be done without case-sensitivity.
|
||||
*
|
||||
* This method MUST be implemented in such a way as to retain the
|
||||
* immutability of the message, and MUST return an instance that removes
|
||||
* the named header.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name to remove.
|
||||
* @return static
|
||||
*/
|
||||
public function withoutHeader(string $name): static
|
||||
{
|
||||
// TODO: Implement withoutHeader() method.
|
||||
unset($this->headers[$name]);
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* Return an instance without the specified header.
|
||||
*
|
||||
* Header resolution MUST be done without case-sensitivity.
|
||||
*
|
||||
* This method MUST be implemented in such a way as to retain the
|
||||
* immutability of the message, and MUST return an instance that removes
|
||||
* the named header.
|
||||
*
|
||||
* @param string $name Case-insensitive header field name to remove.
|
||||
* @return static
|
||||
*/
|
||||
public function withoutHeader(string $name): static
|
||||
{
|
||||
// TODO: Implement withoutHeader() method.
|
||||
unset($this->headers[$name]);
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the body of the message.
|
||||
*
|
||||
* @return StreamInterface Returns the body as a stream.
|
||||
*/
|
||||
public function getBody(): StreamInterface
|
||||
{
|
||||
// TODO: Implement getBody() method.
|
||||
return $this->stream;
|
||||
}
|
||||
/**
|
||||
* Gets the body of the message.
|
||||
*
|
||||
* @return StreamInterface Returns the body as a stream.
|
||||
*/
|
||||
public function getBody(): StreamInterface
|
||||
{
|
||||
// TODO: Implement getBody() method.
|
||||
return $this->stream;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an instance with the specified message body.
|
||||
*
|
||||
* The body MUST be a StreamInterface object.
|
||||
*
|
||||
* 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
|
||||
* new body stream.
|
||||
*
|
||||
* @param StreamInterface $body Body.
|
||||
* @return static
|
||||
* @throws InvalidArgumentException When the body is not valid.
|
||||
*/
|
||||
public function withBody(StreamInterface $body): static
|
||||
{
|
||||
// TODO: Implement withBody() method.
|
||||
$this->stream = $body;
|
||||
return $this;
|
||||
}
|
||||
/**
|
||||
* Return an instance with the specified message body.
|
||||
*
|
||||
* The body MUST be a StreamInterface object.
|
||||
*
|
||||
* 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
|
||||
* new body stream.
|
||||
*
|
||||
* @param StreamInterface $body Body.
|
||||
* @return static
|
||||
* @throws
|
||||
*/
|
||||
public function withBody(StreamInterface $body): static
|
||||
{
|
||||
// TODO: Implement withBody() method.
|
||||
$this->stream = $body;
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
||||
+227
-228
@@ -4,7 +4,6 @@ declare(strict_types=1);
|
||||
namespace Kiri\Router\Constrict;
|
||||
|
||||
use Psr\Http\Message\StreamInterface;
|
||||
use RuntimeException;
|
||||
|
||||
class Stream implements StreamInterface
|
||||
{
|
||||
@@ -13,255 +12,255 @@ class Stream implements StreamInterface
|
||||
/**
|
||||
* @var resource|string
|
||||
*/
|
||||
public mixed $content = '';
|
||||
public mixed $content = '';
|
||||
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* @var int
|
||||
*/
|
||||
public int $size = 0;
|
||||
public int $size = 0;
|
||||
|
||||
|
||||
/**
|
||||
* @param mixed $content
|
||||
*/
|
||||
public function __construct(mixed $content = '')
|
||||
{
|
||||
$this->content = $content;
|
||||
}
|
||||
/**
|
||||
* @param mixed $content
|
||||
*/
|
||||
public function __construct(mixed $content = '')
|
||||
{
|
||||
$this->content = $content;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 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
|
||||
* reading data and read the stream until the end is reached.
|
||||
*
|
||||
* 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
|
||||
* string casting operations.
|
||||
*
|
||||
* @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
|
||||
* @return string
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
// TODO: Implement __toString() method.
|
||||
return $this->content;
|
||||
}
|
||||
/**
|
||||
* 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
|
||||
* reading data and read the stream until the end is reached.
|
||||
*
|
||||
* 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
|
||||
* string casting operations.
|
||||
*
|
||||
* @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
|
||||
* @return string
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
// TODO: Implement __toString() method.
|
||||
return $this->content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Closes the stream and any underlying resources.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function close(): void
|
||||
{
|
||||
// TODO: Implement close() method.
|
||||
if (is_resource($this->content)) {
|
||||
fclose($this->content);
|
||||
} else {
|
||||
$this->content = '';
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Closes the stream and any underlying resources.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function close(): void
|
||||
{
|
||||
// TODO: Implement close() method.
|
||||
if (is_resource($this->content)) {
|
||||
fclose($this->content);
|
||||
} else {
|
||||
$this->content = '';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Separates any underlying resources from the stream.
|
||||
*
|
||||
* After the stream has been detached, the stream is in an unusable state.
|
||||
*
|
||||
* @return resource|null Underlying PHP stream, if any
|
||||
*/
|
||||
public function detach(): mixed
|
||||
{
|
||||
// TODO: Implement detach() method.
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* Separates any underlying resources from the stream.
|
||||
*
|
||||
* After the stream has been detached, the stream is in an unusable state.
|
||||
*
|
||||
* @return resource|null Underlying PHP stream, if any
|
||||
*/
|
||||
public function detach(): mixed
|
||||
{
|
||||
// TODO: Implement detach() method.
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the size of the stream if known.
|
||||
*
|
||||
* @return int|null Returns the size in bytes if known, or null if unknown.
|
||||
*/
|
||||
public function getSize(): ?int
|
||||
{
|
||||
// TODO: Implement getSize() method.
|
||||
return $this->size;
|
||||
}
|
||||
/**
|
||||
* Get the size of the stream if known.
|
||||
*
|
||||
* @return int|null Returns the size in bytes if known, or null if unknown.
|
||||
*/
|
||||
public function getSize(): ?int
|
||||
{
|
||||
// TODO: Implement getSize() method.
|
||||
return $this->size;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current position of the file read/write pointer
|
||||
*
|
||||
* @return int Position of the file pointer
|
||||
* @throws RuntimeException on error.
|
||||
*/
|
||||
public function tell(): int
|
||||
{
|
||||
// TODO: Implement tell() method.
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
* Returns the current position of the file read/write pointer
|
||||
*
|
||||
* @return int Position of the file pointer
|
||||
* @throws
|
||||
*/
|
||||
public function tell(): int
|
||||
{
|
||||
// TODO: Implement tell() method.
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the stream is at the end of the stream.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function eof(): bool
|
||||
{
|
||||
// TODO: Implement eof() method.
|
||||
return false;
|
||||
}
|
||||
/**
|
||||
* Returns true if the stream is at the end of the stream.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function eof(): bool
|
||||
{
|
||||
// TODO: Implement eof() method.
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether or not the stream is seekable.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isSeekable(): bool
|
||||
{
|
||||
// TODO: Implement isSeekable() method.
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
* Returns whether or not the stream is seekable.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isSeekable(): bool
|
||||
{
|
||||
// TODO: Implement isSeekable() method.
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Seek to a position in the stream.
|
||||
*
|
||||
* @link http://www.php.net/manual/en/function.fseek.php
|
||||
* @param int $offset Stream offset
|
||||
* @param int $whence Specifies how the cursor position will be calculated
|
||||
* based on the seek offset. Valid values are identical to the built-in
|
||||
* PHP $whence values for `fseek()`. SEEK_SET: Set position equal to
|
||||
* offset bytes SEEK_CUR: Set position to current location plus offset
|
||||
* SEEK_END: Set position to end-of-stream plus offset.
|
||||
* @throws RuntimeException on failure.
|
||||
*/
|
||||
public function seek(int $offset, int $whence = SEEK_SET): void
|
||||
{
|
||||
// TODO: Implement seek() method.
|
||||
if (is_resource($this->content)) {
|
||||
fseek($this->content, $offset, $whence);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Seek to a position in the stream.
|
||||
*
|
||||
* @link http://www.php.net/manual/en/function.fseek.php
|
||||
* @param int $offset Stream offset
|
||||
* @param int $whence Specifies how the cursor position will be calculated
|
||||
* based on the seek offset. Valid values are identical to the built-in
|
||||
* PHP $whence values for `fseek()`. SEEK_SET: Set position equal to
|
||||
* offset bytes SEEK_CUR: Set position to current location plus offset
|
||||
* SEEK_END: Set position to end-of-stream plus offset.
|
||||
* @throws
|
||||
*/
|
||||
public function seek(int $offset, int $whence = SEEK_SET): void
|
||||
{
|
||||
// TODO: Implement seek() method.
|
||||
if (is_resource($this->content)) {
|
||||
fseek($this->content, $offset, $whence);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Seek to the beginning of the stream.
|
||||
*
|
||||
* If the stream is not seekable, this method will raise an exception;
|
||||
* otherwise, it will perform a seek(0).
|
||||
*
|
||||
* @throws RuntimeException on failure.
|
||||
* @link http://www.php.net/manual/en/function.fseek.php
|
||||
* @see seek()
|
||||
*/
|
||||
public function rewind(): void
|
||||
{
|
||||
// TODO: Implement rewind() method.
|
||||
$this->seek(0);
|
||||
}
|
||||
/**
|
||||
* Seek to the beginning of the stream.
|
||||
*
|
||||
* If the stream is not seekable, this method will raise an exception;
|
||||
* otherwise, it will perform a seek(0).
|
||||
*
|
||||
* @throws
|
||||
* @link http://www.php.net/manual/en/function.fseek.php
|
||||
* @see seek()
|
||||
*/
|
||||
public function rewind(): void
|
||||
{
|
||||
// TODO: Implement rewind() method.
|
||||
$this->seek(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether or not the stream is writable.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isWritable(): bool
|
||||
{
|
||||
// TODO: Implement isWritable() method.
|
||||
if (is_resource($this->content)) {
|
||||
return is_writable($this->content);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
* Returns whether or not the stream is writable.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isWritable(): bool
|
||||
{
|
||||
// TODO: Implement isWritable() method.
|
||||
if (is_resource($this->content)) {
|
||||
return is_writable($this->content);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Write data to the stream.
|
||||
*
|
||||
* @param string $string The string that is to be written.
|
||||
* @return int Returns the number of bytes written to the stream.
|
||||
* @throws RuntimeException on failure.
|
||||
*/
|
||||
public function write(string $string): int
|
||||
{
|
||||
// TODO: Implement write() method.
|
||||
if (is_resource($this->content)) {
|
||||
$this->content = fopen($string, 'wr');
|
||||
/**
|
||||
* Write data to the stream.
|
||||
*
|
||||
* @param string $string The string that is to be written.
|
||||
* @return int Returns the number of bytes written to the stream.
|
||||
* @throws
|
||||
*/
|
||||
public function write(string $string): int
|
||||
{
|
||||
// TODO: Implement write() method.
|
||||
if (is_resource($this->content)) {
|
||||
$this->content = fopen($string, 'wr');
|
||||
// $this->size = filesize($string);
|
||||
} else {
|
||||
$this->content = $string;
|
||||
} else {
|
||||
$this->content = $string;
|
||||
// $this->size = mb_strlen($string);
|
||||
}
|
||||
return $this->size;
|
||||
}
|
||||
}
|
||||
return $this->size;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether or not the stream is readable.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isReadable(): bool
|
||||
{
|
||||
// TODO: Implement isReadable() method.
|
||||
if (is_resource($this->content)) {
|
||||
return is_readable($this->content);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
* Returns whether or not the stream is readable.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isReadable(): bool
|
||||
{
|
||||
// TODO: Implement isReadable() method.
|
||||
if (is_resource($this->content)) {
|
||||
return is_readable($this->content);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Read data from the stream.
|
||||
*
|
||||
* @param int $length Read up to $length bytes from the object and return
|
||||
* them. Fewer than $length bytes may be returned if underlying stream
|
||||
* call returns fewer bytes.
|
||||
* @return string Returns the data read from the stream, or an empty string
|
||||
* if no bytes are available.
|
||||
* @throws RuntimeException if an error occurs.
|
||||
*/
|
||||
public function read(int $length): string
|
||||
{
|
||||
// TODO: Implement read() method.
|
||||
if (!is_resource($this->content)) {
|
||||
return mb_substr($this->content, 0, $length);
|
||||
} else {
|
||||
return fread($this->content, $length);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Read data from the stream.
|
||||
*
|
||||
* @param int $length Read up to $length bytes from the object and return
|
||||
* them. Fewer than $length bytes may be returned if underlying stream
|
||||
* call returns fewer bytes.
|
||||
* @return string Returns the data read from the stream, or an empty string
|
||||
* if no bytes are available.
|
||||
* @throws
|
||||
*/
|
||||
public function read(int $length): string
|
||||
{
|
||||
// TODO: Implement read() method.
|
||||
if (!is_resource($this->content)) {
|
||||
return mb_substr($this->content, 0, $length);
|
||||
} else {
|
||||
return fread($this->content, $length);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the remaining contents in a string
|
||||
*
|
||||
* @return string
|
||||
* @throws RuntimeException if unable to read or an error occurs while
|
||||
* reading.
|
||||
*/
|
||||
public function getContents(): string
|
||||
{
|
||||
// TODO: Implement getContents() method.
|
||||
if (is_resource($this->content)) {
|
||||
return fread($this->content, $this->getSize());
|
||||
}
|
||||
return $this->content;
|
||||
}
|
||||
/**
|
||||
* Returns the remaining contents in a string
|
||||
*
|
||||
* @return string
|
||||
* @throws
|
||||
* reading.
|
||||
*/
|
||||
public function getContents(): string
|
||||
{
|
||||
// TODO: Implement getContents() method.
|
||||
if (is_resource($this->content)) {
|
||||
return fread($this->content, $this->getSize());
|
||||
}
|
||||
return $this->content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get stream metadata as an associative array or retrieve a specific key.
|
||||
*
|
||||
* The keys returned are identical to the keys returned from PHP's
|
||||
* stream_get_meta_data() function.
|
||||
*
|
||||
* @link http://php.net/manual/en/function.stream-get-meta-data.php
|
||||
* @param string|null $key Specific metadata to retrieve.
|
||||
* @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
|
||||
* value is found, or null if the key is not found.
|
||||
*/
|
||||
public function getMetadata(?string $key = null): mixed
|
||||
{
|
||||
// TODO: Implement getMetadata() method.
|
||||
if (is_resource($this->content)) {
|
||||
return stream_get_meta_data($this->content);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
/**
|
||||
* Get stream metadata as an associative array or retrieve a specific key.
|
||||
*
|
||||
* The keys returned are identical to the keys returned from PHP's
|
||||
* stream_get_meta_data() function.
|
||||
*
|
||||
* @link http://php.net/manual/en/function.stream-get-meta-data.php
|
||||
* @param string|null $key Specific metadata to retrieve.
|
||||
* @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
|
||||
* value is found, or null if the key is not found.
|
||||
*/
|
||||
public function getMetadata(?string $key = null): mixed
|
||||
{
|
||||
// TODO: Implement getMetadata() method.
|
||||
if (is_resource($this->content)) {
|
||||
return stream_get_meta_data($this->content);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ class Uri implements UriInterface
|
||||
*
|
||||
* @param string $scheme The scheme to use with the new instance.
|
||||
* @return static A new instance with the specified scheme.
|
||||
* @throws \InvalidArgumentException for invalid or unsupported schemes.
|
||||
* @throws
|
||||
*/
|
||||
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.
|
||||
* @return static A new instance with the specified host.
|
||||
* @throws \InvalidArgumentException for invalid hostnames.
|
||||
* @throws
|
||||
*/
|
||||
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
|
||||
* removes the port information.
|
||||
* @return static A new instance with the specified port.
|
||||
* @throws \InvalidArgumentException for invalid ports.
|
||||
* @throws
|
||||
*/
|
||||
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.
|
||||
* @return static A new instance with the specified path.
|
||||
* @throws \InvalidArgumentException for invalid paths.
|
||||
* @throws
|
||||
*/
|
||||
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.
|
||||
* @return static A new instance with the specified query string.
|
||||
* @throws \InvalidArgumentException for invalid query strings.
|
||||
* @throws
|
||||
*/
|
||||
public function withQuery(string $query): static
|
||||
{
|
||||
|
||||
@@ -5,11 +5,8 @@ namespace Kiri\Router;
|
||||
|
||||
use Closure;
|
||||
use Exception;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\ContainerInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
use ReflectionClass;
|
||||
use ReflectionException;
|
||||
use ReflectionMethod;
|
||||
|
||||
class ControllerInterpreter
|
||||
@@ -29,9 +26,7 @@ class ControllerInterpreter
|
||||
* @param string|ReflectionMethod $method
|
||||
* @param ReflectionClass|null $reflection
|
||||
* @return Handler
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function addRouteByString(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler
|
||||
{
|
||||
@@ -45,9 +40,7 @@ class ControllerInterpreter
|
||||
/**
|
||||
* @param Closure $method
|
||||
* @return Handler
|
||||
* @throws ReflectionException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws
|
||||
*/
|
||||
public function addRouteByClosure(Closure $method): Handler
|
||||
{
|
||||
@@ -64,9 +57,7 @@ class ControllerInterpreter
|
||||
* @param string|ReflectionMethod $method
|
||||
* @param ReflectionClass|null $reflection
|
||||
* @return Handler
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function addRouteByObject(object $class, string|ReflectionMethod $method, ?ReflectionClass $reflection = null): Handler
|
||||
{
|
||||
@@ -82,10 +73,7 @@ class ControllerInterpreter
|
||||
* @param string|ReflectionMethod $reflectionMethod
|
||||
* @param ReflectionClass $reflectionClass
|
||||
* @return Handler
|
||||
* @throws ReflectionException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function resolveMethod(object $class, string|\ReflectionMethod $reflectionMethod, ReflectionClass $reflectionClass): Handler
|
||||
{
|
||||
|
||||
+13
-14
@@ -4,26 +4,25 @@ declare(strict_types=1);
|
||||
namespace Kiri\Router;
|
||||
|
||||
use Kiri;
|
||||
use ReflectionException;
|
||||
|
||||
class DataGrip
|
||||
{
|
||||
|
||||
private array $servers = [];
|
||||
private array $servers = [];
|
||||
|
||||
|
||||
/**
|
||||
* @param $type
|
||||
* @return RouterCollector
|
||||
* @throws ReflectionException
|
||||
*/
|
||||
public function get($type): RouterCollector
|
||||
{
|
||||
if (!isset($this->servers[$type])) {
|
||||
$this->servers[$type] = Kiri::getDi()->make(RouterCollector::class);
|
||||
}
|
||||
return $this->servers[$type];
|
||||
}
|
||||
/**
|
||||
* @param $type
|
||||
* @return RouterCollector
|
||||
* @throws
|
||||
*/
|
||||
public function get($type): RouterCollector
|
||||
{
|
||||
if (!isset($this->servers[$type])) {
|
||||
$this->servers[$type] = Kiri::getDi()->make(RouterCollector::class);
|
||||
}
|
||||
return $this->servers[$type];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+3
-8
@@ -11,13 +11,10 @@ use Kiri\Router\Format\NoBody;
|
||||
use Kiri\Router\Format\OtherFormat;
|
||||
use Kiri\Router\Format\ResponseFormat;
|
||||
use Kiri\Router\Format\VoidFormat;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\ContainerInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use ReflectionException;
|
||||
use ReflectionNamedType;
|
||||
|
||||
class Handler implements RequestHandlerInterface
|
||||
@@ -42,8 +39,7 @@ class Handler implements RequestHandlerInterface
|
||||
* @param array|Closure $handler
|
||||
* @param array $parameter
|
||||
* @param ReflectionNamedType|null $reflectionType
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws
|
||||
*/
|
||||
public function __construct(public array|Closure $handler, public array $parameter, public ?ReflectionNamedType $reflectionType)
|
||||
{
|
||||
@@ -74,8 +70,7 @@ class Handler implements RequestHandlerInterface
|
||||
/**
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws
|
||||
*/
|
||||
public function setRequestMethod(string $method): void
|
||||
{
|
||||
@@ -134,7 +129,7 @@ class Handler implements RequestHandlerInterface
|
||||
/**
|
||||
* @param ServerRequestInterface $request
|
||||
* @return ResponseInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function handle(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
|
||||
@@ -16,7 +16,7 @@ class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterf
|
||||
/**
|
||||
* @param ServerRequestInterface $request
|
||||
* @return ResponseInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function run(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
@@ -27,7 +27,7 @@ class HttpRequestHandler extends AbstractHandler implements RequestHandlerInterf
|
||||
/**
|
||||
* @param ServerRequestInterface $request
|
||||
* @return ResponseInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function handle(ServerRequestInterface $request): ResponseInterface
|
||||
{
|
||||
|
||||
+6
-6
@@ -224,7 +224,7 @@ class Request implements ServerRequestInterface
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @param string|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException for invalid header names or values.
|
||||
* @throws
|
||||
*/
|
||||
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|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException for invalid header names or values.
|
||||
* @throws
|
||||
*/
|
||||
public function withAddedHeader(string $name, $value): ServerRequestInterface
|
||||
{
|
||||
@@ -339,7 +339,7 @@ class Request implements ServerRequestInterface
|
||||
*
|
||||
* @param StreamInterface $body Body.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException When the body is not valid.
|
||||
* @throws
|
||||
*/
|
||||
public function withBody(StreamInterface $body): ServerRequestInterface
|
||||
{
|
||||
@@ -416,7 +416,7 @@ class Request implements ServerRequestInterface
|
||||
*
|
||||
* @param string $method Case-sensitive method.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException for invalid HTTP methods.
|
||||
* @throws
|
||||
*/
|
||||
public function withMethod(string $method): ServerRequestInterface
|
||||
{
|
||||
@@ -602,7 +602,7 @@ class Request implements ServerRequestInterface
|
||||
*
|
||||
* @param array $uploadedFiles An array tree of UploadedFileInterface instances.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException if an invalid structure is provided.
|
||||
* @throws
|
||||
*/
|
||||
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
|
||||
* typically be in an array or object.
|
||||
* @return static
|
||||
* @throws \InvalidArgumentException if an unsupported argument type is
|
||||
* @throws
|
||||
* provided.
|
||||
*/
|
||||
public function withParsedBody($data): ServerRequestInterface
|
||||
|
||||
+5
-7
@@ -3,11 +3,9 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Router;
|
||||
|
||||
use InvalidArgumentException;
|
||||
use Kiri\Di\Interface\ResponseEmitterInterface;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\StreamInterface;
|
||||
use ReflectionException;
|
||||
|
||||
|
||||
/**
|
||||
@@ -40,7 +38,7 @@ class Response implements ResponseInterface
|
||||
|
||||
/**
|
||||
* @return void
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function init(): void
|
||||
{
|
||||
@@ -281,7 +279,7 @@ class Response implements ResponseInterface
|
||||
* @param string $name Case-insensitive header field name.
|
||||
* @param string|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws InvalidArgumentException for invalid header names or values.
|
||||
* @throws
|
||||
*/
|
||||
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|string[] $value Header value(s).
|
||||
* @return static
|
||||
* @throws InvalidArgumentException for invalid header names or values.
|
||||
* @throws
|
||||
*/
|
||||
public function withAddedHeader(string $name, $value): ResponseInterface
|
||||
{
|
||||
@@ -361,7 +359,7 @@ class Response implements ResponseInterface
|
||||
*
|
||||
* @param StreamInterface $body Body.
|
||||
* @return static
|
||||
* @throws InvalidArgumentException When the body is not valid.
|
||||
* @throws
|
||||
*/
|
||||
public function withBody(StreamInterface $body): ResponseInterface
|
||||
{
|
||||
@@ -413,7 +411,7 @@ class Response implements ResponseInterface
|
||||
* provided status code; if none is provided, implementations MAY
|
||||
* use the defaults as suggested in the HTTP specification.
|
||||
* @return static
|
||||
* @throws InvalidArgumentException For invalid status code arguments.
|
||||
* @throws
|
||||
*/
|
||||
public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface
|
||||
{
|
||||
|
||||
+3
-7
@@ -4,14 +4,10 @@ declare(strict_types=1);
|
||||
namespace Kiri\Router;
|
||||
|
||||
use Closure;
|
||||
use Exception;
|
||||
use Kiri;
|
||||
use Kiri\Router\Base\Middleware as MiddlewareManager;
|
||||
use Kiri\Router\Constrict\RequestMethod;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
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
|
||||
* @return void
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
private function read_dir_file($path): void
|
||||
{
|
||||
@@ -225,7 +221,7 @@ class Router
|
||||
|
||||
/**
|
||||
* @param $files
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
private function resolve_file($files): void
|
||||
{
|
||||
|
||||
@@ -79,9 +79,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
|
||||
|
||||
/**
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -172,9 +170,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
* @param string|array $closure
|
||||
* @param ControllerInterpreter $interpreter
|
||||
* @return Handler
|
||||
* @throws ReflectionException
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws
|
||||
*/
|
||||
private function resolve(string|array $closure, ControllerInterpreter $interpreter): Handler
|
||||
{
|
||||
@@ -209,7 +205,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
* @param string $method
|
||||
* @param Handler $handler
|
||||
* @return void
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function register(string $path, string $method, Handler $handler): void
|
||||
{
|
||||
@@ -222,7 +218,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
* @param string $class
|
||||
* @param string $method
|
||||
* @return void
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function registerMiddleware(string $class, string $method): void
|
||||
{
|
||||
@@ -261,7 +257,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
* @param string $path
|
||||
* @param string $method
|
||||
* @return HttpRequestHandler
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function query(string $path, string $method): HttpRequestHandler
|
||||
{
|
||||
|
||||
+13
-15
@@ -15,27 +15,25 @@ use ReflectionException;
|
||||
class StreamResponse extends Response
|
||||
{
|
||||
|
||||
public int $limit;
|
||||
public int $limit;
|
||||
|
||||
|
||||
/**
|
||||
* @param object $response
|
||||
* @return void
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function end(object $response): void
|
||||
{
|
||||
$body = $this->getBody();
|
||||
$total = ceil($this->limit / $body->getSize());
|
||||
$response->header('Content-Length', [$body->getSize()]);
|
||||
for ($i = 0; $i < $total; $i++) {
|
||||
$body->seek($i);
|
||||
public function end(object $response): void
|
||||
{
|
||||
$body = $this->getBody();
|
||||
$total = ceil($this->limit / $body->getSize());
|
||||
$response->header('Content-Length', [$body->getSize()]);
|
||||
for ($i = 0; $i < $total; $i++) {
|
||||
$body->seek($i);
|
||||
|
||||
$response->write($body->read($this->limit));
|
||||
}
|
||||
$response->end();
|
||||
}
|
||||
$response->write($body->read($this->limit));
|
||||
}
|
||||
$response->end();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -49,9 +49,7 @@ class SwooleHttpResponseEmitter implements ResponseEmitterInterface
|
||||
* @param object $response
|
||||
* @param object $request
|
||||
* @return void
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function response(ResponseInterface $proxy, object $response, object $request): void
|
||||
{
|
||||
|
||||
@@ -57,14 +57,12 @@ class SwowHttpResponseEmitter implements ResponseEmitterInterface
|
||||
* @param object $response
|
||||
* @param object $request
|
||||
* @return void
|
||||
* @throws ContainerExceptionInterface
|
||||
* @throws NotFoundExceptionInterface
|
||||
* @throws ReflectionException
|
||||
* @throws
|
||||
*/
|
||||
public function response(ResponseInterface $proxy, object $response, object $request): void
|
||||
{
|
||||
// TODO: Implement sender() method.
|
||||
$proxy->withHeader('Server', 'Swow');
|
||||
public function response(ResponseInterface $proxy, object $response, object $request): void
|
||||
{
|
||||
// TODO: Implement sender() method.
|
||||
$proxy->withHeader('Server', 'Swow');
|
||||
$proxy->withHeader('Run-Time', $this->getRunTime($request));
|
||||
$response->sendHttpResponse($proxy);
|
||||
|
||||
|
||||
@@ -28,8 +28,7 @@ class BindForm implements InjectParameterInterface
|
||||
* @param string $class
|
||||
* @param string $method
|
||||
* @return mixed
|
||||
* @throws ReflectionException
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function dispatch(string $class, string $method): object
|
||||
{
|
||||
@@ -38,10 +37,6 @@ class BindForm implements InjectParameterInterface
|
||||
$reflect = $container->getReflectionClass($this->formValidate);
|
||||
$object = $validator->setFormData($reflect->newInstanceWithoutConstructor());
|
||||
foreach ($reflect->getProperties() as $property) {
|
||||
// $binding = $property->getAttributes(Binding::class);
|
||||
// if (count($binding) < 1) {
|
||||
// continue;
|
||||
// }
|
||||
foreach ($property->getAttributes() as $attribute) {
|
||||
if (!class_exists($attribute->getName())) {
|
||||
continue;
|
||||
@@ -70,7 +65,7 @@ class BindForm implements InjectParameterInterface
|
||||
* @param object $object
|
||||
* @param string $property
|
||||
* @return void
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
private function insertDefaultValue(ReflectionNamedType|ReflectionUnionType $reflectionProperty, object $object, string $property): void
|
||||
{
|
||||
@@ -87,7 +82,7 @@ class BindForm implements InjectParameterInterface
|
||||
/**
|
||||
* @param ReflectionNamedType $type
|
||||
* @return array|false|int|string
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
private function defaultValue(ReflectionNamedType $type): array|false|int|string
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Router\Validator;
|
||||
|
||||
use Kiri;
|
||||
use Kiri\Router\Constrict\ConstrictRequest;
|
||||
use Kiri\Router\Interface\ValidatorInterface;
|
||||
use Psr\Http\Message\RequestInterface;
|
||||
@@ -91,8 +90,7 @@ class Validator
|
||||
/**
|
||||
* @param RequestInterface|ServerRequestInterface|ConstrictRequest $request
|
||||
* @return bool
|
||||
* @throws ReflectionException
|
||||
* @throws \Exception
|
||||
* @throws
|
||||
*/
|
||||
public function run(RequestInterface|ServerRequestInterface|ConstrictRequest $request): bool
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace Kiri\Router\Validator;
|
||||
|
||||
use Exception;
|
||||
use Kiri\Di\Inject\Container;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
@@ -31,7 +30,7 @@ class ValidatorMiddleware implements MiddlewareInterface
|
||||
* @param ServerRequestInterface $request
|
||||
* @param RequestHandlerInterface $handler
|
||||
* @return ResponseInterface
|
||||
* @throws Exception
|
||||
* @throws
|
||||
*/
|
||||
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user