Skip to content
Merged
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
2 changes: 1 addition & 1 deletion system/Test/FeatureTestTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ protected function populateGlobals(string $name, Request $request, ?array $param
$request->setGlobal($name, $params);
$request->setGlobal(
'request',
$request->fetchGlobal('post') + $request->fetchGlobal('get'),
(array) $request->fetchGlobal('post') + (array) $request->fetchGlobal('get'),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about it tho...

Copy link
Member Author

@samsonasik samsonasik Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the code, should be fine with this patch, since no 2nd argument as index, means it always array:

// Return all values when $index is null
if ($index === null) {
$values = [];
foreach ($this->globals[$name] as $key => $value) {
$values[$key] = is_array($value)
? $this->fetchGlobal($name, $key, $filter, $flags)
: filter_var($value, $filter, $flags);
}
return $values;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be fine here.

);
}

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Database/BaseConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public function testEscapeIdentifiers(string $item, string $expected): void
}

/**
* @return array<string, list<string>>
* @return iterable<string, list<string>>
*/
public static function provideEscapeIdentifiers(): iterable
{
Expand All @@ -335,7 +335,7 @@ public function testEscapeIdentifier(string $item, string $expected): void
}

/**
* @return array<string, list<string>>
* @return iterable<string, list<string>>
*/
public static function provideEscapeIdentifier(): iterable
{
Expand Down
2 changes: 1 addition & 1 deletion tests/system/Database/Live/OCI8/ConnectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function testIsValidDSN(string $dsn): void
}

/**
* @return array<string, list<string>>
* @return iterable<string, list<string>>
*/
public static function provideIsValidDSN(): iterable
{
Expand Down
Loading