diff --git a/function.php b/function.php index 886599ce..2e4c4242 100644 --- a/function.php +++ b/function.php @@ -3,7 +3,7 @@ defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../')); -use Http\Handler\Router; +use Kiri\Message\Handler\Router; use JetBrains\PhpStorm\Pure; use Kiri\Abstracts\Config; use Kiri\Application; diff --git a/kiri-annotation/Route/Middleware.php b/kiri-annotation/Route/Middleware.php index 46d8eda7..bd7ac8c9 100644 --- a/kiri-annotation/Route/Middleware.php +++ b/kiri-annotation/Route/Middleware.php @@ -5,7 +5,7 @@ namespace Kiri\Annotation\Route; use Kiri\Annotation\Attribute; -use Http\Handler\Abstracts\MiddlewareManager; +use Kiri\Message\Handler\Abstracts\MiddlewareManager; use Psr\Http\Server\MiddlewareInterface; /** diff --git a/kiri-annotation/Route/Route.php b/kiri-annotation/Route/Route.php index 34c94a0d..afb1fc2c 100644 --- a/kiri-annotation/Route/Route.php +++ b/kiri-annotation/Route/Route.php @@ -5,7 +5,7 @@ namespace Kiri\Annotation\Route; use Kiri\Annotation\Attribute; -use Http\Handler\Router; +use Kiri\Message\Handler\Router; use Kiri\Kiri; #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Route extends Attribute diff --git a/kiri-annotation/Task.php b/kiri-annotation/Task.php index 06d7f82b..b70a8478 100644 --- a/kiri-annotation/Task.php +++ b/kiri-annotation/Task.php @@ -6,7 +6,7 @@ namespace Kiri\Annotation; use Exception; use Kiri\Kiri; -use Server\Tasker\AsyncTaskExecute; +use Kiri\Server\Tasker\AsyncTaskExecute; /** diff --git a/kiri-engine/Abstracts/BaseApplication.php b/kiri-engine/Abstracts/BaseApplication.php index f0cee6cc..f5205e3e 100644 --- a/kiri-engine/Abstracts/BaseApplication.php +++ b/kiri-engine/Abstracts/BaseApplication.php @@ -12,7 +12,7 @@ namespace Kiri\Abstracts; use Database\Connection; use Exception; -use Http\Handler\Router; +use Kiri\Message\Handler\Router; use Kafka\KafkaProvider; use Kiri\{Async, Kiri}; use Kiri\Annotation\Annotation as SAnnotation; @@ -21,7 +21,7 @@ use Kiri\Di\LocalService; use Kiri\Error\{ErrorHandler, Logger}; use Kiri\Exception\{InitException, NotFindClassException}; use ReflectionException; -use Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute}; +use Kiri\Server\{Contract\OnTaskInterface, Server, ServerManager, Tasker\AsyncTaskExecute}; use Swoole\Table; /** diff --git a/kiri-engine/Abstracts/Logger.php b/kiri-engine/Abstracts/Logger.php index 9c8d2332..48cfd0d7 100644 --- a/kiri-engine/Abstracts/Logger.php +++ b/kiri-engine/Abstracts/Logger.php @@ -9,7 +9,7 @@ use Kiri\Exception\ConfigException; use Kiri\Kiri; use Psr\Log\LoggerInterface; use ReflectionException; -use Server\Events\OnWorkerStop; +use Kiri\Server\Events\OnWorkerStop; /** diff --git a/kiri-engine/Abstracts/TraitApplication.php b/kiri-engine/Abstracts/TraitApplication.php index 4a908746..eaa02786 100644 --- a/kiri-engine/Abstracts/TraitApplication.php +++ b/kiri-engine/Abstracts/TraitApplication.php @@ -7,8 +7,8 @@ namespace Kiri\Abstracts; use Kiri\Annotation\Annotation as SAnnotation; use Database\Connection; use Database\DatabasesProviders; -use Http\Handler\Router; -use Server\Server; +use Kiri\Message\Handler\Router; +use Kiri\Server\Server; use Kiri\Async; use Kiri\Error\Logger; use Kiri\Jwt\JWTAuth; diff --git a/kiri-engine/Application.php b/kiri-engine/Application.php index 24d9b335..dfe4b71b 100644 --- a/kiri-engine/Application.php +++ b/kiri-engine/Application.php @@ -18,7 +18,7 @@ use Kiri\Crontab\CrontabProviders; use Kiri\Events\{OnAfterCommandExecute, OnBeforeCommandExecute}; use Kiri\FileListen\HotReload; use ReflectionException; -use Server\ServerProviders; +use Kiri\Server\ServerProviders; use stdClass; use Swoole\Process; use Swoole\Timer; diff --git a/kiri-engine/Async.php b/kiri-engine/Async.php index 22c0610b..2257fe1d 100644 --- a/kiri-engine/Async.php +++ b/kiri-engine/Async.php @@ -6,8 +6,8 @@ namespace Kiri; use Exception; use Kiri\Abstracts\Component; -use Server\ServerManager; -use Server\Tasker\AsyncTaskExecute; +use Kiri\Server\ServerManager; +use Kiri\Server\Tasker\AsyncTaskExecute; /** * Class Async diff --git a/kiri-engine/Cache/Redis.php b/kiri-engine/Cache/Redis.php index 65cf8e46..601c90ee 100644 --- a/kiri-engine/Cache/Redis.php +++ b/kiri-engine/Cache/Redis.php @@ -18,7 +18,7 @@ use Kiri\Exception\ConfigException; use Kiri\Kiri; use Kiri\Pool\Redis as PoolRedis; use Kiri\Annotation\Inject; -use Server\Events\OnWorkerExit; +use Kiri\Server\Events\OnWorkerExit; use Swoole\Timer; /** diff --git a/kiri-engine/Error/ErrorHandler.php b/kiri-engine/Error/ErrorHandler.php index de7ee594..f4c15853 100644 --- a/kiri-engine/Error/ErrorHandler.php +++ b/kiri-engine/Error/ErrorHandler.php @@ -10,12 +10,12 @@ declare(strict_types=1); namespace Kiri\Error; use Exception; -use Http\Handler\Formatter\IFormatter; +use Kiri\Message\Handler\Formatter\IFormatter; use Kiri\Abstracts\Component; use Kiri\Core\Json; use Kiri\Events\EventDispatch; use Kiri\Kiri; -use Http\Events\OnAfterRequest; +use Kiri\Message\Events\OnAfterRequest; /** * Class ErrorHandler diff --git a/kiri-engine/Error/LoggerAspect.php b/kiri-engine/Error/LoggerAspect.php index 5734ca7d..77aecec6 100644 --- a/kiri-engine/Error/LoggerAspect.php +++ b/kiri-engine/Error/LoggerAspect.php @@ -5,9 +5,9 @@ namespace Kiri\Error; use Exception; -use Http\Aspect\OnAspectInterface; -use Http\Aspect\OnJoinPointInterface; -use Http\Constrict\RequestInterface; +use Kiri\Message\Aspect\OnAspectInterface; +use Kiri\Message\Aspect\OnJoinPointInterface; +use Kiri\Message\Constrict\RequestInterface; use Kiri\Kiri; use Psr\Log\LoggerInterface; diff --git a/kiri-engine/Error/LoggerProcess.php b/kiri-engine/Error/LoggerProcess.php index 23377c9c..ec1d6503 100644 --- a/kiri-engine/Error/LoggerProcess.php +++ b/kiri-engine/Error/LoggerProcess.php @@ -8,7 +8,7 @@ use Exception; use Kiri\Core\Json; use Kiri\Exception\ComponentException; use Kiri\Kiri; -use Server\Abstracts\BaseProcess; +use Kiri\Server\Abstracts\BaseProcess; use Swoole\Coroutine; use Swoole\Process; diff --git a/kiri-engine/Kiri.php b/kiri-engine/Kiri.php index ce7b93f6..e5ee0008 100644 --- a/kiri-engine/Kiri.php +++ b/kiri-engine/Kiri.php @@ -17,8 +17,8 @@ use Kiri\Core\Json; use Kiri\Di\Container; use Psr\Container\ContainerInterface; use ReflectionException; -use Server\ServerManager; -use Server\Tasker\AsyncTaskExecute; +use Kiri\Server\ServerManager; +use Kiri\Server\Tasker\AsyncTaskExecute; use Swoole\Coroutine; use Swoole\Process; use Swoole\WebSocket\Server; diff --git a/kiri-gii/GiiController.php b/kiri-gii/GiiController.php index 89128e22..851a5308 100644 --- a/kiri-gii/GiiController.php +++ b/kiri-gii/GiiController.php @@ -70,9 +70,9 @@ use Kiri\Annotation\Route\Middleware; use Kiri\Annotation\Route\Route; use Kiri\Core\Str; use Kiri\Core\Json; -use Http\Context\Request; -use Http\Context\Response; -use Http\Controller; +use Kiri\Message\Context\Request; +use Kiri\Message\Context\Response; +use Kiri\Message\Controller; use JetBrains\PhpStorm\ArrayShape; use {$model_namespace}\\{$managerName}; "; diff --git a/kiri-gii/GiiJsonRpc.php b/kiri-gii/GiiJsonRpc.php index 14b02e8e..3961b0e8 100644 --- a/kiri-gii/GiiJsonRpc.php +++ b/kiri-gii/GiiJsonRpc.php @@ -88,7 +88,7 @@ namespace Rpc\Consumers; use Kiri\Annotation\Target; use Kiri\Rpc\Annotation\JsonRpc; -use Http\Handler\Controller; +use Kiri\Message\Handler\Controller; use Rpc\\' . ucfirst($name) . 'RpcInterface; diff --git a/kiri-gii/GiiMiddleware.php b/kiri-gii/GiiMiddleware.php index 064d4d07..01ad070b 100644 --- a/kiri-gii/GiiMiddleware.php +++ b/kiri-gii/GiiMiddleware.php @@ -34,7 +34,7 @@ namespace App\Middleware; use Closure; use Psr\Http\Server\MiddlewareInterface; -use Server\Constrict\RequestInterface; +use Kiri\Server\Constrict\RequestInterface; '; diff --git a/kiri-gii/GiiRpcService.php b/kiri-gii/GiiRpcService.php index 4bc77edd..6a26d0dd 100644 --- a/kiri-gii/GiiRpcService.php +++ b/kiri-gii/GiiRpcService.php @@ -36,7 +36,7 @@ namespace App\Rpc; use Kiri\Annotation\Route\RpcProducer; use Kiri\Annotation\Target; use Exception; -use Http\Controller; +use Kiri\Message\Controller; use Kiri\Core\Json; '; diff --git a/kiri-gii/GiiTask.php b/kiri-gii/GiiTask.php index 36092b7c..1b87b49d 100644 --- a/kiri-gii/GiiTask.php +++ b/kiri-gii/GiiTask.php @@ -31,7 +31,7 @@ class GiiTask extends GiiBase namespace App\Async; -use Server\Contract\OnTaskInterface; +use Kiri\Server\Contract\OnTaskInterface; '; diff --git a/kiri-websocket-server/Server.php b/kiri-websocket-server/Server.php index 2c7a292d..e7209f21 100644 --- a/kiri-websocket-server/Server.php +++ b/kiri-websocket-server/Server.php @@ -3,17 +3,17 @@ namespace Kiri\Websocket; use Exception; -use Http\Handler\DataGrip; -use Http\Handler\Router; +use Kiri\Message\Handler\DataGrip; +use Kiri\Message\Handler\Router; use Kiri\Abstracts\AbstractServer; use Kiri\Annotation\Inject; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; -use Server\Contract\OnCloseInterface; -use Server\Contract\OnHandshakeInterface; -use Server\Contract\OnMessageInterface; -use Server\Contract\OnOpenInterface; -use Server\SwooleServerInterface; +use Kiri\Server\Contract\OnCloseInterface; +use Kiri\Server\Contract\OnHandshakeInterface; +use Kiri\Server\Contract\OnMessageInterface; +use Kiri\Server\Contract\OnOpenInterface; +use Kiri\Server\SwooleServerInterface; use Swoole\Http\Request; use Swoole\Http\Response; use Swoole\WebSocket\Frame;