Skip to content

Commit df2a5a8

Browse files
Merge branch '2.6' into 2.7
* 2.6: [2.6] Towards 100% HHVM compat [Security/Http] Fix test [Stopwatch] Fix test Minor fixes Towards 100% HHVM compat unify default AccessDeniedExeption message trigger event with right user (add test) [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser [Form] Fixed: Data mappers always receive forms indexed by their names Conflicts: src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Component/VarDumper/Tests/CliDumperTest.php src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2 parents b724782 + c37b4b6 commit df2a5a8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Controller/Controller.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ protected function addFlash($type, $message)
119119
* @param mixed $attributes The attributes
120120
* @param mixed $object The object
121121
*
122-
* @throws \LogicException
123-
*
124122
* @return bool
123+
*
124+
* @throws \LogicException
125125
*/
126126
protected function isGranted($attributes, $object = null)
127127
{
@@ -231,7 +231,7 @@ public function createNotFoundException($message = 'Not Found', \Exception $prev
231231
*
232232
* @return AccessDeniedException
233233
*/
234-
public function createAccessDeniedException($message = 'Access Denied', \Exception $previous = null)
234+
public function createAccessDeniedException($message = 'Access Denied.', \Exception $previous = null)
235235
{
236236
return new AccessDeniedException($message, $previous);
237237
}

0 commit comments

Comments
 (0)