[Pkg-owncloud-commits] [php-sabre-vobject] 33/106: Suggestions from @staabm

[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-sabre-vobject.

commit f7931c93f56ee991ec34bb50a8e8a9e1bee88183
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 23 17:49:52 2014 -0400

    Suggestions from @staabm
---
 lib/Sabre/VObject/Component/VCalendar.php |  2 +-
 lib/Sabre/VObject/ITip/Broker.php         | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/Sabre/VObject/Component/VCalendar.php b/lib/Sabre/VObject/Component/VCalendar.php
index 6b5d46c..211667a 100644
--- a/lib/Sabre/VObject/Component/VCalendar.php
+++ b/lib/Sabre/VObject/Component/VCalendar.php
@@ -195,7 +195,7 @@ class VCalendar extends VObject\Document {
      * If there is no such component, null will be returned.
      *
      * @param string $componentName filter by component name
-     * @return array
+     * @return VObject\Component
      */
     public function getBaseComponent($componentName = null) {
 
diff --git a/lib/Sabre/VObject/ITip/Broker.php b/lib/Sabre/VObject/ITip/Broker.php
index f052326..626af1c 100644
--- a/lib/Sabre/VObject/ITip/Broker.php
+++ b/lib/Sabre/VObject/ITip/Broker.php
@@ -6,10 +6,10 @@ use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Reader;
 
 /**
- * The ITip class is a utility class that helps with processing so-called iTip
- * messages.
+ * The ITip\Broker class is a utility class that helps with processing
+ * so-called iTip messages.
  *
- * ITip is defined in rfc5546, stands for iCalendar Transport-Independent
+ * iTip is defined in rfc5546, stands for iCalendar Transport-Independent
  * Interoperability Protocol, and describes the underlying mechanism for
  * using iCalendar for scheduling for for example through email (also known as
  * IMip) and CalDAV Scheduling.
@@ -36,11 +36,11 @@ use Sabre\VObject\Reader;
 class Broker {
 
     /**
-     * This setting determines wether the rules for the SCHEDULE-AGENT
+     * This setting determines whether the rules for the SCHEDULE-AGENT
      * parameter should be followed.
      *
      * This is a parameter defined on ATTENDEE properties, introduced by RFC
-     * 6638. This parameter allows a caldav client to tell the server 'don't do
+     * 6638. This parameter allows a caldav client to tell the server 'Don't do
      * any scheduling operations'.
      *
      * If this setting is turned on, any attendees with SCHEDULE-AGENT set to
@@ -58,7 +58,7 @@ class Broker {
      * Examples:
      *
      * 1. A user is an attendee to an event. The organizer sends an updated
-     * meeting using a new ITip message with METHOD:REQUEST. This function
+     * meeting using a new iTip message with METHOD:REQUEST. This function
      * will process the message and update the attendee's event accordingly.
      *
      * 2. The organizer cancelled the event using METHOD:CANCEL. We will update
@@ -335,7 +335,6 @@ class Broker {
      *
      * @param VCalendar $calendar
      * @param array $eventInfo
-     * @param VCalendar $oldCalendar
      * @param array $oldEventInfo
      * @return array
      */
@@ -470,7 +469,7 @@ class Broker {
      * @param array $eventInfo
      * @param array $oldEventInfo
      * @param string $attendee
-     * @return void
+     * @return Message[]
      */
     protected function parseEventForAttendee(VCalendar $calendar, array $eventInfo, array $oldEventInfo, $attendee) {
 
@@ -641,14 +640,14 @@ class Broker {
 
         }
 
-        return array(
-            'uid' => $uid,
-            'organizer' => $organizer,
-            'organizerName' => $organizerName,
-            'instances' => $instances,
-            'attendees' => $attendees,
-            'sequence' => $sequence,
-            'exdate' => $exdate,
+        return compact(
+            'uid',
+            'organizer',
+            'organizerName',
+            'instances',
+            'attendees',
+            'sequence',
+            'exdate'
         );
 
     }

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