Skip to content

doctrine-dbal: implement Connection->iterateColumn() #210

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

Merged
merged 1 commit into from
Jan 25, 2022
Merged

doctrine-dbal: implement Connection->iterateColumn() #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/DoctrineReflection/DoctrineReflection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function fetchResultType(MethodReflection $methodReflection, Type $result
$fetchType = QueryReflector::FETCH_TYPE_ONE;
break;
case 'fetchfirstcolumn':
case 'iteratecolumn':
$fetchType = QueryReflector::FETCH_TYPE_FIRST_COL;
break;
case 'fetchnumeric':
Expand Down Expand Up @@ -57,6 +58,10 @@ public function fetchResultType(MethodReflection $methodReflection, Type $result
return $valueTypes[$i];
}
if (QueryReflector::FETCH_TYPE_FIRST_COL === $fetchType) {
if (\in_array($usedMethod, ['iteratecolumn'], true)) {
return new GenericObjectType(Traversable::class, [new IntegerType(), $valueTypes[$i]]);
}

return new ArrayType(IntegerRangeType::fromInterval(0, null), $valueTypes[$i]);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/DoctrineConnectionFetchDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function getClass(): string

public function isMethodSupported(MethodReflection $methodReflection): bool
{
return \in_array(strtolower($methodReflection->getName()), ['fetchone', 'fetchfirstcolumn', 'fetchassociative', 'fetchallassociative', 'fetchnumeric', 'fetchallnumeric', 'iterateassociative', 'iteratenumeric', 'iterateallnumeric'], true);
return \in_array(strtolower($methodReflection->getName()), ['fetchone', 'fetchfirstcolumn', 'fetchassociative', 'fetchallassociative', 'fetchnumeric', 'fetchallnumeric', 'iteratecolumn', 'iterateassociative', 'iteratenumeric', 'iterateallnumeric'], true);
}

public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
Expand Down
7 changes: 7 additions & 0 deletions tests/data/doctrine-dbal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ public function iterateNumeric(Connection $conn)
assertType('Traversable<int, array{string, int<0, 4294967295>, int<-128, 127>, int<-128, 127>}>', $fetchResult);
}

public function iterateColumn(Connection $conn)
{
$query = 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = ?';
$fetchResult = $conn->iterateColumn($query, [1]);
assertType('Traversable<int, string>', $fetchResult);
}

public function fetchOne(Connection $conn)
{
$query = 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE adaid = ?';
Expand Down