Merge pull request #25 from mperednya/master

Change days addition to date function to prevent DST offset.

2 files changed, 3 insertions, 2 deletions

diff --git a/RecurringType.php b/RecurringType.php
index 7d48f30..eab57ee 100644
--- a/RecurringType.php
+++ b/RecurringType.php
@@ -272,7 +272,7 @@ class RecurringType {
                 $step = $this->_transpose_size[$type] * $this->getRecurringTypeStepValue();
                 $day = 24 * 60 * 60;
                 $delta = floor(($intervalStartDateStamp - $recurringStartDateStamp) / ($day * $step));
-                $recurringInterval["start_date_stamp"] = $recurringStartDateStamp + $delta * $step * $day;
+                $recurringInterval["start_date_stamp"] = SchedulerHelperDate::addDays($recurringStartDateStamp, $delta*$step);
             } else {
                 $step = $this->_transpose_size[$type] * $this->getRecurringTypeStepValue();
                 $intStartDetails = SchedulerHelperDate::getDateInfo($intervalStartDateStamp);
diff --git a/tests/SchedulerHelperTest.php b/tests/SchedulerHelperTest.php
index 679a852..abaed1d 100644
--- a/tests/SchedulerHelperTest.php
+++ b/tests/SchedulerHelperTest.php
@@ -27,12 +27,13 @@ class SchedulerHelperTest extends \PHPUnit_Framework_TestCase
         ));
         
         $schedHelper->config["debug"] = false;
-        
+        $schedHelper->config["occurrence_timestamp_in_utc"] = true;
         return $schedHelper;
     }
     
     public function __construct()
     {
+        date_default_timezone_set('Europe/Minsk');
         $this->_logger = new Logger();
 
         $this->_baseHelper = new TestBaseHelper(array(