#2035 Disable NO_ZERO_DIFF option by default

briannesbitt · May 6, 2020 · c5ed301 · c5ed301
1 parent 3f9ca81
commit c5ed301
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/Carbon/Traits/Difference.php b/src/Carbon/Traits/Difference.php
@@ -1051,7 +1051,6 @@ public function timespan($other = null, $timezone = null)
         return $this->diffForHumans($other, [
             'join' => ', ',
             'syntax' => CarbonInterface::DIFF_ABSOLUTE,
-            'options' => CarbonInterface::NO_ZERO_DIFF,
             'parts' => -1,
         ]);
     }

diff --git a/src/Carbon/Traits/Localization.php b/src/Carbon/Traits/Localization.php
@@ -46,7 +46,7 @@ trait Localization
      *
      * @var int
      */
-    protected static $humanDiffOptions = CarbonInterface::NO_ZERO_DIFF;
+    protected static $humanDiffOptions = 0;
 
     /**
      * @deprecated To avoid conflict between different third-party libraries, static setters should not be used.

diff --git a/tests/Carbon/DiffTest.php b/tests/Carbon/DiffTest.php
@@ -544,7 +544,7 @@ public function testDiffInSecondsWithTimezonesAndVsDefault()
     public function testDiffForHumansNowAndSecond()
     {
         $this->wrapWithTestNow(function () {
-            $this->assertSame('1 second ago', Carbon::now()->diffForHumans());
+            $this->assertSame('0 seconds ago', Carbon::now()->diffForHumans());
         });
     }
 
@@ -553,7 +553,7 @@ public function testDiffForHumansNowAndSecondWithTimezone()
         $vanNow = Carbon::now('America/Vancouver');
         $hereNow = $vanNow->copy()->setTimezone(Carbon::now()->tz);
         $this->wrapWithTestNow(function () use ($vanNow) {
-            $this->assertSame('1 second ago', $vanNow->diffForHumans());
+            $this->assertSame('0 seconds ago', $vanNow->diffForHumans());
         }, $hereNow);
     }
 
@@ -1308,10 +1308,10 @@ public function testDiffOptions()
         $this->assertSame(8, Carbon::TWO_DAY_WORDS);
 
         $options = Carbon::getHumanDiffOptions();
-        $this->assertSame(1, $options);
+        $this->assertSame(0, $options);
 
         $date = Carbon::create(2018, 3, 12, 2, 5, 6, 'UTC');
-        $this->assertSame('1 second before', $date->diffForHumans($date));
+        $this->assertSame('0 seconds before', $date->diffForHumans($date));
 
         Carbon::setHumanDiffOptions(0);
         $this->assertSame(0, Carbon::getHumanDiffOptions());

diff --git a/tests/CarbonImmutable/DiffTest.php b/tests/CarbonImmutable/DiffTest.php
@@ -512,7 +512,7 @@ public function testDiffInSecondsWithTimezonesAndVsDefault()
     public function testDiffForHumansNowAndSecond()
     {
         $this->wrapWithTestNow(function () {
-            $this->assertSame('1 second ago', Carbon::now()->diffForHumans());
+            $this->assertSame('0 seconds ago', Carbon::now()->diffForHumans());
         });
     }
 
@@ -521,7 +521,7 @@ public function testDiffForHumansNowAndSecondWithTimezone()
         $vanNow = Carbon::now('America/Vancouver');
         $hereNow = $vanNow->copy()->setTimezone(Carbon::now()->tz);
         $this->wrapWithTestNow(function () use ($vanNow) {
-            $this->assertSame('1 second ago', $vanNow->diffForHumans());
+            $this->assertSame('0 seconds ago', $vanNow->diffForHumans());
         }, $hereNow);
     }
 
@@ -1236,10 +1236,10 @@ public function testDiffOptions()
         $this->assertSame(16, Carbon::SEQUENTIAL_PARTS_ONLY);
 
         $options = Carbon::getHumanDiffOptions();
-        $this->assertSame(1, $options);
+        $this->assertSame(0, $options);
 
         $date = Carbon::create(2018, 3, 12, 2, 5, 6, 'UTC');
-        $this->assertSame('1 second before', $date->diffForHumans($date));
+        $this->assertSame('0 seconds before', $date->diffForHumans($date));
 
         Carbon::setHumanDiffOptions(0);
         $this->assertSame(0, Carbon::getHumanDiffOptions());

diff --git a/tests/CommonTraits/MacroContextNestingTest.php b/tests/CommonTraits/MacroContextNestingTest.php
@@ -24,7 +24,7 @@ public function getMacroableClasses()
         return [
             [Carbon::class, Carbon::parse('2010-05-23'), null],
             [CarbonImmutable::class, CarbonImmutable::parse('2010-05-23'), null],
-            [CarbonInterval::class, CarbonInterval::make('P1M6D'), strval(CarbonInterval::second())],
+            [CarbonInterval::class, CarbonInterval::make('P1M6D'), strval(CarbonInterval::seconds(0))],
             [CarbonPeriod::class, CarbonPeriod::create('2010-08-23', '2010-10-02'), null],
         ];
     }