[Pkg-owncloud-commits] [php-sabre-vobject] 317/341: hhvm requires these to be cast to int.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 6eeea2d6af1435217cff8e696bbff20e9f8e8ce1
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 8 18:11:39 2015 -0400

    hhvm requires these to be cast to int.
    
    See:
    https://github.com/facebook/hhvm/issues/3796
---
 lib/Recur/RRuleIterator.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/Recur/RRuleIterator.php b/lib/Recur/RRuleIterator.php
index 2f18324..4d9a63d 100644
--- a/lib/Recur/RRuleIterator.php
+++ b/lib/Recur/RRuleIterator.php
@@ -491,7 +491,11 @@ class RRuleIterator implements Iterator {
 
         }
 
-        $this->currentDate = $this->currentDate->setDate($this->currentDate->format('Y'), $this->currentDate->format('n'), $occurrence);
+        $this->currentDate = $this->currentDate->setDate(
+            (int)$this->currentDate->format('Y'),
+            (int)$this->currentDate->format('n'),
+            $occurrence
+        );
 
     }
 
@@ -578,12 +582,20 @@ class RRuleIterator implements Iterator {
                     }
                 } while (!in_array($currentMonth, $this->byMonth));
 
-                $this->currentDate = $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+                $this->currentDate = $this->currentDate->setDate(
+                    (int)$currentYear,
+                    (int)$currentMonth,
+                    (int)$currentDayOfMonth
+                );
 
             }
 
             // If we made it here, it means we got a valid occurrence
-            $this->currentDate = $this->currentDate->setDate($currentYear, $currentMonth, $occurrence);
+            $this->currentDate = $this->currentDate->setDate(
+                (int)$currentYear,
+                (int)$currentMonth,
+                (int)$occurrence
+            );
             return;
 
         } else {
@@ -598,7 +610,11 @@ class RRuleIterator implements Iterator {
                     $currentMonth = 1;
                 }
             } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate = $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+            $this->currentDate = $this->currentDate->setDate(
+                (int)$currentYear,
+                (int)$currentMonth,
+                (int)$currentDayOfMonth
+            );
 
             return;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git