Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-11 06:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Orange-Management/phpOMS into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-08-29 16:35:20 +02:00
commit 10494cc160
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Utils/ArrayUtils.php
View File

@ -57,7 +57,7 @@ final class ArrayUtils
throw new \Exception(); throw new \Exception();
} }
foreach ($nodes as &$node) { foreach ($nodes as $node) {
$prevEl = &$el; $prevEl = &$el;
if (!isset($el[$node])) { if (!isset($el[$node])) {
@ -102,10 +102,10 @@ final class ArrayUtils
if ($overwrite) { if ($overwrite) {
$current = $value; $current = $value;
} elseif (\is_array($current) && !is_array($value)) { } elseif (\is_array($current) && !\is_array($value)) {
$current[] = $value; $current[] = $value;
} elseif (\is_array($current) && is_array($value)) { } elseif (\is_array($current) && \is_array($value)) {
$current = array_merge($current, $value); $current = \array_merge($current, $value);
} elseif (\is_scalar($current) && $current !== null) { } elseif (\is_scalar($current) && $current !== null) {
$current = [$current, $value]; $current = [$current, $value];
} else { } else {