diff options
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/README.md | 2 | ||||
| -rw-r--r-- | Core/SecurityContext.php | 14 | ||||
| -rw-r--r-- | Core/SecurityContextInterface.php | 2 | ||||
| -rw-r--r-- | Core/composer.json | 12 | ||||
| -rw-r--r-- | Core/phpunit.xml.dist | 4 |
5 files changed, 24 insertions, 10 deletions
diff --git a/Core/README.md b/Core/README.md index 66c323e..8e05a92 100644 --- a/Core/README.md +++ b/Core/README.md @@ -11,7 +11,7 @@ Resources Documentation: -http://symfony.com/doc/2.6/book/security.html +http://symfony.com/doc/2.7/book/security.html Tests ----- diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index 165c22a..7695959 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -26,7 +26,7 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; * * @author Fabien Potencier <fabien@symfony.com> * @author Johannes M. Schmitt <schmittjoh@gmail.com> - * @deprecated Deprecated since version 2.6, to be removed in 3.0. + * @deprecated since version 2.6, to be removed in 3.0. */ class SecurityContext implements SecurityContextInterface { @@ -70,26 +70,38 @@ class SecurityContext implements SecurityContextInterface } /** + * @deprecated since version 2.6, to be removed in 3.0. Use TokenStorageInterface::getToken() instead. + * * {@inheritdoc} */ public function getToken() { + trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage::getToken() method instead.', E_USER_DEPRECATED); + return $this->tokenStorage->getToken(); } /** + * @deprecated since version 2.6, to be removed in 3.0. Use TokenStorageInterface::setToken() instead. + * * {@inheritdoc} */ public function setToken(TokenInterface $token = null) { + trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage::setToken() method instead.', E_USER_DEPRECATED); + return $this->tokenStorage->setToken($token); } /** + * @deprecated since version 2.6, to be removed in 3.0. Use AuthorizationCheckerInterface::isGranted() instead. + * * {@inheritdoc} */ public function isGranted($attributes, $object = null) { + trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface::isGranted() method instead.', E_USER_DEPRECATED); + return $this->authorizationChecker->isGranted($attributes, $object); } } diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php index bceb506..0ad7bd3 100644 --- a/Core/SecurityContextInterface.php +++ b/Core/SecurityContextInterface.php @@ -18,7 +18,7 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; * The SecurityContextInterface. * * @author Johannes M. Schmitt <schmittjoh@gmail.com> - * @deprecated Deprecated since version 2.6, to be removed in 3.0. + * @deprecated since version 2.6, to be removed in 3.0. */ interface SecurityContextInterface extends TokenStorageInterface, AuthorizationCheckerInterface { diff --git a/Core/composer.json b/Core/composer.json index c6923bf..56240d8 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -19,11 +19,11 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/event-dispatcher": "~2.1", - "symfony/expression-language": "~2.6", - "symfony/http-foundation": "~2.4", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/validator": "~2.5,>=2.5.5", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/http-foundation": "~2.4|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.5|~3.0.0", "psr/log": "~1.0", "ircmaxell/password-compat": "1.0.*" }, @@ -41,7 +41,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } } } diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist index 7bdf5cb..7a5f7da 100644 --- a/Core/phpunit.xml.dist +++ b/Core/phpunit.xml.dist @@ -12,9 +12,11 @@ bootstrap="vendor/autoload.php" > <php> - <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) --> + <!-- Disable E_USER_DEPRECATED until 3.0 --> + <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' --> <ini name="error_reporting" value="-16385"/> </php> + <testsuites> <testsuite name="Symfony Security Component Core Test Suite"> <directory>./Tests/</directory> |