fix signed urls with custom parameters

laravel · Jul 1, 2020 · bcb133e · bcb133e
1 parent dc3ad68
commit bcb133e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php
@@ -320,7 +320,7 @@ public function formatScheme($secure = null)
      */
     public function signedRoute($name, $parameters = [], $expiration = null, $absolute = true)
     {
-        $parameters = $this->formatParameters($parameters);
+        $parameters = Arr::wrap($parameters);
 
         if (array_key_exists('signature', $parameters)) {
             throw new InvalidArgumentException(

diff --git a/tests/Integration/Routing/UrlSigningTest.php b/tests/Integration/Routing/UrlSigningTest.php
@@ -25,6 +25,17 @@ public function testSigningUrl()
         $this->assertSame('valid', $this->get($url)->original);
     }
 
+    public function testSigningUrlWithCustomRouteSlug()
+    {
+        Route::get('/foo/{post:slug}', function (Request $request, $slug) {
+            return ['slug' => $slug, 'valid' => $request->hasValidSignature() ? 'valid' : 'invalid'];
+        })->name('foo');
+
+        $this->assertIsString($url = URL::signedRoute('foo', ['post' => new RoutableInterfaceStub]));
+        $this->assertSame('valid', $this->get($url)->original['valid']);
+        $this->assertSame('routable-slug', $this->get($url)->original['slug']);
+    }
+
     public function testTemporarySignedUrls()
     {
         Route::get('/foo/{id}', function (Request $request, $id) {
@@ -90,6 +101,7 @@ public function testSignedMiddlewareWithRoutableParameter()
 class RoutableInterfaceStub implements UrlRoutable
 {
     public $key;
+    public $slug = 'routable-slug';
 
     public function getRouteKey()
     {