Skip to content

Commit 3a58bf6

Browse files
committed
Merge pull request #46 from php-cache/travis
Travis codecov and dropping sf2.6
2 parents b27eddd + 9a2cab3 commit 3a58bf6

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

.travis.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ php:
1010
env:
1111
global:
1212
- COMPOSER_COMMAND="composer install --prefer-dist"
13+
- TEST_COMMAND="php vendor/bin/phpunit"
14+
- COVERAGE=false
1315
matrix:
14-
- SYMFONY_VERSION=2.6.*
1516
- SYMFONY_VERSION=2.7.*
1617
- SYMFONY_VERSION=2.8.*
1718
- SYMFONY_VERSION=3.0.*
@@ -20,21 +21,23 @@ matrix:
2021
fast_finish: true
2122
include:
2223
- php: 5.5
23-
env: COMPOSER_COMMAND="composer update --prefer-lowest --prefer-stable" && SYMFONY_VERSION=2.7.*
24+
env: COMPOSER_COMMAND="composer update --prefer-lowest --prefer-stable" COVERAGE=true TEST_COMMAND="php -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-clover=coverage.xml" SYMFONY_VERSION=2.7.*
2425

2526
cache:
26-
directories:
27-
- $HOME/.composer/cache
27+
directories:
28+
- $HOME/.composer/cache
2829

29-
install_script:
30-
- composer self-update
30+
before_install:
31+
- if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi;
32+
- pip install --user codecov
33+
- composer self-update
34+
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
3135

3236
install:
33-
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
34-
- travis_retry ${COMPOSER_COMMAND} --no-interaction
37+
- travis_retry ${COMPOSER_COMMAND} --no-interaction
3538

3639
script:
37-
- php vendor/bin/phpunit
40+
- $TEST_COMMAND
3841

3942
after_success:
40-
- codecov
43+
- if [[ "$COVERAGE" = true ]]; then codecov; fi

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
],
2626
"require": {
2727
"php": "^5.5|^7",
28-
"symfony/framework-bundle": "^2.6|^3.0",
29-
"cache/taggable-cache": "^0.2|^0.3"
28+
"symfony/framework-bundle": "^2.7|^3.0",
29+
"cache/taggable-cache": "^0.3"
3030
},
3131
"require-dev": {
3232
"phpunit/phpunit": "^5.1|^4.0",
3333
"cache/psr-6-doctrine-bridge": "^2.0",
34-
"cache/doctrine-adapter": "^0.3"
34+
"cache/array-adapter": "@stable"
3535
},
3636
"suggest": {
3737
"cache/doctrine-adapter-bundle": "A bundle to register PSR-6 compliant services based on Doctrine cache",

0 commit comments

Comments
 (0)