Skip to content

Commit 03869a9

Browse files
committed
add phpunit bridge
1 parent ea6a685 commit 03869a9

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,8 @@ matrix:
3737
- PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
3838
- COVERAGE=true
3939

40-
# only needed for the hackaround for https://github.com/symfony/symfony/issues/12868
41-
before_install:
42-
- sudo apt-get install -qq bc
43-
4440
before_script:
4541
- sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
46-
# hackaround until https://github.com/symfony/symfony/issues/12868 is fixed
47-
- bash -c 'FLAWED_DEPRECATIONS=`echo "${SYMFONY_VERSION:0:3} >= 2.7"|bc`; if [ "$FLAWED_DEPRECATIONS" = "1" ]; then echo "error_reporting = E_ALL & ~E_DEPRECATED" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; echo "PHPUnit_Framework_Error_Deprecated::\$enabled = false;" >> Tests/bootstrap.php; fi;'
4842
- sh -c 'if [ "$FRAMEWORK_EXTRA_VERSION" != "" ]; then composer require --dev --no-update sensio/framework-extra-bundle=$FRAMEWORK_EXTRA_VERSION; fi;'
4943
- composer install
5044
- sudo apt-get install python-sphinx enchant

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"symfony/framework-bundle": "~2.3"
2727
},
2828
"require-dev": {
29-
"friendsofsymfony/http-cache": "~1.2@dev",
3029
"mockery/mockery": "0.9.*",
3130
"monolog/monolog": "*",
3231
"sensio/framework-extra-bundle": "~2.3",
3332
"symfony/symfony": "~2.3",
33+
"symfony/phpunit-bridge": "~2.7",
3434
"symfony/expression-language": "~2.4",
3535
"symfony/monolog-bundle": "~2.3",
3636
"polishsymfonycommunity/symfony-mocker-container": "~1.0",

0 commit comments

Comments
 (0)