From 5de8ac3d9dea05c0b0f45e16c951d1480a063a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 5 Jun 2018 09:25:45 +0200 Subject: [PATCH 1/3] Update sabre/dav to 3.3.0-alpha1 --- composer.json | 2 +- composer.lock | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index e005e0f8ac6a..7f4ab10eb1cc 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "deepdiver1975/TarStreamer": "v0.1.0", "patchwork/jsqueeze": "^2.0", "lukasreschke/id3parser": "^0.0.3", - "sabre/dav": "^3.2", + "sabre/dav": "^3.3@dev", "deepdiver/zipstreamer": "^1.1", "zendframework/zend-inputfilter": "^2.8", "zendframework/zend-servicemanager": "^3.3", diff --git a/composer.lock b/composer.lock index 4c408688a1a8..27d357a6f7ab 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ea3e68d97d1936adbc464695dc7991c3", + "content-hash": "c9222ffe1fe2830cb3a75a91f286ae5e", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -2050,16 +2050,16 @@ }, { "name": "sabre/dav", - "version": "3.2.2", + "version": "3.3.x-dev", "source": { "type": "git", "url": "https://github.com/sabre-io/dav.git", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516" + "reference": "6fd5483ef1713d15d6288e970b8ff4977218bbe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516", + "url": "https://api.github.com/repos/sabre-io/dav/zipball/6fd5483ef1713d15d6288e970b8ff4977218bbe1", + "reference": "6fd5483ef1713d15d6288e970b8ff4977218bbe1", "shasum": "" }, "require": { @@ -2095,11 +2095,6 @@ "bin/naturalselection" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1.0-dev" - } - }, "autoload": { "psr-4": { "Sabre\\DAV\\": "lib/DAV/", @@ -2129,7 +2124,7 @@ "framework", "iCalendar" ], - "time": "2017-02-15T03:06:08+00:00" + "time": "2018-06-05T06:29:46+00:00" }, { "name": "sabre/event", @@ -6797,6 +6792,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "sabre/dav": 20, "behat/mink-selenium2-driver": 20 }, "prefer-stable": false, From 11a1177b066bf56238860c78e06d3903d0116008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 5 Jun 2018 11:55:49 +0200 Subject: [PATCH 2/3] Fix BC break of Tree::getChildren() --- apps/dav/lib/Files/FilesHome.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/lib/Files/FilesHome.php b/apps/dav/lib/Files/FilesHome.php index bfb9b866cb91..9a9d3bad1730 100644 --- a/apps/dav/lib/Files/FilesHome.php +++ b/apps/dav/lib/Files/FilesHome.php @@ -57,7 +57,7 @@ public function getChildren($path = null) { if ($path === null) { return $this->rootNode->getChildren(); } - return parent::getChildren($path); + return \iterator_to_array(parent::getChildren($path)); } public function childExists($name) { From 5c4c26911d01731dc90a616a4b4fbc9c89501fb0 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 5 Jun 2018 13:41:26 +0545 Subject: [PATCH 3/3] Unskip tests for issue 29599 --- .../features/apiWebdav/webdav-related-new-endpoint.feature | 1 - tests/acceptance/features/webUIUpload/uploadEdgecases.feature | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/acceptance/features/apiWebdav/webdav-related-new-endpoint.feature b/tests/acceptance/features/apiWebdav/webdav-related-new-endpoint.feature index a98f71238e89..af4ed983d495 100644 --- a/tests/acceptance/features/apiWebdav/webdav-related-new-endpoint.feature +++ b/tests/acceptance/features/apiWebdav/webdav-related-new-endpoint.feature @@ -598,7 +598,6 @@ Feature: webdav-related-new-endpoint | TIÄFÜ | #this test should be integrated into the previous scenario after fixing the issue - @skip @issue-29599 Scenario: Upload a file called "0" using new chunking Given using new DAV path And user "user0" has been created diff --git a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature index 8decd8b0d823..f1a01ec39681 100644 --- a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature +++ b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature @@ -95,7 +95,6 @@ that is not academically correct but saves a lot of time #this test should be intergrated into the previous scenario after fixing the issue #uploading into "simple-folder" because there is a folder called "0" in the root - @skip @issue-29599 Scenario: Upload a file called "0" using chunking Given a file with the size of "30000000" bytes and the name "0" has been created locally When the user opens the folder "simple-folder" using the webUI