diff options
| author | Thomas Willingham <founder@kakste.com> | 2014-04-12 18:13:37 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2014-04-12 18:13:37 +0100 |
| commit | cdc8454cf112006e4199b6221bcaa3c3a509b564 (patch) | |
| tree | 267293b7f5536bda899324af8913549baf4c4c72 /vendor/sabre/vobject/tests/Sabre/VObject | |
| parent | 2fdcd0c27eac389709f48d6b40723e153c1492e6 (diff) | |
| download | volse-hubzilla-cdc8454cf112006e4199b6221bcaa3c3a509b564.tar.gz volse-hubzilla-cdc8454cf112006e4199b6221bcaa3c3a509b564.tar.bz2 volse-hubzilla-cdc8454cf112006e4199b6221bcaa3c3a509b564.zip | |
Update sabre
Diffstat (limited to 'vendor/sabre/vobject/tests/Sabre/VObject')
| -rw-r--r-- | vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php | 4 | ||||
| -rw-r--r-- | vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php b/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php index 1811d8b6f..5988f16e2 100644 --- a/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php +++ b/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php @@ -1291,7 +1291,7 @@ class RecurrenceIteratorTest extends \PHPUnit_Framework_TestCase { } - $tz = new DateTimeZone('GMT'); + $tz = new DateTimeZone('UTC'); $this->assertEquals(array( new DateTime('2012-01-07 12:00:00',$tz), new DateTime('2012-01-08 12:00:00',$tz), @@ -1356,7 +1356,7 @@ class RecurrenceIteratorTest extends \PHPUnit_Framework_TestCase { } - $tz = new DateTimeZone('GMT'); + $tz = new DateTimeZone('UTC'); $this->assertEquals(array( new DateTime('2012-01-12 12:00:00',$tz), new DateTime('2012-01-13 12:00:00',$tz), diff --git a/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php b/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php index 7f76353d2..b898e8d26 100644 --- a/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php +++ b/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php @@ -144,7 +144,12 @@ HI; function testTimezoneOffset() { $tz = TimeZoneUtil::getTimeZone('GMT-0400', null, true); - $ex = new \DateTimeZone('Etc/GMT-4'); + + if (version_compare(PHP_VERSION, '5.5.10', '>=')) { + $ex = new \DateTimeZone('-04:00'); + } else { + $ex = new \DateTimeZone('Etc/GMT-4'); + } $this->assertEquals($ex->getName(), $tz->getName()); } @@ -289,7 +294,11 @@ END:VCALENDAR HI; $tz = TimeZoneUtil::getTimeZone('/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT', Reader::read($vobj), true); - $ex = new \DateTimeZone('EST5EDT'); + if (version_compare(PHP_VERSION, '5.5.10', '>=')) { + $ex = new \DateTimeZone('America/New_York'); + } else { + $ex = new \DateTimeZone('EST5EDT'); + } $this->assertEquals($ex->getName(), $tz->getName()); } |