remove exception properties

kbond · kbond · commit ce0feb3d606b · 2025-04-18T15:04:44.000-04:00
diff --git a/src/Symfony/Component/HttpFoundation/Exception/ExpiredSignedUriException.php b/src/Symfony/Component/HttpFoundation/Exception/ExpiredSignedUriException.php
@@ -16,10 +16,11 @@
  */
 final class ExpiredSignedUriException extends SignedUriException
 {
-    public function __construct(
-        public readonly \DateTimeImmutable $expiredAt,
-        string $uri,
-    ) {
-        parent::__construct($uri, 'The URI has expired.');
+    /**
+     * @internal
+     */
+    public function __construct()
+    {
+        parent::__construct('The URI has expired.');
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Exception/SignedUriException.php b/src/Symfony/Component/HttpFoundation/Exception/SignedUriException.php
@@ -16,10 +16,4 @@
  */
 abstract class SignedUriException extends \RuntimeException implements ExceptionInterface
 {
-    public function __construct(
-        public readonly string $uri,
-        string $message,
-    ) {
-        parent::__construct($message);
-    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Exception/UnsignedUriException.php b/src/Symfony/Component/HttpFoundation/Exception/UnsignedUriException.php
@@ -16,8 +16,11 @@
  */
 final class UnsignedUriException extends SignedUriException
 {
-    public function __construct(string $uri)
+    /**
+     * @internal
+     */
+    public function __construct()
     {
-        parent::__construct($uri, 'The URI is not signed.');
+        parent::__construct('The URI is not signed.');
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Exception/UnverifiedSignedUriException.php b/src/Symfony/Component/HttpFoundation/Exception/UnverifiedSignedUriException.php
@@ -16,8 +16,11 @@
  */
 final class UnverifiedSignedUriException extends SignedUriException
 {
-    public function __construct(string $uri)
+    /**
+     * @internal
+     */
+    public function __construct()
     {
-        parent::__construct($uri, 'The URI signature is invalid.');
+        parent::__construct('The URI signature is invalid.');
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/UriSignerTest.php b/src/Symfony/Component/HttpFoundation/Tests/UriSignerTest.php
@@ -237,44 +237,28 @@ public function testVerifyUnSignedUri()
         $signer = new UriSigner('foobar');
         $uri = 'http://example.com/foo';
 
-        try {
-            $signer->verify($uri);
+        $this->expectException(UnsignedUriException::class);
 
-            $this->fail('Exception not thrown.');
-        } catch (UnsignedUriException $e) {
-            $this->assertSame('The URI is not signed.', $e->getMessage());
-            $this->assertSame($uri, $e->uri);
-        }
+        $signer->verify($uri);
     }
 
     public function testVerifyUnverifiedUri()
     {
         $signer = new UriSigner('foobar');
         $uri = 'http://example.com/foo?_hash=invalid';
 
-        try {
-            $signer->verify($uri);
+        $this->expectException(UnverifiedSignedUriException::class);
 
-            $this->fail('Exception not thrown.');
-        } catch (UnverifiedSignedUriException $e) {
-            $this->assertSame('The URI signature is invalid.', $e->getMessage());
-            $this->assertSame($uri, $e->uri);
-        }
+        $signer->verify($uri);
     }
 
     public function testVerifyExpiredUri()
     {
         $signer = new UriSigner('foobar');
         $uri = $signer->sign('http://example.com/foo', 123456);
 
-        try {
-            $signer->verify($uri);
+        $this->expectException(ExpiredSignedUriException::class);
 
-            $this->fail('Exception not thrown.');
-        } catch (ExpiredSignedUriException $e) {
-            $this->assertSame('The URI has expired.', $e->getMessage());
-            $this->assertSame($uri, $e->uri);
-            $this->assertSame(123456, $e->expiredAt->getTimestamp());
-        }
+        $signer->verify($uri);
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/UriSigner.php b/src/Symfony/Component/HttpFoundation/UriSigner.php
@@ -126,18 +126,14 @@ public function verify(Request|string $uri): void
         }
 
         if (self::STATUS_MISSING === $status) {
-            throw new UnsignedUriException($uri);
+            throw new UnsignedUriException();
         }
 
         if (self::STATUS_INVALID === $status) {
-            throw new UnverifiedSignedUriException($uri);
+            throw new UnverifiedSignedUriException();
         }
 
-        $url = parse_url($uri);
-        parse_str($url['query'], $params);
-        $expiration = $params[$this->expirationParameter];
-
-        throw new ExpiredSignedUriException(\DateTimeImmutable::createFromFormat('U', $expiration), $uri);
+        throw new ExpiredSignedUriException();
     }
 
     private function computeHash(string $uri): string

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,11 @@`
`16`	`16`	`*/`
`17`	`17`	`final class ExpiredSignedUriException extends SignedUriException`
`18`	`18`	`{`
`19`		`- public function __construct(`
`20`		`- public readonly \DateTimeImmutable $expiredAt,`
`21`		`- string $uri,`
`22`		`- ) {`
`23`		`- parent::__construct($uri, 'The URI has expired.');`
	`19`	`+ /**`
	`20`	`+ * @internal`
	`21`	`+ */`
	`22`	`+ public function __construct()`
	`23`	`+ {`
	`24`	`+ parent::__construct('The URI has expired.');`
`24`	`25`	`}`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,4 @@`
`16`	`16`	`*/`
`17`	`17`	`abstract class SignedUriException extends \RuntimeException implements ExceptionInterface`
`18`	`18`	`{`
`19`		`- public function __construct(`
`20`		`- public readonly string $uri,`
`21`		`- string $message,`
`22`		`- ) {`
`23`		`- parent::__construct($message);`
`24`		`- }`
`25`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,11 @@`
`16`	`16`	`*/`
`17`	`17`	`final class UnsignedUriException extends SignedUriException`
`18`	`18`	`{`
`19`		`- public function __construct(string $uri)`
	`19`	`+ /**`
	`20`	`+ * @internal`
	`21`	`+ */`
	`22`	`+ public function __construct()`
`20`	`23`	`{`
`21`		`- parent::__construct($uri, 'The URI is not signed.');`
	`24`	`+ parent::__construct('The URI is not signed.');`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,18 +126,14 @@ public function verify(Request\|string $uri): void`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`if (self::STATUS_MISSING === $status) {`
`129`		`- throw new UnsignedUriException($uri);`
	`129`	`+ throw new UnsignedUriException();`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`if (self::STATUS_INVALID === $status) {`
`133`		`- throw new UnverifiedSignedUriException($uri);`
	`133`	`+ throw new UnverifiedSignedUriException();`
`134`	`134`	`}`
`135`	`135`
`136`		`- $url = parse_url($uri);`
`137`		`- parse_str($url['query'], $params);`
`138`		`- $expiration = $params[$this->expirationParameter];`
`139`		`-`
`140`		`- throw new ExpiredSignedUriException(\DateTimeImmutable::createFromFormat('U', $expiration), $uri);`
	`136`	`+ throw new ExpiredSignedUriException();`
`141`	`137`	`}`
`142`	`138`
`143`	`139`	`private function computeHash(string $uri): string`