Skip to content

Update SelectQuery return typehints to match updated ResultSetInterface #18925

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
dereuromark merged 1 commit into from
Oct 12, 2025
Merged

Update SelectQuery return typehints to match updated ResultSetInterface #18925

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
8 changes: 4 additions & 4 deletions src/ORM/Query/SelectQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public function setResult(iterable $results)
* iterated without having to call execute() manually, thus making it look like
* a result set instead of the query itself.
*
* @return \Cake\Datasource\ResultSetInterface<\Cake\Datasource\EntityInterface|array>
* @return \Cake\Datasource\ResultSetInterface<array-key, \Cake\Datasource\EntityInterface|array>
*/
public function getIterator(): ResultSetInterface
{
Expand Down Expand Up @@ -365,7 +365,7 @@ public function aliasFields(array $fields, ?string $defaultAlias = null): array
* ResultSetDecorator is a traversable object that implements the methods found
* on Cake\Collection\Collection.
*
* @return \Cake\Datasource\ResultSetInterface<mixed>
* @return \Cake\Datasource\ResultSetInterface<array-key, mixed>
*/
public function all(): ResultSetInterface
{
Expand Down Expand Up @@ -725,7 +725,7 @@ public function applyOptions(array $options)
* Decorates the results iterator with MapReduce routines and formatters
*
* @param iterable $result Original results
* @return \Cake\Datasource\ResultSetInterface<\Cake\Datasource\EntityInterface|mixed>
* @return \Cake\Datasource\ResultSetInterface<array-key, \Cake\Datasource\EntityInterface|mixed>
*/
protected function _decorateResults(iterable $result): ResultSetInterface
{
Expand Down Expand Up @@ -1728,7 +1728,7 @@ public function __debugInfo(): array
*
* Part of JsonSerializable interface.
*
* @return \Cake\Datasource\ResultSetInterface<(\Cake\Datasource\EntityInterface|mixed)> The data to convert to JSON.
* @return \Cake\Datasource\ResultSetInterface<array-key, (\Cake\Datasource\EntityInterface|mixed)> The data to convert to JSON.
*/
public function jsonSerialize(): ResultSetInterface
{
Expand Down