[Pkg-owncloud-commits] [php-sabre-vobject] 257/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 3ee2b9dd9423cd648b6555e2609a63bbf79eaf8f
Merge: 2caa05e 97f6729
Author: Evert Pot <me at evertpot.com>
Date:   Fri Jan 30 08:28:50 2015 -0800

    Merge branch '3.3'
    
    Conflicts:
    	ChangeLog.md
    	lib/Version.php

 ChangeLog.md                                       |  22 +++-
 bin/fetch_windows_zones.php                        |   2 +-
 bin/generate_vcards                                |  40 +++----
 lib/Component/VEvent.php                           |   2 +-
 lib/Component/VJournal.php                         |   2 +-
 lib/Component/VTimeZone.php                        |   2 +-
 lib/Component/VTodo.php                            |   2 +-
 lib/Recur/EventIterator.php                        |   4 +-
 .../EventIterator/ExpandFloatingTimesTest.php      | 119 +++++++++++++++++++++
 9 files changed, 167 insertions(+), 28 deletions(-)

diff --cc ChangeLog.md
index 7a2a6c0,69fb0f2..46b43fd
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,24 -1,15 +1,32 @@@
  ChangeLog
  =========
  
 +4.0.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.5.
 +* #160: Support for xCal. (@Hywan)
 +* #186: Fixing conversion of `UTC-OFFSET` properties when going back and
 +  forward between jCal and iCalendar.
 +* Properties, Components and Parameters now implement PHP's `JsonSerializable`
 +  interface.
 +* #139: We now accept `DateTimeInterface` whereever it accepted `DateTime`
 +   before in arguments. This means that either `DateTime` or
 +  `DateTimeImmutable` may be used everywhere.
 +* #139: We now _always_ return `DateTimeImmutable` from any method. This could
 +  potentially have big implications if you manipulate Date objects anywhere.
 +* #161: Simplified `ElementList` by extending `ArrayIterator`.
 +
 +
- 3.3.5 (2014-??-??)
+ 3.3.6 (2015-??-??)
+ ------------------
+ 
+ * #187: Fixed validator rules for `LAST-MODIFIED` properties.
+ * #188: Retain floating times when generating instances using
+   `Recur\EventIterator`.
+ 
+ 
+ 3.3.5 (2015-01-09)
  ------------------
  
  * #168: Expanding calendars now removes objects with recurrence rules that
diff --cc lib/Component/VTimeZone.php
index 416e9a4,1fc37eb..a70922c
--- a/lib/Component/VTimeZone.php
+++ b/lib/Component/VTimeZone.php
@@@ -46,10 -46,10 +46,10 @@@ class VTimeZone extends VObject\Compone
       */
      function getValidationRules() {
  
 -        return array(
 +        return [
              'TZID' => 1,
  
-             'LAST-MODIFICATION' => '?',
+             'LAST-MODIFIED' => '?',
              'TZURL' => '?',
  
              // At least 1 STANDARD or DAYLIGHT must appear, or more. But both

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