Skip to content

Commit 91e0d6f

Browse files
committed
Merge pull request #22 from php-cache/travis
Travis fix and drop support for sf 2.6
2 parents 013d685 + 679c44c commit 91e0d6f

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

.travis.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
language: php
2+
sudo: false
3+
24
php:
35
- hhvm
46
- 7.0
57
- 5.6
68
- 5.5
79

8-
sudo: false
9-
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,17 +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.*
25+
26+
cache:
27+
directories:
28+
- $HOME/.composer/cache
2429

2530
before_install:
31+
- if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi;
32+
- pip install --user codecov
2633
- composer self-update
2734
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
2835

2936
install:
3037
- travis_retry ${COMPOSER_COMMAND} --no-interaction
3138

3239
script:
33-
- php vendor/bin/phpunit
40+
- $TEST_COMMAND
3441

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

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"keywords": [],
66
"homepage": "https://github.com/php-cache/adapter-bundle",
77
"license": "MIT",
8-
"authors": [
8+
"authors": [
99
{
1010
"name": "Aaron Scherer",
1111
"email": "[email protected]",
@@ -17,21 +17,21 @@
1717
"homepage": "https://github.com/Nyholm"
1818
}
1919
],
20-
"require": {
20+
"require": {
2121
"php": "^5.5|^7",
22-
"symfony/framework-bundle": "^2.6|^3.0",
23-
"symfony/options-resolver": "^2.6|^3.0",
22+
"symfony/framework-bundle": "^2.7|^3.0",
23+
"symfony/options-resolver": "^2.7|^3.0",
2424
"psr/cache": "1.0.0"
2525
},
26-
"require-dev": {
27-
"phpunit/phpunit": "5.0.*|^4.0",
26+
"require-dev": {
27+
"phpunit/phpunit": "5.0.*|^4.0",
2828
"matthiasnoback/symfony-dependency-injection-test": "0.7.*",
29-
"cache/array-adapter": "@stable"
29+
"cache/array-adapter": "@stable"
3030
},
31-
"suggest": {
31+
"suggest": {
3232
"cache/*-adapter": "To integrate with a PSR-6 cache"
3333
},
34-
"autoload": {
34+
"autoload": {
3535
"psr-4": {
3636
"Cache\\AdapterBundle\\": "src/"
3737
}

0 commit comments

Comments
 (0)