Skip to content

Commit ec4c1ff

Browse files
committed
remove optional container in run
1 parent 6fd0984 commit ec4c1ff

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/Http/Http.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,7 @@ public static function onRequest(): Hook
494494
public function start()
495495
{
496496
$this->server->onRequest(function ($request, $response, $context, array $resources = []) {
497-
$container = $this->resourceContainer->scope();
498-
499-
$this->registerRequestResources($resources, $container);
500-
$this->run($request, $response, $context, $container);
497+
$this->runWithResources($request, $response, $context, $resources);
501498
});
502499
$this->server->onStart(function ($server) {
503500
$this->registerResource('server', function () use ($server) {
@@ -690,8 +687,15 @@ protected function getArguments(Hook $hook, Container $container, array $values,
690687
* @param Request $request
691688
* @param Response $response;
692689
*/
693-
public function run(Request $request, Response $response, string $context, Container $container): static
690+
public function run(Request $request, Response $response, string $context): static
691+
{
692+
return $this->runWithResources($request, $response, $context);
693+
}
694+
695+
protected function runWithResources(Request $request, Response $response, string $context, array $resources = []): static
694696
{
697+
$container = $this->resourceContainer->scope();
698+
$this->registerRequestResources($resources, $container);
695699
$this->registerResource('context', fn () => $context, [], $container);
696700
$this->registerResource('request', fn () => $request, [], $container);
697701
$this->registerResource('response', fn () => $response, [], $container);

tests/HttpTest.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,8 @@ public function testCanRunRequest(): void
566566
$response->send('HELLO');
567567
});
568568

569-
$scope = $this->http->getResourceContainer()->scope();
570-
571569
\ob_start();
572-
$this->http->run(new Request(), new Response(), '1', $scope);
570+
$this->http->run(new Request(), new Response(), '1');
573571
$result = \ob_get_contents();
574572
\ob_end_clean();
575573

@@ -647,10 +645,8 @@ public function testWildcardRoute(): void
647645
}
648646
});
649647

650-
$scope = $this->http->getResourceContainer()->scope();
651-
652648
\ob_start();
653-
@$this->http->run(new Request(), new Response(), '1', $scope);
649+
@$this->http->run(new Request(), new Response(), '1');
654650
$result = \ob_get_contents();
655651
\ob_end_clean();
656652

@@ -659,7 +655,7 @@ public function testWildcardRoute(): void
659655
\ob_start();
660656
$req = new Request();
661657
$req = $req->setMethod('OPTIONS');
662-
@$this->http->run($req, new Response(), '1', $this->http->getResourceContainer()->scope());
658+
@$this->http->run($req, new Response(), '1');
663659
$result = \ob_get_contents();
664660
\ob_end_clean();
665661

0 commit comments

Comments
 (0)