Update exception messages

dunglas · dunglas · commit e0bb4e4cd76e · 2016-12-02T09:21:54.000+01:00
diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php
@@ -77,25 +77,25 @@ public function handle(GetResponseEvent $event)
         try {
             $username = $this->propertyAccessor->getValue($data, $this->options['username_path']);
         } catch (AccessException $e) {
-            throw new BadCredentialsException(sprintf('Missing key "%s".', $this->options['username_path']));
+            throw new BadCredentialsException(sprintf('The key "%s" must be provided.', $this->options['username_path']));
         }
 
         try {
             $password = $this->propertyAccessor->getValue($data, $this->options['password_path']);
         } catch (AccessException $e) {
-            throw new BadCredentialsException(sprintf('Missing key "%s".', $this->options['password_path']));
+            throw new BadCredentialsException(sprintf('The key "%s" must be provided.', $this->options['password_path']));
         }
 
         if (!is_string($username)) {
-            throw new BadCredentialsException(sprintf('The key "%s" must contain a string.', $this->options['username_path']));
+            throw new BadCredentialsException(sprintf('The key "%s" must be a string.', $this->options['username_path']));
         }
 
         if (strlen($username) > Security::MAX_USERNAME_LENGTH) {
             throw new BadCredentialsException('Invalid username.');
         }
 
         if (!is_string($password)) {
-            throw new BadCredentialsException(sprintf('The key "%s" must contain a string.', $this->options['password_path']));
+            throw new BadCredentialsException(sprintf('The key "%s" must be a string.', $this->options['password_path']));
         }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -77,25 +77,25 @@ public function handle(GetResponseEvent $event)`
`77`	`77`	`try {`
`78`	`78`	`$username = $this->propertyAccessor->getValue($data, $this->options['username_path']);`
`79`	`79`	`} catch (AccessException $e) {`
`80`		`- throw new BadCredentialsException(sprintf('Missing key "%s".', $this->options['username_path']));`
	`80`	`+ throw new BadCredentialsException(sprintf('The key "%s" must be provided.', $this->options['username_path']));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`try {`
`84`	`84`	`$password = $this->propertyAccessor->getValue($data, $this->options['password_path']);`
`85`	`85`	`} catch (AccessException $e) {`
`86`		`- throw new BadCredentialsException(sprintf('Missing key "%s".', $this->options['password_path']));`
	`86`	`+ throw new BadCredentialsException(sprintf('The key "%s" must be provided.', $this->options['password_path']));`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`if (!is_string($username)) {`
`90`		`- throw new BadCredentialsException(sprintf('The key "%s" must contain a string.', $this->options['username_path']));`
	`90`	`+ throw new BadCredentialsException(sprintf('The key "%s" must be a string.', $this->options['username_path']));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (strlen($username) > Security::MAX_USERNAME_LENGTH) {`
`94`	`94`	`throw new BadCredentialsException('Invalid username.');`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if (!is_string($password)) {`
`98`		`- throw new BadCredentialsException(sprintf('The key "%s" must contain a string.', $this->options['password_path']));`
	`98`	`+ throw new BadCredentialsException(sprintf('The key "%s" must be a string.', $this->options['password_path']));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`try {`