Skip to content

Commit 1f23c3f

Browse files
Merge branch '4.4'
* 4.4: [Debug] Improve UPGRADE files remove wrongly added legacy group from test consistently throw NotSupportException [HttpKernel] Clarify error handler restoring process again [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt add missing conflict rule [Intl] fix nullable phpdocs and useless method visibility of internal class remove some more useless phpdocs Resilience against file_get_contents() race conditions. Turned return type annotations of private methods into php return types.
2 parents 52ae76b + e40f777 commit 1f23c3f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

FormFieldRegistry.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,8 @@ private static function create(string $base, array $values)
154154

155155
/**
156156
* Transforms a PHP array in a list of fully qualified name / value.
157-
*
158-
* @return array The list of fields as [string] Fully qualified name => (mixed) value)
159157
*/
160-
private function walk(array $array, ?string $base = '', array &$output = [])
158+
private function walk(array $array, ?string $base = '', array &$output = []): array
161159
{
162160
foreach ($array as $k => $v) {
163161
$path = empty($base) ? $k : sprintf('%s[%s]', $base, $k);
@@ -178,7 +176,7 @@ private function walk(array $array, ?string $base = '', array &$output = [])
178176
*
179177
* @return string[] The list of segments
180178
*/
181-
private function getSegments(string $name)
179+
private function getSegments(string $name): array
182180
{
183181
if (preg_match('/^(?P<base>[^[]+)(?P<extra>(\[.*)|$)/', $name, $m)) {
184182
$segments = [$m['base']];

0 commit comments

Comments
 (0)