hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use composer update instead of install with PHP7

Browse Source
This commit is contained in:
Benoît Burnichon
2016-05-11 15:54:31 +02:00
parent b7d1849e24
commit 2932963ecb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -43,7 +43,7 @@ before_install:
- yes | pecl install imagick-beta
install:
- if [[ $TRAVIS_PHP_VERSION = 5.* ]];then travis_retry composer install --no-progress --no-interaction --optimize-autoloader; fi;
- if [[ $TRAVIS_PHP_VERSION = 7.* ]];then travis_retry composer install --no-interaction --no-progress --ignore-platform-reqs; travis_retry composer remove --no-interaction --dev phpunit/phpunit; travis_retry composer require --dev phpunit/phpunit --sort-packages --optimize-autoloader --no-progress --no-interaction; fi;
- if [[ $TRAVIS_PHP_VERSION = 7.* ]];then travis_retry composer update --no-progress --no-interaction --optimize-autoloader; fi;
- travis_retry npm install
before_script:
- mysql -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;'

2
composer.json
View File

@@ -103,7 +103,7 @@
},
"require-dev": {
"mikey179/vfsStream": "~1.5",
"phpunit/phpunit": "^4.8"
"phpunit/phpunit": "^4.8|^5.0"
},
"autoload": {
"psr-0": {