Redirects back with query params

Author: tonysm

src/Http/Middleware/TurboMiddleware.php

@@ -96,6 +96,6 @@ private function guessRedirectingRoute($request)
             return null;
         }
 
-        return route($formRouteName, $route->parameters());
+        return route($formRouteName, $route->parameters() + request()->query());
     }
 }

tests/Http/Middleware/TurboMiddlewareTest.php

@@ -144,6 +144,27 @@ public function redirects_back_to_resource_edit_routes_on_failed_validation_foll
         $response->assertStatus(303);
     }
 
+    /** @test */
+    public function redirects_include_query_params()
+    {
+        Route::get('/test-models/{testModel}/edit', function () {
+            return 'show form';
+        })->name('test-models.edit');
+
+        Route::put('/test-models/{testModel}', function (TestModel $model) {
+            request()->validate(['name' => 'required']);
+        })->name('test-models.update')->middleware(TurboMiddleware::class);
+
+        $testModel = TestModel::create(['name' => 'Dummy model']);
+
+        $response = $this->from('/source')->put(route('test-models.update', ['testModel' => $testModel, 'frame' => 'lorem']), [], [
+            'Accept' => sprintf('%s, text/html, application/xhtml+xml', Turbo::TURBO_STREAM_FORMAT),
+        ]);
+
+        $response->assertRedirect(route('test-models.edit', ['testModel' => $testModel, 'frame' => 'lorem']));
+        $response->assertStatus(303);
+    }
+
     /** @test */
     public function lets_it_crash_when_redirect_route_does_not_exist()
     {