diff options
| -rw-r--r-- | Core/SecurityContext.php | 6 | ||||
| -rw-r--r-- | Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php | 3 | ||||
| -rw-r--r-- | Tests/Core/LegacySecurityContextInterfaceTest.php (renamed from Tests/Core/SecurityContextInterfaceTest.php) | 6 |
3 files changed, 5 insertions, 10 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(); } /** diff --git a/Tests/Core/SecurityContextInterfaceTest.php b/Tests/Core/LegacySecurityContextInterfaceTest.php index 09a4590..764a43d 100644 --- a/Tests/Core/SecurityContextInterfaceTest.php +++ b/Tests/Core/LegacySecurityContextInterfaceTest.php @@ -14,15 +14,15 @@ namespace Symfony\Component\Security\Tests\Core; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\Security; -class SecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase +class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase { /** * Test if the BC Layer is working as intended - * - * @deprecated since version 2.6, to be removed in 3.0. */ public function testConstantSync() { + $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); + $this->assertSame(Security::ACCESS_DENIED_ERROR, SecurityContextInterface::ACCESS_DENIED_ERROR); $this->assertSame(Security::AUTHENTICATION_ERROR, SecurityContextInterface::AUTHENTICATION_ERROR); $this->assertSame(Security::LAST_USERNAME, SecurityContextInterface::LAST_USERNAME); |