adding regression tests for a bug when inserting a value for a/b/c wh…

…en the array is empty
mathiasgrimm · Apr 26, 2016 · c5bb1ed · c5bb1ed
1 parent 578966a
commit c5bb1ed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/ArrayPath.php b/src/ArrayPath.php
@@ -88,14 +88,14 @@ public static function set(&$aSource, $mIndex, $mValue)
         $mCurSource = &$aSource;
 
         foreach ($aPath as $mPath) {
-            if (array_key_exists($mPath, (array) $mCurSource)) {
-                $mCurSource = &$mCurSource[$mPath];
-            } else {
+            if (!array_key_exists($mPath, (array) $mCurSource)) {
                 $mCurSource[$mPath] = array();
             }
+
+            $mCurSource = &$mCurSource[$mPath];
         }
 
-        $mCurSource[$mPath] = $mValue;
+        $mCurSource = $mValue;
 
         return $mValue;
     }

diff --git a/test/src/ArrayPathTest.php b/test/src/ArrayPathTest.php
@@ -126,6 +126,21 @@ public function testSet()
         $this->assertEquals(17, ArrayPath::set($aSource, 'l1-2/l2-2/l3-3', 17));
         $this->assertEquals($aExpected, $aSource);
     }
+
+    public function testSetWithoutParent()
+    {
+        $aSource = array();
+
+        $aExpected   = array(
+            'l1-2' => array(
+                'l2-2' => array(
+                    'l3-3' => 17
+                )
+            )
+        );
+        $this->assertEquals(17, ArrayPath::set($aSource, 'l1-2/l2-2/l3-3', 17));
+        $this->assertEquals($aExpected, $aSource);
+    }
 
     public function testRemove()
     {