[Pkg-owncloud-commits] [php-sabredav] 27/275: Merge branch 'master' into calendar-auto-schedule

David Prévot taffit at moszumanska.debian.org
Thu Sep 25 14:55:47 UTC 2014


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

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

commit e17f93b172070f0a6884dff6cf0d18142cfda6d6
Merge: cb8cca8 bf8349e
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Jan 6 17:14:16 2014 +0100

    Merge branch 'master' into calendar-auto-schedule
    
    Conflicts:
    	lib/Sabre/CalDAV/Backend/PDO.php
    	lib/Sabre/CalDAV/Plugin.php

 .travis.yml                                        |   5 +
 ChangeLog                                          |  25 +-
 LICENSE                                            |   2 +-
 build.xml                                          |   6 +-
 composer.json                                      |   5 +-
 examples/calendarserver.php                        |  24 +-
 lib/Sabre/CalDAV/Backend/AbstractBackend.php       |   2 +-
 lib/Sabre/CalDAV/Backend/BackendInterface.php      |   2 +-
 lib/Sabre/CalDAV/Backend/NotificationSupport.php   |   2 +-
 lib/Sabre/CalDAV/Backend/PDO.php                   |  25 +-
 lib/Sabre/CalDAV/Backend/SharingSupport.php        |   2 +-
 lib/Sabre/CalDAV/Backend/SubscriptionSupport.php   |   2 +-
 lib/Sabre/CalDAV/Backend/SyncSupport.php           |   2 +-
 lib/Sabre/CalDAV/Calendar.php                      |   2 +-
 lib/Sabre/CalDAV/CalendarObject.php                |   2 +-
 lib/Sabre/CalDAV/CalendarQueryParser.php           |   2 +-
 lib/Sabre/CalDAV/CalendarQueryValidator.php        |   2 +-
 lib/Sabre/CalDAV/CalendarRootNode.php              |   2 +-
 .../CalDAV/Exception/InvalidComponentType.php      |   2 +-
 lib/Sabre/CalDAV/ICSExportPlugin.php               |  42 +-
 lib/Sabre/CalDAV/ICalendar.php                     |   2 +-
 lib/Sabre/CalDAV/ICalendarObject.php               |   2 +-
 lib/Sabre/CalDAV/IShareableCalendar.php            |   2 +-
 lib/Sabre/CalDAV/ISharedCalendar.php               |   2 +-
 lib/Sabre/CalDAV/Notifications/Collection.php      |   2 +-
 lib/Sabre/CalDAV/Notifications/ICollection.php     |   2 +-
 lib/Sabre/CalDAV/Notifications/INode.php           |   2 +-
 .../CalDAV/Notifications/INotificationType.php     |   2 +-
 lib/Sabre/CalDAV/Notifications/Node.php            |   2 +-
 .../CalDAV/Notifications/Notification/Invite.php   |   2 +-
 .../Notifications/Notification/InviteReply.php     |   2 +-
 .../Notifications/Notification/SystemStatus.php    |   2 +-
 lib/Sabre/CalDAV/Plugin.php                        |  15 +-
 lib/Sabre/CalDAV/Principal/Collection.php          |   2 +-
 lib/Sabre/CalDAV/Principal/IProxyRead.php          |   2 +-
 lib/Sabre/CalDAV/Principal/IProxyWrite.php         |   2 +-
 lib/Sabre/CalDAV/Principal/ProxyRead.php           |   2 +-
 lib/Sabre/CalDAV/Principal/ProxyWrite.php          |   2 +-
 lib/Sabre/CalDAV/Principal/User.php                |   2 +-
 lib/Sabre/CalDAV/Property/AllowedSharingModes.php  |   2 +-
 lib/Sabre/CalDAV/Property/Invite.php               |   2 +-
 .../CalDAV/Property/ScheduleCalendarTransp.php     |   2 +-
 .../Property/SupportedCalendarComponentSet.php     |   2 +-
 .../CalDAV/Property/SupportedCalendarData.php      |   2 +-
 .../CalDAV/Property/SupportedCollationSet.php      |   2 +-
 lib/Sabre/CalDAV/Schedule/IMip.php                 |   4 +-
 lib/Sabre/CalDAV/Schedule/IOutbox.php              |   2 +-
 lib/Sabre/CalDAV/Schedule/Outbox.php               |   2 +-
 lib/Sabre/CalDAV/ShareableCalendar.php             |   2 +-
 lib/Sabre/CalDAV/SharedCalendar.php                |   2 +-
 lib/Sabre/CalDAV/SharingPlugin.php                 |   4 +-
 lib/Sabre/CalDAV/Subscriptions/ISubscription.php   |   2 +-
 lib/Sabre/CalDAV/Subscriptions/Plugin.php          |   2 +-
 lib/Sabre/CalDAV/Subscriptions/Subscription.php    |   2 +-
 lib/Sabre/CalDAV/UserCalendars.php                 |   4 +-
 lib/Sabre/CardDAV/AddressBook.php                  |   2 +-
 lib/Sabre/CardDAV/AddressBookQueryParser.php       |   2 +-
 lib/Sabre/CardDAV/AddressBookRoot.php              |   2 +-
 lib/Sabre/CardDAV/Backend/AbstractBackend.php      |   2 +-
 lib/Sabre/CardDAV/Backend/BackendInterface.php     |   2 +-
 lib/Sabre/CardDAV/Backend/PDO.php                  |   8 +-
 lib/Sabre/CardDAV/Backend/SyncSupport.php          |   2 +-
 lib/Sabre/CardDAV/Card.php                         |   2 +-
 lib/Sabre/CardDAV/IAddressBook.php                 |   2 +-
 lib/Sabre/CardDAV/ICard.php                        |   2 +-
 lib/Sabre/CardDAV/IDirectory.php                   |   2 +-
 lib/Sabre/CardDAV/Plugin.php                       |   7 +-
 .../CardDAV/Property/SupportedAddressData.php      |   2 +-
 lib/Sabre/CardDAV/UserAddressBooks.php             |   2 +-
 lib/Sabre/CardDAV/VCFExportPlugin.php              |   2 +-
 lib/Sabre/DAV/Auth/Backend/AbstractBasic.php       |   2 +-
 lib/Sabre/DAV/Auth/Backend/AbstractDigest.php      |   2 +-
 lib/Sabre/DAV/Auth/Backend/Apache.php              |   2 +-
 lib/Sabre/DAV/Auth/Backend/BackendInterface.php    |   2 +-
 lib/Sabre/DAV/Auth/Backend/BasicCallBack.php       |   2 +-
 lib/Sabre/DAV/Auth/Backend/File.php                |   2 +-
 lib/Sabre/DAV/Auth/Backend/PDO.php                 |  14 +-
 lib/Sabre/DAV/Auth/Plugin.php                      |   2 +-
 lib/Sabre/DAV/Browser/GuessContentType.php         |   2 +-
 lib/Sabre/DAV/Browser/MapGetToPropFind.php         |   2 +-
 lib/Sabre/DAV/Browser/Plugin.php                   |  19 +-
 lib/Sabre/DAV/Client.php                           |   6 +-
 lib/Sabre/DAV/Collection.php                       |   2 +-
 lib/Sabre/DAV/CopyTest.php                         |  24 -
 lib/Sabre/DAV/CorePlugin.php                       |  28 +-
 lib/Sabre/DAV/Exception.php                        |   2 +-
 lib/Sabre/DAV/Exception/BadRequest.php             |   2 +-
 lib/Sabre/DAV/Exception/Conflict.php               |   2 +-
 lib/Sabre/DAV/Exception/ConflictingLock.php        |   3 +-
 lib/Sabre/DAV/Exception/FileNotFound.php           |   2 +-
 lib/Sabre/DAV/Exception/Forbidden.php              |   2 +-
 lib/Sabre/DAV/Exception/InsufficientStorage.php    |   2 +-
 lib/Sabre/DAV/Exception/InvalidResourceType.php    |   2 +-
 lib/Sabre/DAV/Exception/InvalidSyncToken.php       |   2 +-
 .../DAV/Exception/LockTokenMatchesRequestUri.php   |   2 +-
 lib/Sabre/DAV/Exception/Locked.php                 |   2 +-
 lib/Sabre/DAV/Exception/MethodNotAllowed.php       |   2 +-
 lib/Sabre/DAV/Exception/NotAuthenticated.php       |   2 +-
 lib/Sabre/DAV/Exception/NotFound.php               |   2 +-
 lib/Sabre/DAV/Exception/NotImplemented.php         |   2 +-
 lib/Sabre/DAV/Exception/PaymentRequired.php        |   2 +-
 lib/Sabre/DAV/Exception/PreconditionFailed.php     |   2 +-
 lib/Sabre/DAV/Exception/ReportNotSupported.php     |   2 +-
 .../DAV/Exception/RequestedRangeNotSatisfiable.php |   2 +-
 lib/Sabre/DAV/Exception/ServiceUnavailable.php     |   2 +-
 lib/Sabre/DAV/Exception/TooMuchMatches.php         |   2 +-
 lib/Sabre/DAV/Exception/UnsupportedMediaType.php   |   2 +-
 lib/Sabre/DAV/FS/Directory.php                     |   2 +-
 lib/Sabre/DAV/FS/File.php                          |   2 +-
 lib/Sabre/DAV/FS/Node.php                          |   2 +-
 lib/Sabre/DAV/FSExt/Directory.php                  |   2 +-
 lib/Sabre/DAV/FSExt/File.php                       |   2 +-
 lib/Sabre/DAV/FSExt/Node.php                       |   2 +-
 lib/Sabre/DAV/File.php                             |   2 +-
 lib/Sabre/DAV/ICollection.php                      |   2 +-
 lib/Sabre/DAV/IExtendedCollection.php              |   2 +-
 lib/Sabre/DAV/IFile.php                            |   2 +-
 lib/Sabre/DAV/IMultiGet.php                        |   2 +-
 lib/Sabre/DAV/INode.php                            |   2 +-
 lib/Sabre/DAV/IProperties.php                      |   2 +-
 lib/Sabre/DAV/IQuota.php                           |   2 +-
 lib/Sabre/DAV/Locks/Backend/AbstractBackend.php    |   2 +-
 lib/Sabre/DAV/Locks/Backend/BackendInterface.php   |   2 +-
 lib/Sabre/DAV/Locks/Backend/FS.php                 |   2 +-
 lib/Sabre/DAV/Locks/Backend/File.php               |   2 +-
 lib/Sabre/DAV/Locks/Backend/PDO.php                |   2 +-
 lib/Sabre/DAV/Locks/LockInfo.php                   |   2 +-
 lib/Sabre/DAV/Locks/Plugin.php                     |   4 +-
 lib/Sabre/DAV/Mount/Plugin.php                     |   2 +-
 lib/Sabre/DAV/Node.php                             |   2 +-
 lib/Sabre/DAV/ObjectTree.php                       |   2 +-
 lib/Sabre/DAV/PartialUpdate/IFile.php              |   2 +-
 lib/Sabre/DAV/PartialUpdate/Plugin.php             |   4 +-
 lib/Sabre/DAV/Property.php                         |   2 +-
 lib/Sabre/DAV/Property/GetLastModified.php         |   2 +-
 lib/Sabre/DAV/Property/Href.php                    |  10 +-
 lib/Sabre/DAV/Property/HrefList.php                |   8 +-
 lib/Sabre/DAV/Property/IHref.php                   |   2 +-
 lib/Sabre/DAV/Property/LockDiscovery.php           |   2 +-
 lib/Sabre/DAV/Property/ResourceType.php            |   2 +-
 lib/Sabre/DAV/Property/Response.php                |   2 +-
 lib/Sabre/DAV/Property/ResponseList.php            |   2 +-
 lib/Sabre/DAV/Property/SupportedLock.php           |   2 +-
 lib/Sabre/DAV/Property/SupportedReportSet.php      |   2 +-
 lib/Sabre/DAV/PropertyInterface.php                |   2 +-
 lib/Sabre/DAV/Server.php                           |  33 +-
 lib/Sabre/DAV/ServerPlugin.php                     |   2 +-
 lib/Sabre/DAV/SimpleCollection.php                 |   2 +-
 lib/Sabre/DAV/SimpleFile.php                       |   2 +-
 lib/Sabre/DAV/StringUtil.php                       |   2 +-
 lib/Sabre/DAV/Sync/ISyncCollection.php             |   2 +-
 lib/Sabre/DAV/Sync/Plugin.php                      |   4 +-
 lib/Sabre/DAV/TemporaryFileFilterPlugin.php        |   5 +-
 lib/Sabre/DAV/Tree.php                             |   2 +-
 lib/Sabre/DAV/Tree/Filesystem.php                  |   2 +-
 lib/Sabre/DAV/URLUtil.php                          |   3 +-
 lib/Sabre/DAV/UUIDUtil.php                         |   2 +-
 lib/Sabre/DAV/Version.php                          |   9 +-
 lib/Sabre/DAV/XMLUtil.php                          |   2 +-
 lib/Sabre/DAVACL/AbstractPrincipalCollection.php   |   2 +-
 lib/Sabre/DAVACL/Exception/AceConflict.php         |   2 +-
 lib/Sabre/DAVACL/Exception/NeedPrivileges.php      |   2 +-
 lib/Sabre/DAVACL/Exception/NoAbstract.php          |   2 +-
 .../DAVACL/Exception/NotRecognizedPrincipal.php    |   2 +-
 .../DAVACL/Exception/NotSupportedPrivilege.php     |   2 +-
 lib/Sabre/DAVACL/IACL.php                          |   2 +-
 lib/Sabre/DAVACL/IPrincipal.php                    |   2 +-
 lib/Sabre/DAVACL/IPrincipalCollection.php          |   2 +-
 lib/Sabre/DAVACL/Plugin.php                        |  67 +-
 lib/Sabre/DAVACL/Principal.php                     |   2 +-
 .../DAVACL/PrincipalBackend/AbstractBackend.php    |   2 +-
 .../DAVACL/PrincipalBackend/BackendInterface.php   |   2 +-
 lib/Sabre/DAVACL/PrincipalBackend/PDO.php          |   2 +-
 lib/Sabre/DAVACL/PrincipalCollection.php           |   2 +-
 lib/Sabre/DAVACL/Property/Acl.php                  |   2 +-
 lib/Sabre/DAVACL/Property/AclRestrictions.php      |   2 +-
 .../DAVACL/Property/CurrentUserPrivilegeSet.php    |   2 +-
 lib/Sabre/DAVACL/Property/Principal.php            |   4 +-
 .../DAVACL/Property/SupportedPrivilegeSet.php      |   2 +-
 lib/Sabre/autoload.php                             |   2 +-
 .../CalDAV/Backend/MockSubscriptionSupport.php     |   2 +-
 .../CalDAV/ExpandEventsDTSTARTandDTENDTest.php     |   4 +-
 .../ExpandEventsDTSTARTandDTENDbyDayTest.php       |   5 +-
 .../Sabre/CalDAV/ExpandEventsDoubleEventsTest.php  |   4 +-
 tests/Sabre/CalDAV/FreeBusyReportTest.php          |   6 +-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php    |   5 +-
 tests/Sabre/CalDAV/ICSExportPluginTest.php         |  55 +-
 tests/Sabre/CalDAV/Issue203Test.php                |   5 +-
 tests/Sabre/CalDAV/Issue205Test.php                |   5 +-
 tests/Sabre/CalDAV/Issue211Test.php                |   5 +-
 tests/Sabre/CalDAV/Issue220Test.php                |   7 +-
 tests/Sabre/CalDAV/Issue228Test.php                |   4 +-
 tests/Sabre/CalDAV/PluginTest.php                  |  74 +-
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  |  26 +-
 tests/Sabre/CalDAV/Schedule/IMip/Mock.php          |   6 +-
 tests/Sabre/CalDAV/Schedule/OutboxPostTest.php     |  60 +-
 tests/Sabre/CalDAV/SharingPluginTest.php           |  52 +-
 tests/Sabre/CalDAV/ValidateICalTest.php            |  52 +-
 tests/Sabre/CardDAV/AddressBookQueryTest.php       |  16 +-
 tests/Sabre/CardDAV/MultiGetTest.php               |   4 +-
 tests/Sabre/CardDAV/SogoStripContentTypeTest.php   |   2 +-
 tests/Sabre/CardDAV/VCFExportTest.php              |   4 +-
 tests/Sabre/CardDAV/ValidateVCardTest.php          |  26 +-
 tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php |   4 +-
 .../Sabre/DAV/Auth/Backend/AbstractDigestTest.php  |  10 +-
 tests/Sabre/DAV/Auth/Backend/ApacheTest.php        |   2 +-
 tests/Sabre/DAV/Auth/Backend/BasicCallBackTest.php |   4 +-
 tests/Sabre/DAV/Auth/PluginTest.php                |   4 +-
 tests/Sabre/DAV/Browser/MapGetToPropFindTest.php   |   4 +-
 tests/Sabre/DAV/Browser/PluginTest.php             |  20 +-
 tests/Sabre/DAV/ClientTest.php                     | 947 ---------------------
 tests/Sabre/DAV/FSExt/ServerTest.php               |  36 +-
 tests/Sabre/DAV/GetIfConditionsTest.php            |  20 +-
 tests/Sabre/DAV/HTTPPreferParsingTest.php          |  20 +-
 tests/Sabre/DAV/Issue33Test.php                    |   4 +-
 tests/Sabre/DAV/Locks/MSWordTest.php               |  12 +-
 tests/Sabre/DAV/Locks/PluginTest.php               | 148 ++--
 tests/Sabre/DAV/Mount/PluginTest.php               |   8 +-
 tests/Sabre/DAV/PartialUpdate/PluginTest.php       |  20 +-
 .../Sabre/DAV/Property/SupportedReportSetTest.php  |   6 +-
 tests/Sabre/DAV/ServerCopyMoveTest.php             |  40 +-
 tests/Sabre/DAV/ServerEventsTest.php               |   4 +-
 tests/Sabre/DAV/ServerFinderBlockTest.php          |   8 +-
 tests/Sabre/DAV/ServerMKCOLTest.php                |  52 +-
 tests/Sabre/DAV/ServerPluginTest.php               |   4 +-
 tests/Sabre/DAV/ServerPreconditionTest.php         |  44 +-
 tests/Sabre/DAV/ServerPropsTest.php                |   8 +-
 tests/Sabre/DAV/ServerRangeTest.php                |  36 +-
 tests/Sabre/DAV/ServerSimpleTest.php               | 100 +--
 tests/Sabre/DAV/Sync/MockSyncCollection.php        |   2 +-
 tests/Sabre/DAV/Sync/PluginTest.php                |  52 +-
 tests/Sabre/DAV/TemporaryFileFilterTest.php        |  42 +-
 tests/Sabre/DAV/URLUtilTest.php                    | 131 ---
 tests/Sabre/DAVACL/ExpandPropertiesTest.php        |  16 +-
 tests/Sabre/DAVACL/PluginAdminTest.php             |   8 +-
 tests/Sabre/DAVACL/PrincipalPropertySearchTest.php |  16 +-
 .../DAVACL/PrincipalSearchPropertySetTest.php      |  12 +-
 tests/Sabre/DAVServerTest.php                      |   5 +-
 tests/Sabre/HTTP/ResponseMock.php                  |   2 +-
 tests/bootstrap.php                                |   4 +-
 tests/composer.vobject3.json                       |  51 --
 241 files changed, 1015 insertions(+), 2039 deletions(-)

diff --cc lib/Sabre/CalDAV/Backend/PDO.php
index 5f4c31c,72ff08b..3abc8fe
mode 100755,100644..100755
--- a/lib/Sabre/CalDAV/Backend/PDO.php
+++ b/lib/Sabre/CalDAV/Backend/PDO.php
@@@ -59,11 -59,11 +59,18 @@@ class PDO extends AbstractBackend imple
      protected $calendarChangesTableName;
  
      /**
 +     * The table name that will be used inbox items.
 +     *
 +     * @var string
 +     */
 +    protected $schedulingObjectTableName;
++    
++    /**
+      * The table name that will be used for calendar subscriptions.
+      *
+      * @var string
+      */
+     protected $calendarSubscriptionsTableName;
  
      /**
       * List of CalDAV properties, and how they map to database fieldnames
@@@ -102,17 -102,16 +109,19 @@@
       * @param \PDO $pdo
       * @param string $calendarTableName
       * @param string $calendarObjectTableName
 -     * @param string $calendarChangesTableName
 +     * @param string $calendarChangesTable
 +     * @param string $schedulingObjectTable
+      * @param string $calendarSubscriptionsTableName
 +     * @todo we have to do something about this signature. It's bullshit.
       */
-     public function __construct(\PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects', $calendarChangesTableName = 'calendarchanges', $schedulingObjectTableName = "schedulingobjects") {
 -    public function __construct(\PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects', $calendarChangesTableName = 'calendarchanges', $calendarSubscriptionsTableName = 'calendarsubscriptions') {
++    public function __construct(\PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects', $calendarChangesTableName = 'calendarchanges', $calendarSubscriptionsTableName = "calendarsubscriptions", $schedulingObjectTableName = "schedulingobjects") {
  
          $this->pdo = $pdo;
          $this->calendarTableName = $calendarTableName;
          $this->calendarObjectTableName = $calendarObjectTableName;
          $this->calendarChangesTableName = $calendarChangesTableName;
 +        $this->schedulingObjectTableName = $schedulingObjectTableName;
+         $this->calendarSubscriptionsTableName = $calendarSubscriptionsTableName;
  
      }
  
diff --cc tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
index bce89b8,4df95d1..8a1ed59
--- a/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
+++ b/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
@@@ -44,10 -44,10 +44,10 @@@ END:VCALENDAR'
  
          $tree = array(
              new DAVACL\PrincipalCollection($principalBackend),
 -            new CalendarRootNode($principalBackend, $caldavBackend),
 +            new CalDAV\CalendarRootNode($principalBackend, $caldavBackend),
          );
  
-         $this->request = HTTP\Request::createFromServerArray([
+         $this->request = HTTP\Sapi::createFromServerArray([
              'CONTENT_TYPE' => 'text/calendar',
          ]);
          $this->response = new HTTP\ResponseMock();
diff --cc tests/Sabre/CalDAV/Schedule/OutboxPostTest.php
index 97c8b90,0669d23..af90066
--- a/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php
+++ b/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php
@@@ -317,12 -318,12 +317,12 @@@ class OutboxPostTest extends \Sabre\DAV
  
          $req->setBody(implode("\r\n",$body));
  
 -        $handler = new Schedule\IMip\Mock('server at example.org');
 +        $handler = new IMip\Mock('server at example.org');
  
 -        $this->caldavPlugin->setIMIPhandler($handler);
 +        $this->caldavSchedulePlugin->setIMIPhandler($handler);
  
          $response = $this->request($req);
-         $this->assertEquals('200 OK', $response->status);
+         $this->assertEquals(200, $response->status);
          $this->assertEquals(array(
              'Content-Type' => 'application/xml',
          ), $response->headers);
@@@ -369,12 -370,12 +369,12 @@@
  
          $req->setBody(implode("\r\n",$body));
  
 -        $handler = new Schedule\IMip\Mock('server at example.org');
 +        $handler = new IMip\Mock('server at example.org');
  
 -        $this->caldavPlugin->setIMIPhandler($handler);
 +        $this->caldavSchedulePlugin->setIMIPhandler($handler);
  
          $response = $this->request($req);
-         $this->assertEquals('200 OK', $response->status, 'Full body: ' . $response->body);
+         $this->assertEquals(200, $response->status, 'Full body: ' . $response->body);
          $this->assertEquals(array(
              'Content-Type' => 'application/xml',
          ), $response->headers);
@@@ -420,12 -421,12 +420,12 @@@
  
          $req->setBody(implode("\r\n",$body));
  
 -        $handler = new Schedule\IMip\Mock('server at example.org');
 +        $handler = new IMip\Mock('server at example.org');
  
 -        $this->caldavPlugin->setIMIPhandler($handler);
 +        $this->caldavSchedulePlugin->setIMIPhandler($handler);
  
          $response = $this->request($req);
-         $this->assertEquals('200 OK', $response->status);
+         $this->assertEquals(200, $response->status);
          $this->assertEquals(array(
              'Content-Type' => 'application/xml',
          ), $response->headers);
@@@ -557,12 -558,12 +557,12 @@@
  
          $req->setBody(implode("\r\n",$body));
  
 -        $handler = new Schedule\IMip\Mock('server at example.org');
 +        $handler = new IMip\Mock('server at example.org');
  
 -        $this->caldavPlugin->setIMIPhandler($handler);
 +        $this->caldavSchedulePlugin->setIMIPhandler($handler);
  
          $response = $this->request($req);
-         $this->assertEquals('403 Forbidden', $response->status, 'Full body: ' . $response->body);
+         $this->assertEquals(403, $response->status, 'Full body: ' . $response->body);
  
      }
  }
diff --cc tests/bootstrap.php
index c5439d3,8abd8fe..47cce5a
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@@ -8,13 -8,9 +8,11 @@@ include 'Sabre/DAVServerTest.php'
  include 'Sabre/CardDAV/Backend/AbstractPDOTest.php';
  include 'Sabre/CardDAV/TestUtil.php';
  include 'Sabre/DAV/ClientMock.php';
 +include 'Sabre/CalDAV/Schedule/IMip/Mock.php';
 +include 'Sabre/CalDAV/Backend/MockScheduling.php';
  
- date_default_timezone_set('GMT');
+ date_default_timezone_set('UTC');
  
- // If sqlite is not available, this constant is used to skip the relevant
- // tests
  $config = [
      'SABRE_TEMPDIR'   => dirname(__FILE__) . '/temp/',
      'SABRE_HASSQLITE' => in_array('sqlite',PDO::getAvailableDrivers()),

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



More information about the Pkg-owncloud-commits mailing list