Skip to content

Commit becd745

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (27 commits) feat: add completion for DebugAutowiring search argument [Routing] Add support for aliasing routes [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS [Console] Open CompleteCommand for custom outputs [Intl] Update the ICU data to 70.1 [Messenger] Add completion for failed messages commands. Fix tests Fixing missing full_stack variable that's needed by toolbar.html.twig [PropertyInfo] Bump phpstan/phpdoc-parser [Security] Backport type fixes [VarExporter] escape unicode chars involved in directionality [Framework] Add completion to debug:container [Messenger] Add completion to command messenger:consume [Intl] Update the ICU data to 70.1 Fix more generic types Default access_decision_manager.strategy option with merge. Fix typos Update validators.ca.xlf Add missing Validator translations for Estonian ... Signed-off-by: Alexander M. Turek <me@derrabus.de>
2 parents c0e076b + a19e5ae commit becd745

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Authorization/TraceableAccessDecisionManager.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class TraceableAccessDecisionManager implements AccessDecisionManagerInterface
2727
{
2828
private AccessDecisionManagerInterface $manager;
2929
private AccessDecisionStrategyInterface $strategy;
30+
/** @var iterable<mixed, VoterInterface> */
3031
private iterable $voters = [];
3132
private array $decisionLog = []; // All decision logs
3233
private array $currentLog = []; // Logs being filled in
@@ -97,7 +98,7 @@ public function getStrategy(): string
9798
}
9899

99100
/**
100-
* @return iterable<int, VoterInterface>
101+
* @return iterable<mixed, VoterInterface>
101102
*/
102103
public function getVoters(): iterable
103104
{

Role/RoleHierarchy.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@
1919
class RoleHierarchy implements RoleHierarchyInterface
2020
{
2121
private array $hierarchy;
22+
/** @var array<string, list<string>> */
2223
protected $map;
2324

25+
/**
26+
* @param array<string, list<string>> $hierarchy
27+
*/
2428
public function __construct(array $hierarchy)
2529
{
2630
$this->hierarchy = $hierarchy;

User/InMemoryUserProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InMemoryUserProvider implements UserProviderInterface
3333
* The user array is a hash where the keys are usernames and the values are
3434
* an array of attributes: 'password', 'enabled', and 'roles'.
3535
*
36-
* @param array $users An array of users
36+
* @param array<string, array{password?: string, enabled?: bool, roles?: list<string>}> $users An array of users
3737
*/
3838
public function __construct(array $users = [])
3939
{

0 commit comments

Comments
 (0)