Init

Author: odan

src/ArrayReader.php

@@ -2,6 +2,7 @@
 
 namespace Selective\ArrayReader;
 
+use Cake\Chronos\Chronos;
 use Exception;
 use InvalidArgumentException;
 
@@ -269,23 +270,18 @@ public function findChronos(string $key, Chronos $default = null)
      */
     public function find(string $path, $default = null)
     {
-        if (strpos($path, '.') === false) {
-            return $this->data[$path] ?? $default;
-        }
+        $pathKeys = explode('.', $path);
 
-        $parts = explode('.', $path);
-        $value = &$this->data;
+        $arrayCopyOrValue = $this->data;
 
-        foreach ($parts as $key) {
-            if (isset($value[$key])) {
-                $value = &$value[$key];
-            } else {
+        foreach ($pathKeys as $pathKey) {
+            if (!isset($arrayCopyOrValue[$pathKey])) {
                 return $default;
             }
+            $arrayCopyOrValue = $arrayCopyOrValue[$pathKey];
         }
-        $value = &$this->$value;
 
-        return $value;
+        return $arrayCopyOrValue;
     }
 
     /**
@@ -311,19 +307,15 @@ public function all(): array
      */
     public function exists(string $path): bool
     {
-        if (strpos($path, '.') === false) {
-            return array_key_exists($path, $this->data);
-        }
+        $pathKeys = explode('.', $path);
 
-        $parts = explode('.', $path);
+        $arrayCopyOrValue = $this->data;
 
-        $temp = &$this->data;
-        foreach ($parts as $key) {
-            if (array_key_exists($key, $temp)) {
-                $temp = &$this->data[$key];
-            } else {
+        foreach ($pathKeys as $pathKey) {
+            if (!array_key_exists($pathKey, $arrayCopyOrValue)) {
                 return false;
             }
+            $arrayCopyOrValue = $arrayCopyOrValue[$pathKey];
         }
 
         return true;

tests/ArrayReaderTest.php

@@ -13,11 +13,33 @@ class ArrayReaderTest extends TestCase
     /**
      * Test.
      *
+     * @dataProvider providerGetString
+     *
+     * @param mixed $data The data
+     * @param string $key The lookup key
+     * @param mixed $default The default value
+     * @param mixed $expected The expected value
+     *
      * @return void
      */
-    public function testGetString()
+    public function testGetString($data, string $key, $default, $expected)
+    {
+        $reader = new ArrayReader($data);
+        static::assertSame($expected, $reader->getString($key, $default));
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerGetString(): array
     {
-        $reader = new ArrayReader(['key' => 'value']);
-        static::assertSame('value', $reader->getString('key'));
+        return [
+            [['key' => 'value'], 'key', null, 'value'],
+            [['key' => 'value'], 'nope', 'default', 'default'],
+            [['key' => ['key2' => 'value']], 'key.key2', null, 'value'],
+            [['key' => ['key2' => 'value']], 'key.nope', 'default', 'default'],
+        ];
     }
 }