[9.x] Add Conditionable Trait to Illuminate\Support\Carbon (#42500)

* Make Carbon conditionable * Style
laravel · May 25, 2022 · f9fda99 · f9fda99
1 parent 105037b
commit f9fda99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Illuminate/Support/Carbon.php b/src/Illuminate/Support/Carbon.php
@@ -4,9 +4,12 @@
 
 use Carbon\Carbon as BaseCarbon;
 use Carbon\CarbonImmutable as BaseCarbonImmutable;
+use Illuminate\Support\Traits\Conditionable;
 
 class Carbon extends BaseCarbon
 {
+    use Conditionable;
+
     /**
      * {@inheritdoc}
      */

diff --git a/tests/Support/SupportCarbonTest.php b/tests/Support/SupportCarbonTest.php
@@ -117,4 +117,10 @@ public function testSetTestNowWillPersistBetweenImmutableAndMutableInstance()
         $this->assertSame('2017-06-27 13:14:15', BaseCarbon::now()->toDateTimeString());
         $this->assertSame('2017-06-27 13:14:15', BaseCarbonImmutable::now()->toDateTimeString());
     }
+
+    public function testCarbonIsConditionable()
+    {
+        $this->assertTrue(Carbon::now()->when(null, fn (Carbon $carbon) => $carbon->addDays(1))->isToday());
+        $this->assertTrue(Carbon::now()->when(true, fn (Carbon $carbon) => $carbon->addDays(1))->isTomorrow());
+    }
 }