summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-06-11 19:27:52 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2015-06-11 19:27:52 +0200
commitbb80188e3b42a85f6c4ead17332098cab3f62aac (patch)
treeb189c86950b080405b146e263cdfecf3e81a7b45
parent1b4222e6f3132eba8bbb6f2550c713c62829dfe1 (diff)
parentf661d9367f281bce3704211a06028b82c1ed3314 (diff)
downloadsymfony-security-bb80188e3b42a85f6c4ead17332098cab3f62aac.zip
symfony-security-bb80188e3b42a85f6c4ead17332098cab3f62aac.tar.gz
symfony-security-bb80188e3b42a85f6c4ead17332098cab3f62aac.tar.bz2
Merge branch '2.7' into 2.8
* 2.7: Fix test name fixed CS Allow new lines in Messages translated with transchoice() (replacement for #14867) [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one [2.3] Fix tests on Windows [Yaml] remove partial deprecation annotation Silence invasive deprecation warnings, opt-in for warnings Documenting how to keep option value BC - see #14377 Conflicts: src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Twig/composer.json
-rw-r--r--Core/SecurityContext.php2
-rw-r--r--Core/SecurityContextInterface.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 27e85c5..8bcbfee 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Security\Core;
-trigger_error('The '.__NAMESPACE__.'\SecurityContext class is deprecated since version 2.6 and will be removed in 3.0. Use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage or Symfony\Component\Security\Core\Authorization\AuthorizationChecker instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\SecurityContext class is deprecated since version 2.6 and will be removed in 3.0. Use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage or Symfony\Component\Security\Core\Authorization\AuthorizationChecker instead.', E_USER_DEPRECATED);
use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php
index f260aa3..61cdf4f 100644
--- a/Core/SecurityContextInterface.php
+++ b/Core/SecurityContextInterface.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\Security\Core;
-trigger_error('The '.__NAMESPACE__.'\SecurityContextInterface interface is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\SecurityContextInterface interface is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;