Skip to content

Commit 2f305cd

Browse files
greg0irenicolas-grekas
authored andcommitted
Remove patches for Doctrine bugs and deprecations
1 parent a8b5b15 commit 2f305cd

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"doctrine/annotations": "~1.0",
9292
"doctrine/cache": "~1.6",
9393
"doctrine/data-fixtures": "1.0.*",
94-
"doctrine/dbal": "~2.4,<=2.10.2",
94+
"doctrine/dbal": "~2.4",
9595
"doctrine/orm": "~2.4,>=2.4.5",
9696
"doctrine/doctrine-bundle": "~1.4",
9797
"monolog/monolog": "~1.11",

phpunit

-10
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,4 @@ if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
2121
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
2222
}
2323
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
24-
25-
if (!getenv('SYMFONY_DEPRECATIONS_HELPER')) {
26-
foreach ($_SERVER['argv'] as $v) {
27-
if (false !== strpos($v, 'Bridge/Doctrine')) {
28-
putenv('SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7');
29-
break;
30-
}
31-
}
32-
}
33-
3424
require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';

src/Symfony/Bridge/Doctrine/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"symfony/validator": "^3.2.5|~4.0",
3636
"symfony/translation": "~2.8|~3.0|~4.0",
3737
"doctrine/data-fixtures": "1.0.*",
38-
"doctrine/dbal": "~2.4,<=2.10.2",
38+
"doctrine/dbal": "~2.4",
3939
"doctrine/orm": "^2.4.5"
4040
},
4141
"conflict": {

0 commit comments

Comments
 (0)