Merge remote-tracking branch 'origin/master'

Author: odan

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 dist: xenial
 

src/ArrayReader.php

@@ -283,6 +283,14 @@ public function findChronos(string $key, Chronos $default = null)
      */
     public function find(string $path, $default = null)
     {
+        if (array_key_exists($path, $this->data)) {
+            return $this->data[$path] ?? $default;
+        }
+
+        if (strpos($path, '.') === false) {
+            return $default;
+        }
+
         $pathKeys = explode('.', $path);
 
         $arrayCopyOrValue = $this->data;

tests/ArrayReaderTest.php

@@ -11,6 +11,109 @@
  */
 class ArrayReaderTest extends TestCase
 {
+    /**
+     * Test.
+     *
+     * @dataProvider providerGetInt
+     *
+     * @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 testGetInt($data, string $key, $default, $expected)
+    {
+        $reader = new ArrayReader($data);
+        static::assertSame($expected, $reader->getInt($key, $default));
+    }
+
+    /**
+     * Test.
+     *
+     * @dataProvider providerGetIntError
+     *
+     * @param mixed $data The data
+     * @param string $key The lookup key
+     * @param mixed $default The default value
+     *
+     * @return void
+     */
+    public function testGetIntError($data, string $key, $default)
+    {
+        $reader = new ArrayReader($data);
+
+        $this->expectException(InvalidArgumentException::class);
+
+        $reader->getInt($key, $default);
+    }
+
+    /**
+     * Test.
+     *
+     * @dataProvider providerFindInt
+     *
+     * @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 testFindInt($data, string $key, $default, $expected)
+    {
+        $reader = new ArrayReader($data);
+        static::assertSame($expected, $reader->findInt($key, $default));
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerGetInt(): array
+    {
+        return [
+            [[0, 1, 2, 3], 0, null, 0],
+            [[0, 1, 2, 3], 1, null, 1],
+            [[0, 1, 2, 3], 2, null, 2],
+            [[0, 1, 2, 3], 3, null, 3],
+        ];
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerGetIntError(): array
+    {
+        return [
+            [[0, 1, 2, 3], 4, null],
+            [[0, 1, 2, 3, null], 4, null],
+            [[0, 1, 2, null, 4], 3, null],
+        ];
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerFindInt(): array
+    {
+        return [
+            [[0, 1, 2, 3], 0, null, 0],
+            [[0, 1, 2, 3], 1, null, 1],
+            [[0, 1, 2, 3], 2, null, 2],
+            [[0, 1, 2, 3], 3, null, 3],
+            [[0, 1, 2, 3], 4, null, null],
+            [[0, 1, 2, 3, null], 4, null, null],
+            [[0, 1, 2, null, 4], 3, null, null],
+        ];
+    }
+
     /**
      * Test.
      *
@@ -115,4 +218,106 @@ public function providerFindString(): array
             [['key' => ['key2' => 'value']], 'key.nope', 'default', 'default'],
         ];
     }
+
+    /**
+     * Test.
+     *
+     * @dataProvider providerGetArray
+     *
+     * @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 testGetArray($data, string $key, $default, $expected)
+    {
+        $reader = new ArrayReader($data);
+        static::assertSame($expected, $reader->getArray($key, $default));
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerGetArray(): array
+    {
+        return [
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 0, null, [1, 2, 3, 4]],
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 1, null, [2, 3, 4, 5, 6]],
+            [[['key' => 'value'], ['key2' => 'value2']], 0, null, ['key' => 'value']],
+            [[['key' => 'value'], ['key2' => 'value2']], 1, null, ['key2' => 'value2']],
+        ];
+    }
+
+    /**
+     * Test.
+     *
+     * @dataProvider providerGetArrayError
+     *
+     * @param mixed $data The data
+     * @param string $key The lookup key
+     * @param mixed $default The default value
+     *
+     * @return void
+     */
+    public function testGetArrayError($data, string $key, $default)
+    {
+        $reader = new ArrayReader($data);
+
+        $this->expectException(InvalidArgumentException::class);
+
+        $reader->getArray($key, $default);
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerGetArrayError(): array
+    {
+        return [
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 2, null],
+            [[['key' => 'value'], ['key2' => 'value2']], 2, null],
+        ];
+    }
+
+    /**
+     * Test.
+     *
+     * @dataProvider providerFindArray
+     *
+     * @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 testFindArray($data, string $key, $default, $expected)
+    {
+        $reader = new ArrayReader($data);
+        static::assertSame($expected, $reader->findArray($key, $default));
+    }
+
+    /**
+     * Provider.
+     *
+     * @return array[] The test data
+     */
+    public function providerFindArray(): array
+    {
+        return [
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 0, null, [1, 2, 3, 4]],
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 1, null, [2, 3, 4, 5, 6]],
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 2, [], []],
+            [[[1, 2, 3, 4], [2, 3, 4, 5, 6]], 2, null, null],
+            [[['key' => 'value'], ['key2' => 'value2']], 0, null, ['key' => 'value']],
+            [[['key' => 'value'], ['key2' => 'value2']], 1, null, ['key2' => 'value2']],
+            [[['key' => 'value'], ['key2' => 'value2']], 2, null, null],
+        ];
+    }
 }