Skip to content

Commit 9c50d92

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: fix SQLSRV throws for method_exists() [HttpKernel] Add basic support for language negotiation [Messenger] Add a middleware to log when transaction has been left open [HttpClient] Add method to set response factory in mock client Move array_merge calls out of loops to improve performance Remove references to DBALException [VarDumper] Fix handling of "new" in initializers on PHP 8.1
2 parents c878cb8 + 98c4a5a commit 9c50d92

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Form.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ public function getPhpValues(): array
124124
if (!empty($qs)) {
125125
parse_str($qs, $expandedValue);
126126
$varName = substr($name, 0, \strlen(key($expandedValue)));
127-
$values = array_replace_recursive($values, [$varName => current($expandedValue)]);
127+
$values[] = [$varName => current($expandedValue)];
128128
}
129129
}
130130

131-
return $values;
131+
return array_replace_recursive([], ...$values);
132132
}
133133

134134
/**
@@ -161,11 +161,11 @@ function (&$value, $key) {
161161

162162
reset($expandedValue);
163163

164-
$values = array_replace_recursive($values, [$varName => current($expandedValue)]);
164+
$values[] = [$varName => current($expandedValue)];
165165
}
166166
}
167167

168-
return $values;
168+
return array_replace_recursive([], ...$values);
169169
}
170170

171171
/**

0 commit comments

Comments
 (0)