diff options
| author | Mario <mario@mariovavti.com> | 2022-10-11 18:29:06 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-11 18:29:06 +0000 |
| commit | ccd826f63a7a4c7e442fab8a70d9c4c84808b417 (patch) | |
| tree | fbbde69114acba764cf6b735433c53e099fd19c5 /vendor/sabre/dav | |
| parent | 5e5f0aa955d86743a14531bed98501b59140ab1f (diff) | |
| download | volse-hubzilla-ccd826f63a7a4c7e442fab8a70d9c4c84808b417.tar.gz volse-hubzilla-ccd826f63a7a4c7e442fab8a70d9c4c84808b417.tar.bz2 volse-hubzilla-ccd826f63a7a4c7e442fab8a70d9c4c84808b417.zip | |
Revert "update composer libs"
This reverts commit 5e5f0aa955d86743a14531bed98501b59140ab1f.
Diffstat (limited to 'vendor/sabre/dav')
| -rw-r--r-- | vendor/sabre/dav/README.md | 21 | ||||
| -rw-r--r-- | vendor/sabre/dav/lib/DAV/CorePlugin.php | 5 | ||||
| -rw-r--r-- | vendor/sabre/dav/lib/DAV/StringUtil.php | 6 | ||||
| -rw-r--r-- | vendor/sabre/dav/lib/DAV/Version.php | 2 |
4 files changed, 15 insertions, 19 deletions
diff --git a/vendor/sabre/dav/README.md b/vendor/sabre/dav/README.md index 32ca1c3fa..acdb1e03c 100644 --- a/vendor/sabre/dav/README.md +++ b/vendor/sabre/dav/README.md @@ -14,17 +14,16 @@ http://sabre.io/ Build status ------------ -| branch | status | PHP version | -|------------|---------------------------------------------------------------------------|--------------------| -| master 4.* |  | PHP 7.1 up, 8.0 up | -| 3.2 | unmaintained | PHP 5.5 to 7.1 | -| 3.1 | unmaintained | PHP 5.5 | -| 3.0 | unmaintained | PHP 5.4 | -| 2.1 | unmaintained | PHP 5.4 | -| 2.0 | unmaintained | PHP 5.4 | -| 1.8 | unmaintained | PHP 5.3 | -| 1.7 | unmaintained | PHP 5.3 | -| 1.6 | unmaintained | PHP 5.3 | +| branch | status | minimum PHP version | +| ------------ | ------ | ------------------- | +| master | [](https://travis-ci.org/sabre-io/dav) | PHP 7.1 | +| 3.1 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.5 | +| 3.0 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.4 | +| 2.1 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.4 | +| 2.0 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.4 | +| 1.8 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.3 | +| 1.7 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.3 | +| 1.6 | [](https://travis-ci.org/sabre-io/dav) | PHP 5.3 | Documentation ------------- diff --git a/vendor/sabre/dav/lib/DAV/CorePlugin.php b/vendor/sabre/dav/lib/DAV/CorePlugin.php index dbd8976b1..74350c28d 100644 --- a/vendor/sabre/dav/lib/DAV/CorePlugin.php +++ b/vendor/sabre/dav/lib/DAV/CorePlugin.php @@ -645,10 +645,6 @@ class CorePlugin extends ServerPlugin if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) { return false; } - if (!$this->server->emit('beforeCopy', [$path, $copyInfo['destination']])) { - return false; - } - if ($copyInfo['destinationExists']) { if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) { return false; @@ -657,7 +653,6 @@ class CorePlugin extends ServerPlugin } $this->server->tree->copy($path, $copyInfo['destination']); - $this->server->emit('afterCopy', [$path, $copyInfo['destination']]); $this->server->emit('afterBind', [$copyInfo['destination']]); // If a resource was overwritten we should send a 204, otherwise a 201 diff --git a/vendor/sabre/dav/lib/DAV/StringUtil.php b/vendor/sabre/dav/lib/DAV/StringUtil.php index edfb7fa5c..13a4399e3 100644 --- a/vendor/sabre/dav/lib/DAV/StringUtil.php +++ b/vendor/sabre/dav/lib/DAV/StringUtil.php @@ -77,8 +77,10 @@ class StringUtil */ public static function ensureUTF8($input) { - if (!mb_check_encoding($input, 'UTF-8') && mb_check_encoding($input, 'ISO-8859-1')) { - return mb_convert_encoding($input, 'UTF-8', 'ISO-8859-1'); + $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true); + + if ('ISO-8859-1' === $encoding) { + return utf8_encode($input); } else { return $input; } diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php index c6273ef72..f8b56bb98 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.4.0'; + public const VERSION = '4.3.1'; } |