Validate count and until property (#20)

Co-authored-by: Ren Xie Liu <liurx41@protonmail.com>
ProtonMail · Jan 18, 2021 · bee705a · bee705a
1 parent 6507b3d
commit bee705a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/Recur/RRuleIterator.php b/lib/Recur/RRuleIterator.php
@@ -1002,6 +1002,10 @@ protected function parseRRule($rrule)
         if (!isset($this->frequency)) {
             throw new InvalidDataException('Unknown value for FREQ');
         }
+
+        if (isset($this->count) && isset($this->until)) {
+            throw new InvalidDataException('Can not have both UNTIL and COUNT property at the same time');
+        }
     }
 
     /**

diff --git a/tests/VObject/Recur/RRuleIteratorTest.php b/tests/VObject/Recur/RRuleIteratorTest.php
@@ -974,6 +974,18 @@ public function testUntilBeforeDtStart()
         );
     }
 
+    public function testUntilAndCount()
+    {
+        $this->expectException(InvalidDataException::class);
+        $this->expectExceptionMessage('Can not have both UNTIL and COUNT property at the same time');
+
+        $this->parse(
+            'FREQ=DAILY;COUNT=5;UNTIL=20201108T225959Z',
+            '2021-01-18 00:15:00',
+            []
+        );
+    }
+
     public function testIgnoredStuff()
     {
         $this->parse(