summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-01-04 21:27:00 +0100
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-01-05 09:56:52 +0100
commitb7409ef75f050977d0444913b103413f36888430 (patch)
tree8dab33cc5e01d659bd74e270cb6e000023bb39b2
parent495d07a1730d12646dbcb51ed6ef5915982630bf (diff)
downloadsymfony-security-b7409ef75f050977d0444913b103413f36888430.zip
symfony-security-b7409ef75f050977d0444913b103413f36888430.tar.gz
symfony-security-b7409ef75f050977d0444913b103413f36888430.tar.bz2
[2.6] cleanup deprecated uses
-rw-r--r--Core/SecurityContext.php6
-rw-r--r--Tests/Core/LegacySecurityContextInterfaceTest.php (renamed from Tests/Core/SecurityContextInterfaceTest.php)6
2 files changed, 3 insertions, 9 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/Tests/Core/SecurityContextInterfaceTest.php b/Tests/Core/LegacySecurityContextInterfaceTest.php
index f65d202..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 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);