Skip to content

Commit 07f444b

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Profiler] relax return type for memory data collector Fix param annotation in HttpKernelBrowser [Cache] fix compat with apcu < 5.1.10 Expand FormView key to include int [PropertyInfo] PhpStan extractor nested object fix [Console] Fix autocompletion of argument with default value Run `open_basedir` tests in separate processes
2 parents 65c14e9 + 2083142 commit 07f444b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

FormView.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
/**
1717
* @author Bernhard Schussek <[email protected]>
1818
*
19-
* @implements \ArrayAccess<string, FormView>
20-
* @implements \IteratorAggregate<string, FormView>
19+
* @implements \ArrayAccess<int|string, FormView>
20+
* @implements \IteratorAggregate<int|string, FormView>
2121
*/
2222
class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
2323
{
@@ -37,7 +37,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
3737
/**
3838
* The child views.
3939
*
40-
* @var array<string, FormView>
40+
* @var array<int|string, FormView>
4141
*/
4242
public $children = [];
4343

@@ -100,7 +100,7 @@ public function setMethodRendered()
100100
/**
101101
* Returns a child by name (implements \ArrayAccess).
102102
*
103-
* @param string $name The child name
103+
* @param int|string $name The child name
104104
*/
105105
public function offsetGet(mixed $name): self
106106
{
@@ -110,7 +110,7 @@ public function offsetGet(mixed $name): self
110110
/**
111111
* Returns whether the given child exists (implements \ArrayAccess).
112112
*
113-
* @param string $name The child name
113+
* @param int|string $name The child name
114114
*/
115115
public function offsetExists(mixed $name): bool
116116
{
@@ -130,7 +130,7 @@ public function offsetSet(mixed $name, mixed $value): void
130130
/**
131131
* Removes a child (implements \ArrayAccess).
132132
*
133-
* @param string $name The child name
133+
* @param int|string $name The child name
134134
*/
135135
public function offsetUnset(mixed $name): void
136136
{
@@ -140,7 +140,7 @@ public function offsetUnset(mixed $name): void
140140
/**
141141
* Returns an iterator to iterate over children (implements \IteratorAggregate).
142142
*
143-
* @return \ArrayIterator<string, FormView>
143+
* @return \ArrayIterator<int|string, FormView>
144144
*/
145145
public function getIterator(): \ArrayIterator
146146
{

0 commit comments

Comments
 (0)