Skip to content

Commit c9c7c7f

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 579766f + 0b0aaa6 commit c9c7c7f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Definition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ public function setAutowired(bool $autowired): static
743743
/**
744744
* Gets bindings.
745745
*
746-
* @return array|BoundArgument[]
746+
* @return BoundArgument[]
747747
*/
748748
public function getBindings(): array
749749
{

Dumper/PhpDumper.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class PhpDumper extends Dumper
6262
*/
6363
public const NON_FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_';
6464

65+
/** @var \SplObjectStorage<Definition, Variable>|null */
6566
private ?\SplObjectStorage $definitionVariables = null;
6667
private ?array $referenceVariables = null;
6768
private int $variableCount;

0 commit comments

Comments
 (0)