Skip to content

Commit 0049572

Browse files
authored
Fixed PHPStan type assertions in database model types (#7583)
1 parent 6ac0bf9 commit 0049572

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

types/Model/Builder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ function test(
4848
assertType('Hyperf\Database\Model\Collection<int, Hyperf\Types\Builder\User>', $query->findOr([1], callback: fn () => 42));
4949
assertType('Hyperf\Types\Builder\User', $query->findOrFail(1));
5050
assertType('Hyperf\Types\Builder\User|null', $query->find(1));
51-
assertType('Hyperf\Types\Builder\User|int', $query->findOr(1, fn () => 42));
52-
assertType('Hyperf\Types\Builder\User|int', $query->findOr(1, callback: fn () => 42));
51+
assertType('42|Hyperf\Types\Builder\User', $query->findOr(1, fn () => 42));
52+
assertType('42|Hyperf\Types\Builder\User', $query->findOr(1, callback: fn () => 42));
5353
assertType('Hyperf\Types\Builder\User|null', $query->first());
54-
assertType('Hyperf\Types\Builder\User|int', $query->firstOr(fn () => 42));
55-
assertType('Hyperf\Types\Builder\User|int', $query->firstOr(callback: fn () => 42));
54+
assertType('42|Hyperf\Types\Builder\User', $query->firstOr(fn () => 42));
55+
assertType('42|Hyperf\Types\Builder\User', $query->firstOr(callback: fn () => 42));
5656
assertType('Hyperf\Types\Builder\User', $query->firstOrNew(['id' => 1]));
5757
assertType('Hyperf\Types\Builder\User', $query->findOrNew(1));
5858
assertType('Hyperf\Types\Builder\User', $query->firstOrCreate(['id' => 1]));

types/Model/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
assertType('Hyperf\Database\Model\Collection<int, User>', $collection);
1616

1717
assertType('User|null', $collection->find(1));
18-
assertType('string|User', $collection->find(1, 'string'));
18+
assertType('\'string\'|User', $collection->find(1, 'string'));
1919
assertType('Hyperf\Database\Model\Collection<int, User>', $collection->find([1]));
2020

2121
assertType('Hyperf\Database\Model\Collection<int, User>', $collection->load('string'));

0 commit comments

Comments
 (0)