Merge pull request #311 from fruux/fix-306-c

Added test case for #306.

Author: evert

ChangeLog.md

@@ -4,7 +4,7 @@ ChangeLog
 3.5.1 (????-??-??)
 ------------------
 
-* #306: When expanding recurring events, the first event should also have a
+* #309: When expanding recurring events, the first event should also have a
   `RECURRENCE-ID` property.
 
 

lib/ITip/Broker.php

@@ -807,9 +807,15 @@ protected function parseEventForAttendee(VCalendar $calendar, array $eventInfo,
      * 1. uid
      * 2. organizer
      * 3. organizerName
-     * 4. attendees
-     * 5. instances
-     *
+     * 4. organizerScheduleAgent
+     * 5. organizerForceSend
+     * 6. instances
+     * 7. attendees
+     * 8. sequence
+     * 9. exdate
+     * 10. timezone
+     * 11. significantChangeHash
+     * 12. status
      * @param VCalendar $calendar
      * @return array
      */

tests/VObject/ITip/BrokerProcessReplyTest.php

@@ -426,6 +426,67 @@ function testReplyAcceptUpdateRSVP() {
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
 END:VCALENDAR
+ICS;
+
+        $result = $this->process($itip, $old, $expected);
+
+    }
+
+    function testReplyNewExceptionFirstOccurence() {
+
+        // This is a reply to 1 instance of a recurring event. This should
+        // automatically create an exception.
+        $itip = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REPLY
+BEGIN:VEVENT
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+SEQUENCE:2
+RECURRENCE-ID:20140724T000000Z
+UID:foobar
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $old = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+SEQUENCE:2
+UID:foobar
+RRULE:FREQ=DAILY
+DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
+ATTENDEE:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $expected = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+SEQUENCE:2
+UID:foobar
+RRULE:FREQ=DAILY
+DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
+ATTENDEE:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:2
+UID:foobar
+DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+RECURRENCE-ID:20140724T000000Z
+END:VEVENT
+END:VCALENDAR
 ICS;
 
         $result = $this->process($itip, $old, $expected);