Skip to content

[downstream] Fix colon issue #2727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Dec 19, 2016
Merged

[downstream] Fix colon issue #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553883a
Add integration test for creating folder with colon
Dec 6, 2016
ad725de
Update third-party ref for new sabre/uri version
LukasReschke Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 10 files
+1 −1 composer.json
+7 −7 composer.lock
+1 −0 composer/autoload_classmap.php
+1 −1 composer/autoload_real.php
+1 −0 composer/autoload_static.php
+53 −53 composer/installed.json
+11 −0 sabre/uri/CHANGELOG.md
+17 −0 sabre/uri/lib/InvalidUriException.php
+1 −1 sabre/uri/lib/Version.php
+92 −1 sabre/uri/lib/functions.php
9 changes: 9 additions & 0 deletions build/integration/features/bootstrap/WebDav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use GuzzleHttp\Client as GClient;
use GuzzleHttp\Message\ResponseInterface;
use Sabre\DAV\Client as SClient;
use Sabre\DAV\Xml\Property\ResourceType;

require __DIR__ . '/../../vendor/autoload.php';

Expand Down Expand Up @@ -328,6 +329,14 @@ public function theSingleResponseShouldContainAPropertyWithValue($key, $expected
}

$value = $keys[$key];
if ($value instanceof ResourceType) {
$value = $value->getValue();
if (empty($value)) {
$value = '';
} else {
$value = $value[0];
}
}
if ($value != $expectedValue) {
throw new \Exception("Property \"$key\" found with value \"$value\", expected \"$expectedValue\"");
}
Expand Down
16 changes: 16 additions & 0 deletions build/integration/features/webdav-related.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,3 +447,19 @@ Feature: webdav-related
And As an "user1"
When User "user1" deletes file "/testfolder/asdf.txt"
Then the HTTP status code should be "204"

Scenario: Creating a folder
Given using old dav path
And user "user0" exists
And user "user0" created a folder "/test_folder"
When as "user0" gets properties of folder "/test_folder" with
|{DAV:}resourcetype|
Then the single response should contain a property "{DAV:}resourcetype" with value "{DAV:}collection"

Scenario: Creating a folder with special chars
Given using old dav path
And user "user0" exists
And user "user0" created a folder "/test_folder:5"
When as "user0" gets properties of folder "/test_folder:5" with
|{DAV:}resourcetype|
Then the single response should contain a property "{DAV:}resourcetype" with value "{DAV:}collection"