From ab57da86c03f75c2aa78bb34f73c7aa85a9e4775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Sat, 20 Feb 2021 17:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Abstracts/Callback.php | 3 +-- HttpServer/Abstracts/ServerBase.php | 3 +-- HttpServer/Http/Formatter/HtmlFormatter.php | 4 ++-- HttpServer/Http/Formatter/JsonFormatter.php | 5 ++--- HttpServer/Http/Formatter/XmlFormatter.php | 4 ++-- HttpServer/Http/Request.php | 4 ++-- HttpServer/Http/Response.php | 4 ++-- HttpServer/Route/Filter.php | 4 ++-- HttpServer/Route/Filter/Filter.php | 4 ++-- HttpServer/Route/Handler.php | 4 ++-- HttpServer/Route/Node.php | 4 ++-- HttpServer/Route/Router.php | 4 ++-- 12 files changed, 22 insertions(+), 25 deletions(-) diff --git a/HttpServer/Abstracts/Callback.php b/HttpServer/Abstracts/Callback.php index f31ce805..4a7cba75 100644 --- a/HttpServer/Abstracts/Callback.php +++ b/HttpServer/Abstracts/Callback.php @@ -5,7 +5,6 @@ namespace HttpServer\Abstracts; use Exception; -use HttpServer\Application; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\SMTP; use Snowflake\Abstracts\Config; @@ -21,7 +20,7 @@ use Swoole\Timer; * Class Callback * @package HttpServer\Abstracts */ -abstract class Callback extends Application +abstract class Callback extends HttpService { diff --git a/HttpServer/Abstracts/ServerBase.php b/HttpServer/Abstracts/ServerBase.php index 2a888f80..02d25565 100644 --- a/HttpServer/Abstracts/ServerBase.php +++ b/HttpServer/Abstracts/ServerBase.php @@ -9,14 +9,13 @@ declare(strict_types=1); namespace HttpServer\Abstracts; -use HttpServer\Application; use Swoole\WebSocket\Server; /** * Class ServerBase * @package Snowflake\Snowflake\Server */ -abstract class ServerBase extends Application +abstract class ServerBase extends HttpService { /** @var Server */ diff --git a/HttpServer/Http/Formatter/HtmlFormatter.php b/HttpServer/Http/Formatter/HtmlFormatter.php index 324aa790..81f3aa2d 100644 --- a/HttpServer/Http/Formatter/HtmlFormatter.php +++ b/HttpServer/Http/Formatter/HtmlFormatter.php @@ -11,8 +11,8 @@ namespace HttpServer\Http\Formatter; use Exception; +use HttpServer\Abstracts\HttpService; use Snowflake\Core\Json; -use HttpServer\Application; use Swoole\Http\Response; use HttpServer\IInterface\IFormatter; @@ -20,7 +20,7 @@ use HttpServer\IInterface\IFormatter; * Class HtmlFormatter * @package Snowflake\Snowflake\Http\Formatter */ -class HtmlFormatter extends Application implements IFormatter +class HtmlFormatter extends HttpService implements IFormatter { public $data; diff --git a/HttpServer/Http/Formatter/JsonFormatter.php b/HttpServer/Http/Formatter/JsonFormatter.php index e5a42ce3..c97f43b2 100644 --- a/HttpServer/Http/Formatter/JsonFormatter.php +++ b/HttpServer/Http/Formatter/JsonFormatter.php @@ -9,15 +9,14 @@ declare(strict_types=1); namespace HttpServer\Http\Formatter; -use Exception; -use HttpServer\Application; +use HttpServer\Abstracts\HttpService; use HttpServer\IInterface\IFormatter; /** * Class JsonFormatter * @package Snowflake\Snowflake\Http\Formatter */ -class JsonFormatter extends Application implements IFormatter +class JsonFormatter extends HttpService implements IFormatter { public $data; diff --git a/HttpServer/Http/Formatter/XmlFormatter.php b/HttpServer/Http/Formatter/XmlFormatter.php index 462bc9c2..98c045f0 100644 --- a/HttpServer/Http/Formatter/XmlFormatter.php +++ b/HttpServer/Http/Formatter/XmlFormatter.php @@ -11,7 +11,7 @@ namespace HttpServer\Http\Formatter; use Exception; -use HttpServer\Application; +use HttpServer\Abstracts\HttpService; use SimpleXMLElement; use Swoole\Http\Response; use HttpServer\IInterface\IFormatter; @@ -21,7 +21,7 @@ use HttpServer\IInterface\IFormatter; * Class XmlFormatter * @package Snowflake\Snowflake\Http\Formatter */ -class XmlFormatter extends Application implements IFormatter +class XmlFormatter extends HttpService implements IFormatter { public ?string $data = ''; diff --git a/HttpServer/Http/Request.php b/HttpServer/Http/Request.php index e09fd37e..572f121d 100644 --- a/HttpServer/Http/Request.php +++ b/HttpServer/Http/Request.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace HttpServer\Http; use Exception; -use HttpServer\Application; +use HttpServer\Abstracts\HttpService; use HttpServer\IInterface\AuthIdentity; use JetBrains\PhpStorm\Pure; @@ -33,7 +33,7 @@ defined('REQUEST_FAIL') or define('REQUEST_FAIL', 500); * @property-read $isPackage * @property-read $isReceive */ -class Request extends Application +class Request extends HttpService { /** @var int $fd */ diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php index 2800e03d..cd4157c7 100644 --- a/HttpServer/Http/Response.php +++ b/HttpServer/Http/Response.php @@ -9,7 +9,7 @@ declare(strict_types=1); namespace HttpServer\Http; -use HttpServer\Application; +use HttpServer\Abstracts\HttpService; use HttpServer\Http\Formatter\HtmlFormatter; use HttpServer\Http\Formatter\JsonFormatter; use HttpServer\Http\Formatter\XmlFormatter; @@ -23,7 +23,7 @@ use Swoole\Http2\Response as S2Response; * Class Response * @package Snowflake\Snowflake\Http */ -class Response extends Application +class Response extends HttpService { const JSON = 'json'; diff --git a/HttpServer/Route/Filter.php b/HttpServer/Route/Filter.php index b9c34a56..7f3fa359 100644 --- a/HttpServer/Route/Filter.php +++ b/HttpServer/Route/Filter.php @@ -5,20 +5,20 @@ declare(strict_types=1); namespace HttpServer\Route; +use HttpServer\Abstracts\HttpService; use HttpServer\Exception\AuthException; use HttpServer\Route\Filter\BodyFilter; use HttpServer\Route\Filter\FilterException; use HttpServer\Route\Filter\HeaderFilter; use HttpServer\Route\Filter\QueryFilter; use Exception; -use HttpServer\Application; use Snowflake\Snowflake; /** * Class Filter * @package Snowflake\Snowflake\Route */ -class Filter extends Application +class Filter extends HttpService { /** @var Filter\Filter[] */ diff --git a/HttpServer/Route/Filter/Filter.php b/HttpServer/Route/Filter/Filter.php index 7eb9b4a2..aa0aa87d 100644 --- a/HttpServer/Route/Filter/Filter.php +++ b/HttpServer/Route/Filter/Filter.php @@ -6,14 +6,14 @@ namespace HttpServer\Route\Filter; use Exception; -use HttpServer\Application; +use HttpServer\Abstracts\HttpService; use validator\Validator; /** * Class Filter * @package Snowflake\Snowflake\Route\Filter */ -abstract class Filter extends Application +abstract class Filter extends HttpService { public array $rules = []; diff --git a/HttpServer/Route/Handler.php b/HttpServer/Route/Handler.php index 611c0c8c..c5ec8e7c 100644 --- a/HttpServer/Route/Handler.php +++ b/HttpServer/Route/Handler.php @@ -6,7 +6,7 @@ namespace HttpServer\Route; use Exception; -use HttpServer\Application; +use HttpServer\Abstracts\HttpService; use Snowflake\Exception\ConfigException; use Snowflake\Snowflake; @@ -14,7 +14,7 @@ use Snowflake\Snowflake; * Class TcpListen * @package Snowflake\Snowflake\Route */ -class Handler extends Application +class Handler extends HttpService { /** @var Router */ diff --git a/HttpServer/Route/Node.php b/HttpServer/Route/Node.php index 535889d6..6f8cb899 100644 --- a/HttpServer/Route/Node.php +++ b/HttpServer/Route/Node.php @@ -6,9 +6,9 @@ namespace HttpServer\Route; use Closure; +use HttpServer\Abstracts\HttpService; use HttpServer\Http\Request; use Exception; -use HttpServer\Application; use JetBrains\PhpStorm\Pure; use ReflectionException; @@ -24,7 +24,7 @@ use function Input; * Class Node * @package Snowflake\Snowflake\Route */ -class Node extends Application +class Node extends HttpService { public string $path = ''; diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php index d6d84f64..61023d44 100644 --- a/HttpServer/Route/Router.php +++ b/HttpServer/Route/Router.php @@ -5,9 +5,9 @@ namespace HttpServer\Route; use Closure; use Exception; +use HttpServer\Abstracts\HttpService; use HttpServer\Http\Request; use HttpServer\IInterface\RouterInterface; -use HttpServer\Application; use Snowflake\Abstracts\Config; use Snowflake\Exception\ComponentException; @@ -21,7 +21,7 @@ defined('ROUTER_HASH') or define('ROUTER_HASH', 2); * Class Router * @package Snowflake\Snowflake\Route */ -class Router extends Application implements RouterInterface +class Router extends HttpService implements RouterInterface { /** @var Node[] $nodes */ public array $nodes = [];