Merge remote-tracking branch 'origin/2.7' into 2.8

aitboudad · aitboudad · commit 8c7ac5edc5b8 · 2015-07-01T14:16:54.000Z
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
diff --git a/Exception/AccessDeniedException.php b/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
`@@ -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`	`}`