Skip to content

test: use IUserFolder mocks for Nextcloud 36 - #8329

Merged
vitormattos merged 11 commits into
mainfrom
fix/nc36-user-folder-test-mocks
Sep 10, 2026
Merged

test: use IUserFolder mocks for Nextcloud 36#8329
vitormattos merged 11 commits into
mainfrom
fix/nc36-user-folder-test-mocks

Conversation

@vitormattos

Copy link
Copy Markdown
Member

Summary

Nextcloud 36 changed IRootFolder::getUserFolder() to return IUserFolder.

Several unit tests on main still returned Folder or IRootFolder mocks from getUserFolder(). PHPUnit now rejects these return values and this caused the Nextcloud 36 PHPUnit jobs to fail.

This PR updates only mocks used as getUserFolder() results to use IUserFolder.

Each changed test file has its own signed-off commit.

Testing

  • git diff --check
  • php -l for each changed PHP test file
  • PHPUnit CI against Nextcloud 36

The other AccountServiceTest failures seen in #8142 are related to the tests added by that PR and are not part of this fix.

vitormattos and others added 9 commits September 10, 2026 12:11
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <vitor@php.rio>
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
@vitormattos
vitormattos force-pushed the fix/nc36-user-folder-test-mocks branch from 2e7c986 to 1517052 Compare September 10, 2026 15:12
@github-actions
github-actions Bot force-pushed the fix/nc36-user-folder-test-mocks branch from 67f87ef to 7c47f6d Compare September 10, 2026 15:16
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
@vitormattos
vitormattos force-pushed the fix/nc36-user-folder-test-mocks branch from 7c47f6d to dffce3f Compare September 10, 2026 15:18
@vitormattos
vitormattos merged commit dfd9d08 into main Sep 10, 2026
70 checks passed
@vitormattos
vitormattos deleted the fix/nc36-user-folder-test-mocks branch September 10, 2026 15:45
@github-project-automation github-project-automation Bot moved this from 0. Backlog to 4. to release in Roadmap Sep 10, 2026
@vitormattos vitormattos added this to the Next Major (36) milestone Sep 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: 4. to release

Development

Successfully merging this pull request may close these issues.

1 participant