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

[3rdparty] Bump doctrine/dbal to 2.12.0 #23764

Merged
merged 3 commits into from
Oct 31, 2020
Merged

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Oct 28, 2020

Needed for php8 support

Requires:

@rullzer rullzer added this to the Nextcloud 21 milestone Oct 28, 2020
@rullzer rullzer force-pushed the 3rdparty/doctrine/dbal/2.12.0 branch 2 times, most recently from d09d13a to fe47c42 Compare October 29, 2020 08:44
@rullzer
Copy link
Member Author

rullzer commented Oct 29, 2020

Needed for php8 stuff.
I don't think we can get rid of the psalm warnings here easily.

@MorrisJobke
Copy link
Member

I don't think we can get rid of the psalm warnings here easily.

Just update the baseline and we can move forward then.

@rullzer rullzer mentioned this pull request Oct 29, 2020
@MorrisJobke
Copy link
Member

Just update the baseline and we can move forward then.

Please update the baseline and then we can merge this :)

@rullzer rullzer force-pushed the 3rdparty/doctrine/dbal/2.12.0 branch from 0fc40be to ae5e0ec Compare October 29, 2020 13:54
@MorrisJobke MorrisJobke force-pushed the 3rdparty/doctrine/dbal/2.12.0 branch from ae5e0ec to bed704b Compare October 29, 2020 19:48
@@ -3554,6 +3562,9 @@
<InvalidScalarArgument occurrences="1">
<code>$e-&gt;getCode()</code>
</InvalidScalarArgument>
<LessSpecificImplementedReturnType occurrences="2">
<code>Doctrine\DBAL\Driver\Statement</code>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That changes from Doctrine\DBAL\Statement upstream to Doctrine\DBAL\Driver\Statement on our side and may be a bigger problem.

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine with me now 👍

Needed for php8 support

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
executeUpdate is deprecated in favor of executeStatement.
We overwrote the old one hence the prefix was no longer replaced.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer force-pushed the 3rdparty/doctrine/dbal/2.12.0 branch from bed704b to fe46149 Compare October 30, 2020 18:28
@rullzer
Copy link
Member Author

rullzer commented Oct 31, 2020

Mmmm we still need a psalm baseline update. Lets do that separatly then. As to not delay this (as php8 stuff also depends on it).

@rullzer rullzer merged commit 5396e98 into master Oct 31, 2020
@rullzer rullzer deleted the 3rdparty/doctrine/dbal/2.12.0 branch October 31, 2020 07:47
@MorrisJobke
Copy link
Member

Psalm fix is in #23834

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants