Skip to content

Commit 24af8e5

Browse files
committed
Fix Travis CI tests with low deps
Until now, the low-deps tests were useless because we always executed a `composer update` afterwards, which updated all installed low-deps packages to its latest version. The coverage folder was changed in order to work around the bug `sebastianbergmann/comparator#30`. Conflicting packages were added in order to work around PHP version problems with low-deps tests. Relates to #21
1 parent c9e12f9 commit 24af8e5

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/bin/
2-
/build/
1+
/coverage/
32
/composer.lock
43
/vendor/

.travis.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: php
22

3-
matrix:
3+
jobs:
44
include:
55
- php: 7.1
66
- php: 7.1
@@ -11,29 +11,27 @@ matrix:
1111
- php: 7.3
1212
- php: 7.3
1313
env: deps=low
14+
- php: 7.4
15+
- php: 7.4
16+
env: deps=low
1417
- php: nightly
1518
env: deps=low
1619
- php: nightly
1720
allow_failures:
1821
- php: nightly
1922

20-
depth: 1
21-
2223
cache:
2324
directories:
24-
- $HOME/.composer/cache/files
25+
- $HOME/.composer/cache
2526

26-
before_script:
27-
- if [[ $deps = low ]]; then composer update --prefer-lowest --prefer-stable; fi
27+
install:
28+
- travis_retry composer install --no-interaction
29+
- if [[ $deps = low ]]; then travis_retry composer update --prefer-lowest --prefer-stable --no-interaction; fi
2830

2931
script:
3032
- composer validate
31-
- composer update
3233
- composer grumphp
3334

34-
install:
35-
- travis_retry composer install
36-
3735
after_success:
3836
- phpenv config-rm xdebug.ini
3937
- composer scrutinizer

composer.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@
3939
],
4040
"require": {
4141
"php": "^7.1",
42-
"phpspec/phpspec": "^4.2 || ^5.0 || ^6.0",
43-
"phpunit/php-code-coverage": "^5.0 || ^6.0 || ^7.0"
42+
"phpspec/phpspec": "^5.0 || ^6.0",
43+
"phpunit/php-code-coverage": "^6.0 || ^7.0"
44+
},
45+
"conflict": {
46+
"friendsofphp/php-cs-fixer": "2.16.0",
47+
"sebastian/comparator": "<2.0"
4448
},
4549
"require-dev": {
4650
"drupol/php-conventions": "^1",
@@ -66,7 +70,7 @@
6670
"minimum-stability": "stable",
6771
"scripts": {
6872
"grumphp": "./vendor/bin/grumphp run",
69-
"scrutinizer": "./vendor/bin/ocular code-coverage:upload --format=php-clover build/coverage.xml"
73+
"scrutinizer": "./vendor/bin/ocular code-coverage:upload --format=php-clover coverage/clover.xml"
7074
},
7175
"support": {
7276
"issues": "https://github.com/friends-of-phpspec/phpspec-code-coverage/issues",

phpspec.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
# friends-of-phpspec/phpspec-code-coverage
33
formatter.name: pretty
44
suites:
5-
default_suite:
6-
namespace: FriendsOfPhpSpec\PhpSpec\CodeCoverage
7-
psr4_prefix: FriendsOfPhpSpec\PhpSpec\CodeCoverage
5+
default_suite:
6+
namespace: FriendsOfPhpSpec\PhpSpec\CodeCoverage
7+
psr4_prefix: FriendsOfPhpSpec\PhpSpec\CodeCoverage
88

99
extensions:
1010
FriendsOfPhpSpec\PhpSpec\CodeCoverage\CodeCoverageExtension:
1111
format:
1212
- html
1313
- clover
14-
- php
15-
- text
1614
output:
17-
html: build/coverage
18-
clover: build/coverage.xml
19-
php: build/coverage.php
15+
html: coverage
16+
clover: coverage/clover.xml

0 commit comments

Comments
 (0)