Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compat with Symfony 5 after a recent deprecation #1047

Merged
merged 1 commit into from Nov 8, 2019

Conversation

@nicolas-grekas
Copy link
Member

nicolas-grekas commented Nov 6, 2019

This drops support for Symfony 3.4, but the alternative is ugly, so I think we should do it, for v2 of course.

Follows symfony/symfony#34230 and symfony/symfony#34230

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:dc branch 6 times, most recently from 947bbe4 to 0538e66 Nov 6, 2019
@@ -36,7 +36,7 @@ public function __construct(ManagerRegistry $registry)
/**
* {@inheritdoc}
*/
public function collect(Request $request, Response $response, Exception $exception = null)
public function collect(Request $request, Response $response, Throwable $exception = null)

This comment has been minimized.

Copy link
@nicolas-grekas

nicolas-grekas Nov 6, 2019

Author Member

this is the change that triggered all the rest

.travis.yml Outdated Show resolved Hide resolved
@@ -5,6 +5,7 @@
"keywords": ["DBAL", "ORM", "Database", "Persistence"],
"homepage": "http://www.doctrine-project.org",
"license": "MIT",
"minimum-stability": "dev",

This comment has been minimized.

Copy link
@alcaeus

alcaeus Nov 6, 2019

Member

I suppose this is ok to avoid a bunch of composer config calls in .travis.yml - let's see if we have any adverse side effects.

@alcaeus alcaeus self-assigned this Nov 6, 2019
@alcaeus alcaeus added the Improvement label Nov 6, 2019
@alcaeus alcaeus added this to the 2.0.0 milestone Nov 6, 2019
@alcaeus alcaeus added this to 2.0 in Roadmap Nov 6, 2019
@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:dc branch from 0538e66 to a39b1a4 Nov 8, 2019
@alcaeus
alcaeus approved these changes Nov 8, 2019
@alcaeus alcaeus merged commit 6246c15 into doctrine:master Nov 8, 2019
2 checks passed
2 checks passed
Scrutinizer 2 new issues, 1 updated code elements
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@alcaeus

This comment has been minimized.

Copy link
Member

alcaeus commented Nov 8, 2019

Thanks @nicolas-grekas!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
2 participants
You can’t perform that action at this time.