[Pkg-owncloud-commits] [php-sabredav] 21/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 8af176ae94e676e41cb88e001d360cfce5f1ab2e
Merge: a600936 472b358
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Mar 24 20:59:46 2014 -0400

    Merge branch '1.7' into 1.8
    
    Conflicts:
    	composer.json
    	tests/Sabre/DAV/ServerFinderBlockTest.php
    	tests/Sabre/DAV/ServerSimpleTest.php
    	tests/Sabre/DAVServerTest.php

 ChangeLog                                 |   3 +
 composer.json                             |   6 +-
 lib/Sabre/DAV/Server.php                  |   6 +-
 tests/Sabre/DAV/HttpPutTest.php           | 357 ++++++++++++++++++++++++++++++
 tests/Sabre/DAV/Mock/Collection.php       | 120 ++++++++++
 tests/Sabre/DAV/Mock/File.php             | 113 ++++++++++
 tests/Sabre/DAV/ServerFinderBlockTest.php |  53 -----
 tests/Sabre/DAV/ServerSimpleTest.php      |  98 --------
 tests/Sabre/DAVServerTest.php             |  10 +-
 9 files changed, 607 insertions(+), 159 deletions(-)

diff --cc composer.json
index 23a003d,6f049d0..321c3e7
--- a/composer.json
+++ b/composer.json
@@@ -27,9 -27,8 +27,9 @@@
          "ext-libxml" : "*"
      },
      "require-dev" : {
-         "phpunit/phpunit" : "3.7.*",
-         "evert/phpdoc-md" : "~0.0.7",
-         "phing/phing" : "2.4.14"
+         "phpunit/phpunit" : "~4.0.0",
 -        "phing/phing" : "~2.4"
++        "phing/phing" : "~2.4",
++        "evert/phpdoc-md" : "~0.0.7"
      },
      "provide" : {
          "evert/sabredav" : "1.7.*"
diff --cc lib/Sabre/DAV/Server.php
index 4aa6cac,d11c75e..49cfbc0
--- a/lib/Sabre/DAV/Server.php
+++ b/lib/Sabre/DAV/Server.php
@@@ -875,11 -878,8 +878,8 @@@ class Server 
  
              $node = $this->tree->getNodeForPath($uri);
  
-             // Checking If-None-Match and related headers.
-             if (!$this->checkPreconditions()) return;
- 
              // If the node is a collection, we'll deny it
 -            if (!($node instanceof Sabre_DAV_IFile)) throw new Sabre_DAV_Exception_Conflict('PUT is not allowed on non-files.');
 +            if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.');
              if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false;
  
              $etag = $node->put($body);
diff --cc tests/Sabre/DAVServerTest.php
index a92c706,fb76f78..19eca4a
--- a/tests/Sabre/DAVServerTest.php
+++ b/tests/Sabre/DAVServerTest.php
@@@ -1,13 -1,18 +1,19 @@@
  <?php
  
 +namespace Sabre;
 +
  require_once 'Sabre/HTTP/ResponseMock.php';
+ 
 -require_once 'Sabre/DAV/Auth/MockBackend.php';
++require_once 'Sabre/DAV/Auth/Backend/Mock.php';
+ require_once 'Sabre/DAV/Mock/File.php';
+ require_once 'Sabre/DAV/Mock/Collection.php';
+ 
 -require_once 'Sabre/DAVACL/MockPrincipalBackend.php';
++require_once 'Sabre/DAVACL/PrincipalBackend/Mock.php';
+ 
  require_once 'Sabre/CalDAV/Backend/Mock.php';
+ 
  require_once 'Sabre/CardDAV/Backend/Mock.php';
- require_once 'Sabre/DAVACL/PrincipalBackend/Mock.php';
- require_once 'Sabre/DAV/Auth/Backend/Mock.php';
  
 -
  /**
   * This class may be used as a basis for other webdav-related unittests.
   *

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