Skip to content

FIX fix merge-up#11800

Merged
emteknetnz merged 1 commit intosilverstripe:6from
creative-commoners:pulls/6/fix-merge
Jul 24, 2025
Merged

FIX fix merge-up#11800
emteknetnz merged 1 commit intosilverstripe:6from
creative-commoners:pulls/6/fix-merge

Conversation

@GuySartorelli
Copy link
Copy Markdown
Member

@GuySartorelli GuySartorelli commented Jul 23, 2025

Fixes a bad merge-up

I forgot to apply these changes before committing this merge-up.

This PR:

  1. fixes the format of the provideSortFieldBecomesIndexes() data provider - it may not actually pass the test, but the format is correct. Fixing the test if it is failing will be a separate follow-up PR. Fixing tests is not part of the merge-up, but updating the style of the provider to match the other scenarios is.
  2. Removes array_keys call to match the other call to DataObjectSchema::deriveIndexFromSort()

Issue

Copy link
Copy Markdown
Member

@emteknetnz emteknetnz left a comment

Choose a reason for hiding this comment

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

Code is fine

CI broken

@GuySartorelli
Copy link
Copy Markdown
Member Author

From the PR description

it may not actually pass the test, but the format is correct. Fixing the test if it is failing will be a separate follow-up PR. Fixing tests is not part of the merge-up, but updating the style of the provider to match the other scenarios is.

@emteknetnz emteknetnz merged commit 77388be into silverstripe:6 Jul 24, 2025
10 of 13 checks passed
@GuySartorelli GuySartorelli deleted the pulls/6/fix-merge branch July 24, 2025 01:32
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