Fix bug with precision not being correctly copied

spatie · Jan 14, 2019 · bdd9fcc · bdd9fcc
1 parent 67a0909
commit bdd9fcc
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to `period` will be documented in this file
 
 - initial release
 
+## 0.5.1 - 2019-01-14
+
+- Fix bug with precision not being correctly copied
+
 ## 0.5.0 - 2019-01-09
 
 - Add boundary and precision support

diff --git a/src/Period.php b/src/Period.php
@@ -285,13 +285,15 @@ public function gap(Period $period): ?Period
         if ($this->getIncludedStart() >= $period->getIncludedEnd()) {
             return static::make(
                 $period->getIncludedEnd()->add($this->interval),
-                $this->getIncludedStart()->sub($this->interval)
+                $this->getIncludedStart()->sub($this->interval),
+                $this->getPrecisionMask()
             );
         }
 
         return static::make(
             $this->getIncludedEnd()->add($this->interval),
-            $period->getIncludedStart()->sub($this->interval)
+            $period->getIncludedStart()->sub($this->interval),
+            $this->getPrecisionMask()
         );
     }
 
@@ -316,7 +318,7 @@ public function overlapSingle(Period $period): ?Period
             return null;
         }
 
-        return static::make($start, $end);
+        return static::make($start, $end, $this->getPrecisionMask());
     }
 
     /**
@@ -363,6 +365,8 @@ public function overlapAll(Period ...$periods): Period
 
     public function diffSingle(Period $period): PeriodCollection
     {
+        $this->ensurePrecisionMatches($period);
+
         $periodCollection = new PeriodCollection();
 
         if (! $this->overlapsWith($period)) {
@@ -385,14 +389,16 @@ public function diffSingle(Period $period): PeriodCollection
         if ($overlap->getIncludedStart() > $start) {
             $periodCollection[] = static::make(
                 $start,
-                $overlap->getIncludedStart()->sub($this->interval)
+                $overlap->getIncludedStart()->sub($this->interval),
+                $this->getPrecisionMask()
             );
         }
 
         if ($overlap->getIncludedEnd() < $end) {
             $periodCollection[] = static::make(
                 $overlap->getIncludedEnd()->add($this->interval),
-                $end
+                $end,
+                $this->getPrecisionMask()
             );
         }
 

diff --git a/tests/PeriodTest.php b/tests/PeriodTest.php
@@ -6,6 +6,7 @@
 use DateTimeImmutable;
 use Spatie\Period\Period;
 use PHPUnit\Framework\TestCase;
+use Spatie\Period\Precision;
 
 class PeriodTest extends TestCase
 {

diff --git a/tests/PrecisionTest.php b/tests/PrecisionTest.php
@@ -186,4 +186,37 @@ public function precision_is_kept_when_testing_contains()
         $this->assertFalse($a->contains(DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2018-02-01 00:00:00')));
         $this->assertFalse($a->contains(DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2017-12-21 23:59:59')));
     }
+
+    /** @test */
+    public function precision_is_kept_with_diff()
+    {
+        $a = Period::make('2018-01-05 00:00:00', '2018-01-10 00:00:00', Precision::MINUTE);
+        $b = Period::make('2018-01-15 00:00:00', '2018-03-01 00:00:00', Precision::MINUTE);
+
+        [$diff] = $a->diff($b);
+
+        $this->assertEquals(Precision::MINUTE, $diff->getPrecisionMask());
+    }
+
+    /** @test */
+    public function precision_is_kept_with_overlap()
+    {
+        $a = Period::make('2018-01-05 00:00:00', '2018-01-10 00:00:00', Precision::MINUTE);
+        $b = Period::make('2018-01-01 00:00:00', '2018-01-31 00:00:00', Precision::MINUTE);
+
+        [$diff] = $a->overlap($b);
+
+        $this->assertEquals(Precision::MINUTE, $diff->getPrecisionMask());
+    }
+
+    /** @test */
+    public function precision_is_kept_with_gap()
+    {
+        $a = Period::make('2018-01-05 00:00:00', '2018-01-10 00:00:00', Precision::MINUTE);
+        $b = Period::make('2018-01-15 00:00:00', '2018-01-31 00:00:00', Precision::MINUTE);
+
+        $gap = $a->gap($b);
+
+        $this->assertEquals(Precision::MINUTE, $gap->getPrecisionMask());
+    }
 }