[Pkg-owncloud-commits] [php-sabre-vobject] 15/43: Merge branch 'master' into birthday-event

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 4.0.0-alpha2
in repository php-sabre-vobject.

commit c9129dc2236189b643e765d622862e2319e0d509
Merge: 2a62379 87009d5
Author: Dominik Tobschall <dominik at fruux.com>
Date:   Mon Jul 20 21:35:22 2015 +0200

    Merge branch 'master' into birthday-event
    
    # Conflicts:
    #	CHANGELOG.md

 .travis.yml                                    |   2 +
 CHANGELOG.md                                   |  30 +-
 bin/bench.php                                  |   4 +-
 bin/bench_freebusygenerator.php                |   8 +-
 bin/bench_manipulatevcard.php                  |   8 +-
 bin/fetch_windows_zones.php                    |   8 +-
 bin/generateicalendardata.php                  |  27 +-
 bin/rrulebench.php                             |   2 +-
 lib/Component/Available.php                    |  33 +-
 lib/Component/VAvailability.php                |  56 +++
 lib/Component/VCalendar.php                    |  14 +-
 lib/Component/VCard.php                        |   4 +-
 lib/FreeBusyData.php                           | 193 +++++++++
 lib/FreeBusyGenerator.php                      | 286 +++++++++++--
 lib/Property/{Float.php => FloatValue.php}     |   2 +-
 lib/Property/{Integer.php => IntegerValue.php} |   2 +-
 lib/Recur/RRuleIterator.php                    |  24 +-
 lib/Settings.php                               |  39 ++
 lib/Version.php                                |   2 +-
 tests/VObject/Component/AvailableTest.php      |  73 ++++
 tests/VObject/Component/VAvailabilityTest.php  | 102 +++++
 tests/VObject/FreeBusyDataTest.php             | 318 ++++++++++++++
 tests/VObject/FreeBusyGeneratorTest.php        | 572 +++++++++++++++++++------
 tests/VObject/Property/FloatTest.php           |   2 +-
 tests/phpunit.xml                              |   4 +-
 25 files changed, 1607 insertions(+), 208 deletions(-)

diff --cc CHANGELOG.md
index f8571f4,40beaaa..ff17457
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,12 -1,24 +1,24 @@@
  ChangeLog
  =========
  
- 4.0.0-alpha1
- ------------
+ 4.0.0-alpha2 (2015-??-??)
+ -------------------------
+ 
 -* ...
++* #239: Added a `BirthdayCalendarGenerator`. (@DominikTo)
+ 
+ 4.0.0-alpha1 (2015-07-17)
+ -------------------------
  
  * sabre/vobject now requires PHP 5.5.
- * #160: Support for xCal! (@Hywan)
- * #192: Support for xCard! (@Hywan)
+ * #244: PHP7 support.
+ * Lots of speedups and reduced memory usage!
+ * #160: Support for xCal a.k.a. RFC6321! (@Hywan)
+ * #192: Support for xCard a.k.a. RFC6351! (@Hywan)
+ * #139: We now accept `DateTimeInterface` wherever it accepted `DateTime`
+    before in arguments. This means that either `DateTime` or
+   `DateTimeImmutable` may be used everywhere.
+ * #242: Full support for the `VAVAILABILITY` component, and calculating
+   `VFREEBUSY` based on `VAVAILABILITY` data.
  * #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`
@@@ -28,7 -37,8 +37,12 @@@
  * #197: The `$children` property on components has been changed from `public`
    to `protected`. Use the `children()` method instead to get a flat list of
    objects.
- * #239: Added a `BirthdayCalendarGenerator`. (@DominikTo)
++<<<<<<< HEAD
++
++=======
+ * #244: The `Float` and `Integer` classes have been renamed to `FloatValue`
+   and `IntegerValue` to allow PHP 7 compatibility.
++>>>>>>> master
  
  
  3.4.5 (2015-06-02)

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