[Pkg-owncloud-commits] [php-sabredav] 36/80: Fix function arguments in Sabre\Dav

David Prévot taffit at moszumanska.debian.org
Thu Jan 7 02:56:25 UTC 2016


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

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

commit 0ce5ecc332522b39ae5573a3197cb3c85f899892
Author: Jakob Sack <mail at jakobsack.de>
Date:   Mon Jan 4 16:20:49 2016 +0100

    Fix function arguments in Sabre\Dav
---
 lib/DAV/Auth/Backend/AbstractBasic.php | 2 +-
 lib/DAV/CorePlugin.php                 | 2 +-
 lib/DAV/TemporaryFileFilterPlugin.php  | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/DAV/Auth/Backend/AbstractBasic.php b/lib/DAV/Auth/Backend/AbstractBasic.php
index b82bec9..40a95f8 100644
--- a/lib/DAV/Auth/Backend/AbstractBasic.php
+++ b/lib/DAV/Auth/Backend/AbstractBasic.php
@@ -98,7 +98,7 @@ abstract class AbstractBasic implements BackendInterface {
             $response
         );
 
-        $userpass = $auth->getCredentials($request);
+        $userpass = $auth->getCredentials();
         if (!$userpass) {
             return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
         }
diff --git a/lib/DAV/CorePlugin.php b/lib/DAV/CorePlugin.php
index a0ce43c..69361cf 100644
--- a/lib/DAV/CorePlugin.php
+++ b/lib/DAV/CorePlugin.php
@@ -76,7 +76,7 @@ class CorePlugin extends ServerPlugin {
     function httpGet(RequestInterface $request, ResponseInterface $response) {
 
         $path = $request->getPath();
-        $node = $this->server->tree->getNodeForPath($path, 0);
+        $node = $this->server->tree->getNodeForPath($path);
 
         if (!$node instanceof IFile) return;
 
diff --git a/lib/DAV/TemporaryFileFilterPlugin.php b/lib/DAV/TemporaryFileFilterPlugin.php
index a4f15f3..c5b8aa1 100644
--- a/lib/DAV/TemporaryFileFilterPlugin.php
+++ b/lib/DAV/TemporaryFileFilterPlugin.php
@@ -134,9 +134,12 @@ class TemporaryFileFilterPlugin extends ServerPlugin {
      *
      * @param string $uri
      * @param resource $data
+     * @param DAV\ICollection $parentNode
+     * @param bool $modified Should be set to true, if this event handler
+     *                       changed &$data.
      * @return bool
      */
-    function beforeCreateFile($uri, $data) {
+    function beforeCreateFile($uri, $data, $parent, $modified) {
 
         if ($tempPath = $this->isTempFile($uri)) {
 

-- 
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