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

[master] [stable25] Quota value as float for 32-bit systems #37344

Merged
merged 6 commits into from
Apr 1, 2023
Merged

[master] [stable25] Quota value as float for 32-bit systems #37344

merged 6 commits into from
Apr 1, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 22, 2023 •
edited by MichaIng
Loading

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

backport of #35734

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 24.0.11 milestone Mar 22, 2023
@MichaIng MichaIng marked this pull request as ready for review March 22, 2023 12:57
@MichaIng
Copy link
Member

MichaIng commented Mar 22, 2023 •
edited
Loading

A forward port, not a backport. Conflicts were cased where float was added on master already, otherwise it is complete.

@MichaIng MichaIng mentioned this pull request Mar 22, 2023
Merged
4 tasks
@MichaIng MichaIng linked an issue Mar 22, 2023 that may be closed by this pull request
[Bug]: Internal server error after upgrade to NC25beta: Typed property OC\Files\Storage\Wrapper\Quota::$quota must be int or null, float used in file #34010
Closed
9 tasks
@MichaIng
Copy link
Member

/backport to stable26

@MichaIng MichaIng added bug feature: 32bits Bug specific to 32bits architectures and removed bug labels Mar 22, 2023
@szaimen szaimen requested review from come-nc, a team, ArtificialOwl and icewind1991 and removed request for PVince81, szaimen and a team March 22, 2023 14:12
come-nc
come-nc reviewed Mar 27, 2023
View reviewed changes
PVince81 and others added 3 commits April 1, 2023 14:20
@PVince81 @MichaIng
Remove quota value type for 32-bit systems
c6b6833 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@come-nc @MichaIng
Make it clear that file sizes may be float on 32bits
ed863fb 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc @MichaIng
Adapt types of subclasses
1740311 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
come-nc and others added 3 commits April 1, 2023 14:20
@come-nc @MichaIng
Silence a warning from psalm with explanation
3f84d41 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc @MichaIng
Fix quota typing for 32bits after forward port from 25
da618c4 
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
@come-nc @MichaIng
Remove useless coalescing operator on non-null return value
8104d9f 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@MichaIng MichaIng force-pushed the backport/35734/master branch from 9442cce to 8104d9f Compare April 1, 2023 12:20
@MichaIng MichaIng enabled auto-merge April 1, 2023 12:28
@MichaIng MichaIng merged commit 06ab4f2 into master Apr 1, 2023
@MichaIng MichaIng deleted the backport/35734/master branch April 1, 2023 13:04
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Apr 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaIng MichaIng MichaIng approved these changes

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

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl ArtificialOwl was automatically assigned from nextcloud/server-backend

@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 was automatically assigned from nextcloud/server-backend

Assignees
No one assigned
Labels
feature: files feature: 32bits Bug specific to 32bits architectures
Projects
None yet
Milestone
Nextcloud 27
4 participants
@MichaIng @come-nc @skjnldsv @PVince81