Skip to content

refactor: Update types for BaseModel, Model and dependencies #9711

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

Open
wants to merge 4 commits into
base: 4.7
Choose a base branch
from
Open

refactor: Update types for BaseModel, Model and dependencies #9711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23acf7e
refactor: Update types for `BaseModel`, `Model` and dependencies
neznaika0 Sep 6, 2025
cf6bb6d
docs: Add changelog `cleanValidationRules()`
neznaika0 Sep 8, 2025
4c14510
refactor: Add new `hasRationalPrimaryKey()`
neznaika0 Sep 8, 2025
0174725
refactor: Rename `hasRationalPrimaryKey()`
neznaika0 Sep 14, 2025
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
400 changes: 196 additions & 204 deletions system/BaseModel.php
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions system/Database/BaseBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,8 +947,8 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
* @used-by whereNotIn()
* @used-by orWhereNotIn()
*
* @param non-empty-string|null $key
* @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
* @param non-empty-string|null $key
* @param array<int|string, >|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the array is missing the value type?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a list of IDs for whereIn(). Do you think it's acceptable to have string keys or just a list? As $qb->whereIn('user.id', [0 => 123, 'user_id2' => 134])

*
* @return $this
*
Expand Down
Loading
Loading