diff --git a/Gii/GiiLimits.php b/Gii/GiiLimits.php index 798443eb..c2b76957 100644 --- a/Gii/GiiLimits.php +++ b/Gii/GiiLimits.php @@ -35,7 +35,7 @@ class GiiLimits extends GiiBase namespace App\Http\Limits; use Closure; -use Http\Http\Request; +use Http\Context\Request; use Http\IInterface\Limits; diff --git a/Gii/GiiMiddleware.php b/Gii/GiiMiddleware.php index 81e26c28..ea23115d 100644 --- a/Gii/GiiMiddleware.php +++ b/Gii/GiiMiddleware.php @@ -33,7 +33,7 @@ class GiiMiddleware extends GiiBase namespace App\Http\Middleware; use Closure; -use Http\Http\Request; +use Http\Context\Request; use Http\IInterface\Middleware; '; diff --git a/Server/Constrict/Request.php b/Server/Constrict/Request.php index e64ef735..38fb4bb1 100644 --- a/Server/Constrict/Request.php +++ b/Server/Constrict/Request.php @@ -2,9 +2,9 @@ namespace Server\Constrict; -use Http\Http\Context; -use Http\Http\Request as HttpResponse; -use Http\Http\Response; +use Http\Context\Context; +use Http\Context\Request as HttpResponse; +use Http\Context\Response; use ReflectionException; use Server\RequestInterface; use Kiri\Exception\NotFindClassException; diff --git a/Server/Constrict/Response.php b/Server/Constrict/Response.php index d2de7362..3dbf813e 100644 --- a/Server/Constrict/Response.php +++ b/Server/Constrict/Response.php @@ -4,8 +4,8 @@ namespace Server\Constrict; -use Http\Http\Context; -use Http\Http\Response as HttpResponse; +use Http\Context\Context; +use Http\Context\Response as HttpResponse; use Server\ResponseInterface; diff --git a/Server/Constrict/ResponseEmitter.php b/Server/Constrict/ResponseEmitter.php index da33ae74..9ad5a9b6 100644 --- a/Server/Constrict/ResponseEmitter.php +++ b/Server/Constrict/ResponseEmitter.php @@ -3,7 +3,7 @@ namespace Server\Constrict; use Exception; -use Http\Http\Formatter\FileFormatter; +use Http\Context\Formatter\FileFormatter; use Kiri\Exception\NotFindClassException; use ReflectionException; use Server\ResponseInterface; diff --git a/Server/Constrict/TcpEmitter.php b/Server/Constrict/TcpEmitter.php index d12d70b6..b3092438 100644 --- a/Server/Constrict/TcpEmitter.php +++ b/Server/Constrict/TcpEmitter.php @@ -2,7 +2,7 @@ namespace Server\Constrict; -use Http\Http\Formatter\FileFormatter; +use Http\Context\Formatter\FileFormatter; use Kiri\Exception\NotFindClassException; use Server\ResponseInterface; use Swoole\Server; diff --git a/Server/RequestInterface.php b/Server/RequestInterface.php index 297ec4fc..c8536e4a 100644 --- a/Server/RequestInterface.php +++ b/Server/RequestInterface.php @@ -3,7 +3,7 @@ namespace Server; -use Http\Http\Request; +use Http\Context\Request; /** * diff --git a/Server/ResponseInterface.php b/Server/ResponseInterface.php index 85a87280..9e67a375 100644 --- a/Server/ResponseInterface.php +++ b/Server/ResponseInterface.php @@ -3,7 +3,7 @@ namespace Server; -use Http\Http\Response; +use Http\Context\Response; /** * @mixin Response diff --git a/System/Abstracts/BaseApplication.php b/System/Abstracts/BaseApplication.php index eb4ee934..6fc821db 100644 --- a/System/Abstracts/BaseApplication.php +++ b/System/Abstracts/BaseApplication.php @@ -13,10 +13,10 @@ namespace Kiri\Abstracts; use Annotation\Annotation as SAnnotation; use Database\Connection; use Exception; -use Http\Http\HttpHeaders; -use Http\Http\HttpParams; -use Http\Http\Request; -use Http\Http\Response; +use Http\Context\HttpHeaders; +use Http\Context\HttpParams; +use Http\Context\Request; +use Http\Context\Response; use Http\Route\Router; use Http\Server; use Http\Shutdown; diff --git a/System/Abstracts/TraitApplication.php b/System/Abstracts/TraitApplication.php index 542350c4..99894c59 100644 --- a/System/Abstracts/TraitApplication.php +++ b/System/Abstracts/TraitApplication.php @@ -8,8 +8,8 @@ use Annotation\Annotation as SAnnotation; use Database\DatabasesProviders; use Http\Client\Client; use Http\Client\Curl; -use Http\Http\Request; -use Http\Http\Response; +use Http\Context\Request; +use Http\Context\Response; use Http\HttpFilter; use Http\Route\Router; use Http\Server; diff --git a/System/Application.php b/System/Application.php index 9dcf3cac..c63c10e3 100644 --- a/System/Application.php +++ b/System/Application.php @@ -16,7 +16,7 @@ use Console\ConsoleProviders; use Database\DatabasesProviders; use Exception; use Http\Command; -use Http\Http\Response; +use Http\Context\Response; use Http\ServerProviders; use Kiri\Abstracts\BaseApplication; use Kiri\Abstracts\Config; diff --git a/System/Cache/Base/Redis.php b/System/Cache/Base/Redis.php index 710b7628..c5ba6dc1 100644 --- a/System/Cache/Base/Redis.php +++ b/System/Cache/Base/Redis.php @@ -2,7 +2,7 @@ namespace Kiri\Cache\Base; -use Http\Http\Context; +use Http\Context\Context; use Kiri\Events\EventProvider; use Kiri\Exception\RedisConnectException; use Kiri\Kiri; diff --git a/System/Jwt/JWTAuthMiddleware.php b/System/Jwt/JWTAuthMiddleware.php index 153f27f6..96439815 100644 --- a/System/Jwt/JWTAuthMiddleware.php +++ b/System/Jwt/JWTAuthMiddleware.php @@ -7,7 +7,7 @@ namespace Kiri\Jwt; use Closure; use Exception; -use Http\Http\Request; +use Http\Context\Request; use Http\IInterface\Middleware; use Server\RequestInterface; use Kiri\Kiri; diff --git a/System/Pool/Connection.php b/System/Pool/Connection.php index fb9a9315..923dd1aa 100644 --- a/System/Pool/Connection.php +++ b/System/Pool/Connection.php @@ -6,7 +6,7 @@ namespace Kiri\Pool; use Closure; use Database\Mysql\PDO; use Exception; -use Http\Http\Context; +use Http\Context\Context; use Kiri\Abstracts\Component; use Kiri\Kiri; use Swoole\Error; diff --git a/System/Pool/Redis.php b/System/Pool/Redis.php index b63d5aa7..7f179ea1 100644 --- a/System/Pool/Redis.php +++ b/System/Pool/Redis.php @@ -7,7 +7,7 @@ namespace Kiri\Pool; use Closure; use Exception; -use Http\Http\Context; +use Http\Context\Context; use Kiri\Abstracts\Component; use Kiri\Exception\ConfigException; use Kiri\Exception\RedisConnectException; diff --git a/function.php b/function.php index 2fb4a074..d39c636b 100644 --- a/function.php +++ b/function.php @@ -4,9 +4,9 @@ defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../')); use Annotation\Annotation; -use Http\Http\Context; -use Http\Http\HttpParams; -use Http\Http\Response as HttpResponse; +use Http\Context\Context; +use Http\Context\HttpParams; +use Http\Context\Response as HttpResponse; use Http\Route\Router; use JetBrains\PhpStorm\Pure; use Kiri\Abstracts\Config; diff --git a/http-helper/Http/Context.php b/http-helper/Context/Context.php similarity index 99% rename from http-helper/Http/Context.php rename to http-helper/Context/Context.php index fc7f36e1..83bc90fb 100644 --- a/http-helper/Http/Context.php +++ b/http-helper/Context/Context.php @@ -1,7 +1,7 @@