diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-09-26 14:33:27 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2020-09-26 14:33:27 +0200 |
| commit | e011be01701e7f0f2bee9a5de3f062a5ca1b17df (patch) | |
| tree | b4463f23348d5fb07a1374b5bfd512a5dea32b1e | |
| parent | d0ae1ba273b6decea8d35ef79bfabb055b0fb6df (diff) | |
| download | Shaarli-e011be01701e7f0f2bee9a5de3f062a5ca1b17df.tar.gz Shaarli-e011be01701e7f0f2bee9a5de3f062a5ca1b17df.tar.zst Shaarli-e011be01701e7f0f2bee9a5de3f062a5ca1b17df.zip | |
Travis CI: run composer update instead of install
And ignore PHP 7.1 platform requirement, in order to get matching version of PHPUnit
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fb95235c..afccce08 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -43,7 +43,7 @@ cache: | |||
| 43 | 43 | ||
| 44 | install: | 44 | install: |
| 45 | # install/update composer and php dependencies | 45 | # install/update composer and php dependencies |
| 46 | - composer install --prefer-dist | 46 | - composer update --ignore-platform-reqs |
| 47 | 47 | ||
| 48 | before_script: | 48 | before_script: |
| 49 | - PATH=${PATH//:\.\/node_modules\/\.bin/} | 49 | - PATH=${PATH//:\.\/node_modules\/\.bin/} |
diff --git a/composer.json b/composer.json index 738d9f58..35043fd2 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | "require-dev": { | 28 | "require-dev": { |
| 29 | "roave/security-advisories": "dev-master", | 29 | "roave/security-advisories": "dev-master", |
| 30 | "phpunit/phpcov": "*", | 30 | "phpunit/phpcov": "*", |
| 31 | "phpunit/phpunit": "^7.5", | 31 | "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", |
| 32 | "squizlabs/php_codesniffer": "3.*" | 32 | "squizlabs/php_codesniffer": "3.*" |
| 33 | }, | 33 | }, |
| 34 | "suggest": { | 34 | "suggest": { |