[10.x] Fix type error registering PSR Request (#48823)

* [10.x] fix type error registering PSR Request * Formatting * Formatting --------- Co-authored-by: Tim MacDonald <hello@timacdonald.me>
laravel · Oct 26, 2023 · d5e8a9d · d5e8a9d
1 parent f54b5e0
commit d5e8a9d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/Illuminate/Routing/RoutingServiceProvider.php b/src/Illuminate/Routing/RoutingServiceProvider.php
@@ -139,7 +139,7 @@ protected function registerPsrRequest()
 
                 return with((new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory))
                     ->createRequest($illuminateRequest = $app->make('request')), fn ($request) => $request->withParsedBody(
-                        array_merge($request->getParsedBody(), $illuminateRequest->getPayload()->all())
+                        array_merge($request->getParsedBody() ?? [], $illuminateRequest->getPayload()->all())
                     ));
             }
 

diff --git a/tests/Integration/Foundation/RoutingServiceProviderTest.php b/tests/Integration/Foundation/RoutingServiceProviderTest.php
@@ -26,6 +26,42 @@ public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGe
         ]);
     }
 
+    public function testItWorksNormallyWithoutMergeDataMiddlewareWithEmptyRequests()
+    {
+        Route::get('test-route', function (ServerRequestInterface $request) {
+            return $request->getParsedBody();
+        });
+
+        $response = $this->withoutExceptionHandling()->get('test-route', [
+            'content-type' => 'application/json',
+        ]);
+
+        $response->assertOk();
+        $response->assertExactJson([]);
+    }
+
+    public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGetJsonRequestsWithContentTypeHeader()
+    {
+        Route::get('test-route', function (ServerRequestInterface $request) {
+            return $request->getParsedBody();
+        })->middleware(MergeDataMiddleware::class);
+
+        $response = $this->getJson('test-route?'.http_build_query([
+            'sent' => 'sent-data',
+            'overridden' => 'overriden-sent-data',
+        ]), [
+            'content-type' => 'application/json',
+        ]);
+
+        $response->assertOk();
+        $response->assertExactJson([
+            'json-data' => 'json-data',
+            'merged' => 'replaced-merged-data',
+            'overridden' => 'overriden-merged-data',
+            'request-data' => 'request-data',
+        ]);
+    }
+
     public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGetJsonRequests()
     {
         Route::get('test-route', function (ServerRequestInterface $request) {