[Pkg-owncloud-commits] [php-sabredav] 33/275: Merge remote-tracking branch 'origin/master' into calendar-auto-schedule

[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 c060fe8429425be005bf45f72b2e456ef264ee87
Merge: ee27439 7304aec
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Jan 9 17:49:21 2014 -0500

    Merge remote-tracking branch 'origin/master' into calendar-auto-schedule
    
    Conflicts:
    	lib/Sabre/CalDAV/Plugin.php

 ChangeLog                                             |  1 +
 lib/Sabre/CalDAV/Plugin.php                           |  2 +-
 lib/Sabre/DAV/Locks/Plugin.php                        |  2 +-
 lib/Sabre/DAV/Server.php                              | 15 ++++++++++++---
 tests/Sabre/CalDAV/ICSExportPluginTest.php            |  9 +++++++++
 tests/Sabre/CalDAV/PluginTest.php                     |  1 +
 tests/Sabre/CalDAV/ValidateICalTest.php               |  1 +
 tests/Sabre/CardDAV/AbstractPluginTest.php            |  2 ++
 tests/Sabre/CardDAV/ValidateVCardTest.php             |  1 +
 tests/Sabre/DAV/AbstractServer.php                    |  3 +--
 tests/Sabre/DAV/Auth/PluginTest.php                   |  1 +
 tests/Sabre/DAV/Issue33Test.php                       |  1 +
 tests/Sabre/DAV/Locks/MSWordTest.php                  |  1 +
 tests/Sabre/DAV/Locks/PluginTest.php                  |  9 ++++-----
 tests/Sabre/DAV/ServerCopyMoveTest.php                |  1 +
 tests/Sabre/DAVACL/ExpandPropertiesTest.php           |  1 +
 tests/Sabre/DAVACL/PluginAdminTest.php                |  2 ++
 tests/Sabre/DAVACL/PrincipalPropertySearchTest.php    |  1 +
 tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php |  1 +
 tests/Sabre/DAVServerTest.php                         |  4 +++-
 tests/Sabre/HTTP/ResponseMock.php                     |  9 ---------
 tests/Sabre/HTTP/{ResponseMock.php => SapiMock.php}   | 11 ++---------
 tests/bootstrap.php                                   |  1 +
 23 files changed, 49 insertions(+), 31 deletions(-)

diff --cc lib/Sabre/CalDAV/Plugin.php
index ca3f927,cdccb93..bead15a
--- a/lib/Sabre/CalDAV/Plugin.php
+++ b/lib/Sabre/CalDAV/Plugin.php
@@@ -555,7 -644,7 +555,7 @@@ class Plugin extends DAV\ServerPlugin 
  
          // If we're dealing with a calendar, the calendar itself is responsible
          // for the calendar-query.
-         if ($node instanceof ICalendarObjectContainer && $depth = 1) {
 -        if ($node instanceof ICalendar && $depth == 1) {
++        if ($node instanceof ICalendarObjectContainer && $depth == 1) {
  
              $nodePaths = $node->calendarQuery($parser->filters);
  
diff --cc tests/bootstrap.php
index 47cce5a,fda2be5..140409e
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@@ -7,9 -7,8 +7,10 @@@ include 'Sabre/TestUtil.php'
  include 'Sabre/DAVServerTest.php';
  include 'Sabre/CardDAV/Backend/AbstractPDOTest.php';
  include 'Sabre/CardDAV/TestUtil.php';
+ include 'Sabre/HTTP/SapiMock.php';
  include 'Sabre/DAV/ClientMock.php';
 +include 'Sabre/CalDAV/Schedule/IMip/Mock.php';
 +include 'Sabre/CalDAV/Backend/MockScheduling.php';
  
  date_default_timezone_set('UTC');
  

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