[Pkg-owncloud-commits] [php-sabredav] 17/45: Merge branch '1.8' into 2.0

[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-sabredav.

commit e474f7f0f3d7d5b9f44fe3038a4bb665b7dccf32
Merge: b56d4fb bfeb480
Author: Evert Pot <me at evertpot.com>
Date:   Thu Dec 18 17:53:38 2014 -0500

    Merge branch '1.8' into 2.0
    
    Conflicts:
    	.travis.yml
    	tests/phpunit.xml

 .travis.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --cc .travis.yml
index 60755ba,a9620ca..6d7fe4f
--- a/.travis.yml
+++ b/.travis.yml
@@@ -7,25 -9,25 +7,27 @@@ php
  
  matrix:
    fast_finish: true
--  allow_failures:
-     - php: hhvm-nightly
 -    - php: hhvm
+ 
+ env:
+   matrix:
 -    - VOBJECT=2 LOWEST_DEPS=""
 -    - VOBJECT=2 LOWEST_DEPS="--prefer-lowest"
 -    - VOBJECT=3 LOWEST_DEPS=""
 -    - VOBJECT=3 LOWEST_DEPS="--prefer-lowest"
++    - LOWEST_DEPS=""
++    - LOWEST_DEPS="--prefer-lowest"
  
  services:
    - mysql
  
+ 
  before_script:
    - mysql -e 'create database sabredav'
- #  - composer self-update
-   - composer install --prefer-source
- #  - echo "zend.enable_gc=0" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+   - composer self-update
 -  - if [ "$VOBJECT" == "3" ]; then cp tests/composer.vobject3.json composer.json; fi
+   - composer update --prefer-source $LOWEST_DEPS
  
  script:
 -  - phpunit --configuration tests/phpunit.xml
 +  - ./bin/phpunit --configuration tests/phpunit.xml
 +
 +notifications:
 +  irc:
 +    channels:
 +        - "chat.freenode.net#sabredav"
 +    on_success: change
 +    on_failure: change

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