diff options
Diffstat (limited to 'vendor/sabre/dav/lib/DAV')
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Auth/Plugin.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Browser/Plugin.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Exception/Locked.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Exception/TooManyMatches.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/INodeByPath.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Server.php | 6 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Sharing/Plugin.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Tree.php | 14 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Version.php | 2 |
11 files changed, 26 insertions, 12 deletions
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php b/vendor/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php index 39324e4db..d142cbfbf 100644 --- a/vendor/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php +++ b/vendor/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php @@ -44,7 +44,7 @@ class PDOBasicAuth extends AbstractBasic * Digest prefix: * if the backend you are using for is prefixing * your password hashes set this option to your prefix to - * cut it off before verfiying. + * cut it off before verifying. * * @var string */ diff --git a/vendor/sabre/dav/lib/DAV/Auth/Plugin.php b/vendor/sabre/dav/lib/DAV/Auth/Plugin.php index eb4f27ca6..47fbe205a 100644 --- a/vendor/sabre/dav/lib/DAV/Auth/Plugin.php +++ b/vendor/sabre/dav/lib/DAV/Auth/Plugin.php @@ -58,7 +58,7 @@ class Plugin extends ServerPlugin * * @param Backend\BackendInterface $authBackend */ - public function __construct(Backend\BackendInterface $authBackend = null) + public function __construct(?Backend\BackendInterface $authBackend = null) { if (!is_null($authBackend)) { $this->addBackend($authBackend); diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php index 89495e5db..a8a6f430e 100644 --- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php +++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php @@ -522,7 +522,7 @@ HTML; /** * This method takes a path/name of an asset and turns it into url - * suiteable for http access. + * suitable for http access. * * @param string $assetName * diff --git a/vendor/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php b/vendor/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php index 37b28ca54..f28d20f41 100644 --- a/vendor/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php +++ b/vendor/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php @@ -9,7 +9,7 @@ use Sabre\DAV; /** * InvalidSyncToken. * - * This exception is emited for the {DAV:}valid-sync-token pre-condition, as + * This exception is emitted for the {DAV:}valid-sync-token pre-condition, as * defined in rfc6578, section 3.2. * * http://tools.ietf.org/html/rfc6578#section-3.2 diff --git a/vendor/sabre/dav/lib/DAV/Exception/Locked.php b/vendor/sabre/dav/lib/DAV/Exception/Locked.php index 28263cf13..24fad7095 100644 --- a/vendor/sabre/dav/lib/DAV/Exception/Locked.php +++ b/vendor/sabre/dav/lib/DAV/Exception/Locked.php @@ -32,7 +32,7 @@ class Locked extends DAV\Exception * * @param DAV\Locks\LockInfo $lock */ - public function __construct(DAV\Locks\LockInfo $lock = null) + public function __construct(?DAV\Locks\LockInfo $lock = null) { parent::__construct(); diff --git a/vendor/sabre/dav/lib/DAV/Exception/TooManyMatches.php b/vendor/sabre/dav/lib/DAV/Exception/TooManyMatches.php index 3f7d2d5fb..ef6f50243 100644 --- a/vendor/sabre/dav/lib/DAV/Exception/TooManyMatches.php +++ b/vendor/sabre/dav/lib/DAV/Exception/TooManyMatches.php @@ -9,7 +9,7 @@ use Sabre\DAV; /** * TooManyMatches. * - * This exception is emited for the {DAV:}number-of-matches-within-limits + * This exception is emitted for the {DAV:}number-of-matches-within-limits * post-condition, as defined in rfc6578, section 3.2. * * http://tools.ietf.org/html/rfc6578#section-3.2 diff --git a/vendor/sabre/dav/lib/DAV/INodeByPath.php b/vendor/sabre/dav/lib/DAV/INodeByPath.php index 4d63a33bd..349ea1053 100644 --- a/vendor/sabre/dav/lib/DAV/INodeByPath.php +++ b/vendor/sabre/dav/lib/DAV/INodeByPath.php @@ -9,7 +9,7 @@ namespace Sabre\DAV; * * This interface adds a tiny bit of functionality to collections. * - * Getting a node that is deep in the tree normally requires going trough each parent node + * Getting a node that is deep in the tree normally requires going through each parent node * which can cause a significant performance overhead. * * Implementing this interface allows solving this overhead by directly jumping to the target node. diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php index 1f8300d4a..3133e54ad 100644 --- a/vendor/sabre/dav/lib/DAV/Server.php +++ b/vendor/sabre/dav/lib/DAV/Server.php @@ -211,7 +211,7 @@ class Server implements LoggerAwareInterface, EmitterInterface * * @throws Exception */ - public function __construct($treeOrNode = null, HTTP\Sapi $sapi = null) + public function __construct($treeOrNode = null, ?HTTP\Sapi $sapi = null) { if ($treeOrNode instanceof Tree) { $this->tree = $treeOrNode; @@ -882,7 +882,7 @@ class Server implements LoggerAwareInterface, EmitterInterface * * @return \Traversable */ - private function generatePathNodes(PropFind $propFind, array $yieldFirst = null) + private function generatePathNodes(PropFind $propFind, ?array $yieldFirst = null) { if (null !== $yieldFirst) { yield $yieldFirst; @@ -1635,6 +1635,8 @@ class Server implements LoggerAwareInterface, EmitterInterface */ public function generateMultiStatus($fileProperties, $strip404s = false) { + $this->emit('beforeMultiStatus', [&$fileProperties]); + $w = $this->xml->getWriter(); if (self::$streamMultiStatus) { return function () use ($fileProperties, $strip404s, $w) { diff --git a/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php b/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php index e7adbeee6..d766ae0de 100644 --- a/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php +++ b/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php @@ -194,7 +194,7 @@ class Plugin extends ServerPlugin } /** - * This method is triggered whenever a subsystem reqeuests the privileges + * This method is triggered whenever a subsystem requests the privileges * hat are supported on a particular node. * * We need to add a number of privileges for scheduling purposes. diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php index 65b4583ce..1483e1bc5 100644 --- a/vendor/sabre/dav/lib/DAV/Tree.php +++ b/vendor/sabre/dav/lib/DAV/Tree.php @@ -62,9 +62,21 @@ class Tree implements INodeByPath return $this->rootNode; } - $parts = explode('/', $path); $node = $this->rootNode; + // look for any cached parent and collect the parts below the parent + $parts = []; + $remainingPath = $path; + do { + list($remainingPath, $baseName) = Uri\split($remainingPath); + array_unshift($parts, $baseName); + + if (isset($this->cache[$remainingPath])) { + $node = $this->cache[$remainingPath]; + break; + } + } while ('' !== $remainingPath); + while (count($parts)) { if (!($node instanceof ICollection)) { throw new Exception\NotFound('Could not find node at path: '.$path); diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php index 345c62d7e..e6aee097c 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.6.0'; + public const VERSION = '4.7.0'; } |