Merge branch '1.3'

Conflicts: .travis.yml src/PublishWorkflow/Voter/PublishableVoter.php
symfony-cmf · Jan 29, 2017 · 3a71cbb · 3a71cbb
2 parents 389e3ca + 2c4018d
commit 3a71cbb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/src/PublishWorkflow/Voter/PublishTimePeriodVoter.php b/src/PublishWorkflow/Voter/PublishTimePeriodVoter.php
@@ -70,16 +70,16 @@ public function supportsClass($class)
     /**
      * {@inheritdoc}
      *
-     * @param PublishTimePeriodReadInterface $object
+     * @param PublishTimePeriodReadInterface $subject
      */
-    public function vote(TokenInterface $token, $object, array $attributes)
+    public function vote(TokenInterface $token, $subject, array $attributes)
     {
-        if (!$this->supportsClass(get_class($object))) {
+        if (!is_object($subject) || !$this->supportsClass(get_class($subject))) {
             return self::ACCESS_ABSTAIN;
         }
 
-        $startDate = $object->getPublishStartDate();
-        $endDate = $object->getPublishEndDate();
+        $startDate = $subject->getPublishStartDate();
+        $endDate = $subject->getPublishEndDate();
 
         $decision = self::ACCESS_GRANTED;
         foreach ($attributes as $attribute) {

diff --git a/src/PublishWorkflow/Voter/PublishableVoter.php b/src/PublishWorkflow/Voter/PublishableVoter.php
@@ -48,11 +48,11 @@ public function supportsClass($class)
     /**
      * {@inheritdoc}
      *
-     * @param PublishableReadInterface $object
+     * @param PublishableReadInterface $subject
      */
-    public function vote(TokenInterface $token, $object, array $attributes)
+    public function vote(TokenInterface $token, $subject, array $attributes)
     {
-        if (!$this->supportsClass(get_class($object))) {
+        if (!is_object($subject) || !$this->supportsClass(get_class($subject))) {
             return self::ACCESS_ABSTAIN;
         }
 
@@ -66,7 +66,7 @@ public function vote(TokenInterface $token, $object, array $attributes)
                 continue;
             }
 
-            if (!$object->isPublishable()) {
+            if (!$subject->isPublishable()) {
                 return self::ACCESS_DENIED;
             }
         }

diff --git a/src/Security/Authorization/Voter/PublishedVoter.php b/src/Security/Authorization/Voter/PublishedVoter.php
@@ -57,11 +57,11 @@ public function supportsClass($class)
     /**
      * {@inheritdoc}
      *
-     * @param object $object
+     * @param object $subject
      */
-    public function vote(TokenInterface $token, $object, array $attributes)
+    public function vote(TokenInterface $token, $subject, array $attributes)
     {
-        if (!$this->supportsClass(get_class($object))) {
+        if (!is_object($subject) || !$this->supportsClass(get_class($subject))) {
             return self::ACCESS_ABSTAIN;
         }
         foreach ($attributes as $attribute) {
@@ -70,7 +70,7 @@ public function vote(TokenInterface $token, $object, array $attributes)
             }
         }
 
-        if ($this->publishWorkflowChecker->isGranted($attributes, $object)) {
+        if ($this->publishWorkflowChecker->isGranted($attributes, $subject)) {
             return self::ACCESS_GRANTED;
         }
 

diff --git a/tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php b/tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php
@@ -133,4 +133,10 @@ public function testUnsupportedClass()
         );
         $this->assertEquals(VoterInterface::ACCESS_ABSTAIN, $result);
     }
+
+    public function testNonClassSubject()
+    {
+        $result = $this->voter->vote($this->token, array(1, 2, 3), array(PublishWorkflowChecker::VIEW_ATTRIBUTE));
+        $this->assertEquals(VoterInterface::ACCESS_ABSTAIN, $result);
+    }
 }
diff --git a/tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php b/tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php
@@ -101,4 +101,10 @@ public function testUnsupportedClass()
         );
         $this->assertEquals(VoterInterface::ACCESS_ABSTAIN, $result);
     }
+
+    public function testNonClassSubject()
+    {
+        $result = $this->voter->vote($this->token, array(1, 2, 3), array(PublishWorkflowChecker::VIEW_ATTRIBUTE));
+        $this->assertEquals(VoterInterface::ACCESS_ABSTAIN, $result);
+    }
 }