Skip to content
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

Fix: used new parent relation on instanceof control for has one through #15265

Merged
merged 7 commits into from
Jan 10, 2025
+14 −8
Merged

Fix: used new parent relation on instanceof control for has one through #15265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9617773
used new parent relation on instanceof control for has one through
musaberatbahadir Jan 6, 2025
808d665
class_exists control is added
musaberatbahadir Jan 7, 2025
4aedecb
all instanceof HasManyThrough checks are changed
musaberatbahadir Jan 7, 2025
93c5fe0
forgotten HasOneOrManyThrough on return type
musaberatbahadir Jan 9, 2025
9fd31e2
phpstan fix
musaberatbahadir Jan 9, 2025
0495a39
Update phpstan.neon.dist
danharrin Jan 10, 2025
406098c
Merge branch '3.x' into pr/15265
danharrin Jan 10, 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
9 changes: 5 additions & 4 deletions packages/forms/src/Components/Select.php
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

Does the return type of getRelationship() need updating? Any other references to this class?

Copy link
Member

Choose a reason for hiding this comment

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

If we did, I think we would need to retain both HasManyThrough and HasOneOrManyThrough on the return type for backwards compatibility, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! I fixed that too.

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
use Illuminate\Database\Eloquent\Relations\HasOneOrManyThrough;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
Expand Down Expand Up @@ -816,7 +817,7 @@ public function relationship(string | Closure | null $name = null, string | Clos

if (
($relationship instanceof BelongsToMany) ||
($relationship instanceof HasManyThrough)
($relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class))
) {
if ($modifyQueryUsing) {
$component->evaluate($modifyQueryUsing, [
Expand Down Expand Up @@ -989,7 +990,7 @@ static function (Select $component): bool {

if (
($relationship instanceof HasOneOrMany) ||
($relationship instanceof HasManyThrough) ||
($relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class)) ||
($relationship instanceof BelongsToThrough)
) {
return;
Expand Down Expand Up @@ -1144,7 +1145,7 @@ public function getLabel(): string | Htmlable | null
return parent::getLabel();
}

public function getRelationship(): BelongsTo | BelongsToMany | HasOneOrMany | HasManyThrough | BelongsToThrough | null
public function getRelationship(): BelongsTo | BelongsToMany | HasOneOrMany | HasManyThrough | HasOneOrManyThrough | BelongsToThrough | null
{
if (blank($this->getRelationshipName())) {
return null;
Expand Down Expand Up @@ -1269,7 +1270,7 @@ protected function getQualifiedRelatedKeyNameForRelationship(Relation $relations
return $relationship->getQualifiedRelatedKeyName();
}

if ($relationship instanceof HasManyThrough) {
if ($relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class)) {
return $relationship->getQualifiedForeignKeyName();
}

Expand Down
3 changes: 2 additions & 1 deletion packages/panels/src/Resources/Pages/CreateRecord.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOneOrManyThrough;
use Illuminate\Support\Js;
use Throwable;

Expand Down Expand Up @@ -182,7 +183,7 @@ protected function associateRecordWithTenant(Model $record, Model $tenant): Mode
{
$relationship = static::getResource()::getTenantRelationship($tenant);

if ($relationship instanceof HasManyThrough) {
if ($relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class)) {
$record->save();

return $record;
Expand Down
3 changes: 2 additions & 1 deletion packages/tables/src/Actions/CreateAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasOneOrManyThrough;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Support\Arr;

Expand Down Expand Up @@ -66,7 +67,7 @@ protected function setUp(): void

if (
(! $relationship) ||
$relationship instanceof HasManyThrough
$relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class)
) {
$record->save();

Expand Down
3 changes: 2 additions & 1 deletion packages/tables/src/Filters/Concerns/HasRelationship.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOneOrManyThrough;
use Illuminate\Database\Eloquent\Relations\Relation;
use Znck\Eloquent\Relations\BelongsToThrough;

Expand Down Expand Up @@ -110,7 +111,7 @@ public function getRelationshipKey(?Builder $query = null): ?string
$relationship->getQualifiedRelatedKeyName();
}

if ($relationship instanceof HasManyThrough) {
if ($relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class)) {
return $query?->getModel()->qualifyColumn($relationship->getForeignKeyName()) ??
$relationship->getQualifiedForeignKeyName();
}
Expand Down
3 changes: 2 additions & 1 deletion packages/tables/src/Table/Concerns/HasQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOneOrMany;
use Illuminate\Database\Eloquent\Relations\HasOneOrManyThrough;
use Illuminate\Database\Eloquent\Relations\Relation;

use function Livewire\invade;
Expand Down Expand Up @@ -88,7 +89,7 @@ public function getRelationshipQuery(): ?Builder

$query = $relationship->getQuery();

if ($relationship instanceof HasManyThrough) {
if ($relationship instanceof (class_exists(HasOneOrManyThrough::class) ? HasOneOrManyThrough::class : HasManyThrough::class)) {
// https://github.com/laravel/framework/issues/4962
$query->select($query->getModel()->getTable() . '.*');

Expand Down
1 change: 1 addition & 0 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ parameters:
ignoreErrors:
- '#Unable to resolve the template type TKey in call to function collect#'
- '#Unable to resolve the template type TValue in call to function collect#'
- '#.*Illuminate\\Database\\Eloquent\\Relations\\HasOneOrManyThrough.*#'
-
message: "#^Parameter \\#1 \\$value of method Filament\\\\Support\\\\Components\\\\Component\\:\\:evaluate\\(\\) expects \\(callable\\(\\)\\: void\\)\\|void, Closure\\(Filament\\\\Forms\\\\Components\\\\BaseFileUpload, Filament\\\\Forms\\\\Get, Filament\\\\Forms\\\\Set\\)\\: void given\\.$#"
count: 2
Expand Down
Loading