Skip to content

Commit f7bee21

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Console] Restore psr/log >= 3.0 conflict [Security] Make the abstract Voter class implement CacheableVoterInterface Add generic types to traversable implementations [Security] Fix TypeError message [Security] Fix deprecation layer [FrameworkBundle] Add completion for workflow:dump Fix cancel button Fix misleading error on missing provider with authenticator manager Don't limit retries of toolbar loading
2 parents df4a51c + 9ac7f2f commit f7bee21

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

ConstraintViolationList.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* Default implementation of {@ConstraintViolationListInterface}.
1616
*
1717
* @author Bernhard Schussek <[email protected]>
18+
*
19+
* @implements \IteratorAggregate<int, ConstraintViolationInterface>
1820
*/
1921
class ConstraintViolationList implements \IteratorAggregate, ConstraintViolationListInterface
2022
{
@@ -131,7 +133,7 @@ public function offsetExists(mixed $offset): bool
131133
return $this->has($offset);
132134
}
133135

134-
public function offsetGet(mixed $offset): mixed
136+
public function offsetGet(mixed $offset): ConstraintViolationInterface
135137
{
136138
return $this->get($offset);
137139
}

ConstraintViolationListInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
* A list of constraint violations.
1616
*
1717
* @author Bernhard Schussek <[email protected]>
18+
*
19+
* @extends \ArrayAccess<int, ConstraintViolationInterface>
20+
* @extends \Traversable<int, ConstraintViolationInterface>
1821
*/
1922
interface ConstraintViolationListInterface extends \Traversable, \Countable, \ArrayAccess
2023
{

Constraints/GroupSequence.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class GroupSequence
5757
/**
5858
* The groups in the sequence.
5959
*
60-
* @var array<string|string[]|GroupSequence>
60+
* @var array<int, string|string[]|GroupSequence>
6161
*/
6262
public $groups;
6363

Context/ExecutionContext.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ class ExecutionContext implements ExecutionContextInterface
103103
*/
104104
private array $initializedObjects = [];
105105

106+
/**
107+
* @var \SplObjectStorage<object, string>
108+
*/
106109
private \SplObjectStorage $cachedObjectsRefs;
107110

108111
/**

0 commit comments

Comments
 (0)