Some minor tweaks based on suggestions from stof in symfony#15870

weaverryan · weaverryan · commit a7612b11e616 · 2015-09-26T11:03:42.000-04:00
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
@@ -71,9 +71,9 @@ public function vote(TokenInterface $token, $object, array $attributes)
         $class = get_class($object);
 
         $reflector = new \ReflectionMethod($this, 'voteOnAttribute');
-        $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter';
+        $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== __CLASS__;
         if (!$isNewOverwritten) {
-            @trigger_error(sprintf("The AbstractVoter::isGranted method is deprecated since 2.8 and won't be called anymore in 3.0. Override voteOnAttribute() instead.", $reflector->class), E_USER_DEPRECATED);
+            @trigger_error(sprintf("The AbstractVoter::isGranted method is deprecated since 2.8 and won't be called anymore in 3.0. Override voteOnAttribute() in %s instead.", $reflector->class, get_class($this)), E_USER_DEPRECATED);
         }
 
         foreach ($attributes as $attribute) {
@@ -191,6 +191,9 @@ protected function getSupportedAttributes()
      */
     protected function isGranted($attribute, $object, $user = null)
     {
+        // in case someone calls this directly
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ public function vote(TokenInterface $token, $object, array $attributes)`
`71`	`71`	`$class = get_class($object);`
`72`	`72`
`73`	`73`	`$reflector = new \ReflectionMethod($this, 'voteOnAttribute');`
`74`		`- $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter';`
	`74`	`+ $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== __CLASS__;`
`75`	`75`	`if (!$isNewOverwritten) {`
`76`		`- @trigger_error(sprintf("The AbstractVoter::isGranted method is deprecated since 2.8 and won't be called anymore in 3.0. Override voteOnAttribute() instead.", $reflector->class), E_USER_DEPRECATED);`
	`76`	`+ @trigger_error(sprintf("The AbstractVoter::isGranted method is deprecated since 2.8 and won't be called anymore in 3.0. Override voteOnAttribute() in %s instead.", $reflector->class, get_class($this)), E_USER_DEPRECATED);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`foreach ($attributes as $attribute) {`
`@@ -191,6 +191,9 @@ protected function getSupportedAttributes()`
`191`	`191`	`*/`
`192`	`192`	`protected function isGranted($attribute, $object, $user = null)`
`193`	`193`	`{`
	`194`	`+ // in case someone calls this directly`
	`195`	`+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');`
	`196`	`+`
`194`	`197`	`return false;`
`195`	`198`	`}`
`196`	`199`