rooty/php-rrule
1
0
Fork 0
mirror of https://github.com/rlanvin/php-rrule.git synced 2025-02-26 15:54:14 +01:00
Code Issues Releases Activity

Fix #78 RRule size limited to 1460

Browse Source
This commit is contained in:
rlanvin 2019-11-01 12:48:41 +01:00
parent 6332b7e44a
commit 2ed1d53333
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
### Fixed ### Fixed
- Fix valid rules wrongly detected as not producing results, and cut short after MAX_CYCLES [#78](https://github.com/rlanvin/php-rrule/issues/78)
- Fix `RRule::createFromRfcString` not detecting RSet properly if the rule was lowercase - Fix `RRule::createFromRfcString` not detecting RSet properly if the rule was lowercase
- [internal] Replace static variables by array constants (permitted since PHP 5.6). Shouldn't break backward compatibility unless you were doing weird things with this lib in the first place. - [internal] Replace static variables by array constants (permitted since PHP 5.6). Shouldn't break backward compatibility unless you were doing weird things with this lib in the first place.

17
src/RRule.php
View File

@ -1398,7 +1398,7 @@ class RRule implements RRuleInterface
} }
} }
$max_cycles = self::REPEAT_CYCLES[$this->freq <= self::DAILY ? $this->freq : self::DAILY]; $max_cycles = self::MAX_CYCLES[$this->freq <= self::DAILY ? $this->freq : self::DAILY];
for ($i = 0; $i < $max_cycles; $i++) { for ($i = 0; $i < $max_cycles; $i++) {
// 1. get an array of all days in the next interval (day, month, week, etc.) // 1. get an array of all days in the next interval (day, month, week, etc.)
// we filter out from this array all days that do not match the BYXXX conditions // we filter out from this array all days that do not match the BYXXX conditions
@ -1514,7 +1514,7 @@ class RRule implements RRuleInterface
} }
} }
// 2. loop, generate a valid date, and return the result (fake "yield") // 2. loop, generate a valid date, and yield the result
// at the same time, we check the end condition and return null if // at the same time, we check the end condition and return null if
// we need to stop // we need to stop
if ($this->bysetpos && $timeset) { if ($this->bysetpos && $timeset) {
@ -1535,12 +1535,12 @@ class RRule implements RRuleInterface
$total += 1; $total += 1;
$this->cache[] = clone $occurrence; $this->cache[] = clone $occurrence;
yield clone $occurrence; // yield yield clone $occurrence; // yield
$i = 0; // reset the max cycles counter, since we yieled a result
} }
} }
} }
else { else {
// normal loop, without BYSETPOS // normal loop, without BYSETPOS
// while ( ($yearday = current($dayset)) !== false ) {
foreach ($dayset as $yearday) { foreach ($dayset as $yearday) {
$occurrence = \DateTime::createFromFormat( $occurrence = \DateTime::createFromFormat(
'Y z', 'Y z',
@ -1566,10 +1566,9 @@ class RRule implements RRuleInterface
$total += 1; $total += 1;
$this->cache[] = clone $occurrence; $this->cache[] = clone $occurrence;
yield clone $occurrence; // yield yield clone $occurrence; // yield
$i = 0; // reset the max cycles counter, since we yieled a result
} }
} }
// reset($timeset);
// next($dayset);
} }
} }
@ -1621,7 +1620,7 @@ class RRule implements RRuleInterface
} }
$found = false; $found = false;
for ($j = 0; $j < self::REPEAT_CYCLES[self::HOURLY]; $j++) { for ($j = 0; $j < self::MAX_CYCLES[self::HOURLY]; $j++) {
$hour += $this->interval; $hour += $this->interval;
$div = (int) ($hour / 24); $div = (int) ($hour / 24);
$mod = $hour % 24; $mod = $hour % 24;
@ -1648,7 +1647,7 @@ class RRule implements RRuleInterface
} }
$found = false; $found = false;
for ($j = 0; $j < self::REPEAT_CYCLES[self::MINUTELY]; $j++) { for ($j = 0; $j < self::MAX_CYCLES[self::MINUTELY]; $j++) {
$minute += $this->interval; $minute += $this->interval;
$div = (int) ($minute / 60); $div = (int) ($minute / 60);
$mod = $minute % 60; $mod = $minute % 60;
@ -1682,7 +1681,7 @@ class RRule implements RRuleInterface
} }
$found = false; $found = false;
for ($j = 0; $j < self::REPEAT_CYCLES[self::SECONDLY]; $j++) { for ($j = 0; $j < self::MAX_CYCLES[self::SECONDLY]; $j++) {
$second += $this->interval; $second += $this->interval;
$div = (int) ($second / 60); $div = (int) ($second / 60);
$mod = $second % 60; $mod = $second % 60;
@ -1865,7 +1864,7 @@ class RRule implements RRuleInterface
* going to be a problem anytime soon, so at the moment I use the 28 years * going to be a problem anytime soon, so at the moment I use the 28 years
* cycle. * cycle.
*/ */
const REPEAT_CYCLES = [ const MAX_CYCLES = [
// self::YEARLY => 400, // self::YEARLY => 400,
// self::MONTHLY => 4800, // self::MONTHLY => 4800,
// self::WEEKLY => 20871, // self::WEEKLY => 20871,

22
tests/RRuleTest.php
View File

@ -1793,6 +1793,28 @@ class RRuleTest extends TestCase
} }
} }
public function rulesBeyondMaxCycles()
{
return [
['yearly' => 'YEARLY', 30],
['monthly' => 'MONTHLY', 400],
['weekly' => 'WEEKLY', 1500],
['daily' => 'DAILY', 11000],
['hourly' => 'HOURLY', 30],
['minutely' => 'MINUTELY', 1500]
];
}
/**
* @dataProvider rulesBeyondMaxCycles
*/
public function testMaxCyclesDoesntKickInIfTheRuleProduceOccurrences($frequency, $count)
{
// see https://github.com/rlanvin/php-rrule/issues/78
$rrule = new RRule(['FREQ' => $frequency, 'COUNT' => $count]);
$this->assertEquals($count, $rrule->count());
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// GetOccurrences // GetOccurrences