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

[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 e6aa6368c4e62862905a07e87760a56e2024f991
Merge: 350d34d 30f29b4
Author: Evert Pot <me at evertpot.com>
Date:   Thu Dec 18 17:30:39 2014 -0500

    Merge branch '1.7' into 1.8
    
    Conflicts:
    	.travis.yml

 .travis.yml       | 13 +++++++++----
 tests/phpunit.xml |  3 ---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --cc .travis.yml
index 5fc1d17,fc2e55c..b03fbb9
--- a/.travis.yml
+++ b/.travis.yml
@@@ -12,19 -11,18 +12,24 @@@ matrix
    allow_failures:
      - php: hhvm
  
 +env:
-     - VOBJECT=2
-     - VOBJECT=3
++  matrix:
++    - VOBJECT=2 LOWEST_DEPS=""
++    - VOBJECT=2 LOWEST_DEPS="--prefer-lowest"
++    - VOBJECT=3 LOWEST_DEPS=""
++    - VOBJECT=3 LOWEST_DEPS="--prefer-lowest"
 +
  services:
    - mysql
  
+ env:
 -  matrix:
 -    - LOWEST_DEPS=""
 -    - LOWEST_DEPS="--prefer-lowest"
++
+ 
  before_script:
    - mysql -e 'create database sabredav'
    - composer self-update
 +  - if [ "$VOBJECT" == "3" ]; then cp tests/composer.vobject3.json composer.json; fi
-   - composer install --prefer-source
- #  - echo "zend.enable_gc=0" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+   - composer update --prefer-source $LOWEST_DEPS
  
  script:
    - phpunit --configuration tests/phpunit.xml

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