This commit is contained in:
2021-08-01 15:25:59 +08:00
parent c2aa3ae44a
commit 0eea1d7963
5 changed files with 77 additions and 77 deletions
+2 -3
View File
@@ -22,10 +22,9 @@ use Snowflake\Snowflake;
/** /**
* Inject constructor. * Inject constructor.
* @param string $value * @param string $value
* @param bool $withContext
* @param array $args * @param array $args
*/ */
public function __construct(private string $value, public bool $withContext = false, private array $args = []) public function __construct(private string $value, private array $args = [])
{ {
} }
@@ -93,7 +92,7 @@ use Snowflake\Snowflake;
*/ */
private function parseInjectValue(): mixed private function parseInjectValue(): mixed
{ {
if ($this->withContext) { if (Context::hasContext($this->value)) {
return Context::getContext($this->value); return Context::getContext($this->value);
} }
if (class_exists($this->value)) { if (class_exists($this->value)) {
+2 -2
View File
@@ -26,7 +26,7 @@ class Controller
* *
* @var Request|null * @var Request|null
*/ */
#[Inject(value: 'request')] #[Inject(value: Request::class)]
public ?Request $request = null; public ?Request $request = null;
@@ -49,7 +49,7 @@ class Controller
* *
* @var Response|null * @var Response|null
*/ */
#[Inject(value: 'response')] #[Inject(value: Response::class)]
public ?Response $response = null; public ?Response $response = null;
+1 -1
View File
@@ -440,7 +440,7 @@ class Request extends HttpService
$httpRequest->params->setGets($request->get); $httpRequest->params->setGets($request->get);
$httpRequest->params->setRawContent($request->rawContent(), $httpRequest); $httpRequest->params->setRawContent($request->rawContent(), $httpRequest);
return Context::setContext('request', $httpRequest); return Context::setContext(Request::class, $httpRequest);
} }
+1 -1
View File
@@ -147,7 +147,7 @@ class Service extends \Server\Abstracts\Server
$sRequest->headers->setRequestUri('rpc/p' . $server_port . '/' . ltrim($cmd, '/')); $sRequest->headers->setRequestUri('rpc/p' . $server_port . '/' . ltrim($cmd, '/'));
$sRequest->headers->setRequestMethod(Request::HTTP_CMD); $sRequest->headers->setRequestMethod(Request::HTTP_CMD);
return Context::setContext('request', $sRequest); return Context::setContext(Request::class, $sRequest);
} }
+2 -1
View File
@@ -4,6 +4,7 @@ defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
use Annotation\Annotation; use Annotation\Annotation;
use HttpServer\Http\Context;
use HttpServer\Http\HttpParams; use HttpServer\Http\HttpParams;
use HttpServer\Http\Request; use HttpServer\Http\Request;
use HttpServer\Http\Response; use HttpServer\Http\Response;
@@ -483,7 +484,7 @@ if (!function_exists('request')) {
*/ */
function request(): Request function request(): Request
{ {
return Snowflake::app()->get('request'); return Context::getContext(Request::class);
} }
} }