Merge pull request #216 from FriendsOfSymfony/remove-deprecation-hacks

remove hacks to avoid failure due to deprecations

Author: ddeboer

.travis.yml

@@ -37,14 +37,8 @@ matrix:
         - PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
         - COVERAGE=true
 
-# only needed for the hackaround for https://github.com/symfony/symfony/issues/12868
-before_install:
-  - sudo apt-get install -qq bc
-
 before_script:
   - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
-  # hackaround until https://github.com/symfony/symfony/issues/12868 is fixed
-  - 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;'
   - sh -c 'if [ "$FRAMEWORK_EXTRA_VERSION" != "" ]; then composer require --dev --no-update sensio/framework-extra-bundle=$FRAMEWORK_EXTRA_VERSION; fi;'
   - composer install
   - sudo apt-get install python-sphinx enchant

composer.json

@@ -26,11 +26,11 @@
         "symfony/framework-bundle": "~2.3"
     },
     "require-dev": {
-        "friendsofsymfony/http-cache": "~1.2@dev",
         "mockery/mockery": "0.9.*",
         "monolog/monolog": "*",
         "sensio/framework-extra-bundle": "~2.3",
         "symfony/symfony": "~2.3",
+        "symfony/phpunit-bridge": "~2.7",
         "symfony/expression-language": "~2.4",
         "symfony/monolog-bundle": "~2.3",
         "polishsymfonycommunity/symfony-mocker-container": "~1.0",