AbstractVoter should abstain string objects

Daniel Espendiller · Daniel Espendiller · commit cae89ca4f6bc · 2015-11-12T14:40:16.000+01:00
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
@@ -58,7 +58,7 @@ public function supportsClass($class)
      */
     public function vote(TokenInterface $token, $object, array $attributes)
     {
-        if (!$object || !$this->supportsClass(get_class($object))) {
+        if (!$object || !is_object($object) || !$this->supportsClass(get_class($object))) {
             return self::ACCESS_ABSTAIN;
         }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php
@@ -39,6 +39,7 @@ public function getTests()
             array(array('EDIT'), VoterInterface::ACCESS_ABSTAIN, $this, 'ACCESS_ABSTAIN if class is not supported'),
 
             array(array('EDIT'), VoterInterface::ACCESS_ABSTAIN, null, 'ACCESS_ABSTAIN if object is null'),
+            array(array('EDIT'), VoterInterface::ACCESS_ABSTAIN, 'foo', 'ACCESS_ABSTAIN if object is string'),
 
             array(array(), VoterInterface::ACCESS_ABSTAIN, new \stdClass(), 'ACCESS_ABSTAIN if no attributes were provided'),
         );

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function supportsClass($class)`
`58`	`58`	`*/`
`59`	`59`	`public function vote(TokenInterface $token, $object, array $attributes)`
`60`	`60`	`{`
`61`		`- if (!$object \|\| !$this->supportsClass(get_class($object))) {`
	`61`	`+ if (!$object \|\| !is_object($object) \|\| !$this->supportsClass(get_class($object))) {`
`62`	`62`	`return self::ACCESS_ABSTAIN;`
`63`	`63`	`}`
`64`	`64`