Make ConvertEmptyStringsToNullTest middleware terminable

laravel · Dec 11, 2023 · d2f733f · d2f733f
1 parent 0b70cda
commit d2f733f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php b/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php
@@ -43,6 +43,16 @@ protected function transform($key, $value)
         return $value === '' ? null : $value;
     }
 
+    /**
+     * Clean up callbacks list when the app terminates.
+     *
+     * @return void
+     */
+    public function terminate()
+    {
+        static::$skipCallbacks = [];
+    }
+
     /**
      * Register a callback that instructs the middleware to be skipped.
      *

diff --git a/tests/Foundation/Http/Middleware/ConvertEmptyStringsToNullTest.php b/tests/Foundation/Http/Middleware/ConvertEmptyStringsToNullTest.php
@@ -41,4 +41,24 @@ public function testSkipConvertsEmptyStringsToNull()
             $this->assertSame('', $request->get('baz'));
         });
     }
+
+    public function testItClearsOutSkipCallbacksWhenTerminated(): void
+    {
+        $middleware = new ConvertEmptyStringsToNull();
+
+        ConvertEmptyStringsToNull::skipWhen(fn (Request $request) => true);
+
+        $middleware->terminate();
+
+        $symfonyRequest = new SymfonyRequest([
+            'foo' => '',
+        ]);
+
+        $symfonyRequest->server->set('REQUEST_METHOD', 'GET');
+        $request = Request::createFromBase($symfonyRequest);
+
+        $middleware->handle($request, function (Request $request) {
+            $this->assertSame(null, $request->get('foo'));
+        });
+    }
 }