Simplify AbstractVoter

Koc · Koc · commit 8c8cfa1942f4 · 2015-10-04T12:03:28.000+03:00
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
@@ -68,10 +68,9 @@ public function vote(TokenInterface $token, $object, array $attributes)
 
         // abstain vote by default in case none of the attributes are supported
         $vote = self::ACCESS_ABSTAIN;
-        $class = get_class($object);
 
         foreach ($attributes as $attribute) {
-            if (!$this->supports($attribute, $class)) {
+            if (!$this->supports($attribute, $object)) {
                 continue;
             }
 
@@ -88,25 +87,22 @@ public function vote(TokenInterface $token, $object, array $attributes)
     }
 
     /**
-     * Determines if the attribute and class are supported by this voter.
-     *
-     * To determine if the passed class is instance of the supported class, the
-     * isClassInstanceOf() method can be used.
+     * Determines if the attribute and object are supported by this voter.
      *
      * This method will become abstract in 3.0.
      *
      * @param string $attribute An attribute
-     * @param string $class     The fully qualified class name of the passed object
+     * @param string $object    The object to secure
      *
-     * @return bool True if the attribute and class is supported, false otherwise
+     * @return bool True if the attribute and object is supported, false otherwise
      */
-    protected function supports($attribute, $class)
+    protected function supports($attribute, $object)
     {
         @trigger_error('The getSupportedClasses and getSupportedAttributes methods are deprecated since version 2.8 and will be removed in version 3.0. Overwrite supports instead.', E_USER_DEPRECATED);
 
         $classIsSupported = false;
         foreach ($this->getSupportedClasses() as $supportedClass) {
-            if ($this->isClassInstanceOf($class, $supportedClass)) {
+            if ($object instanceof $supportedClass) {
                 $classIsSupported = true;
                 break;
             }
@@ -123,20 +119,6 @@ protected function supports($attribute, $class)
         return true;
     }
 
-    /**
-     * A helper method to test if the actual class is instanceof or equal
-     * to the expected class.
-     *
-     * @param string $actualClass   The actual class name
-     * @param string $expectedClass The expected class name
-     *
-     * @return bool
-     */
-    protected function isClassInstanceOf($actualClass, $expectedClass)
-    {
-        return $expectedClass === $actualClass || is_subclass_of($actualClass, $expectedClass);
-    }
-
     /**
      * Return an array of supported classes. This will be called by supportsClass.
      *
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php
@@ -84,10 +84,9 @@ protected function voteOnAttribute($attribute, $object, TokenInterface $token)
         return 'EDIT' === $attribute;
     }
 
-    protected function supports($attribute, $class)
+    protected function supports($attribute, $object)
     {
-        return $this->isClassInstanceOf($class, 'stdClass')
-            && in_array($attribute, array('EDIT', 'CREATE'));
+        return $object instanceof \stdClass && in_array($attribute, array('EDIT', 'CREATE'));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,9 @@ protected function voteOnAttribute($attribute, $object, TokenInterface $token)`
`84`	`84`	`return 'EDIT' === $attribute;`
`85`	`85`	`}`
`86`	`86`
`87`		`- protected function supports($attribute, $class)`
	`87`	`+ protected function supports($attribute, $object)`
`88`	`88`	`{`
`89`		`- return $this->isClassInstanceOf($class, 'stdClass')`
`90`		`- && in_array($attribute, array('EDIT', 'CREATE'));`
	`89`	`+ return $object instanceof \stdClass && in_array($attribute, array('EDIT', 'CREATE'));`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`