Skip to content

Commit cbe8436

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Leverage array_is_list drop dev dependency on the HttpClient component
2 parents 1bfbd24 + aa119e5 commit cbe8436

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
328328
$workflows = [];
329329
}
330330

331-
if (1 === \count($workflows) && isset($workflows['workflows']) && array_keys($workflows['workflows']) !== range(0, \count($workflows) - 1) && !empty(array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_marking', 'places', 'transitions']))) {
331+
if (1 === \count($workflows) && isset($workflows['workflows']) && !array_is_list($workflows['workflows']) && !empty(array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_marking', 'places', 'transitions']))) {
332332
$workflows = $workflows['workflows'];
333333
}
334334

@@ -1251,7 +1251,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
12511251
->ifString()->then(function ($v) { return ['default' => $v]; })
12521252
->end()
12531253
->beforeNormalization()
1254-
->ifTrue(function ($v) { return \is_array($v) && array_keys($v) === range(0, \count($v) - 1); })
1254+
->ifTrue(function ($v) { return \is_array($v) && array_is_list($v); })
12551255
->then(function ($v) {
12561256
$resources = [];
12571257
foreach ($v as $resource) {

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"symfony/http-foundation": "^5.4|^6.0",
2828
"symfony/http-kernel": "^5.4|^6.0",
2929
"symfony/polyfill-mbstring": "~1.0",
30+
"symfony/polyfill-php81": "^1.22",
3031
"symfony/filesystem": "^5.4|^6.0",
3132
"symfony/finder": "^5.4|^6.0",
3233
"symfony/routing": "^5.4|^6.0"

0 commit comments

Comments
 (0)