Skip to content

fix(32bit): use PHP_INT_MAX where needed #52402

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
Merged
merged 1 commit into from
Apr 28, 2025
Merged

fix(32bit): use PHP_INT_MAX where needed #52402

merged 1 commit into from
Apr 28, 2025
+8 −1

Conversation

@susnux
Copy link
Contributor

@susnux susnux commented Apr 24, 2025

0xFFFF is only 2 bytes, but we need either 0xFFFFFFFF or maybe a bit easier to read PHP_INT_MAX.

@susnux susnux added bug 3. to review Waiting for reviews feature: 32bits Bug specific to 32bits architectures labels Apr 24, 2025
@susnux susnux added this to the Nextcloud 32 milestone Apr 24, 2025
@susnux susnux requested a review from come-nc April 24, 2025 09:24
@susnux susnux requested a review from a team as a code owner April 24, 2025 09:24
@susnux susnux requested review from Altahrim and yemkareems and removed request for a team April 24, 2025 09:24
@come-nc
Copy link
Contributor

come-nc commented Apr 28, 2025

https://github.com/nextcloud/server/actions/runs/14702311414 Running the 32bit CI on this branch

@come-nc
Copy link
Contributor

come-nc commented Apr 28, 2025

⚠️

There were 2 failures:

1) Test\Security\Normalizer\IpAddressTest::testGetSubnet with data set #5 ('2001:0db8:0000:0000:0000:8a2e...0:7334', '2001:db8::/56')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'2001:db8::/56'
+'2001:d38::/56'

/__w/server/server/tests/lib/Security/Normalizer/IpAddressTest.php:64

2) Test\Security\Normalizer\IpAddressTest::testGetSubnet with data set #6 ('2001:db8:3333:4444:5555:6666:7777:8888', '2001:db8:3333:4400::/56')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'2001:db8:[333](https://github.com/nextcloud/server/actions/runs/14702311414/job/41254097336#step:7:334)3:4400::/56'
+'2001:d38:3333:4400::/56'

/__w/server/server/tests/lib/Security/Normalizer/IpAddressTest.php:64

come-nc
come-nc requested changes Apr 28, 2025
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

Tests are failing

@susnux
fix(32bit): use PHP_INT_MAX where needed
a221715 
* Typo from #52392

`0xFFFF` is only 2 bytes, but we need either `0xFFFFFFFF` or maybe a bit
easier to read `PHP_INT_MAX`.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
Copy link
Contributor Author

susnux commented Apr 28, 2025

@come-nc sorry I thought PHP int max is unsigned 😅
Fixed see ci:
https://github.com/nextcloud/server/actions/runs/14705637781/job/41265336197

@susnux susnux requested a review from come-nc April 28, 2025 10:54
come-nc
come-nc approved these changes Apr 28, 2025
View reviewed changes
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

🤷

@susnux
Copy link
Contributor Author

susnux commented Apr 28, 2025

/backport 9bfea21 a221715 to stable30

@susnux
Copy link
Contributor Author

susnux commented Apr 28, 2025

/backport 9bfea21 a221715 to stable31

AndyScherzinger
AndyScherzinger approved these changes Apr 28, 2025
View reviewed changes
Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

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

🎉

@provokateurin provokateurin merged commit 10a0142 into master Apr 28, 2025
206 of 210 checks passed
@provokateurin provokateurin deleted the fix/32bit-pack branch April 28, 2025 19:23
This was referenced Apr 28, 2025
Merged
Merged
@skjnldsv skjnldsv mentioned this pull request Aug 19, 2025
Merged
@skjnldsv skjnldsv modified the milestones: Nextcloud 32, Nextcloud 33 Sep 28, 2025
@skjnldsv skjnldsv modified the milestones: Nextcloud 33, Nextcloud 32 Oct 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

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

@Altahrim Altahrim Awaiting requested review from Altahrim Altahrim is a code owner automatically assigned from nextcloud/server-backend

@yemkareems yemkareems Awaiting requested review from yemkareems yemkareems is a code owner automatically assigned from nextcloud/server-backend

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug feature: 32bits Bug specific to 32bits architectures

Projects

None yet

Milestone

Nextcloud 32

Development

Successfully merging this pull request may close these issues.

6 participants

@susnux @come-nc @AndyScherzinger @skjnldsv @provokateurin