Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Psalm to 5.12.0 #6061

Merged
merged 11 commits into from
Jun 13, 2023
Merged

Update Psalm to 5.12.0 #6061

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df2f221
Remove unnecessary type casting of exception codes
morozov May 19, 2023
35c548c
Expect row counts to be returned as numeric strings
morozov May 19, 2023
26265e9
Use more specific types for schema diffs
morozov May 19, 2023
d885b87
Use more specific types in query builder
morozov May 19, 2023
31bb60f
Rework building parameters in primary-read-replica connection
morozov May 19, 2023
3ff4818
Add more assertions against the column counts
morozov May 19, 2023
f7dd003
Add result set shape assertions to schema managers
morozov May 19, 2023
21e931d
Simplify provided test data types
morozov Jun 11, 2023
977b8cc
Remove unused and add missing connection parameters
morozov Jun 12, 2023
6122e2c
Use more specific and correct types in tests
morozov May 19, 2023
ebdea00
Update Psalm and Jetbrains stubs
morozov May 19, 2023
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
Prev Previous commit
Next Next commit
Add more assertions against the column counts
  • Loading branch information
@morozov
morozov committed Jun 12, 2023
commit 3ff4818e85193da482c9a6c228a397d7590208e9
15 changes: 11 additions & 4 deletions src/Result.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
use Traversable;

use function array_shift;
use function assert;
use function count;

class Result
{
Expand Down Expand Up @@ -109,8 +111,10 @@ public function fetchAllKeyValue(): array

$data = [];

foreach ($this->fetchAllNumeric() as [$key, $value]) {
$data[$key] = $value;
foreach ($this->fetchAllNumeric() as $row) {
assert(count($row) >= 2);
[$key, $value] = $row;
$data[$key] = $value;
}

return $data;
Expand Down Expand Up @@ -174,15 +178,18 @@ public function iterateAssociative(): Traversable
}

/**
* {@inheritDoc}
* @return Traversable<mixed,mixed>
*
* @throws Exception
*/
public function iterateKeyValue(): Traversable
{
$this->ensureHasKeyValue();

foreach ($this->iterateNumeric() as [$key, $value]) {
foreach ($this->iterateNumeric() as $row) {
assert(count($row) >= 2);
[$key, $value] = $row;

yield $key => $value;
}
}
Expand Down