Skip to content

[stable20] Use query builder instead of OC_DB in trashbin - #23971

Merged
MorrisJobke merged 3 commits into
stable20from
backport/23936/stable20
Nov 9, 2020
Merged

[stable20] Use query builder instead of OC_DB in trashbin#23971
MorrisJobke merged 3 commits into
stable20from
backport/23936/stable20

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Nov 7, 2020

Copy link
Copy Markdown

backport of #23936

@nickvergessen@backportbot
Use query builder instead of OC_DB in trashbin
ef22580
Signed-off-by: Joas Schilling <coding@schilljs.com>
@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 20.0.2 milestone Nov 7, 2020
@faily-bot

faily-botBot commented Nov 7, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 35185: failure

mariadb10.4-php7.3

Show full log
There were 2 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
--
There was 1 failure:
1) OCA\Files_Trashbin\Tests\StorageTest::testSingleStorageDeleteFolderFail
Failed asserting that false is true.
/drone/src/apps/files_trashbin/tests/StorageTest.php:537

@skjnldsvskjnldsv added the 3. to review Waiting for reviews label Nov 7, 2020
@rullzerrullzer mentioned this pull request Nov 9, 2020
Merged
@kesselb@MorrisJobke
Add explicit typecast for $value.
a01da78
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@MorrisJobke

MorrisJobke commented Nov 9, 2020

Copy link
Copy Markdown
Member

I ported #23144 (except the typecast - only the PHPDoc updates) to this PR to get Psalm accept it.

@MorrisJobkeMorrisJobke mentioned this pull request Nov 9, 2020
Merged
@MorrisJobke
Check in failing psalm checks
f28c436
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobkeMorrisJobke 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 9, 2020
@MorrisJobke

MorrisJobke commented Nov 9, 2020

Copy link
Copy Markdown
Member

Only psalm related changes done lately and psalm is happy: merge

@MorrisJobke
MorrisJobke merged commit 2088584 into stable20Nov 9, 2020
@MorrisJobke
MorrisJobke deleted the backport/23936/stable20 branch November 9, 2020 09:27
@MorrisJobkeMorrisJobke mentioned this pull request Nov 9, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@icewind1991icewind1991Awaiting requested review from icewind1991
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: trashbintechnical debt🧱 🤔🚀

Projects

None yet

Milestone

Nextcloud 20.0.2

Development

Successfully merging this pull request may close these issues.

5 participants

@MorrisJobke@rullzer@skjnldsv@nickvergessen@kesselb