From de6d291a093117f1d2ed79ad871f7a5c3a59a036 Mon Sep 17 00:00:00 2001 From: Sami Mazouz Date: Wed, 29 Sep 2021 21:58:32 +0100 Subject: [PATCH] fix: `$relationsArray` can end up containing closures (#146) * fix: `$relationsArray` can end up containing closures Not sure I didn't simply unset the first time around.. * Use a new array instead of modifying one --- extensions/tags/src/TagRepository.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/tags/src/TagRepository.php b/extensions/tags/src/TagRepository.php index f5a1bedf4..ba877ca92 100644 --- a/extensions/tags/src/TagRepository.php +++ b/extensions/tags/src/TagRepository.php @@ -33,15 +33,16 @@ class TagRepository */ public function with($relations, User $actor): Builder { - $relationsArray = is_string($relations) ? explode(',', $relations) : $relations; - - foreach (self::TAG_RELATIONS as $relation) { - if (in_array($relation, $relationsArray, true)) { - $relationsArray = array_diff($relationsArray, [$relation]); + $relations = is_string($relations) ? explode(',', $relations) : $relations; + $relationsArray = []; + foreach ($relations as $relation) { + if (in_array($relation, self::TAG_RELATIONS, true)) { $relationsArray[$relation] = function ($query) use ($actor) { $query->whereVisibleTo($actor); }; + } else { + $relationsArray[] = $relation; } }