aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-10-30 18:11:49 -0700
committerzotlabs <mike@macgirvin.com>2018-10-30 18:11:49 -0700
commit70c55da1df69d90dcbeb5a78c994b23a8456bfc9 (patch)
tree86d39069b02ecabe4ed091514e5076a98abda43a /vendor/sabre
parent623aa7ea48149ca7c2bc556931f25befdf49e58a (diff)
parentf9ab7647dd660adb37464614616cb8484c500de4 (diff)
downloadvolse-hubzilla-70c55da1df69d90dcbeb5a78c994b23a8456bfc9.tar.gz
volse-hubzilla-70c55da1df69d90dcbeb5a78c994b23a8456bfc9.tar.bz2
volse-hubzilla-70c55da1df69d90dcbeb5a78c994b23a8456bfc9.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'vendor/sabre')
-rw-r--r--vendor/sabre/dav/CHANGELOG.md6
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/build.php0
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/googlecode_upload.py0
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/migrateto20.php0
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/migrateto21.php0
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/migrateto30.php0
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/migrateto32.php0
-rw-r--r--[-rwxr-xr-x]vendor/sabre/dav/bin/sabredav.php0
-rw-r--r--vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php5
-rw-r--r--vendor/sabre/dav/lib/DAV/Server.php7
-rw-r--r--vendor/sabre/dav/lib/DAV/Tree.php4
-rw-r--r--vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php2
-rw-r--r--vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php16
13 files changed, 34 insertions, 6 deletions
diff --git a/vendor/sabre/dav/CHANGELOG.md b/vendor/sabre/dav/CHANGELOG.md
index 0bccc995c..cda2564e1 100644
--- a/vendor/sabre/dav/CHANGELOG.md
+++ b/vendor/sabre/dav/CHANGELOG.md
@@ -1,6 +1,12 @@
ChangeLog
=========
+3.2.3 (2018-10-19)
+------------------
+
+* #982: Make sure that files that are siblings of directories, are reported
+ as files (@nickvergessen)
+
3.2.2 (2017-02-14)
------------------
diff --git a/vendor/sabre/dav/bin/build.php b/vendor/sabre/dav/bin/build.php
index c4ba20941..c4ba20941 100755..100644
--- a/vendor/sabre/dav/bin/build.php
+++ b/vendor/sabre/dav/bin/build.php
diff --git a/vendor/sabre/dav/bin/googlecode_upload.py b/vendor/sabre/dav/bin/googlecode_upload.py
index caafd5ded..caafd5ded 100755..100644
--- a/vendor/sabre/dav/bin/googlecode_upload.py
+++ b/vendor/sabre/dav/bin/googlecode_upload.py
diff --git a/vendor/sabre/dav/bin/migrateto20.php b/vendor/sabre/dav/bin/migrateto20.php
index 77236804f..77236804f 100755..100644
--- a/vendor/sabre/dav/bin/migrateto20.php
+++ b/vendor/sabre/dav/bin/migrateto20.php
diff --git a/vendor/sabre/dav/bin/migrateto21.php b/vendor/sabre/dav/bin/migrateto21.php
index c81ee5cca..c81ee5cca 100755..100644
--- a/vendor/sabre/dav/bin/migrateto21.php
+++ b/vendor/sabre/dav/bin/migrateto21.php
diff --git a/vendor/sabre/dav/bin/migrateto30.php b/vendor/sabre/dav/bin/migrateto30.php
index 9ca77c13c..9ca77c13c 100755..100644
--- a/vendor/sabre/dav/bin/migrateto30.php
+++ b/vendor/sabre/dav/bin/migrateto30.php
diff --git a/vendor/sabre/dav/bin/migrateto32.php b/vendor/sabre/dav/bin/migrateto32.php
index 7567aeb60..7567aeb60 100755..100644
--- a/vendor/sabre/dav/bin/migrateto32.php
+++ b/vendor/sabre/dav/bin/migrateto32.php
diff --git a/vendor/sabre/dav/bin/sabredav.php b/vendor/sabre/dav/bin/sabredav.php
index 950075d1a..950075d1a 100755..100644
--- a/vendor/sabre/dav/bin/sabredav.php
+++ b/vendor/sabre/dav/bin/sabredav.php
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
index a130cd61d..5b7b2ee17 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
@@ -52,12 +52,15 @@ class AddressData implements XmlDeserializable {
];
$elems = (array)$reader->parseInnerTree();
+ $elems = array_filter($elems, function($element) {
+ return $element['name'] === '{urn:ietf:params:xml:ns:carddav}prop' &&
+ isset($element['attributes']['name']);
+ });
$result['addressDataProperties'] = array_map(function($element) {
return $element['attributes']['name'];
}, $elems);
return $result;
-
}
}
diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php
index 6805ec0b0..f7fcf3057 100644
--- a/vendor/sabre/dav/lib/DAV/Server.php
+++ b/vendor/sabre/dav/lib/DAV/Server.php
@@ -893,15 +893,16 @@ class Server extends EventEmitter implements LoggerAwareInterface {
$newDepth--;
}
+ $propertyNames = $propFind->getRequestedProperties();
+ $propFindType = !empty($propertyNames) ? PropFind::NORMAL : PropFind::ALLPROPS;
+
foreach ($this->tree->getChildren($path) as $childNode) {
- $subPropFind = clone $propFind;
- $subPropFind->setDepth($newDepth);
if ($path !== '') {
$subPath = $path . '/' . $childNode->getName();
} else {
$subPath = $childNode->getName();
}
- $subPropFind->setPath($subPath);
+ $subPropFind = new PropFind($subPath, $propertyNames, $newDepth, $propFindType);
yield [
$subPropFind,
diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php
index 5d2792503..7c04f0915 100644
--- a/vendor/sabre/dav/lib/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/DAV/Tree.php
@@ -298,7 +298,9 @@ class Tree {
*/
protected function copyNode(INode $source, ICollection $destinationParent, $destinationName = null) {
- if (!$destinationName) $destinationName = $source->getName();
+ if ((string)$destinationName === '') {
+ $destinationName = $source->getName();
+ }
if ($source instanceof IFile) {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
index 455403aff..917f5ec3f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
@@ -60,7 +60,7 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
$backend->setRealm('writing unittests on a saturday night');
$backend->challenge($request, $response);
- $this->assertEquals(
+ $this->assertContains(
'Basic realm="writing unittests on a saturday night"',
$response->getHeader('WWW-Authenticate')
);
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
index e719e38d5..c70d17a22 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
@@ -24,6 +24,22 @@ class TreeTest extends \PHPUnit_Framework_TestCase {
}
+ function testCopyFile() {
+
+ $tree = new TreeMock();
+ $tree->copy('hi/file', 'hi/newfile');
+
+ $this->assertArrayHasKey('newfile', $tree->getNodeForPath('hi')->newFiles);
+ }
+
+ function testCopyFile0() {
+
+ $tree = new TreeMock();
+ $tree->copy('hi/file', 'hi/0');
+
+ $this->assertArrayHasKey('0', $tree->getNodeForPath('hi')->newFiles);
+ }
+
function testMove() {
$tree = new TreeMock();