Repository navigation
[stable33] fix(encryption): Remember the recalculated unencrypted size as int - #65699
Merged
Merged
Conversation
backportbot
Bot
added
bug
3. to review
nickvergessen
approved these changes
Oct 19, 2026
nickvergessen
left a comment
nickvergessen
left a comment
Member
There was a problem hiding this comment.
Code is good, only baseline needs an update
DerDreschner
marked this pull request as ready for review
October 19, 2026 16:24
DerDreschner
force-pushed
the
backport/65688/stable33
branch
from
October 19, 2026 16:24
7aa3ffe to
9076f70
Compare
DerDreschner
requested review from
icewind1991,
leftybournes,
salmart-dev and
sorbaugh
and removed request for
a team
October 19, 2026 16:24
Contributor
|
Psalm baseline looks good. Most exceptions that I removed now aren't there in the first place for some reason. |
DerDreschner
enabled auto-merge
October 19, 2026 16:25
DerDreschner
approved these changes
Oct 19, 2026
Member
CI Psalm disagrees: diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index bb8b5b3..496f92d 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3807,12 +3807,6 @@
</TypeDoesNotContainType>
</file>
<file src="lib/private/Files/Storage/Wrapper/Encryption.php">
- <InvalidReturnStatement>
- <code><![CDATA[$result]]></code>
- </InvalidReturnStatement>
- <InvalidReturnType>
- <code><![CDATA[int]]></code>
- </InvalidReturnType>
<InvalidScalarArgument>
<code><![CDATA[$size]]></code>
</InvalidScalarArgument> |
CarlSchwan
approved these changes
Oct 20, 2026
Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: David Dreschner <david.dreschner@nextcloud.com>
DerDreschner
force-pushed
the
backport/65688/stable33
branch
from
October 20, 2026 09:39
9076f70 to
a9f1d9c
Compare
Contributor
What the...? I guess I was blind yesterday. Didn't saw the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #65688
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.