[Pkg-owncloud-commits] [php-sabredav] 40/80: Fixed several more calls to expand()

[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 3d80f577e0b07a72d7b16dbf7e753a78b123016d
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 4 14:25:33 2016 -0500

    Fixed several more calls to expand()
---
 lib/CalDAV/ICSExportPlugin.php                      | 2 +-
 tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php | 8 ++++----
 tests/Sabre/CalDAV/PluginTest.php                   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/CalDAV/ICSExportPlugin.php b/lib/CalDAV/ICSExportPlugin.php
index 2902ceb..8c296d5 100644
--- a/lib/CalDAV/ICSExportPlugin.php
+++ b/lib/CalDAV/ICSExportPlugin.php
@@ -243,7 +243,7 @@ class ICSExportPlugin extends DAV\ServerPlugin {
                 $calendarTimeZone = new DateTimeZone('UTC');
             }
 
-            $mergedCalendar->expand($start, $end, $calendarTimeZone);
+            $mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
         }
 
         $response->setHeader('Content-Type', $format);
diff --git a/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php b/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php
index 4392fc7..fba47d7 100644
--- a/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php
+++ b/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php
@@ -110,10 +110,10 @@ END:VCALENDAR
                 /** @var $child Sabre\VObject\Property */
                 if ($child->name == 'DTSTART') {
                     // DTSTART should be the UTC equivalent of given floating time
-                    $this->assertEquals($child->getValue(), '20141108T043000Z');
+                    $this->assertEquals('20141108T043000Z', $child->getValue());
                 } elseif ($child->name == 'DTEND') {
                     // DTEND should be the UTC equivalent of given floating time
-                    $this->assertEquals($child->getValue(), '20141108T063000Z');
+                    $this->assertEquals('20141108T063000Z', $child->getValue());
                 }
             }
         }
@@ -195,10 +195,10 @@ END:VCALENDAR
                 /** @var $child Sabre\VObject\Property */
                 if ($child->name == 'DTSTART') {
                     // DTSTART should be the UTC equivalent of given floating time
-                    $this->assertEquals($child->getValue(), '20141108T043000Z');
+                    $this->assertEquals('20141108T043000Z', $child->getValue());
                 } elseif ($child->name == 'DTEND') {
                     // DTEND should be the UTC equivalent of given floating time
-                    $this->assertEquals($child->getValue(), '20141108T063000Z');
+                    $this->assertEquals('20141108T063000Z', $child->getValue());
                 }
             }
         }
diff --git a/tests/Sabre/CalDAV/PluginTest.php b/tests/Sabre/CalDAV/PluginTest.php
index 3223f4e..138012f 100644
--- a/tests/Sabre/CalDAV/PluginTest.php
+++ b/tests/Sabre/CalDAV/PluginTest.php
@@ -612,7 +612,7 @@ XML;
 
         $expectedIcal = TestUtil::getTestCalendarData();
         $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
-        $expectedIcal->expand(
+        $expectedIcal = $expectedIcal->expand(
             new DateTime('2011-01-01 00:00:00', new DateTimeZone('UTC')),
             new DateTime('2011-12-31 23:59:59', new DateTimeZone('UTC'))
         );
@@ -670,7 +670,7 @@ XML;
 
         $expectedIcal = TestUtil::getTestCalendarData();
         $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
-        $expectedIcal->expand(
+        $expectedIcal = $expectedIcal->expand(
             new DateTime('2000-01-01 00:00:00', new DateTimeZone('UTC')),
             new DateTime('2010-12-31 23:59:59', new DateTimeZone('UTC'))
         );
@@ -732,7 +732,7 @@ XML;
 
         $expectedIcal = TestUtil::getTestCalendarData();
         $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
-        $expectedIcal->expand(
+        $expectedIcal = $expectedIcal->expand(
             new DateTime('2000-01-01 00:00:00', new DateTimeZone('UTC')),
             new DateTime('2010-12-31 23:59:59', new DateTimeZone('UTC'))
         );
@@ -895,7 +895,7 @@ XML;
 
         $expectedIcal = TestUtil::getTestCalendarData();
         $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
-        $expectedIcal->expand(
+        $expectedIcal = $expectedIcal->expand(
             new DateTime('2000-01-01 00:00:00', new DateTimeZone('UTC')),
             new DateTime('2010-12-31 23:59:59', new DateTimeZone('UTC'))
         );

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