Skip to content

[stable33] fix(encryption): Remember the recalculated unencrypted size as int - #65699

Merged
nickvergessen merged 1 commit into
stable33from
backport/65688/stable33
Oct 20, 2026
Merged

[stable33] fix(encryption): Remember the recalculated unencrypted size as int#65699
nickvergessen merged 1 commit into
stable33from
backport/65688/stable33

Conversation

@backportbot

@backportbot backportbot Bot commented Oct 19, 2026 •
edited by DerDreschner
Loading

Copy link
Copy Markdown

Backport of #65688

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot Bot added this to the Nextcloud 33.0.11 milestone Oct 19, 2026
nickvergessen
nickvergessen approved these changes Oct 19, 2026
View reviewed changes

@nickvergessen nickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is good, only baseline needs an update

@DerDreschner
DerDreschner marked this pull request as ready for review October 19, 2026 16:24
@DerDreschner
DerDreschner force-pushed the backport/65688/stable33 branch from 7aa3ffe to 9076f70 Compare October 19, 2026 16:24
@DerDreschner
DerDreschner requested a review from a team as a code owner October 19, 2026 16:24
@DerDreschner
DerDreschner requested review from icewind1991, leftybournes, salmart-dev and sorbaugh and removed request for a team October 19, 2026 16:24
@DerDreschner

DerDreschner commented Oct 19, 2026

Copy link
Copy Markdown
Member

Psalm baseline looks good. Most exceptions that I removed now aren't there in the first place for some reason.

@nickvergessen

nickvergessen commented Oct 20, 2026

Copy link
Copy Markdown
Member

Psalm baseline looks good.

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>

@DerDreschner
fix(encryption): Remember the recalculated unencrypted size as int
a9f1d9c 
Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: David Dreschner <[email protected]>
@DerDreschner
DerDreschner force-pushed the backport/65688/stable33 branch from 9076f70 to a9f1d9c Compare October 20, 2026 09:39
@DerDreschner

DerDreschner commented Oct 20, 2026

Copy link
Copy Markdown
Member

CI Psalm disagrees:

What the...? I guess I was blind yesterday. Didn't saw the InvalidReturnStatement and InvalidReturnType nodes at all in this backport branch 🤔 Thanks!!

@nickvergessen
nickvergessen merged commit 59485d7 into stable33 Oct 20, 2026
183 of 190 checks passed
@nickvergessen
nickvergessen deleted the backport/65688/stable33 branch October 20, 2026 11:22
@github-actions

github-actions Bot commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

This pull request has been automatically locked because it has been closed for more than 7 days. As we do not monitor merged or closed pull requests, we are locking this pull request to prevent further comments from getting lost in the noise.
If you discovered any issues with this pull request, please open a new issue instead. In case you want to discuss this pull request or have further questions, please use our forum: https://help.nextcloud.com

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Oct 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes
@CarlSchwan CarlSchwan CarlSchwan approved these changes
@DerDreschner DerDreschner DerDreschner approved these changes
@susnux susnux Awaiting requested review from susnux
@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 is a code owner automatically assigned from nextcloud/server-backend
@salmart-dev salmart-dev Awaiting requested review from salmart-dev salmart-dev is a code owner automatically assigned from nextcloud/server-backend
@leftybournes leftybournes Awaiting requested review from leftybournes leftybournes is a code owner automatically assigned from nextcloud/server-backend
@sorbaugh sorbaugh Awaiting requested review from sorbaugh sorbaugh is a code owner automatically assigned from nextcloud/server-backend

Assignees

@DerDreschner DerDreschner

Labels

3. to review Waiting for reviews 34-feedback AI assisted bug feature: encryption (server-side)

Projects

None yet

Milestone

Nextcloud 33.0.11

Development

Successfully merging this pull request may close these issues.

3 participants

@DerDreschner @nickvergessen @CarlSchwan