diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-01 13:25:50 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-01 13:25:50 +0200 |
| commit | c46b28dca01d53efe9dd4e59109010538c219ff9 (patch) | |
| tree | ce71c4ff7d972b22f78c33225a70fab35db97709 /Core | |
| parent | a98ce20e9fe75a27039c6a52b9e9ca96aeb71aff (diff) | |
| parent | 5e1c369074daca0707bc1845ed9b8f907ffd6ef9 (diff) | |
| download | symfony-security-c46b28dca01d53efe9dd4e59109010538c219ff9.zip symfony-security-c46b28dca01d53efe9dd4e59109010538c219ff9.tar.gz symfony-security-c46b28dca01d53efe9dd4e59109010538c219ff9.tar.bz2 | |
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
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Exception/AccessDeniedException.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Exception/AccessDeniedException.php b/Core/Exception/AccessDeniedException.php index 7c16afb..736a36b 100644 --- a/Core/Exception/AccessDeniedException.php +++ b/Core/Exception/AccessDeniedException.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Security\Core\Exception; */ 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); } |