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

[stable26] fix unencrypted_size for folders when scanning the filesystem with encryption enabled #38555

Merged
merged 5 commits into from
Oct 12, 2023
Merged

[stable26] fix unencrypted_size for folders when scanning the filesystem with encryption enabled #38555

merged 5 commits into from
Oct 12, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 31, 2023 •
edited by icewind1991
Loading

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #36857

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.3 milestone May 31, 2023
@icewind1991 icewind1991 marked this pull request as ready for review June 2, 2023 13:36
@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@blizzz blizzz added the 3. to review Waiting for reviews label Jun 13, 2023
@blizzz
Copy link
Member

blizzz commented Jun 13, 2023

Psalm complaints:

Error: lib/private/Files/Cache/Cache.php:899:13: InvalidReturnType: The declared return type 'int' for OC\Files\Cache\Cache::calculateFolderSizeInner is incorrect, got 'float|int' (see https://psalm.dev/011)
Error: lib/private/Files/Cache/Cache.php:977:10: InvalidReturnStatement: The inferred type 'float|int' does not match the declared return type 'int' for OC\Files\Cache\Cache::calculateFolderSizeInner (see https://psalm.dev/128)
Error: lib/private/Memcache/APCu.php:66:16: InvalidClass: Class, interface or enum APCUIterator has wrong casing (see https://psalm.dev/007)

@blizzz blizzz added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 15, 2023
@blizzz
Copy link
Member

blizzz commented Jun 15, 2023

moving to 26.0.4

@blizzz blizzz mentioned this pull request Jul 10, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Jul 13, 2023

moving to 26.0.5

@max-nextcloud max-nextcloud mentioned this pull request Jul 25, 2023
Closed
@blizzz blizzz mentioned this pull request Aug 2, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Aug 3, 2023

moving to 26.0.6

If there are no updates in any form until building 26.0.6, I will close this PR.

come-nc
come-nc approved these changes Aug 3, 2023
View reviewed changes
lib/private/Files/Cache/Cache.php Outdated Show resolved Hide resolved
@blizzz blizzz mentioned this pull request Sep 5, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Sep 7, 2023

→ 26.0.7

This was referenced Sep 20, 2023
Closed
Merged
@blizzz blizzz mentioned this pull request Oct 9, 2023
Merged
@blizzz blizzz merged commit 33994b2 into stable26 Oct 12, 2023
36 of 37 checks passed
@blizzz blizzz deleted the backport/36857/stable26 branch October 12, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@come-nc come-nc come-nc approved these changes

@artonge artonge artonge approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

Assignees

@icewind1991 icewind1991

Labels
2. developing Work in progress
Projects
None yet
Milestone
Nextcloud 26.0.8
Development

Successfully merging this pull request may close these issues.
4 participants
@blizzz @artonge @come-nc @icewind1991