[Pkg-owncloud-commits] [php-sabredav] 06/11: Fix backport of ca91f5a

[David Prévot]

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

taffit pushed a commit to branch 2.1
in repository php-sabredav.

commit e156653a320e7deac96ed5c76c64163460e89cac
Author: Jakob Sack <mail at jakobsack.de>
Date:   Tue Jul 21 12:40:51 2015 +0200

    Fix backport of ca91f5a
    
    Forgot some fixes, sorry
---
 lib/CalDAV/Plugin.php             | 1 +
 tests/Sabre/CalDAV/PluginTest.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
index 6d4d612..9aa2767 100644
--- a/lib/CalDAV/Plugin.php
+++ b/lib/CalDAV/Plugin.php
@@ -4,6 +4,7 @@ namespace Sabre\CalDAV;
 
 use DateTimeZone;
 use Sabre\DAV;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\DAV\Property\HrefList;
 use Sabre\DAVACL;
 use Sabre\VObject;
diff --git a/tests/Sabre/CalDAV/PluginTest.php b/tests/Sabre/CalDAV/PluginTest.php
index 867aead..030ba4c 100644
--- a/tests/Sabre/CalDAV/PluginTest.php
+++ b/tests/Sabre/CalDAV/PluginTest.php
@@ -758,8 +758,8 @@ END:VCALENDAR';
         $expectedIcal = TestUtil::getTestCalendarData();
         $expectedIcal = \Sabre\VObject\Reader::read($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'))
+            new \DateTime('2000-01-01 00:00:00', new \DateTimeZone('UTC')),
+            new \DateTime('2010-12-31 23:59:59', new \DateTimeZone('UTC'))
         );
         $expectedIcal = str_replace("\r\n", "&#xD;\n", $expectedIcal->serialize());
 

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