symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/SignedUri.php‎
Lines changed: 0 additions & 34 deletions b/‎src/Symfony/Component/HttpFoundation/SignedUri.php‎
Lines changed: 0 additions & 34 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/UriSigner.php‎
Lines changed: 18 additions & 37 deletions b/‎src/Symfony/Component/HttpFoundation/UriSigner.php‎
Lines changed: 18 additions & 37 deletions
@@ -37,7 +37,7 @@ public function __construct(
     }
 
     /**
-     * Signs a URI and returns a SignedUri object.
+     * Signs a URI.
      *
      * The given URI is signed by adding the query string parameter
      * which value depends on the URI and the secret.
@@ -50,8 +50,18 @@ public function __construct(
      *
      * The expiration is added as a query string parameter.
      */
-    public function signAndWrap(string $uri, \DateTimeInterface|\DateInterval|int|null $expiration = null): SignedUri
+    public function sign(string $uri/* , \DateTimeInterface|\DateInterval|int|null $expiration = null */): string
     {
+        $expiration = null;
+
+        if (1 < \func_num_args()) {
+            $expiration = func_get_arg(1);
+        }
+
+        if (null !== $expiration && !$expiration instanceof \DateTimeInterface && !$expiration instanceof \DateInterval && !\is_int($expiration)) {
+            throw new \TypeError(\sprintf('The second argument of "%s()" must be an instance of "%s" or "%s", an integer or null (%s given).', __METHOD__, \DateTimeInterface::class, \DateInterval::class, get_debug_type($expiration)));
+        }
+
         $url = parse_url($uri);
         $params = [];
 
@@ -68,42 +78,13 @@ public function signAndWrap(string $uri, \DateTimeInterface|\DateInterval|int|nu
         }
 
         if (null !== $expiration) {
-            $params[$this->expirationParameter] = $expiration = $this->getExpirationTime($expiration);
+            $params[$this->expirationParameter] = $this->getExpirationTime($expiration);
         }
 
         $uri = $this->buildUrl($url, $params);
         $params[$this->hashParameter] = $this->computeHash($uri);
 
-        return new SignedUri($this->buildUrl($url, $params), $expiration);
-    }
-
-    /**
-     * Signs a URI.
-     *
-     * The given URI is signed by adding the query string parameter
-     * which value depends on the URI and the secret.
-     *
-     * @param \DateTimeInterface|\DateInterval|int|null $expiration The expiration for the given URI.
-     *                                                              If $expiration is a \DateTimeInterface, it's expected to be the exact date + time.
-     *                                                              If $expiration is a \DateInterval, the interval is added to "now" to get the date + time.
-     *                                                              If $expiration is an int, it's expected to be a timestamp in seconds of the exact date + time.
-     *                                                              If $expiration is null, no expiration.
-     *
-     * The expiration is added as a query string parameter.
-     */
-    public function sign(string $uri/* , \DateTimeInterface|\DateInterval|int|null $expiration = null */): string
-    {
-        $expiration = null;
-
-        if (1 < \func_num_args()) {
-            $expiration = func_get_arg(1);
-        }
-
-        if (null !== $expiration && !$expiration instanceof \DateTimeInterface && !$expiration instanceof \DateInterval && !\is_int($expiration)) {
-            throw new \TypeError(\sprintf('The second argument of "%s()" must be an instance of "%s" or "%s", an integer or null (%s given).', __METHOD__, \DateTimeInterface::class, \DateInterval::class, get_debug_type($expiration)));
-        }
-
-        return (string) $this->signAndWrap($uri, $expiration);
+        return $this->buildUrl($url, $params);
     }
 
     /**
@@ -133,14 +114,14 @@ public function checkRequest(Request $request): bool
     }
 
     /**
-     * Verify a Request/string URI and return a SignedUri object.
+     * Verify a Request or string URI.
      *
      * @throws UnSignedUriException         If the URI is not signed
      * @throws UnverifiedSignedUriException If the signature is invalid
      * @throws ExpiredSignedUriException    If the URI has expired
      * @throws SignedUriException
      */
-    public function verify(Request|string $uri): SignedUri
+    public function verify(Request|string $uri): void
     {
         if ($uri instanceof Request) {
             $qs = ($qs = $uri->server->get('QUERY_STRING')) ? '?'.$qs : '';
@@ -167,11 +148,11 @@ public function verify(Request|string $uri): SignedUri
         }
 
         if (!$expiration = $params[$this->expirationParameter] ?? false) {
-            return new SignedUri($uri);
+            return;
         }
 
         if (time() < $expiration) {
-            return new SignedUri($uri, $expiration);
+            return;
         }
 
         throw new ExpiredSignedUriException(