Skip to content

Commit

Permalink
minor #36744 Remove patches for Doctrine bugs and deprecations (greg0…
Browse files Browse the repository at this point in the history
…ire)

This PR was squashed before being merged into the 3.4 branch.

Discussion
----------

Remove patches for Doctrine bugs and deprecations

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | n/a
| License       | MIT
| Doc PR        | n/a

This PR removes patches put in place because of a bug fixed in doctrine/dbal#3994, and because of deprecations addressed in doctrine/orm#7953

Commits
-------

2f305cd Remove patches for Doctrine bugs and deprecations
  • Loading branch information
nicolas-grekas committed May 8, 2020
2 parents a8b5b15 + 2f305cd commit 9b088bb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -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",
Expand Down
10 changes: 0 additions & 10 deletions phpunit
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -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": {
Expand Down

0 comments on commit 9b088bb

Please sign in to comment.