Update LogoutUrlGenerator exception messages

alamirault · alamirault · commit a0eb08f5a165 · 2022-11-17T21:47:35.000+01:00
diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -152,9 +152,9 @@ private function getListener(?string $key): array
         }
 
         if (null === $this->currentFirewallName) {
-            throw new \InvalidArgumentException('Unable to find the current firewall LogoutListener, please make sure request is behind a firewall.');
+            throw new \InvalidArgumentException('This request is not behind a firewall, please pass the firewall name manually to generate a logout URL.');
         }
 
-        throw new \InvalidArgumentException('Unable to find the current firewall LogoutListener, please provide the provider key manually.');
+        throw new \InvalidArgumentException('Unable to find logout in the current firewall, please pass the firewall name manually to generate a logout URL.');
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/Logout/LogoutUrlGeneratorTest.php b/src/Symfony/Component/Security/Http/Tests/Logout/LogoutUrlGeneratorTest.php
@@ -91,7 +91,7 @@ public function testGuessFromTokenWithoutFirewallNameFallbacksToCurrentFirewall(
     public function testUnableToGuessWithoutCurrentFirewallThrowsException()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Unable to find the current firewall LogoutListener, please make sure request is behind a firewall.');
+        $this->expectExceptionMessage('This request is not behind a firewall, please pass the firewall name manually to generate a logout URL.');
         $this->generator->registerListener('secured_area', '/logout', null, null);
 
         $this->generator->getLogoutPath();
@@ -100,7 +100,7 @@ public function testUnableToGuessWithoutCurrentFirewallThrowsException()
     public function testUnableToGuessWithCurrentFirewallThrowsException()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Unable to find the current firewall LogoutListener, please provide the provider key manually.');
+        $this->expectExceptionMessage('Unable to find logout in the current firewall, please pass the firewall name manually to generate a logout URL.');
         $this->generator->registerListener('secured_area', '/logout', null, null);
         $this->generator->setCurrentFirewall('admin');
 

Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,9 @@ private function getListener(?string $key): array`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`if (null === $this->currentFirewallName) {`
`155`		`- throw new \InvalidArgumentException('Unable to find the current firewall LogoutListener, please make sure request is behind a firewall.');`
	`155`	`+ throw new \InvalidArgumentException('This request is not behind a firewall, please pass the firewall name manually to generate a logout URL.');`
`156`	`156`	`}`
`157`	`157`
`158`		`- throw new \InvalidArgumentException('Unable to find the current firewall LogoutListener, please provide the provider key manually.');`
	`158`	`+ throw new \InvalidArgumentException('Unable to find logout in the current firewall, please pass the firewall name manually to generate a logout URL.');`
`159`	`159`	`}`
`160`	`160`	`}`