Merge pull request #166 from m-safwan/fix_fetch_incorrect_keys

anlutro · Oct 26, 2022 · e154dbb · e154dbb
2 parents 679bba8 + bd11529
commit e154dbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/SettingStore.php b/src/SettingStore.php
@@ -231,7 +231,7 @@ public function load($force = false)
 		if (!$this->loaded || $force) {
 			$this->data = $this->readData();
             $this->persistedData = $this->data;
-            $this->data = array_merge($this->updatedData, $this->data);
+            $this->data = $this->updatedData + $this->data;
             $this->loaded = true;
 		}
 	}

diff --git a/tests/functional/AbstractFunctionalTest.php b/tests/functional/AbstractFunctionalTest.php
@@ -145,4 +145,15 @@ public function defaults_are_respected()
 		$this->assertStoreEquals($store, ['foo' => 'bar']);
 		$this->assertStoreKeyEquals($store, ['foo', 'bar'], ['foo' => 'bar', 'bar' => 'default']);
 	}
+
+    /** @test */
+    public function numeric_keys_are_retrieved_correctly()
+    {
+        $store = $this->getStore();
+        $store->set('1234', 'foo');
+        $store->set('9876', 'bar');
+        $store->load(true);
+        $this->assertStoreEquals($store, ['1234' => 'foo', '9876' => 'bar']);
+        $this->assertStoreKeyEquals($store, ['1234', '9876'], ['1234' => 'foo', '9876' => 'bar']);
+    }
 }