Skip to content

[stable31] fix: Fix getting trusted server other than the first #54381

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
Aug 28, 2025
Merged

[stable31] fix: Fix getting trusted server other than the first #54381

merged 1 commit into from
Aug 28, 2025

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Aug 12, 2025

Backport of PR #54371

@backportbot backportbot bot requested review from danxuliu, kesselb and st3iny August 12, 2025 11:26
@backportbot backportbot bot added this to the Nextcloud 31.0.8 milestone Aug 12, 2025
@nextcloud-bot nextcloud-bot mentioned this pull request Aug 14, 2025
Merged
16 tasks
@st3iny
Copy link
Member

st3iny commented Aug 15, 2025 •
edited
Loading

@danxuliu Test failure looks legit:

There was 1 error:

1) OCA\Federation\Tests\TrustedServersTest::testGetServer
ArgumentCountError: Too few arguments to function OCA\Federation\Tests\TrustedServersTest::testGetServer(), 0 passed in /home/runner/work/server/server/vendor-bin/phpunit/vendor/phpunit/phpunit/src/Framework/TestCase.php on line 1617 and exactly 2 expected

/home/runner/work/server/server/apps/federation/tests/TrustedServersTest.php:198

@AndyScherzinger AndyScherzinger force-pushed the backport/54371/stable31 branch from 4700e3f to dfe75e2 Compare August 27, 2025 17:11
@danxuliu
fix: Fix getting trusted server other than the first
9b691c2 
"array_filter" preserves the keys, so after the trusted servers were
filtered "$server[0]" existed only if the server to get was the first
one in the original array.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu danxuliu force-pushed the backport/54371/stable31 branch from dfe75e2 to 9b691c2 Compare August 28, 2025 06:32
@danxuliu
Copy link
Member

@danxuliu Test failure looks legit:

There was 1 error:

1) OCA\Federation\Tests\TrustedServersTest::testGetServer
ArgumentCountError: Too few arguments to function OCA\Federation\Tests\TrustedServersTest::testGetServer(), 0 passed in /home/runner/work/server/server/vendor-bin/phpunit/vendor/phpunit/phpunit/src/Framework/TestCase.php on line 1617 and exactly 2 expected

/home/runner/work/server/server/apps/federation/tests/TrustedServersTest.php:198

It was indeed. It was caused by a different syntax for PHPUnit data providers between stable31 and master. Fixed now.

Thanks for the ping and sorry for the delay!

@kesselb kesselb merged commit ed69213 into stable31 Aug 28, 2025
199 of 201 checks passed
@kesselb kesselb deleted the backport/54371/stable31 branch August 28, 2025 07:40
@nextcloud-bot nextcloud-bot mentioned this pull request Sep 4, 2025
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@st3iny st3iny st3iny approved these changes

@kesselb kesselb kesselb approved these changes

@danxuliu danxuliu Awaiting requested review from danxuliu

Assignees

@danxuliu danxuliu

Labels

3. to review Waiting for reviews bug feature: federation regression

Projects

None yet

Milestone

Nextcloud 31.0.9

Development

Successfully merging this pull request may close these issues.

5 participants

@st3iny @danxuliu @kesselb @Altahrim