[Pkg-owncloud-commits] [php-sabre-vobject] 07/12: Merge branch '3.4' into 3.5

[David Prévot]

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

taffit pushed a commit to branch 3
in repository php-sabre-vobject.

commit 466207f23d6408b74d34639d639e0ee81bfb936e
Merge: d2b0d71 5fc7f89
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jan 11 13:12:25 2016 -0500

    Merge branch '3.4' into 3.5

 .travis.yml   | 1 -
 ChangeLog.md  | 7 +++++++
 composer.json | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --cc .travis.yml
index 2094d5c,b89c1a4..40a7055
--- a/.travis.yml
+++ b/.travis.yml
@@@ -4,14 -4,8 +4,13 @@@ php
    - 5.4
    - 5.5
    - 5.6
 +  - 7
    - hhvm
  
 +matrix:
-   fast_finish: true
 +  allow_failures:
 +    - php: hhvm
 +
  script:
    - phpunit --configuration tests/phpunit.xml
    - ./bin/phpcs -p --standard=tests/phpcs/ruleset.xml lib/
diff --cc ChangeLog.md
index 6165947,0ba7569..c030506
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,16 -1,13 +1,23 @@@
  ChangeLog
  =========
  
 +3.5.0 (????-??-??)
 +-----------------
 +
 +* This release supports PHP 7, contrary to 3.4.x versions.
 +* BC Break: `Sabre\VObject\Property\Float` has been renamed to
 +  `Sabre\VObject\Property\FloatValue`.
 +* BC Break: `Sabre\VObject\Property\Integer` has been renamed to
 +  `Sabre\VObject\Property\IntegerValue`.
 +
 +
+ 3.4.9 (2016-01-11)
+ ------------------
+ 
+ * This package now specifies in composer.json that it does not support PHP 7.
+   For PHP 7, use version 3.5.x or 4.x.
+ 
+ 
  3.4.8 (2016-01-04)
  ------------------
  

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