[Pkg-owncloud-commits] [php-sabredav] 33/163: Fixing #428 on the 1.8 branch.

[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 174109d0c4e358ccd9ee241c0896413d6af3a5c3
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Fri Apr 4 16:45:59 2014 -0400

    Fixing #428 on the 1.8 branch.
---
 lib/Sabre/DAV/Locks/Plugin.php       | 2 +-
 tests/Sabre/DAV/AbstractServer.php   | 1 +
 tests/Sabre/DAV/Locks/PluginTest.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Sabre/DAV/Locks/Plugin.php b/lib/Sabre/DAV/Locks/Plugin.php
index d353986..20c71c0 100644
--- a/lib/Sabre/DAV/Locks/Plugin.php
+++ b/lib/Sabre/DAV/Locks/Plugin.php
@@ -503,7 +503,7 @@ class Plugin extends DAV\ServerPlugin {
 
                         $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
                         $node = $this->server->tree->getNodeForPath($uri);
-                        $etagValid = $node instanceof Sabre_DAV_IFile && $node->getETag()==$conditionToken[2];
+                        $etagValid = $node instanceof DAV\IFile && $node->getETag()==$conditionToken[2];
 
                     }
 
diff --git a/tests/Sabre/DAV/AbstractServer.php b/tests/Sabre/DAV/AbstractServer.php
index 3576756..4bf5b34 100644
--- a/tests/Sabre/DAV/AbstractServer.php
+++ b/tests/Sabre/DAV/AbstractServer.php
@@ -25,6 +25,7 @@ abstract class AbstractServer extends \PHPUnit_Framework_TestCase {
         $this->server = new Server($this->getRootNode());
         $this->server->httpResponse = $this->response;
         $this->server->debugExceptions = true;
+        $this->deleteTree(SABRE_TEMPDIR,false);
         file_put_contents(SABRE_TEMPDIR . '/test.txt', 'Test contents');
         mkdir(SABRE_TEMPDIR . '/dir');
         file_put_contents(SABRE_TEMPDIR . '/dir/child.txt', 'Child contents');
diff --git a/tests/Sabre/DAV/Locks/PluginTest.php b/tests/Sabre/DAV/Locks/PluginTest.php
index ed8a000..caa1d01 100644
--- a/tests/Sabre/DAV/Locks/PluginTest.php
+++ b/tests/Sabre/DAV/Locks/PluginTest.php
@@ -922,7 +922,7 @@ class PluginTest extends DAV\AbstractServer {
             'HTTP_IF' => '(["etag1"])',
         );
 
-        $request = new Sabre_HTTP_Request($serverVars);
+        $request = new HTTP\Request($serverVars);
         $request->setBody('newbody');
         $this->server->httpRequest = $request;
         $this->server->exec();

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