Remove patches for Doctrine bugs and deprecations
This commit is contained in:
parent
a8b5b15c25
commit
2f305cdc83
@ -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",
|
||||
|
10
phpunit
10
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';
|
||||
|
@ -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": {
|
||||
|
Reference in New Issue
Block a user