改名
This commit is contained in:
@@ -22,10 +22,9 @@ use Snowflake\Snowflake;
|
||||
/**
|
||||
* Inject constructor.
|
||||
* @param string $value
|
||||
* @param bool $withContext
|
||||
* @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
|
||||
{
|
||||
if ($this->withContext) {
|
||||
if (Context::hasContext($this->value)) {
|
||||
return Context::getContext($this->value);
|
||||
}
|
||||
if (class_exists($this->value)) {
|
||||
|
||||
@@ -26,7 +26,7 @@ class Controller
|
||||
*
|
||||
* @var Request|null
|
||||
*/
|
||||
#[Inject(value: 'request')]
|
||||
#[Inject(value: Request::class)]
|
||||
public ?Request $request = null;
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ class Controller
|
||||
*
|
||||
* @var Response|null
|
||||
*/
|
||||
#[Inject(value: 'response')]
|
||||
#[Inject(value: Response::class)]
|
||||
public ?Response $response = null;
|
||||
|
||||
|
||||
|
||||
@@ -440,7 +440,7 @@ class Request extends HttpService
|
||||
$httpRequest->params->setGets($request->get);
|
||||
$httpRequest->params->setRawContent($request->rawContent(), $httpRequest);
|
||||
|
||||
return Context::setContext('request', $httpRequest);
|
||||
return Context::setContext(Request::class, $httpRequest);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -147,7 +147,7 @@ class Service extends \Server\Abstracts\Server
|
||||
$sRequest->headers->setRequestUri('rpc/p' . $server_port . '/' . ltrim($cmd, '/'));
|
||||
$sRequest->headers->setRequestMethod(Request::HTTP_CMD);
|
||||
|
||||
return Context::setContext('request', $sRequest);
|
||||
return Context::setContext(Request::class, $sRequest);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@ defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
|
||||
|
||||
|
||||
use Annotation\Annotation;
|
||||
use HttpServer\Http\Context;
|
||||
use HttpServer\Http\HttpParams;
|
||||
use HttpServer\Http\Request;
|
||||
use HttpServer\Http\Response;
|
||||
@@ -483,7 +484,7 @@ if (!function_exists('request')) {
|
||||
*/
|
||||
function request(): Request
|
||||
{
|
||||
return Snowflake::app()->get('request');
|
||||
return Context::getContext(Request::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user