Update config. (#22)

yii-tools · Jun 28, 2023 · f650140 · f650140
1 parent 25cf11f
commit f650140
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/config/web/psr-http-message.php b/config/web/psr-http-message.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use HttpSoft\ServerRequest\ServerRequestCreator;
+use Psr\Http\Message\ServerRequestInterface;
+
+return [
+    ServerRequestInterface::class => ServerRequestCreator::create(),
+];
diff --git a/src/Framework/Runner/HttpApplication.php b/src/Framework/Runner/HttpApplication.php
@@ -5,7 +5,6 @@
 namespace Yii\Framework\Runner;
 
 use ErrorException;
-use HttpSoft\ServerRequest\ServerRequestCreator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -107,12 +106,9 @@ public function run(): void
 
         /** @var Application $application */
         $application = $container->get(Application::class);
-
-        /**
-         * @var ServerRequestInterface $serverRequestFactory
-         */
-        $serverRequestFactory = ServerRequestCreator::create();
-        $serverRequest = $serverRequestFactory->withAttribute('applicationStartTime', $startTime);
+        /** @var ServerRequestInterface $serverRequest */
+        $serverRequest = $container->get(ServerRequestInterface::class);
+        $serverRequest = $serverRequest->withAttribute('applicationStartTime', $startTime);
 
         try {
             $application->start();