Adds deprecation notices for structures to be removed in 3.0.

Hugo Hamon · Hugo Hamon · commit 7c3ed12a9ba6 · 2015-01-05T15:57:15.000+01:00
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
@@ -11,6 +11,8 @@
 
 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 the Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface and Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface implementation to check for authentication and authorization.', E_USER_DEPRECATED);
+
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -74,6 +76,8 @@ public function __construct($tokenStorage, $authorizationChecker, $alwaysAuthent
      */
     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();
     }
 
@@ -82,6 +86,8 @@ public function getToken()
      */
     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);
     }
 
@@ -90,6 +96,8 @@ public function setToken(TokenInterface $token = null)
      */
     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
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Security\Core;
 
+trigger_error('The '.__NAMESPACE__.'\SecurityContextInterface interface is deprecated since version 2.6 and will be removed in 3.0. Use both Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface and Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface interfaces instead.', E_USER_DEPRECATED);
+
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
diff --git a/Tests/Core/LegacySecurityContextInterfaceTest.php b/Tests/Core/LegacySecurityContextInterfaceTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Security\Tests\Core;
 
+trigger_error('The '.__NAMESPACE__.'\SecurityContextInterfaceTest class is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+
 use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Core\Security;
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Core;`
`13`	`13`
	`14`	`+trigger_error('The '.__NAMESPACE__.'\SecurityContext class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface and Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface implementation to check for authentication and authorization.', E_USER_DEPRECATED);`
	`15`	`+`
`14`	`16`	`use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;`
`15`	`17`	`use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;`
`16`	`18`	`use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;`
`@@ -74,6 +76,8 @@ public function __construct($tokenStorage, $authorizationChecker, $alwaysAuthent`
`74`	`76`	`*/`
`75`	`77`	`public function getToken()`
`76`	`78`	`{`
	`79`	`+ 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);`
	`80`	`+`
`77`	`81`	`return $this->tokenStorage->getToken();`
`78`	`82`	`}`
`79`	`83`
`@@ -82,6 +86,8 @@ public function getToken()`
`82`	`86`	`*/`
`83`	`87`	`public function setToken(TokenInterface $token = null)`
`84`	`88`	`{`
	`89`	`+ 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);`
	`90`	`+`
`85`	`91`	`return $this->tokenStorage->setToken($token);`
`86`	`92`	`}`
`87`	`93`
`@@ -90,6 +96,8 @@ public function setToken(TokenInterface $token = null)`
`90`	`96`	`*/`
`91`	`97`	`public function isGranted($attributes, $object = null)`
`92`	`98`	`{`
	`99`	`+ 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);`
	`100`	`+`
`93`	`101`	`return $this->authorizationChecker->isGranted($attributes, $object);`
`94`	`102`	`}`
`95`	`103`	`}`