Add RequestProvider state reset (#6)

yiisoft · May 17, 2023 · 017a406 · 017a406
1 parent 471c0f1
commit 017a406
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/config/di-web.php b/config/di-web.php
@@ -11,7 +11,13 @@
 /** @var array $params */
 
 return [
-    RequestProviderInterface::class => RequestProvider::class,
+    RequestProviderInterface::class => [
+        'class' => RequestProvider::class,
+        'reset' => function () {
+            /** @var RequestProvider $this */
+            $this->request = null;
+        },
+    ],
     RequestInputParametersResolver::class => [
         '__construct()' => [
             'hydrator' => Reference::to(ValidatingHydrator::class),

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -5,10 +5,13 @@
 namespace Yiisoft\Input\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ServerRequestInterface;
 use Yiisoft\Di\Container;
 use Yiisoft\Di\ContainerConfig;
+use Yiisoft\Di\StateResetter;
 use Yiisoft\Hydrator\Hydrator;
 use Yiisoft\Hydrator\HydratorInterface;
+use Yiisoft\Input\Http\Request\RequestNotSetException;
 use Yiisoft\Input\Http\Request\RequestProvider;
 use Yiisoft\Input\Http\Request\RequestProviderInterface;
 use Yiisoft\Input\Http\RequestInputParametersResolver;
@@ -21,9 +24,7 @@ final class ConfigTest extends TestCase
 {
     public function testDi(): void
     {
-        $container = new Container(
-            ContainerConfig::create()->withDefinitions($this->getContainerDefinitions())
-        );
+        $container = $this->createContainer();
 
         $this->assertInstanceOf(RequestProvider::class, $container->get(RequestProviderInterface::class));
         $this->assertInstanceOf(
@@ -32,6 +33,26 @@ public function testDi(): void
         );
     }
 
+    public function testResetRequestProvider(): void
+    {
+        $container = $this->createContainer();
+
+        $requestProvider = $container->get(RequestProviderInterface::class);
+        $requestProvider->set($this->createMock(ServerRequestInterface::class));
+
+        $container->get(StateResetter::class)->reset();
+
+        $this->expectException(RequestNotSetException::class);
+        $requestProvider->get();
+    }
+
+    private function createContainer(): Container
+    {
+        return new Container(
+            ContainerConfig::create()->withDefinitions($this->getContainerDefinitions())
+        );
+    }
+
     private function getContainerDefinitions(array|null $params = null): array
     {
         if ($params === null) {