From 928f11336160ce9f25ad21e891169502b050a65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Bertol=C3=ADn?= Date: Mon, 21 Nov 2016 14:41:00 +0100 Subject: [PATCH] Return explicit values instead of boolean from sabre (#26654) Signed-off-by: Lukas Reschke --- apps/dav/lib/Connector/Sabre/TagsPlugin.php | 6 +++++- build/integration/features/favorites.feature | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/TagsPlugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php index ef6bece58b..59e4ab4546 100644 --- a/apps/dav/lib/Connector/Sabre/TagsPlugin.php +++ b/apps/dav/lib/Connector/Sabre/TagsPlugin.php @@ -250,7 +250,11 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin if (is_null($isFav)) { list(, $isFav) = $this->getTagsAndFav($node->getId()); } - return $isFav; + if ($isFav) { + return 1; + } else { + return 0; + } }); } diff --git a/build/integration/features/favorites.feature b/build/integration/features/favorites.feature index 5e31e1902f..88bbf81a93 100644 --- a/build/integration/features/favorites.feature +++ b/build/integration/features/favorites.feature @@ -19,7 +19,7 @@ Feature: favorite And user "user0" unfavorites element "/FOLDER" Then as "user0" gets properties of folder "/FOLDER" with |{http://owncloud.org/ns}favorite| - And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" + And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0" Scenario: Favorite a file Given using old dav path @@ -38,7 +38,7 @@ Feature: favorite And user "user0" unfavorites element "/textfile0.txt" Then as "user0" gets properties of file "/textfile0.txt" with |{http://owncloud.org/ns}favorite| - And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" + And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0" Scenario: Favorite a folder new endpoint Given using new dav path @@ -57,7 +57,7 @@ Feature: favorite And user "user0" unfavorites element "/FOLDER" Then as "user0" gets properties of folder "/FOLDER" with |{http://owncloud.org/ns}favorite| - And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" + And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0" Scenario: Favorite a file new endpoint Given using new dav path @@ -76,5 +76,5 @@ Feature: favorite And user "user0" unfavorites element "/textfile0.txt" Then as "user0" gets properties of file "/textfile0.txt" with |{http://owncloud.org/ns}favorite| - And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" + And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"