diff --git a/docs/changelogs/v4.7.7.md b/docs/changelogs/v4.7.7.md index d817d9932f94..e5ce1e52355c 100644 --- a/docs/changelogs/v4.7.7.md +++ b/docs/changelogs/v4.7.7.md @@ -27,6 +27,7 @@ Release Date: Unreleased - **Database:** Fixed a bug where `SQLite3\Connection::_foreignKeyData()` did not escape table identifiers in `PRAGMA foreign_key_list`, causing syntax errors on table names containing hyphens or schemas. - **Database:** Fixed a bug where `SQLite3\Table::dropIndexes()` used single-quoted string literals instead of escaped identifiers in `DROP INDEX IF EXISTS`, causing syntax errors on index names containing quotes or special characters. - **Helpers:** Fixed a bug where `excerpt()` threw a `TypeError` when `$phrase` was not found in `$text` or when `$phrase` was `null` and `$radius` was an odd integer. When `$phrase` is not found, `excerpt()` now falls back to extracting an excerpt from the beginning of `$text`. +- **Helpers:** Fixed bugs in `ArrayHelper::dotKeyExists()` where `'0'` path segments caused early loop termination, non-array intermediate values threw a `TypeError`, and paths with segments after a wildcard failed when the wildcard matched multiple elements. - **HTTP:** Fixed a bug where query-string based routing truncated additional query parameters in `SiteURIFactory::parseRequestURI()` due to incorrect array index access. - **HTTP:** Fixed a bug where `UploadedFile::move()` and `UploadedFile::store()` on Windows could store a file under a different name than `getName()` reported, or write its contents to an NTFS alternate data stream. Filenames ending in a period or space or containing a colon are now rejected, including explicitly supplied names. - **Images:** Fixed a bug in `ImageMagickHandler::save()` where saving without an extension or with an unsupported extension threw an `ImagickException` instead of falling back to the image's format. diff --git a/system/Helpers/Array/ArrayHelper.php b/system/Helpers/Array/ArrayHelper.php index b48efbfc4802..6af6ecc506d2 100644 --- a/system/Helpers/Array/ArrayHelper.php +++ b/system/Helpers/Array/ArrayHelper.php @@ -143,30 +143,50 @@ public static function dotKeyExists(string $index, array $array): bool return false; } - $currentArray = $array; + return self::checkDotKeyExists($indexes, $array); + } + /** + * Recursively check if the key exists in the array with wildcards. + * + * @used-by dotKeyExists() + * + * @param list $indexes + * @param array $currentArray + */ + private static function checkDotKeyExists(array $indexes, array $currentArray): bool + { // Grab the current index - while ($currentIndex = array_shift($indexes)) { + while ($indexes !== []) { + $currentIndex = array_shift($indexes); + if ($currentIndex === '*') { - $currentIndex = array_shift($indexes); + if (! is_array($currentArray) || $currentArray === []) { + return false; + } - foreach ($currentArray as $item) { - if (! array_key_exists($currentIndex, $item)) { - return false; + if (count($indexes) === 1) { + $nextIndex = $indexes[0]; + + foreach ($currentArray as $item) { + if (! is_array($item) || ! array_key_exists($nextIndex, $item)) { + return false; + } } - } - // If indexes is empty, all elements are checked. - if ($indexes === []) { return true; } - $currentArray = self::dotSearch('*.' . $currentIndex, $currentArray); + foreach ($currentArray as $item) { + if (! is_array($item) || ! self::checkDotKeyExists($indexes, $item)) { + return false; + } + } - continue; + return true; } - if (! array_key_exists($currentIndex, $currentArray)) { + if (! is_array($currentArray) || ! array_key_exists($currentIndex, $currentArray)) { return false; } diff --git a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php index 432fafcf1a0c..c68919959031 100644 --- a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php +++ b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php @@ -43,7 +43,13 @@ public function testDotKeyExists(): void $this->assertTrue(ArrayHelper::dotKeyExists('contacts.friends', $this->array)); $this->assertFalse(ArrayHelper::dotKeyExists('not.friends', $this->array)); $this->assertTrue(ArrayHelper::dotKeyExists('contacts.friends.0.name', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('contacts.friends.0.nonexistent', $this->array)); $this->assertFalse(ArrayHelper::dotKeyExists('contacts.friends.1.name', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('0', [])); + $this->assertTrue(ArrayHelper::dotKeyExists('0', ['0' => 'value'])); + $this->assertTrue(ArrayHelper::dotKeyExists('0', ['0' => null])); + $this->assertFalse(ArrayHelper::dotKeyExists('contacts.friends.0.name.sub', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('contacts.friends.1.age.sub', $this->array)); } public function testDotKeyExistsWithEndingWildCard(): void @@ -72,6 +78,36 @@ public function testDotKeyExistsWithWildCard(): void $this->assertTrue(ArrayHelper::dotKeyExists('contacts.*.0.age', $this->array)); $this->assertTrue(ArrayHelper::dotKeyExists('contacts.*.1.age', $this->array)); $this->assertTrue(ArrayHelper::dotKeyExists('contacts.*.0.name', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('contacts.*.0.nonexistent', $this->array)); $this->assertFalse(ArrayHelper::dotKeyExists('contacts.*.1.name', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('contacts.friends.*.age.sub', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('contacts.friends.1.age.*.sub', $this->array)); + $this->assertFalse(ArrayHelper::dotKeyExists('*.name', [['name' => 'Fred'], 'not-an-array'])); + $this->assertFalse(ArrayHelper::dotKeyExists('*.name', [])); + } + + public function testDotKeyExistsWithZeroIndexAfterWildCard(): void + { + $array = [ + 'users' => [ + ['contacts' => [['email' => 'alice@example.com']]], + ['contacts' => [['email' => 'bob@example.com']]], + ], + ]; + + $this->assertTrue(ArrayHelper::dotKeyExists('users.*.contacts.0.email', $array)); + $this->assertTrue(ArrayHelper::dotKeyExists('users.*.contacts.*.email', $array)); + $this->assertFalse(ArrayHelper::dotKeyExists('users.*.contacts.0.nonexistent', $array)); + $this->assertFalse(ArrayHelper::dotKeyExists('users.*.contacts.1.email', $array)); + + $arrayWithMissingKey = [ + 'users' => [ + ['contacts' => [['email' => 'alice@example.com']]], + ['contacts' => [['name' => 'Bob']]], + ], + ]; + + $this->assertFalse(ArrayHelper::dotKeyExists('users.*.contacts.0.email', $arrayWithMissingKey)); + $this->assertFalse(ArrayHelper::dotKeyExists('users.*.contacts.*.email', $arrayWithMissingKey)); } }