diff --git a/rules/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php b/rules/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php index bc91e3fea0c..d34120d578f 100644 --- a/rules/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php +++ b/rules/CodeQuality/Rector/FuncCall/ArrayMergeOfNonArraysToSimpleArrayRector.php @@ -78,7 +78,7 @@ CODE_SAMPLE if (!$nestedArrayItemItem instanceof ArrayItem) { continue; } - $array->items[] = new ArrayItem($nestedArrayItemItem->value, $nestedArrayItemItem->key); + $array->items[] = $nestedArrayItemItem->unpack ? $nestedArrayItemItem : new ArrayItem($nestedArrayItemItem->value, $nestedArrayItemItem->key); $isAssigned = \true; } } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 6c17ee228c5..4031f6c9cfd 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '2846b015388fb1eb6d65941481fe9340908c1f79'; + public const PACKAGE_VERSION = '1cd83bef6196e8b8913d2252a6c8a826bafcf62a'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-03-03 09:17:43'; + public const RELEASE_DATE = '2024-03-03 09:30:52'; /** * @var int */