Deprecated supportsAttribute and supportsClass methods

wouterj · wouterj · commit f98a05c6c7be · 2015-07-01T09:22:08.000+02:00
diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+ * deprecated `supportsAttribute()` and `supportsClass()` attributes of
+   `Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface` and
+   `Symfony\Component\Security\Core\Authorization\Voter\VoterInterface`.
+
 2.7.0
 -----
 
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -77,6 +77,8 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
      */
     public function supportsAttribute($attribute)
     {
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+
         foreach ($this->voters as $voter) {
             if ($voter->supportsAttribute($attribute)) {
                 return true;
@@ -91,6 +93,8 @@ public function supportsAttribute($attribute)
      */
     public function supportsClass($class)
     {
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+
         foreach ($this->voters as $voter) {
             if ($voter->supportsClass($class)) {
                 return true;
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php
@@ -37,6 +37,8 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
      * @param string $attribute An attribute
      *
      * @return bool true if this decision manager supports the attribute, false otherwise
+     *
+     * @deprecated since version 2.8, to be removed in 3.0.
      */
     public function supportsAttribute($attribute);
 
@@ -46,6 +48,8 @@ public function supportsAttribute($attribute);
      * @param string $class A class name
      *
      * @return true if this decision manager can process the class
+     *
+     * @deprecated since version 2.8, to be removed in 3.0.
      */
     public function supportsClass($class);
 }
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php
@@ -30,6 +30,8 @@ interface VoterInterface
      * @param string $attribute An attribute
      *
      * @return bool true if this Voter supports the attribute, false otherwise
+     *
+     * @deprecated since version 2.8, to be removed in 3.0.
      */
     public function supportsAttribute($attribute);
 
@@ -39,6 +41,8 @@ public function supportsAttribute($attribute);
      * @param string $class A class name
      *
      * @return bool true if this Voter can process the class
+     *
+     * @deprecated since version 2.8, to be removed in 3.0.
      */
     public function supportsClass($class);
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -16,6 +16,9 @@
 
 class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @group legacy
+     */
     public function testSupportsClass()
     {
         $manager = new AccessDecisionManager(array(
@@ -31,6 +34,9 @@ public function testSupportsClass()
         $this->assertFalse($manager->supportsClass('FooClass'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testSupportsAttribute()
     {
         $manager = new AccessDecisionManager(array(

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ public function decide(TokenInterface $token, array $attributes, $object = null)`
`37`	`37`	`* @param string $attribute An attribute`
`38`	`38`	`*`
`39`	`39`	`* @return bool true if this decision manager supports the attribute, false otherwise`
	`40`	`+ *`
	`41`	`+ * @deprecated since version 2.8, to be removed in 3.0.`
`40`	`42`	`*/`
`41`	`43`	`public function supportsAttribute($attribute);`
`42`	`44`
`@@ -46,6 +48,8 @@ public function supportsAttribute($attribute);`
`46`	`48`	`* @param string $class A class name`
`47`	`49`	`*`
`48`	`50`	`* @return true if this decision manager can process the class`
	`51`	`+ *`
	`52`	`+ * @deprecated since version 2.8, to be removed in 3.0.`
`49`	`53`	`*/`
`50`	`54`	`public function supportsClass($class);`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`
`17`	`17`	`class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase`
`18`	`18`	`{`
	`19`	`+ /**`
	`20`	`+ * @group legacy`
	`21`	`+ */`
`19`	`22`	`public function testSupportsClass()`
`20`	`23`	`{`
`21`	`24`	`$manager = new AccessDecisionManager(array(`
`@@ -31,6 +34,9 @@ public function testSupportsClass()`
`31`	`34`	`$this->assertFalse($manager->supportsClass('FooClass'));`
`32`	`35`	`}`
`33`	`36`
	`37`	`+ /**`
	`38`	`+ * @group legacy`
	`39`	`+ */`
`34`	`40`	`public function testSupportsAttribute()`
`35`	`41`	`{`
`36`	`42`	`$manager = new AccessDecisionManager(array(`