Skip to content

[stable22] properly handle cases where cache wrappers block access #29509

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
Merged
artonge merged 1 commit into from
Nov 25, 2021
Merged

[stable22] properly handle cases where cache wrappers block access #29509

artonge merged 1 commit into from
Nov 25, 2021

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 1, 2021

backport of #28385

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.2.1 milestone Nov 1, 2021
@skjnldsv
Copy link
Member

skjnldsv commented Nov 1, 2021

The declared return type 'string' for OC\Files\Node\File::hash is not nullable, but the function returns 'bool|null|string'

@skjnldsv skjnldsv added the 2. developing Work in progress label Nov 1, 2021
@blizzz blizzz mentioned this pull request Nov 3, 2021
Merged
7 tasks
@blizzz
Copy link
Member

blizzz commented Nov 10, 2021

moved to 22.2.2

@MichaIng MichaIng force-pushed the backport/28385/stable22 branch from d06bd1f to e8d6ffd Compare November 24, 2021 14:05
@MichaIng
Copy link
Member

MichaIng commented Nov 24, 2021 •
edited
Loading

I guess the Psalm error is because of the baseline change. In the diff this removal is not visible, which means that this still exists?

EDIT: Yep that did it. Note that the baseline change was done in original PR against NC23 explicitly to solve a Psalm error. Obviously this does not apply for NC22: #28385 (comment)

@icewind1991 @MichaIng
properly handle cases where cache wrappers block access
c4fa59c 
`CacheWrapper::formatCacheEntry` can return false for files that should be filtered out

Signed-off-by: Robin Appelman <[email protected]>
@MichaIng MichaIng force-pushed the backport/28385/stable22 branch from e8d6ffd to c4fa59c Compare November 24, 2021 19:18
@MichaIng MichaIng added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 24, 2021
@MichaIng
Copy link
Member

MichaIng commented Nov 24, 2021

Drone failures are unrelated.

@artonge artonge merged commit 62416a3 into stable22 Nov 25, 2021
@artonge artonge deleted the backport/28385/stable22 branch November 25, 2021 13:36
@MichaIng MichaIng mentioned this pull request Nov 25, 2021
Merged
@skjnldsv skjnldsv mentioned this pull request Jan 7, 2022
Merged
9 tasks
@CarlSchwan CarlSchwan mentioned this pull request Apr 20, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artonge artonge artonge approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@CarlSchwan CarlSchwan CarlSchwan approved these changes

@MichaIng MichaIng MichaIng approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@icewind1991 icewind1991 Awaiting requested review from icewind1991

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

Nextcloud 22.2.4

Development

Successfully merging this pull request may close these issues.

8 participants

@skjnldsv @blizzz @MichaIng @artonge @CarlSchwan @szaimen @icewind1991