Optimized the implementation of When Method.

Author: assert6

src/Builder.php

@@ -129,10 +129,15 @@ public function orderBy(string $column, ?string $direction = 'asc'): static
 
     /**
      * Apply the callback's query changes if the given "value" is true.
-     * @param mixed $value
+     *
+     * @param callable($this, $value): $this $callback
+     * @param callable($this, $value): $this $default
+     * @return $this
      */
-    public function when($value, callable $callback, ?callable $default = null): static
+    public function when(mixed $value, callable $callback, ?callable $default = null): static
     {
+        $value = $value instanceof Closure ? $value($this) : $value;
+
         if ($value) {
             return $callback($this, $value) ?: $this;
         }

tests/Cases/BuilderTest.php

@@ -34,7 +34,7 @@ protected function tearDown(): void
         $this->assertTrue(true);
     }
 
-    public function testPaginationCorrectlyHandlesPaginatedResults()
+    public function testPaginationCorrectlyHandlesPaginatedResults(): void
     {
         Paginator::currentPageResolver(function () {
             return 1;
@@ -52,7 +52,7 @@ public function testPaginationCorrectlyHandlesPaginatedResults()
         $builder->paginate();
     }
 
-    public function testMacroable()
+    public function testMacroable(): void
     {
         Builder::macro('foo', function () {
             return 'bar';
@@ -64,15 +64,51 @@ public function testMacroable()
         );
     }
 
-    public function testHardDeleteDoesntSetWheres()
+    public function testHardDeleteDoesntSetWheres(): void
     {
         $builder = new Builder($model = m::mock(Model::class), 'zonda', null, false);
         $this->assertArrayNotHasKey('__soft_deleted', $builder->wheres);
     }
 
-    public function testSoftDeleteSetsWheres()
+    public function testSoftDeleteSetsWheres(): void
     {
-        $builder = new Builder($model = m::mock(Model::class), 'zonda', null, true);
+        $builder = new Builder(m::mock(Model::class), 'zonda', null, true);
         $this->assertEquals(0, $builder->wheres['__soft_deleted']);
     }
+
+    public function testWhen(): void
+    {
+        $builder = new Builder(m::mock(Model::class), 'zonda', null, true);
+        $builder->when(true, fn (Builder $collection) => $collection->take(1))
+            ->when(false, fn (Builder $collection) => $collection->take(2));
+        $this->assertEquals(1, $builder->limit);
+    }
+
+    public function testWhenWithValueForCallback(): void
+    {
+        $callback = fn (Builder $collection, int $value) => $collection->take($value);
+
+        $builder = new Builder(m::mock(Model::class), 'zonda', null, true);
+        $builder->when(0, $callback)->when(1, $callback);
+        $this->assertEquals(1, $builder->limit);
+    }
+
+    public function testWhenValueOfClosure(): void
+    {
+        $callback = fn (Builder $collection, int $value) => $collection->take($value);
+
+        $builder = new Builder(m::mock(Model::class), 'zonda', null, true);
+        $builder->when(fn () => 0, $callback)->when(fn () => 1, $callback);
+        $this->assertEquals(1, $builder->limit);
+    }
+
+    public function testWhenCallbackWithDefault(): void
+    {
+        $callback = fn (Builder $collection, int $value) => $collection;
+        $default = fn (Builder $collection, $value) => $collection->take($value);
+
+        $builder = new Builder(m::mock(Model::class), 'zonda', null, true);
+        $builder->when(fn () => 0, $callback, $default)->when(fn () => 1, $callback, $default);
+        $this->assertEquals(0, $builder->limit);
+    }
 }