[Pkg-owncloud-commits] [php-sabre-vobject] 03/341: Merge branch '3.3'

[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 8f813749470849b598c81aeb841e7f38e3d9f951
Merge: 2cba215 2a5c49e
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Sat Sep 20 03:26:49 2014 +0100

    Merge branch '3.3'
    
    Conflicts:
    	ChangeLog.md

 ChangeLog.md                                       |  24 ++
 lib/Component/VCalendar.php                        |   2 +-
 lib/Component/VEvent.php                           |   2 +-
 lib/Component/VJournal.php                         |   2 +-
 lib/Component/VTodo.php                            |   2 +-
 lib/ITip/Broker.php                                | 145 +++++++-
 lib/ITip/Message.php                               |  39 +++
 lib/Parameter.php                                  |  18 +-
 lib/Property.php                                   |   2 +-
 lib/Recur/EventIterator.php                        |   3 +
 lib/Recur/NoInstancesException.php                 |  18 +
 lib/Splitter/ICalendar.php                         |   4 +
 lib/Splitter/VCard.php                             |   5 +
 lib/StringUtil.php                                 |   2 +-
 lib/Version.php                                    |   2 +-
 tests/VObject/ICalendar/AttachParseTest.php        |  31 ++
 tests/VObject/ITip/BrokerAttendeeReplyTest.php     | 220 ++++++++++++
 tests/VObject/ITip/BrokerDeleteEventTest.php       |  44 ++-
 tests/VObject/ITip/BrokerNewEventTest.php          |  66 +++-
 tests/VObject/ITip/BrokerProcessReplyTest.php      |  46 +++
 tests/VObject/ITip/BrokerUpdateEventTest.php       | 372 ++++++++++++++++++++-
 tests/VObject/ITip/MessageTest.php                 |  32 ++
 tests/VObject/JCalTest.php                         |  11 +-
 tests/VObject/ParameterTest.php                    |  14 +
 tests/VObject/Parser/JsonTest.php                  |   2 +-
 tests/VObject/PropertyTest.php                     |  23 ++
 .../Recur/EventIterator/NoInstancesTest.php        |  40 +++
 tests/VObject/Splitter/ICalendarTest.php           |  19 ++
 tests/VObject/Splitter/VCardTest.php               |  36 ++
 29 files changed, 1190 insertions(+), 36 deletions(-)

diff --cc ChangeLog.md
index 114291a,1845caf..e91eb71
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,11 -1,27 +1,34 @@@
  ChangeLog
  =========
  
 +3.4.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.4.
 +
++
+ 3.3.2 (2014-09-19)
+ ------------------
+ 
+ * Changed: iTip broker now sets RSVP status to false when replies are received.
+ * #118: iTip Message now has a `getScheduleStatus()` method.
+ * #119: Support for detecting 'significant changes'.
+ * #120: Support for `SCHEDULE-FORCE-SEND`.
+ * #121: iCal demands parameters containing the + sign to be quoted.
+ * #122: Don't generate REPLY messages for events that have been cancelled.
+ * #123: Added `SUMMARY` to iTip messages.
+ * #130: Incorrect validation rules for `RELATED` (should be `RELATED-TO`).
+ * #128: `ATTACH` in iCalendar is `URI` by default, not `BINARY`.
+ * #131: RRULE that doesn't provide a single valid instance now throws an
+   exception.
+ * #136: Validator rejects *all* control characters. We were missing a few.
+ * #133: Splitter objects will throw exceptions when receiving incompatible
+   objects.
+ * #127: Attendees who delete recurring event instances events they had already
+   declined earlier will no longer generate another reply.
+ * #125: Send CANCEL messages when ORGANIZER property gets deleted.
+ 
++
  3.3.1 (2014-08-18)
  ------------------
  
diff --cc lib/Component/VEvent.php
index 59417de,6ab6ee8..b943bde
--- a/lib/Component/VEvent.php
+++ b/lib/Component/VEvent.php
@@@ -130,10 -130,10 +130,10 @@@ class VEvent extends VObject\Component 
              'CONTACT' => '*',
              'EXDATE' => '*',
              'REQUEST-STATUS' => '*',
-             'RELATED' => '*',
+             'RELATED-TO' => '*',
              'RESOURCES' => '*',
              'RDATE' => '*',
 -        );
 +        ];
  
      }
  
diff --cc lib/Component/VJournal.php
index 4509895,f8dd89f..48a4631
--- a/lib/Component/VJournal.php
+++ b/lib/Component/VJournal.php
@@@ -82,9 -82,9 +82,9 @@@ class VJournal extends VObject\Componen
              'CONTACT' => '*',
              'DESCRIPTION' => '*',
              'EXDATE' => '*',
-             'RELATED' => '*',
+             'RELATED-TO' => '*',
              'RDATE' => '*',
 -        );
 +        ];
  
      }
  }
diff --cc lib/Component/VTodo.php
index 4330f88,654cd68..4e42a10
--- a/lib/Component/VTodo.php
+++ b/lib/Component/VTodo.php
@@@ -113,10 -113,10 +113,10 @@@ class VTodo extends VObject\Component 
              'CONTACT' => '*',
              'EXDATE' => '*',
              'REQUEST-STATUS' => '*',
-             'RELATED' => '*',
+             'RELATED-TO' => '*',
              'RESOURCES' => '*',
              'RDATE' => '*',
 -        );
 +        ];
  
      }
  

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