Add Arrays::getNestedValue

wavevision · Nov 15, 2019 · a34de23 · a34de23
1 parent 21613e5
commit a34de23
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/src/Utils/Arrays.php b/src/Utils/Arrays.php
@@ -4,7 +4,6 @@
 
 use Flow\JSONPath\JSONPath;
 use Flow\JSONPath\JSONPathException;
-use Nette\InvalidArgumentException;
 use Nette\InvalidStateException;
 use Nette\Utils\ArrayHash;
 use Nette\Utils\Arrays as NetteArrays;
@@ -225,15 +224,12 @@ public static function fromArrayHash(ArrayHash $arrayHash): array
 
 	/**
 	 * @param array<mixed> $array
-	 * @param string ...$keyParts
+	 * @param string ...$keys
 	 * @return bool
 	 */
-	public static function hasNestedKey(array $array, string ...$keyParts): bool
+	public static function hasNestedKey(array $array, string ...$keys): bool
 	{
-		if (count($keyParts) === 0) {
-			throw new InvalidArgumentException('Argument "keyParts" should have at least one element.');
-		}
-		foreach ($keyParts as $keyPart) {
+		foreach ($keys as $keyPart) {
 			if (key_exists($keyPart, $array)) {
 				$array = $array[$keyPart];
 				if (!is_array($array)) {
@@ -246,6 +242,23 @@ public static function hasNestedKey(array $array, string ...$keyParts): bool
 		return true;
 	}
 
+	/**
+	 * @param array<mixed> $array
+	 * @param string ...$keys
+	 * @return mixed
+	 */
+	public static function getNestedValue(array $array, string ...$keys)
+	{
+		if (self::hasNestedKey($array, ...$keys)) {
+			$current = $array;
+			foreach ($keys as $key) {
+				$current = $current[$key];
+			}
+			return $current;
+		}
+		return null;
+	}
+
 	/**
 	 * @param array<mixed> $a1
 	 * @param array<mixed> $a2

diff --git a/tests/UtilsTests/ArraysTest.php b/tests/UtilsTests/ArraysTest.php
@@ -2,7 +2,6 @@
 
 namespace Wavevision\UtilsTests;
 
-use Nette\InvalidArgumentException;
 use Nette\InvalidStateException;
 use Nette\Utils\ArrayHash;
 use PHPUnit\Framework\TestCase;
@@ -140,9 +139,21 @@ public function testHasNestedKey(): void
 		$this->assertEquals(true, Arrays::hasNestedKey($array, 'parts', '0', 'format'));
 		$this->assertEquals(false, Arrays::hasNestedKey($array, 'parts', '1', 'format'));
 		$this->assertEquals(false, Arrays::hasNestedKey($array, '42'));
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Argument "keyParts" should have at least one element.');
-		Arrays::hasNestedKey([]);
+		$this->assertEquals(true, Arrays::hasNestedKey($array));
+	}
+
+	public function testGetNestedValue(): void
+	{
+		$array = [
+			'1' => [
+				'2' => 42,
+			],
+		];
+		$this->assertEquals(['2' => 42], Arrays::getNestedValue($array, '1'));
+		$this->assertEquals(42, Arrays::getNestedValue($array, '1', '2'));
+		$this->assertEquals(null, Arrays::getNestedValue($array, '3'));
+		$this->assertEquals(null, Arrays::getNestedValue([], 'x'));
+		$this->assertEquals($array, Arrays::getNestedValue($array));
 	}
 
 	public function testHasSameValues(): void