From 6d9d4d0e79a6ea0445484db0aa3cb3a54b430e79 Mon Sep 17 00:00:00 2001 From: Italo Date: Sat, 17 Feb 2024 02:45:08 -0300 Subject: [PATCH 1/3] [10.x] Fixes proxying conditionable and tappable to relation --- src/Illuminate/Database/Eloquent/Relations/Relation.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php index 7fea6b70d95b..5aa4d4b9906f 100755 --- a/src/Illuminate/Database/Eloquent/Relations/Relation.php +++ b/src/Illuminate/Database/Eloquent/Relations/Relation.php @@ -10,12 +10,14 @@ use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\MultipleRecordsFoundException; use Illuminate\Database\Query\Expression; +use Illuminate\Support\Traits\Conditionable; +use Illuminate\Support\Traits\Tappable; use Illuminate\Support\Traits\ForwardsCalls; use Illuminate\Support\Traits\Macroable; abstract class Relation implements BuilderContract { - use ForwardsCalls, Macroable { + use ForwardsCalls, Conditionable, Macroable { Macroable::__call as macroCall; } From bcb286acd1c1d034fe6c0e0953263f7fba01ceda Mon Sep 17 00:00:00 2001 From: Italo Date: Sat, 17 Feb 2024 02:45:08 -0300 Subject: [PATCH 2/3] [10.x] Fixes proxying conditionable and tappable to relation --- src/Illuminate/Database/Eloquent/Relations/Relation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php index 5aa4d4b9906f..8b5840697686 100755 --- a/src/Illuminate/Database/Eloquent/Relations/Relation.php +++ b/src/Illuminate/Database/Eloquent/Relations/Relation.php @@ -17,7 +17,7 @@ abstract class Relation implements BuilderContract { - use ForwardsCalls, Conditionable, Macroable { + use ForwardsCalls, Conditionable, Tappable, Macroable { Macroable::__call as macroCall; } From ed378e06b82101666f6606597255a2c765be5ab4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 19 Feb 2024 08:36:49 -0600 Subject: [PATCH 3/3] Update Relation.php --- src/Illuminate/Database/Eloquent/Relations/Relation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php index 8b5840697686..af32aa6a7b0c 100755 --- a/src/Illuminate/Database/Eloquent/Relations/Relation.php +++ b/src/Illuminate/Database/Eloquent/Relations/Relation.php @@ -17,7 +17,7 @@ abstract class Relation implements BuilderContract { - use ForwardsCalls, Conditionable, Tappable, Macroable { + use Conditionable, ForwardsCalls, Macroable, Tappable { Macroable::__call as macroCall; }