diff --git a/composer.json b/composer.json index 2c7dc6e89e2c..9ad5e39ad2ca 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,7 @@ "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.4,<=2.10.2", + "doctrine/dbal": "~2.4", "doctrine/orm": "~2.4,>=2.4.5", "doctrine/doctrine-bundle": "~1.4", "monolog/monolog": "~1.11", diff --git a/phpunit b/phpunit index fbce26d8edcc..713594fc19ed 100755 --- a/phpunit +++ b/phpunit @@ -21,14 +21,4 @@ if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) { putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1'); } putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit'); - -if (!getenv('SYMFONY_DEPRECATIONS_HELPER')) { - foreach ($_SERVER['argv'] as $v) { - if (false !== strpos($v, 'Bridge/Doctrine')) { - putenv('SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7'); - break; - } - } -} - require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit'; diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 67c0bb938a4f..1aa2315c609c 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -35,7 +35,7 @@ "symfony/validator": "^3.2.5|~4.0", "symfony/translation": "~2.8|~3.0|~4.0", "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.4,<=2.10.2", + "doctrine/dbal": "~2.4", "doctrine/orm": "^2.4.5" }, "conflict": {