[Pkg-owncloud-commits] [php-sabredav] 39/80: Requiring vobject 4. Fixing expand() issues.

[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-sabredav.

commit 17a775284de02fccf2ed87a5cef2d5860db6bc20
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 4 13:53:33 2016 -0500

    Requiring vobject 4. Fixing expand() issues.
    
    Updates #742
---
 composer.json         | 2 +-
 lib/CalDAV/Plugin.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 1c55052..57c1d94 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "sabre/vobject": ">=4.0.0-alpha1",
+        "sabre/vobject": ">=4.0.0",
         "sabre/event" : "~2.0",
         "sabre/xml"  : "~1.2",
         "sabre/http" : "~4.1",
diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
index 2609573..add6160 100644
--- a/lib/CalDAV/Plugin.php
+++ b/lib/CalDAV/Plugin.php
@@ -455,7 +455,7 @@ class Plugin extends DAV\ServerPlugin {
                         $timeZones[$calendarPath] = $timeZone;
                     }
 
-                    $vObject->expand($report->expand['start'], $report->expand['end'], $timeZones[$calendarPath]);
+                    $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $timeZones[$calendarPath]);
                 }
                 if ($needsJson) {
                     $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = json_encode($vObject->jsonSerialize());
@@ -566,7 +566,7 @@ class Plugin extends DAV\ServerPlugin {
 
 
                         if ($report->expand) {
-                            $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
+                            $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
                         }
                         if ($needsJson) {
                             $properties[200]['{' . self::NS_CALDAV . '}calendar-data'] = json_encode($vObject->jsonSerialize());
@@ -618,7 +618,7 @@ class Plugin extends DAV\ServerPlugin {
                     $vObject = VObject\Reader::read($properties[200]['{' . self::NS_CALDAV . '}calendar-data']);
 
                     if ($report->expand) {
-                        $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
+                        $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
                     }
 
                     if ($needsJson) {

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