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.

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

API Ensure themelist returns an array #612

Merged

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Nov 14, 2024

Issue silverstripe/.github#328

Fixes https://github.com/silverstripe/silverstripe-subsites/actions/runs/11697085928/job/32899670628

1) SilverStripe\Subsites\Tests\SiteTreeSubsitesTest::testThemeResolverIsUsedForSettingThemeList TypeError: SilverStripe\View\SSViewer::set_themes(): Argument #1 ($themes) must be of type array, null given, called in /home/runner/work/silverstripe-subsites/silverstripe-subsites/src/Extensions/SiteTreeSubsites.php on line 405

@emteknetnz emteknetnz marked this pull request as ready for review November 14, 2024 01:57
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

I prefer https://github.com/silverstripe/silverstripe-subsites/pull/611/files#r1838742589 as it feels cleaner and ensures we do always set the theme list, whereas it looks like this change could result in having an old not-relevant theme list if $themelist is null.

@emteknetnz
Copy link
Member Author

emteknetnz commented Nov 14, 2024

That linked solution should still fail as it'll attempt to return null in some circumstances. This unit test started failing after the template work was merged in I think - possibly the linked solution will also fail after rebasing top of the latest work in 6? Could you double check to see if that's the case?

@GuySartorelli
Copy link
Member

It's fixing literally this exact same error in that PR, so no it won't still fail.

@emteknetnz
Copy link
Member Author

emteknetnz commented Nov 14, 2024

Test locally, it does fix it. Will update

@emteknetnz emteknetnz changed the title FIX Ensure themelist is not null API Ensure themelist returns an array Nov 14, 2024
@emteknetnz emteknetnz force-pushed the pulls/4/broken-builds branch 2 times, most recently from 6937a2d to b4eca2e Compare November 17, 2024 20:51
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM

@GuySartorelli GuySartorelli merged commit 487860a into silverstripe:4 Nov 18, 2024
9 checks passed
@GuySartorelli GuySartorelli deleted the pulls/4/broken-builds branch November 18, 2024 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants