Don't require returning the query from "when"

Author: JosephSilber

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -81,14 +81,12 @@ public function first($columns = ['*'])
      */
     public function when($value, $callback, $default = null)
     {
-        $builder = $this;
-
         if ($value) {
-            $builder = $callback($builder, $value);
+            return $callback($builder, $value) ?: $this;
         } elseif ($default) {
-            $builder = $default($builder, $value);
+            return $default($builder, $value) ?: $this;
         }
 
-        return $builder;
+        return $this;
     }
 }

tests/Database/DatabaseQueryBuilderTest.php

@@ -135,7 +135,7 @@ public function testWhenCallback()
         $callback = function ($query, $condition) {
             $this->assertTrue($condition);
 
-            return $query->where('id', '=', 1);
+            $query->where('id', '=', 1);
         };
 
         $builder = $this->getBuilder();
@@ -152,13 +152,13 @@ public function testWhenCallbackWithDefault()
         $callback = function ($query, $condition) {
             $this->assertEquals($condition, 'truthy');
 
-            return $query->where('id', '=', 1);
+            $query->where('id', '=', 1);
         };
 
         $default = function ($query, $condition) {
             $this->assertEquals($condition, 0);
 
-            return $query->where('id', '=', 2);
+            $query->where('id', '=', 2);
         };
 
         $builder = $this->getBuilder();