[Pkg-owncloud-commits] [php-sabredav] 27/163: Merge branch '1.7' into 1.8

[David Prévot]

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

taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit 1464199a7ff44fa55002e0c3df3861479e125fb2
Merge: a854589 4ec2eb1
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Apr 3 14:26:20 2014 -0400

    Merge branch '1.7' into 1.8
    
    Conflicts:
    	tests/Sabre/DAV/Mock/Collection.php
    	tests/Sabre/DAV/ServerSimpleTest.php

 ChangeLog                            |   3 +-
 lib/Sabre/DAV/Server.php             |   3 +
 tests/Sabre/DAV/HttpDeleteTest.php   | 144 +++++++++++++++++++++++++++++++++++
 tests/Sabre/DAV/Mock/Collection.php  |  46 ++++++++++-
 tests/Sabre/DAV/Mock/File.php        |  15 +++-
 tests/Sabre/DAV/ServerSimpleTest.php |  44 -----------
 tests/bootstrap.php                  |   2 +-
 tests/composer.vobject3.json         |   2 +-
 8 files changed, 208 insertions(+), 51 deletions(-)

diff --cc tests/Sabre/DAV/Mock/Collection.php
index 4bc9dd2,f0c674f..6848cad
--- a/tests/Sabre/DAV/Mock/Collection.php
+++ b/tests/Sabre/DAV/Mock/Collection.php
@@@ -107,12 -105,12 +109,12 @@@ class Collection extends DAV\Collectio
          $result = array();
          foreach($this->children as $key=>$value) {
  
 -            if ($value instanceof Sabre_DAV_INode) {
 +            if ($value instanceof DAV\INode) {
                  $result[] = $value;
              } elseif (is_array($value)) {
-                 $result[] = new Collection($key, $value);
 -                $result[] = new Sabre_DAV_Mock_Collection($key, $value, $this);
++                $result[] = new Collection($key, $value, $this);
              } else {
-                 $result[] = new File($key, $value);
 -                $result[] = new Sabre_DAV_Mock_File($key, $value, $this);
++                $result[] = new File($key, $value, $this);
              }
  
          }

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