minor #15143 unify default AccessDeniedExeption message (xabbuh)

fabpot · fabpot · commit 148c7db74e7e · 2015-06-30T07:44:03.000+02:00
This PR was merged into the 2.6 branch. Discussion ---------- unify default AccessDeniedExeption message | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15099 | License | MIT | Doc PR | Commits ------- 87e7709 unify default AccessDeniedExeption message
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -119,8 +119,9 @@ protected function addFlash($type, $message)
      * @param mixed $attributes The attributes
      * @param mixed $object     The object
      *
-     * @throws \LogicException
      * @return bool
+     *
+     * @throws \LogicException
      */
     protected function isGranted($attributes, $object = null)
     {
@@ -230,7 +231,7 @@ public function createNotFoundException($message = 'Not Found', \Exception $prev
      *
      * @return AccessDeniedException
      */
-    public function createAccessDeniedException($message = 'Access Denied', \Exception $previous = null)
+    public function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)
     {
         return new AccessDeniedException($message, $previous);
     }
@@ -344,7 +345,7 @@ public function get($id)
     }
 
     /**
-     * Checks the validity of a CSRF token
+     * Checks the validity of a CSRF token.
      *
      * @param string $id    The id used when generating the token
      * @param string $token The actual token sent with the request that should be validated
diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
@@ -18,7 +18,7 @@
  */
 class AccessDeniedException extends \RuntimeException
 {
-    public function __construct($message = 'Access Denied', \Exception $previous = null)
+    public function __construct($message = 'Access Denied.', \Exception $previous = null)
     {
         parent::__construct($message, 403, $previous);
     }

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,9 @@ protected function addFlash($type, $message)`
`119`	`119`	`* @param mixed $attributes The attributes`
`120`	`120`	`* @param mixed $object The object`
`121`	`121`	`*`
`122`		`- * @throws \LogicException`
`123`	`122`	`* @return bool`
	`123`	`+ *`
	`124`	`+ * @throws \LogicException`
`124`	`125`	`*/`
`125`	`126`	`protected function isGranted($attributes, $object = null)`
`126`	`127`	`{`
`@@ -230,7 +231,7 @@ public function createNotFoundException($message = 'Not Found', \Exception $prev`
`230`	`231`	`*`
`231`	`232`	`* @return AccessDeniedException`
`232`	`233`	`*/`
`233`		`- public function createAccessDeniedException($message = 'Access Denied', \Exception $previous = null)`
	`234`	`+ public function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)`
`234`	`235`	`{`
`235`	`236`	`return new AccessDeniedException($message, $previous);`
`236`	`237`	`}`
`@@ -344,7 +345,7 @@ public function get($id)`
`344`	`345`	`}`
`345`	`346`
`346`	`347`	`/**`
`347`		`- * Checks the validity of a CSRF token`
	`348`	`+ * Checks the validity of a CSRF token.`
`348`	`349`	`*`
`349`	`350`	`* @param string $id The id used when generating the token`
`350`	`351`	`* @param string $token The actual token sent with the request that should be validated`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class AccessDeniedException extends \RuntimeException`
`20`	`20`	`{`
`21`		`- public function __construct($message = 'Access Denied', \Exception $previous = null)`
	`21`	`+ public function __construct($message = 'Access Denied.', \Exception $previous = null)`
`22`	`22`	`{`
`23`	`23`	`parent::__construct($message, 403, $previous);`
`24`	`24`	`}`