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.

Sign up for GitHub

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

Jump to bottom

[stable20] Fix repair mimetype step to not leave stray cursors #23950

Merged
merged 2 commits into from
Nov 10, 2020
Merged

[stable20] Fix repair mimetype step to not leave stray cursors #23950

merged 2 commits into from
Nov 10, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #23928

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 20.0.2 milestone Nov 6, 2020
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Nov 6, 2020
@MorrisJobke
Copy link
Member 

/home/runner/work/server/server/lib/private/Repair/RepairMimeTypes.php:68:27:error - ImplicitToStringCast: Argument 2 of OCP\DB\QueryBuilder\IQueryBuilder::setValue expects string, OCP\DB\QueryBuilder\IParameter provided with a __toString method

I guess the update type hint was not ported :/

@rullzer rullzer mentioned this pull request Nov 9, 2020
Merged
@MorrisJobke
Copy link
Member

I guess the update type hint was not ported :/

I did this in #23971

@rullzer
Copy link
Member

rullzer commented Nov 9, 2020

I guess the update type hint was not ported :/

I did this in #23971

so rebase?

@nickvergessen @MorrisJobke
Fix repair mimetype step to not leave stray cursors
5f3d626 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke MorrisJobke force-pushed the backport/23928/stable20 branch from 2f65e37 to 5f3d626 Compare November 10, 2020 09:27
@MorrisJobke
Copy link
Member

so rebase?

Done.

@MorrisJobke
Update psalm-baseline.xml to accept new errors
cecf579 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 10, 2020
@MorrisJobke
Copy link
Member

I updated the psalm baseline to accept the new warnings.

@MorrisJobke MorrisJobke merged commit 6a5b921 into stable20 Nov 10, 2020
@MorrisJobke MorrisJobke deleted the backport/23928/stable20 branch November 10, 2020 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Milestone
Nextcloud 20.0.2
Development

Successfully merging this pull request may close these issues.
4 participants
@MorrisJobke @rullzer @ChristophWurst @nickvergessen