summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2018-09-01 23:04:07 +0200
committerGeorg Ehrke <developer@georgehrke.com>2018-09-05 14:10:26 +0200
commit83639a9898581919a84f1e2b05e64b236c8268e2 (patch)
tree062fa06720501b970175729d460fe061c010dc8a /apps
parent1c1bf01241a0e7d182a135df02cf85004eb4b898 (diff)
downloadnextcloud-server-83639a9898581919a84f1e2b05e64b236c8268e2.tar.gz
nextcloud-server-83639a9898581919a84f1e2b05e64b236c8268e2.zip
remove LogicException, because it's also triggered with legitimate parameters
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/CalDAV/Plugin.php14
-rw-r--r--apps/dav/lib/CardDAV/Plugin.php5
-rw-r--r--apps/dav/tests/unit/CalDAV/PluginTest.php6
3 files changed, 11 insertions, 14 deletions
diff --git a/apps/dav/lib/CalDAV/Plugin.php b/apps/dav/lib/CalDAV/Plugin.php
index f37d9c571a0..174930b2923 100644
--- a/apps/dav/lib/CalDAV/Plugin.php
+++ b/apps/dav/lib/CalDAV/Plugin.php
@@ -28,10 +28,16 @@ class Plugin extends \Sabre\CalDAV\Plugin {
const SYSTEM_CALENDAR_ROOT = 'system-calendars';
/**
- * @inheritdoc
+ * Returns the path to a principal's calendar home.
+ *
+ * The return url must not end with a slash.
+ * This function should return null in case a principal did not have
+ * a calendar home.
+ *
+ * @param string $principalUrl
+ * @return string|null
*/
- function getCalendarHomeForPrincipal($principalUrl):string {
-
+ function getCalendarHomeForPrincipal($principalUrl) {
if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
list(, $principalId) = \Sabre\Uri\split($principalUrl);
return self::CALENDAR_ROOT . '/' . $principalId;
@@ -44,8 +50,6 @@ class Plugin extends \Sabre\CalDAV\Plugin {
list(, $principalId) = \Sabre\Uri\split($principalUrl);
return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
}
-
- throw new \LogicException('This is not supposed to happen');
}
}
diff --git a/apps/dav/lib/CardDAV/Plugin.php b/apps/dav/lib/CardDAV/Plugin.php
index cd303a394ed..59b9212ef07 100644
--- a/apps/dav/lib/CardDAV/Plugin.php
+++ b/apps/dav/lib/CardDAV/Plugin.php
@@ -39,10 +39,9 @@ class Plugin extends \Sabre\CardDAV\Plugin {
* Returns the addressbook home for a given principal
*
* @param string $principal
- * @return string
+ * @return string|null
*/
protected function getAddressbookHomeForPrincipal($principal) {
-
if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
list(, $principalId) = \Sabre\Uri\split($principal);
return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
@@ -55,8 +54,6 @@ class Plugin extends \Sabre\CardDAV\Plugin {
list(, $principalId) = \Sabre\Uri\split($principal);
return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
}
-
- throw new \LogicException('This is not supposed to happen');
}
/**
diff --git a/apps/dav/tests/unit/CalDAV/PluginTest.php b/apps/dav/tests/unit/CalDAV/PluginTest.php
index 47190d583f0..87bf69c2805 100644
--- a/apps/dav/tests/unit/CalDAV/PluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/PluginTest.php
@@ -63,11 +63,7 @@ class PluginTest extends TestCase {
$this->assertSame($expected, $this->plugin->getCalendarHomeForPrincipal($input));
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage This is not supposed to happen
- */
public function testGetCalendarHomeForUnknownPrincipal() {
- $this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB');
+ $this->assertNull($this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB'));
}
}