Skip to content

Commit 6fd0984

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

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/Http/Http.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,9 +690,8 @@ protected function getArguments(Hook $hook, Container $container, array $values,
690690
* @param Request $request
691691
* @param Response $response;
692692
*/
693-
public function run(Request $request, Response $response, string $context, ?Container $container = null): static
693+
public function run(Request $request, Response $response, string $context, Container $container): static
694694
{
695-
$container ??= $this->resourceContainer->scope();
696695
$this->registerResource('context', fn () => $context, [], $container);
697696
$this->registerResource('request', fn () => $request, [], $container);
698697
$this->registerResource('response', fn () => $response, [], $container);
@@ -883,6 +882,7 @@ protected function resolveResource(string $name, Container $container): mixed
883882
try {
884883
return $container->get($name);
885884
} catch (\Throwable $e) {
885+
// Normalize DI container errors to the Http layer's "resource" terminology.
886886
$message = \str_replace('dependency', 'resource', $e->getMessage());
887887

888888
if ($message === $e->getMessage() && !\str_contains($message, 'resource')) {

tests/HttpTest.php

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

569+
$scope = $this->http->getResourceContainer()->scope();
570+
569571
\ob_start();
570-
$this->http->run(new Request(), new Response(), '1');
572+
$this->http->run(new Request(), new Response(), '1', $scope);
571573
$result = \ob_get_contents();
572574
\ob_end_clean();
573575

@@ -645,8 +647,10 @@ public function testWildcardRoute(): void
645647
}
646648
});
647649

650+
$scope = $this->http->getResourceContainer()->scope();
651+
648652
\ob_start();
649-
@$this->http->run(new Request(), new Response(), '1');
653+
@$this->http->run(new Request(), new Response(), '1', $scope);
650654
$result = \ob_get_contents();
651655
\ob_end_clean();
652656

@@ -655,7 +659,7 @@ public function testWildcardRoute(): void
655659
\ob_start();
656660
$req = new Request();
657661
$req = $req->setMethod('OPTIONS');
658-
@$this->http->run($req, new Response(), '1');
662+
@$this->http->run($req, new Response(), '1', $this->http->getResourceContainer()->scope());
659663
$result = \ob_get_contents();
660664
\ob_end_clean();
661665

0 commit comments

Comments
 (0)