diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 15:29:53 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 15:29:53 +0100 |
| commit | 79471f92de28ed0acf9cce11051ebc47964acfbb (patch) | |
| tree | 702963c8c829cda73762be39f2250ff7a16eb724 /Core | |
| parent | c7f654d74131094b02c247373982d6f9b4287dfa (diff) | |
| parent | 887bcdd527e7a428d5073db41213d18cdc10b8ef (diff) | |
| download | symfony-security-79471f92de28ed0acf9cce11051ebc47964acfbb.zip symfony-security-79471f92de28ed0acf9cce11051ebc47964acfbb.tar.gz symfony-security-79471f92de28ed0acf9cce11051ebc47964acfbb.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[2.6] cleanup deprecated uses
[2.5] cleanup deprecated uses
Conflicts:
src/Symfony/Component/Form/composer.json
src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/SecurityContext.php | 6 | ||||
| -rw-r--r-- | Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index 545d4cb..165c22a 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -70,8 +70,6 @@ class SecurityContext implements SecurityContextInterface } /** - * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use TokenStorageInterface::getToken() instead. - * * {@inheritdoc} */ public function getToken() @@ -80,8 +78,6 @@ class SecurityContext implements SecurityContextInterface } /** - * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use TokenStorageInterface::setToken() instead. - * * {@inheritdoc} */ public function setToken(TokenInterface $token = null) @@ -90,8 +86,6 @@ class SecurityContext implements SecurityContextInterface } /** - * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use AuthorizationCheckerInterface::isGranted() instead. - * * {@inheritdoc} */ public function isGranted($attributes, $object = null) diff --git a/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php index b47a45b..7792913 100644 --- a/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php +++ b/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php @@ -86,7 +86,8 @@ abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest $this->validator->validate('secret', $constraint); - $this->assertViolation('myMessage'); + $this->buildViolation('myMessage') + ->assertRaised(); } /** |