No overlap returns empty collection

spatie · Jan 8, 2019 · fbb30b1 · fbb30b1
1 parent 3615e43
commit fbb30b1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
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.4.1 - 2019-01-08
+
+- No overlap returns empty collection
+
 ## 0.4.0 - 2018-12-19
 
 - Add visualizer

diff --git a/src/Period.php b/src/Period.php
@@ -263,7 +263,13 @@ public function overlap(Period ...$periods): PeriodCollection
         $overlapCollection = new PeriodCollection();
 
         foreach ($periods as $period) {
-            $overlapCollection[] = $this->overlapSingle($period);
+            $overlap = $this->overlapSingle($period);
+
+            if ($overlap === null) {
+                continue;
+            }
+
+            $overlapCollection[] = $overlap;
         }
 
         return $overlapCollection;

diff --git a/tests/PeriodTest.php b/tests/PeriodTest.php
@@ -176,6 +176,15 @@ public function it_can_determine_the_overlap_between_multiple_periods()
         $this->assertTrue($overlap->equals(Period::make('2018-01-10', '2018-01-15')));
     }
 
+    /** @test */
+    public function non_overlapping_dates_return_an_empty_collection()
+    {
+        $a = Period::make('2019-01-01', '2019-01-31');
+        $b = Period::make('2019-02-01', '2019-02-28');
+
+        $this->assertTrue($a->overlap($b)->isEmpty());
+    }
+
     /** @test */
     public function it_can_determine_that_two_periods_do_not_overlap()
     {