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

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

Merged
merged 1 commit into from
Nov 25, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #28385

@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
7 tasks
@blizzz
Copy link
Member

blizzz commented Nov 10, 2021

moved to 22.2.2

@MichaIng
Copy link
Member

MichaIng commented Nov 24, 2021

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)

`CacheWrapper::formatCacheEntry` can return false for files that should be filtered out

Signed-off-by: Robin Appelman <robin@icewind.nl>
@MichaIng MichaIng added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 24, 2021
@MichaIng
Copy link
Member

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants