[10.x] Allow creation of PSR request with merged data

.github/workflows/tests.yml

@@ -82,7 +82,9 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: |
+            composer require symfony/psr-http-message-bridge:^2.0 nyholm/psr7:^1.0 --no-interaction --no-update
+            composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit --display-deprecation
@@ -152,7 +154,9 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: |
+            composer require symfony/psr-http-message-bridge:^^^^2.0 nyholm/psr7:^^^^1.0 --no-interaction --no-update
+            composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit

composer.json

@@ -44,7 +44,7 @@
         "symfony/console": "^6.2",
         "symfony/error-handler": "^6.2",
         "symfony/finder": "^6.2",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.3",
         "symfony/http-kernel": "^6.2",
         "symfony/mailer": "^6.2",
         "symfony/mime": "^6.2",

src/Illuminate/Routing/RoutingServiceProvider.php

@@ -137,8 +137,10 @@ protected function registerPsrRequest()
             if (class_exists(Psr17Factory::class) && class_exists(PsrHttpFactory::class)) {
                 $psr17Factory = new Psr17Factory;
 
-                return (new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory))
-                    ->createRequest($app->make('request'));
+                return with((new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory))
+                    ->createRequest($illuminateRequest = $app->make('request')), fn ($request) => $request->withParsedBody(
+                        array_merge($request->getParsedBody(), $illuminateRequest->getPayload()->all())
+                    ));
             }
 
             throw new BindingResolutionException('Unable to resolve PSR request. Please install the symfony/psr-http-message-bridge and nyholm/psr7 packages.');

tests/Integration/Foundation/RoutingServiceProviderTest.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Foundation;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\TestCase;
+use Psr\Http\Message\ServerRequestInterface;
+
+class RoutingServiceProviderTest extends TestCase
+{
+    public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGetRequests()
+    {
+        Route::get('test-route', function (ServerRequestInterface $request) {
+            return $request->getParsedBody();
+        })->middleware(MergeDataMiddleware::class);
+
+        $response = $this->withoutExceptionHandling()->get('test-route?'.http_build_query([
+            'sent' => 'sent-data',
+            'overridden' => 'overriden-sent-data',
+        ]));
+
+        $response->assertOk();
+        $response->assertExactJson([
+            'request-data' => 'request-data',
+        ]);
+    }
+
+    public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingGetJsonRequests()
+    {
+        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',
+        ]));
+
+        $response->assertOk();
+        $response->assertExactJson([
+            'json-data' => 'json-data',
+            'merged' => 'replaced-merged-data',
+            'overridden' => 'overriden-merged-data',
+            'request-data' => 'request-data',
+        ]);
+    }
+
+    public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingPostRequests()
+    {
+        Route::post('test-route', function (ServerRequestInterface $request) {
+            return $request->getParsedBody();
+        })->middleware(MergeDataMiddleware::class);
+
+        $response = $this->post('test-route', [
+            'sent' => 'sent-data',
+            'overridden' => 'overriden-sent-data',
+        ]);
+
+        $response->assertOk();
+        $response->assertExactJson([
+            'sent' => 'sent-data',
+            'merged' => 'replaced-merged-data',
+            'overridden' => 'overriden-merged-data',
+            'request-data' => 'request-data',
+        ]);
+    }
+
+    public function testItIncludesMergedDataInServerRequestInterfaceInstancesUsingPostJsonRequests()
+    {
+        Route::post('test-route', function (ServerRequestInterface $request) {
+            return $request->getParsedBody();
+        })->middleware(MergeDataMiddleware::class);
+
+        $response = $this->postJson('test-route', [
+            'sent' => 'sent-data',
+            'overridden' => 'overriden-sent-data',
+        ]);
+
+        $response->assertOk();
+        $response->assertExactJson([
+            'json-data' => 'json-data',
+            'sent' => 'sent-data',
+            'merged' => 'replaced-merged-data',
+            'overridden' => 'overriden-merged-data',
+            'request-data' => 'request-data',
+        ]);
+    }
+}
+
+class MergeDataMiddleware
+{
+    public function handle(Request $request, $next)
+    {
+        $request->merge(['merged' => 'first-merged-data']);
+
+        $request->merge(['merged' => 'replaced-merged-data']);
+
+        $request->merge(['overridden' => 'overriden-merged-data']);
+
+        $request->request->set('request-data', 'request-data');
+
+        $request->query->set('query-data', 'query-data');
+
+        $request->json()->set('json-data', 'json-data');
+
+        return $next($request);
+    }
+}