Skip to content

Commit 11f1246

Browse files
committed
minor #238 use symfony/phpunit-bridge for tests (fabpot)
This PR was squashed before being merged into the 3.x-dev branch (closes #238). Discussion ---------- use symfony/phpunit-bridge for tests Commits ------- 33a03f0 fixed Travis PHP 5.3, simplified config a969e63 use symfony/phpunit-bridge for tests
2 parents c087092 + 33a03f0 commit 11f1246

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.travis.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
sudo: false
2-
31
language: php
42

3+
dist: trusty
4+
sudo: false
5+
56
cache:
67
directories:
78
- $HOME/.composer/cache/files
9+
- .phpunit
810

9-
php:
10-
- 5.3
11-
- 5.4
12-
- 5.5
13-
- 7.0
14-
- hhvm
11+
env:
12+
global:
13+
- SYMFONY_PHPUNIT_DIR=.phpunit
1514

1615
matrix:
1716
fast_finish: true
1817
include:
1918
- php: 5.3
2019
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
20+
dist: precise
2121
# Test against Symfony LTS versions
2222
- php: 5.6
2323
env: SYMFONY_VERSION="2.7.*"
@@ -26,6 +26,9 @@ matrix:
2626
# Test against dev versions
2727
- php: 5.6
2828
env: DEPENDENCIES=dev
29+
- php: 7.0
30+
- php: 7.1
31+
- php: hhvm
2932
allow_failures:
3033
- env: DEPENDENCIES=dev
3134

@@ -37,4 +40,4 @@ before_install:
3740
install:
3841
- composer update $COMPOSER_FLAGS
3942

40-
script: phpunit -v --coverage-text
43+
script: ./vendor/bin/simple-phpunit -v --coverage-text

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"require-dev": {
2727
"symfony/yaml": "~2.3|~3.0|~4.0",
2828
"symfony/console": "~2.3|~3.0|~4.0",
29-
"phpunit/phpunit": "^4.8"
29+
"symfony/phpunit-bridge": "^3.3|^4.0"
3030
},
3131
"autoload": {
3232
"psr-4": { "Symfony\\Bundle\\MonologBundle\\": "" },

0 commit comments

Comments
 (0)