From 70610fbd70b5959c9700b44a1d32f6839529c829 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 28 Aug 2018 19:50:07 +0200
Subject: [PATCH 1/4] Remove unused reference

---
 Utils/ArrayUtils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Utils/ArrayUtils.php b/Utils/ArrayUtils.php
index b0356dcfb..b87b6c5a1 100644
--- a/Utils/ArrayUtils.php
+++ b/Utils/ArrayUtils.php
@@ -57,7 +57,7 @@ final class ArrayUtils
             throw new \Exception();
         }
 
-        foreach ($nodes as &$node) {
+        foreach ($nodes as $node) {
             $prevEl = &$el;
 
             if (!isset($el[$node])) {

From a022348e4768ae2d66e50772c5fa4447aefacd86 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 28 Aug 2018 20:13:46 +0200
Subject: [PATCH 2/4] Fix namespace

---
 Utils/ArrayUtils.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Utils/ArrayUtils.php b/Utils/ArrayUtils.php
index b87b6c5a1..d4487d8fd 100644
--- a/Utils/ArrayUtils.php
+++ b/Utils/ArrayUtils.php
@@ -102,10 +102,10 @@ final class ArrayUtils
 
         if ($overwrite) {
             $current = $value;
-        } elseif (\is_array($current) && !is_array($value)) {
+        } elseif (\is_array($current) && !\is_array($value)) {
             $current[] = $value;
-        } elseif (\is_array($current) && is_array($value)) {
-            $current = array_merge($current, $value);
+        } elseif (\is_array($current) && \is_array($value)) {
+            $current = \array_merge($current, $value);
         } elseif (\is_scalar($current) && $current !== null) {
             $current = [$current, $value];
         } else {

From a37dd5e792bed8e62787de22397ae7cf0e2e0685 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 28 Aug 2018 20:17:22 +0200
Subject: [PATCH 3/4] Create array if not existing

---
 Utils/ArrayUtils.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Utils/ArrayUtils.php b/Utils/ArrayUtils.php
index d4487d8fd..b1340a5b0 100644
--- a/Utils/ArrayUtils.php
+++ b/Utils/ArrayUtils.php
@@ -95,9 +95,17 @@ final class ArrayUtils
         if ($pathParts === false) {
             throw new \Exception();
         }
+        
+        $pathPartCount = \count($pathParts);
+        $c             = 1;
 
         foreach ($pathParts as $key) {
+            if (!isset($current[$key]) && $pathPartCount < $c) {
+                $current = [];
+            }
+            
             $current = &$current[$key];
+            ++$c;
         }
 
         if ($overwrite) {

From 39b6f656f640dae71e85bf36a06f0dc410b8f42d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 28 Aug 2018 20:21:17 +0200
Subject: [PATCH 4/4] Undo creating new sub arrays as this seems to be not
 required

---
 Utils/ArrayUtils.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Utils/ArrayUtils.php b/Utils/ArrayUtils.php
index b1340a5b0..d4487d8fd 100644
--- a/Utils/ArrayUtils.php
+++ b/Utils/ArrayUtils.php
@@ -95,17 +95,9 @@ final class ArrayUtils
         if ($pathParts === false) {
             throw new \Exception();
         }
-        
-        $pathPartCount = \count($pathParts);
-        $c             = 1;
 
         foreach ($pathParts as $key) {
-            if (!isset($current[$key]) && $pathPartCount < $c) {
-                $current = [];
-            }
-            
             $current = &$current[$key];
-            ++$c;
         }
 
         if ($overwrite) {