[Pkg-owncloud-commits] [php-sabre-vobject] 37/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 2e0df44134de9097f0ab4a54bdf6f9cef782c99c
Merge: 9b464c7 1c253c2
Author: Evert Pot <me at evertpot.com>
Date:   Thu Dec 11 14:45:49 2014 -0500

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

 ChangeLog.md                              | 13 +++++++++++++
 lib/Component/VCalendar.php               | 14 +++++++++++++-
 lib/Property/ICalendar/DateTime.php       |  1 -
 lib/Recur/EventIterator.php               | 11 -----------
 lib/VCardConverter.php                    |  6 ++----
 lib/timezonedata/php-bc.php               |  2 +-
 lib/timezonedata/windowszones.php         |  2 +-
 tests/VObject/Component/VCalendarTest.php | 22 ++++++++++++++++++++++
 8 files changed, 52 insertions(+), 19 deletions(-)

diff --cc ChangeLog.md
index 7cb6314,073bb6f..2a6ee5f
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,18 -1,13 +1,25 @@@
  ChangeLog
  =========
  
 +4.0.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.5.
 +* #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-??-??)
+ ------------------
+ 
+ * #168: Expanding calendars now removes objects with recurrence rules that
+   don't have a valid recurrence instance.
+ 
+ 
  3.3.4 (2014-11-19)
  ------------------
  
diff --cc lib/Property/ICalendar/DateTime.php
index 97ffe9f,5154b97..90f2ca4
--- a/lib/Property/ICalendar/DateTime.php
+++ b/lib/Property/ICalendar/DateTime.php
@@@ -2,10 -2,8 +2,9 @@@
  
  namespace Sabre\VObject\Property\ICalendar;
  
 +use DateTimeInterface;
  use DateTimeZone;
  use Sabre\VObject\Property;
- use Sabre\VObject\Parser\MimeDir;
  use Sabre\VObject\DateTimeParser;
  use Sabre\VObject\TimeZoneUtil;
  
diff --cc lib/VCardConverter.php
index 119cc77,60e78f6..3838eb4
--- a/lib/VCardConverter.php
+++ b/lib/VCardConverter.php
@@@ -94,9 -94,9 +94,9 @@@ class VCardConverter 
  
          if ($targetVersion===Document::VCARD30) {
  
 -            if ($property instanceof Property\Uri && in_array($property->name, array('PHOTO','LOGO','SOUND'))) {
 +            if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO','LOGO','SOUND'])) {
  
-                 $newProperty = $this->convertUriToBinary($output, $newProperty, $parameters);
+                 $newProperty = $this->convertUriToBinary($output, $newProperty);
  
              } elseif ($property instanceof Property\VCard\DateAndOrTime) {
  
diff --cc lib/timezonedata/php-bc.php
index a70b531,cfe0503..e9097e3
--- a/lib/timezonedata/php-bc.php
+++ b/lib/timezonedata/php-bc.php
@@@ -14,7 -14,7 +14,7 @@@
   * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
   * @license http://sabre.io/license/ Modified BSD License
   */
-  return [
 -return array(
++return [
      'Africa/Asmera',
      'Africa/Timbuktu',
      'America/Argentina/ComodRivadavia',

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