aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/dav/lib/DAV
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2020-08-22 19:31:29 +0200
committerMario Vavti <mario@mariovavti.com>2020-08-22 19:31:29 +0200
commit2c777acb25fd5355ec02dc74c428174df80310d0 (patch)
tree8b74931f1b6c72d885cb47a451b71a565c4187d9 /vendor/sabre/dav/lib/DAV
parent49df57df45f82e2e0f1b10f2508f61b78d6d3ac0 (diff)
downloadvolse-hubzilla-2c777acb25fd5355ec02dc74c428174df80310d0.tar.gz
volse-hubzilla-2c777acb25fd5355ec02dc74c428174df80310d0.tar.bz2
volse-hubzilla-2c777acb25fd5355ec02dc74c428174df80310d0.zip
composer update sabre libs
Diffstat (limited to 'vendor/sabre/dav/lib/DAV')
-rw-r--r--vendor/sabre/dav/lib/DAV/Locks/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/DAV/Server.php6
-rw-r--r--vendor/sabre/dav/lib/DAV/Tree.php2
-rw-r--r--vendor/sabre/dav/lib/DAV/Version.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/vendor/sabre/dav/lib/DAV/Locks/Plugin.php b/vendor/sabre/dav/lib/DAV/Locks/Plugin.php
index 1e9b6839e..110bfce06 100644
--- a/vendor/sabre/dav/lib/DAV/Locks/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Locks/Plugin.php
@@ -371,7 +371,7 @@ class Plugin extends DAV\ServerPlugin
{
return $this->server->xml->write('{DAV:}prop', [
'{DAV:}lockdiscovery' => new DAV\Xml\Property\LockDiscovery([$lockInfo]),
- ]);
+ ], $this->server->getBaseUri());
}
/**
diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php
index 3c237500a..37bf282e8 100644
--- a/vendor/sabre/dav/lib/DAV/Server.php
+++ b/vendor/sabre/dav/lib/DAV/Server.php
@@ -208,8 +208,10 @@ class Server implements LoggerAwareInterface, EmitterInterface
* the nodes in the array as top-level children.
*
* @param Tree|INode|array|null $treeOrNode The tree object
+ *
+ * @throws Exception
*/
- public function __construct($treeOrNode = null)
+ public function __construct($treeOrNode = null, HTTP\Sapi $sapi = null)
{
if ($treeOrNode instanceof Tree) {
$this->tree = $treeOrNode;
@@ -226,7 +228,7 @@ class Server implements LoggerAwareInterface, EmitterInterface
}
$this->xml = new Xml\Service();
- $this->sapi = new HTTP\Sapi();
+ $this->sapi = $sapi ?? new HTTP\Sapi();
$this->httpResponse = new HTTP\Response();
$this->httpRequest = $this->sapi->getRequest();
$this->addPlugin(new CorePlugin());
diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php
index 72e14d522..aedc0155d 100644
--- a/vendor/sabre/dav/lib/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/DAV/Tree.php
@@ -141,8 +141,6 @@ class Tree
*
* @param string $sourcePath The path to the file which should be moved
* @param string $destinationPath The full destination path, so not just the destination parent node
- *
- * @return int
*/
public function move($sourcePath, $destinationPath)
{
diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php
index d2c4afb56..a7f5269bf 100644
--- a/vendor/sabre/dav/lib/DAV/Version.php
+++ b/vendor/sabre/dav/lib/DAV/Version.php
@@ -16,5 +16,5 @@ class Version
/**
* Full version number.
*/
- public const VERSION = '4.1.0';
+ public const VERSION = '4.1.1';
}