[Pkg-owncloud-commits] [php-sabredav] 194/275: Slash after inbox and outbox.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 74a3116447ea84a5e92836a488330ac0ae50c924
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Aug 26 12:48:27 2014 +0200

    Slash after inbox and outbox.
---
 lib/CalDAV/Schedule/IMipPlugin.php                   | 4 +---
 lib/CalDAV/Schedule/Plugin.php                       | 4 ++--
 tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/CalDAV/Schedule/IMipPlugin.php b/lib/CalDAV/Schedule/IMipPlugin.php
index 4136bb2..b885451 100644
--- a/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/lib/CalDAV/Schedule/IMipPlugin.php
@@ -6,8 +6,6 @@ use Sabre\DAV;
 use Sabre\VObject;
 use Sabre\VObject\ITip;
 
-
-
 /**
  * iMIP handler.
  *
@@ -93,7 +91,7 @@ class IMipPlugin extends DAV\ServerPlugin {
     /**
      * Event handler for the 'schedule' event.
      *
-     * @param ITip\Mmessage $iTipMessage
+     * @param ITip\Message $iTipMessage
      * @return void
      */
     public function schedule(ITip\Message $iTipMessage) {
diff --git a/lib/CalDAV/Schedule/Plugin.php b/lib/CalDAV/Schedule/Plugin.php
index de7c6ef..8615582 100644
--- a/lib/CalDAV/Schedule/Plugin.php
+++ b/lib/CalDAV/Schedule/Plugin.php
@@ -210,7 +210,7 @@ class Plugin extends ServerPlugin {
         $propFind->handle('{' . self::NS_CALDAV . '}schedule-outbox-URL' , function() use ($principalUrl, $caldavPlugin) {
 
             $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-            $outboxPath = $calendarHomePath . '/outbox';
+            $outboxPath = $calendarHomePath . '/outbox/';
 
             return new Href($outboxPath);
 
@@ -219,7 +219,7 @@ class Plugin extends ServerPlugin {
         $propFind->handle('{' . self::NS_CALDAV . '}schedule-inbox-URL' , function() use ($principalUrl, $caldavPlugin) {
 
             $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-            $inboxPath = $calendarHomePath . '/inbox';
+            $inboxPath = $calendarHomePath . '/inbox/';
 
             return new Href($inboxPath);
 
diff --git a/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php b/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php
index 191d089..7a5f5b8 100644
--- a/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php
+++ b/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php
@@ -27,12 +27,12 @@ class PluginPropertiesTest extends \Sabre\DAVServerTest {
         $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL',$props[0][200]);
         $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL'];
         $this->assertTrue($prop instanceof DAV\Property\Href);
-        $this->assertEquals('calendars/user1/outbox',$prop->getHref());
+        $this->assertEquals('calendars/user1/outbox/',$prop->getHref());
 
         $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL',$props[0][200]);
         $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL'];
         $this->assertTrue($prop instanceof DAV\Property\Href);
-        $this->assertEquals('calendars/user1/inbox',$prop->getHref());
+        $this->assertEquals('calendars/user1/inbox/',$prop->getHref());
 
         $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',$props[0][200]);
         $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git