From efbb756cabec4f196c732d2c21c09607f457934a Mon Sep 17 00:00:00 2001
From: Antoni Siek <antoni@siek.io>
Date: Wed, 10 Feb 2021 12:17:35 +0100
Subject: [PATCH] Compatibility between EnumeratesValues and BuildsQueries

---
 src/Illuminate/Collections/Traits/EnumeratesValues.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php
index 0c0c7ce3c3ab..899a1e0ad453 100644
--- a/src/Illuminate/Collections/Traits/EnumeratesValues.php
+++ b/src/Illuminate/Collections/Traits/EnumeratesValues.php
@@ -468,9 +468,9 @@ public function when($value, callable $callback = null, callable $default = null
         }
 
         if ($value) {
-            return $callback($this, $value);
+            return $callback($this, $value) ?: $this;
         } elseif ($default) {
-            return $default($this, $value);
+            return $default($this, $value) ?: $this;
         }
 
         return $this;