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

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

Merged
merged 3 commits into from
Nov 9, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #23936

Signed-off-by: Joas Schilling <coding@schilljs.com>
@faily-bot
Copy link

faily-bot bot commented Nov 7, 2020

🤖 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

@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Nov 7, 2020
@rullzer rullzer mentioned this pull request Nov 9, 2020
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@MorrisJobke
Copy link
Member

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

@MorrisJobke MorrisJobke mentioned this pull request Nov 9, 2020
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 9, 2020
@MorrisJobke
Copy link
Member

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

@MorrisJobke MorrisJobke merged commit 2088584 into stable20 Nov 9, 2020
@MorrisJobke MorrisJobke deleted the backport/23936/stable20 branch November 9, 2020 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: trashbin technical debt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants