From 2250ab2a23bf6865467e4ace187f0ff5da318777 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 14 Jun 2021 09:50:36 -0500 Subject: [PATCH] Revert "Adds Conditionable Trait to Relation (#37640)" (#37685) This reverts commit e3adb1c7f739f7c60f993df7e9c7d984d344e3af. --- Eloquent/Relations/Relation.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Eloquent/Relations/Relation.php b/Eloquent/Relations/Relation.php index 66e30ffde..7fe9f3e9f 100755 --- a/Eloquent/Relations/Relation.php +++ b/Eloquent/Relations/Relation.php @@ -10,7 +10,6 @@ use Illuminate\Database\MultipleRecordsFoundException; use Illuminate\Database\Query\Expression; use Illuminate\Support\Arr; -use Illuminate\Support\Traits\Conditionable; use Illuminate\Support\Traits\ForwardsCalls; use Illuminate\Support\Traits\Macroable; @@ -19,7 +18,7 @@ */ abstract class Relation { - use Conditionable, ForwardsCalls, Macroable { + use ForwardsCalls, Macroable { __call as macroCall; }