Skip to content

[12.x] Specify that the query builder returns instances of stdClass #58150

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
taylorotwell merged 1 commit into from
Dec 17, 2025
+16 −16
Merged

[12.x] Specify that the query builder returns instances of stdClass #58150

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
6 changes: 3 additions & 3 deletions src/Illuminate/Database/Query/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

class Builder implements BuilderContract
{
/** @use \Illuminate\Database\Concerns\BuildsQueries<object> */
/** @use \Illuminate\Database\Concerns\BuildsQueries<\stdClass> */
use BuildsWhereDateClauses, BuildsQueries, ExplainsQueries, ForwardsCalls, Macroable {
__call as macroCall;
}
Expand Down Expand Up @@ -3088,7 +3088,7 @@ public function toRawSql()
*
* @param int|string $id
* @param string|\Illuminate\Contracts\Database\Query\Expression|array<string|\Illuminate\Contracts\Database\Query\Expression> $columns
* @return object|null
* @return \stdClass|null
*/
public function find($id, $columns = ['*'])
{
Expand All @@ -3103,7 +3103,7 @@ public function find($id, $columns = ['*'])
* @param mixed $id
* @param (\Closure(): TValue)|string|\Illuminate\Contracts\Database\Query\Expression|array<string|\Illuminate\Contracts\Database\Query\Expression> $columns
* @param (\Closure(): TValue)|null $callback
* @return object|TValue
* @return \stdClass|TValue
*/
public function findOr($id, $columns = ['*'], ?Closure $callback = null)
{
Expand Down
26 changes: 13 additions & 13 deletions types/Database/Query/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
/** @param \Illuminate\Database\Eloquent\Builder<\User> $userQuery */
function test(Builder $query, EloquentBuilder $userQuery): void
{
assertType('object|null', $query->first());
assertType('object|null', $query->find(1));
assertType('42|object', $query->findOr(1, fn () => 42));
assertType('42|object', $query->findOr(1, callback: fn () => 42));
assertType('stdClass|null', $query->first());
assertType('stdClass|null', $query->find(1));
assertType('42|stdClass', $query->findOr(1, fn () => 42));
assertType('42|stdClass', $query->findOr(1, callback: fn () => 42));
assertType('Illuminate\Database\Query\Builder', $query->selectSub($userQuery, 'alias'));
assertType('Illuminate\Database\Query\Builder', $query->fromSub($userQuery, 'alias'));
assertType('Illuminate\Database\Query\Builder', $query->from($userQuery, 'alias'));
Expand All @@ -33,31 +33,31 @@ function test(Builder $query, EloquentBuilder $userQuery): void
assertType('Illuminate\Database\Query\Builder', $query->unionAll($userQuery));
assertType('int', $query->insertUsing([], $userQuery));
assertType('int', $query->insertOrIgnoreUsing([], $userQuery));
assertType('Illuminate\Support\LazyCollection<int, object>', $query->lazy());
assertType('Illuminate\Support\LazyCollection<int, object>', $query->lazyById());
assertType('Illuminate\Support\LazyCollection<int, object>', $query->lazyByIdDesc());
assertType('Illuminate\Support\LazyCollection<int, stdClass>', $query->lazy());
assertType('Illuminate\Support\LazyCollection<int, stdClass>', $query->lazyById());
assertType('Illuminate\Support\LazyCollection<int, stdClass>', $query->lazyByIdDesc());

$query->chunk(1, function ($users, $page) {
assertType('Illuminate\Support\Collection<int, object>', $users);
assertType('Illuminate\Support\Collection<int, stdClass>', $users);
assertType('int', $page);
});
$query->chunkById(1, function ($users, $page) {
assertType('Illuminate\Support\Collection<int, object>', $users);
assertType('Illuminate\Support\Collection<int, stdClass>', $users);
assertType('int', $page);
});
$query->chunkMap(function ($users) {
assertType('object', $users);
assertType('stdClass', $users);
});
$query->chunkByIdDesc(1, function ($users, $page) {
assertType('Illuminate\Support\Collection<int, object>', $users);
assertType('Illuminate\Support\Collection<int, stdClass>', $users);
assertType('int', $page);
});
$query->each(function ($users, $page) {
assertType('object', $users);
assertType('stdClass', $users);
assertType('int', $page);
});
$query->eachById(function ($users, $page) {
assertType('object', $users);
assertType('stdClass', $users);
assertType('int', $page);
});
assertType('Illuminate\Database\Query\Builder', $query->pipe(function () {
Expand Down
Loading