Skip to content

Commit e74bdf0

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 c7e368d + 575f839 commit e74bdf0

File tree

5 files changed

+17
-0
lines changed

5 files changed

+17
-0
lines changed

HeaderBag.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@
1515
* HeaderBag is a container for HTTP headers.
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
18+
*
19+
* @implements \IteratorAggregate<string, array<int, string|null>>
1820
*/
1921
class HeaderBag implements \IteratorAggregate, \Countable
2022
{
2123
protected const UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
2224
protected const LOWER = '-abcdefghijklmnopqrstuvwxyz';
2325

26+
/**
27+
* @var array<string, array<int, string|null>>
28+
*/
2429
protected $headers = [];
2530
protected $cacheControl = [];
2631

@@ -57,6 +62,8 @@ public function __toString(): string
5762
* Returns the headers.
5863
*
5964
* @param string|null $key The name of the headers to return or null to get them all
65+
*
66+
* @return array<string, array<int, string|null>>|array<int, string|null>
6067
*/
6168
public function all(string $key = null): array
6269
{
@@ -69,6 +76,8 @@ public function all(string $key = null): array
6976

7077
/**
7178
* Returns the parameter keys.
79+
*
80+
* @return string[]
7281
*/
7382
public function keys(): array
7483
{

ParameterBag.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* ParameterBag is a container for key/value pairs.
1818
*
1919
* @author Fabien Potencier <fabien@symfony.com>
20+
*
21+
* @implements \IteratorAggregate<string, mixed>
2022
*/
2123
class ParameterBag implements \IteratorAggregate, \Countable
2224
{

Session/Attribute/AttributeBag.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
/**
1515
* This class relates to session attribute storage.
16+
*
17+
* @implements \IteratorAggregate<string, mixed>
1618
*/
1719
class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Countable
1820
{

Session/Attribute/AttributeBagInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public function set(string $name, mixed $value);
3737

3838
/**
3939
* Returns attributes.
40+
*
41+
* @return array<string, mixed>
4042
*/
4143
public function all(): array;
4244

Session/Session.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class_exists(SessionBagProxy::class);
2727
/**
2828
* @author Fabien Potencier <fabien@symfony.com>
2929
* @author Drak <drak@zikula.org>
30+
*
31+
* @implements \IteratorAggregate<string, mixed>
3032
*/
3133
class Session implements SessionInterface, \IteratorAggregate, \Countable
3234
{

0 commit comments

Comments
 (0)