Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 004abd4

Browse filesBrowse files
committed
[Messenger] Messenger options were merged with numbers as keys.
Polyfill php81 array_is_list used.
1 parent 2520b40 commit 004abd4
Copy full SHA for 004abd4

File tree

3 files changed

+6
-4
lines changed
Filter options

3 files changed

+6
-4
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
"symfony/polyfill-mbstring": "~1.0",
5050
"symfony/polyfill-php72": "~1.5",
5151
"symfony/polyfill-php73": "^1.11",
52-
"symfony/polyfill-php80": "^1.15"
52+
"symfony/polyfill-php80": "^1.15",
53+
"symfony/polyfill-php81": "^1.22"
5354
},
5455
"replace": {
5556
"symfony/asset": "self.version",

‎src/Symfony/Component/Config/Definition/PrototypedArrayNode.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ protected function normalizeValue($value)
225225

226226
$value = $this->remapXml($value);
227227

228-
$isAssoc = array_keys($value) !== range(0, \count($value) - 1);
228+
$isAssoc = !array_is_list($value);
229229
$normalized = [];
230230
foreach ($value as $k => $v) {
231231
if (null !== $this->keyAttribute && \is_array($v)) {
@@ -304,7 +304,7 @@ protected function mergeValues($leftSide, $rightSide)
304304
return $rightSide;
305305
}
306306

307-
$isAssoc = array_keys($rightSide) !== range(0, \count($rightSide) - 1);
307+
$isAssoc = !array_is_list($rightSide);
308308
foreach ($rightSide as $k => $v) {
309309
// prototype, and key is irrelevant there are no named keys, append the element
310310
if (null === $this->keyAttribute && !$isAssoc) {

‎src/Symfony/Component/Config/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/composer.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"require": {
1919
"php": ">=7.1.3",
2020
"symfony/filesystem": "^3.4|^4.0|^5.0",
21-
"symfony/polyfill-ctype": "~1.8"
21+
"symfony/polyfill-ctype": "~1.8",
22+
"symfony/polyfill-php81": "^1.22"
2223
},
2324
"require-dev": {
2425
"symfony/event-dispatcher": "^3.4|^4.0|^5.0",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.