From ced06b8cb3b7d2dcdf1a1e01f80903c7adef856e Mon Sep 17 00:00:00 2001 From: "as2252258@163.com" Date: Sat, 24 Apr 2021 00:53:00 +0800 Subject: [PATCH] modify --- System/Abstracts/BaseApplication.php | 23 ----------------------- function.php | 4 ++-- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/System/Abstracts/BaseApplication.php b/System/Abstracts/BaseApplication.php index 7b8fc215..f61f4892 100644 --- a/System/Abstracts/BaseApplication.php +++ b/System/Abstracts/BaseApplication.php @@ -12,8 +12,6 @@ namespace Snowflake\Abstracts; use Exception; use HttpServer\Client\Http2; -use HttpServer\Http\Request; -use HttpServer\Http\Response; use HttpServer\HttpFilter; use HttpServer\Route\Router; use HttpServer\Server; @@ -338,25 +336,6 @@ abstract class BaseApplication extends Service } - /** - * @return Response - * @throws Exception - */ - public function getResponse(): Response - { - return $this->get('response'); - } - - /** - * @return Request - * @throws Exception - */ - public function getRequest(): Request - { - return $this->get('request'); - } - - /** * @param $name * @return Table @@ -479,8 +458,6 @@ abstract class BaseApplication extends Service 'connections' => ['class' => Connection::class], 'redis_connections' => ['class' => SRedis::class], 'pool' => ['class' => SPool::class], - 'response' => ['class' => Response::class], - 'request' => ['class' => Request::class], 'config' => ['class' => Config::class], 'logger' => ['class' => Logger::class], 'annotation' => ['class' => SAnnotation::class], diff --git a/function.php b/function.php index c7b9fdc5..035ac4cc 100644 --- a/function.php +++ b/function.php @@ -509,7 +509,7 @@ if (!function_exists('request')) { function request(): Request { if (!Context::hasContext('request')) { - return make('request', Request::class); + return new Request(); } return Context::getContext('request'); } @@ -659,7 +659,7 @@ if (!function_exists('response')) { function response(): Response|stdClass { if (!Context::hasContext('response')) { - return make('response', Response::class); + return new Response(); } return Context::getContext('response'); }