Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelogs/v4.7.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Release Date: Unreleased

## Bugs Fixed

- **Helpers:** Fixed a bug in `ArrayHelper::dotKeyExists()` where `'0'` path segments caused early loop termination and returned `true`, and non-array intermediate values threw a `TypeError`.
- **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.
- **Security:** Fixed a bug where `Security::__construct()` threw a `TypeError` when the CSRF cookie was an array, causing an HTTP 500 response for affected requests.
- **Worker Mode:** Fixed a bug where every request that ended with an uncaught exception, including a `404 Page Not Found` without a 404 override, called `exit()` in the exception handler. This ended the worker script, so FrankenPHP booted a new one, and the worker loop skipped its cleanup after the request. The exception handler now returns to the worker loop.
Expand Down
10 changes: 7 additions & 3 deletions system/Helpers/Array/ArrayHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,16 @@ public static function dotKeyExists(string $index, array $array): bool
$currentArray = $array;

// Grab the current index
while ($currentIndex = array_shift($indexes)) {
while (($currentIndex = array_shift($indexes)) !== null) {
if ($currentIndex === '*') {
$currentIndex = array_shift($indexes);

if (! is_array($currentArray)) {
return false;
}

foreach ($currentArray as $item) {
if (! array_key_exists($currentIndex, $item)) {
if (! is_array($item) || ! array_key_exists($currentIndex, $item)) {
return false;
}
}
Expand All @@ -166,7 +170,7 @@ public static function dotKeyExists(string $index, array $array): bool
continue;
}

if (! array_key_exists($currentIndex, $currentArray)) {
if (! is_array($currentArray) || ! array_key_exists($currentIndex, $currentArray)) {
return false;
}

Expand Down
10 changes: 10 additions & 0 deletions tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -72,6 +78,10 @@ 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']));
}
}
Loading