Skip to content

Commit 383c860

Browse files
committed
Merge pull request #8 from stof/improve_travis_setup
Improve the CI setup
2 parents 61e433c + ecff6b9 commit 383c860

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

.travis.yml

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

3+
sudo: false
4+
5+
cache:
6+
directories:
7+
- $HOME/.composer/cache/files
8+
39
php:
410
- 5.3
11+
- 5.4
12+
# 5.5 and 5.6 are already covered by the jobs running against specific Symfony versions. no need to duplicate them here
13+
- 7.0
14+
- hhvm
15+
16+
matrix:
17+
include:
18+
# force testing against Symfony LTS versions
19+
- php: 5.5
20+
env: SYMFONY_VERSION=2.3.*
21+
- php: 5.6
22+
env: SYMFONY_VERSION=2.7.*
23+
# Test against lowest dependencies
24+
- php: 5.6
25+
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
526

6-
env:
7-
- SYMFONY_VERSION=2.3.*
8-
- SYMFONY_VERSION=2.4.*
9-
- SYMFONY_VERSION=2.5.*
27+
before_install:
28+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi
1029

11-
before_script:
12-
- composer self-update
13-
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
14-
- composer install --dev --prefer-source
30+
install:
31+
- composer update $COMPOSER_FLAGS
1532

1633
script: phpunit --coverage-text

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"symfony/framework-bundle": "~2.3"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "~3.7"
25+
"symfony/phpunit-bridge": "~2.7",
26+
"phpunit/phpunit": "~4.5"
2627
},
2728
"autoload": {
2829
"psr-4": {

tests/DependencyInjection/KeenIOExtensionTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66
use Symfony\Component\Config\FileLocator;
77
use Symfony\Component\DependencyInjection\ContainerBuilder;
88
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
9-
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
109

1110
class KeenIOExtensionTest extends \PHPUnit_Framework_TestCase
1211
{
1312
/**
14-
* QPush Extension
15-
*
1613
* @var KeenIOExtension
1714
*/
1815
private $extension;

0 commit comments

Comments
 (0)