Make sure we check all attributes

symfony · Nyholm · Mar 10, 2023 · Mar 11, 2023 · Mar 11, 2023 · 940ad0f44c513e3ce26a6c37efc3da3b62dee9eb
commit 940ad0f44c513e3ce26a6c37efc3da3b62dee9eb
@@ -102,15 +102,16 @@ private function getVoters(array $attributes, $object = null): iterable
            }
        }

+        $voters = [];
        foreach ($this->voters as $key => $voter) {
            if (!$voter instanceof CacheableVoterInterface) {
                $this->nonCachableVoters[$key] = $voter;
-                yield $voter;
+                $voters[] = $voter;
                continue;
            }

            $supports = true;
-            $supportedAttribute = null;
+            $supportedAttributes = [];
            // The voter supports the attributes if it supports at least one attribute of the list
            foreach ($keyAttributes as $keyAttribute) {
                if (null === $keyAttribute) {
@@ -121,11 +122,10 @@ private function getVoters(array $attributes, $object = null): iterable
                    $supports = $this->votersCacheAttributes[$keyAttribute][$key];
                }
                if ($supports) {
-                    $supportedAttribute = $keyAttribute;
-                    break;
+                    $supportedAttributes[] = $keyAttribute;
                }
            }
-            if (!$supports) {
+            if (!$supports && [] === $supportedAttributes) {
                continue;
            }

@@ -138,8 +138,13 @@ private function getVoters(array $attributes, $object = null): iterable
                continue;
            }

-            $this->cachedVoters[$supportedAttribute][$keyObject][$key] = $voter;
-            yield $voter;
+            foreach ($supportedAttributes as $supportedAttribute) {
+                $this->cachedVoters[$supportedAttribute][$keyObject][$key] = $voter;
+            }
+
+            $voters[] = $voter;
        }
+
+        yield from $voters;
    }
 }