8000 [5.x] Fix field config overrides being lost when ensuring referenced fields by el-schneider · Pull Request #12915 · statamic/cms · GitHub
[go: up one dir, main page]
Skip to content

[5.x] Fix field config overrides being lost when ensuring referenced fields #12915

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

Merged
jasonvarga merged 1 commit into from
Oct 30, 2025
Merged

[5.x] Fix field config overrides being lost when ensuring referenced fields #12915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Fields/Blueprint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,9 @@ private function addEnsuredFieldToContents($contents, $ensured)
// override array, but only keys that don't already exist in the actual partial field's config.
$referencedField = FieldRepository::find($existingField['field']);
$referencedFieldConfig = $referencedField->config();
$config = array_merge($config, $referencedFieldConfig);
$fieldOverrides = $existingField['config'] ?? [];

$config = array_merge($config, $referencedFieldConfig, $fieldOverrides);
$config = Arr::except($config, array_keys($referencedFieldConfig));
$field = ['handle' => $handle, 'field' => $existingField['field'], 'config' => $config];
} else {
Expand Down
49 changes: 49 additions & 0 deletions tests/Fields/BlueprintTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,6 +1041,55 @@ public function it_merges_config_overrides_for_previously_undefined_keys_when_en
$this->assertEquals(['type' => 'text', 'foo' => 'bar'], $blueprint->fields()->get('from_partial')->config());
}

#[Test]
public function it_merges_configs_in_correct_priority_order_when_ensuring_a_referenced_field_with_overrides()
{
FieldsetRepository::shouldReceive('find')->with('the_partial')->andReturn(
(new Fieldset)->setContents(['fields' => [
[
'handle' => 'the_field',
'field' => ['type' => 'text', 'display' => 'The Field'],
],
]])
);

$blueprint = (new Blueprint)->setContents(['tabs' => [
'tab_one' => [
'sections' => [
[
'fields' => [
['handle' => 'from_partial', 'field' => 'the_partial.the_field', 'config' => ['visibility' => 'read_only', 'validate' => 'max:543']],
],
],
],
],
]]);

$blueprint->ensureField('from_partial', ['validate' => 'max:200', 'required' => true]);

$this->assertEquals(['tabs' => [
'tab_one' => [
'sections' => [
[
'fields' => [
['handle' => 'from_partial', 'field' => 'the_partial.the_field', 'config' => ['visibility' => 'read_only', 'validate' => 'max:543', 'required' => true]],
],
],
],
],
]], $blueprint->contents());

$fieldConfig = $blueprint->fields()->get('from_partial')->config();

$this->assertEquals(true, $fieldConfig['required']);

$this->assertEquals('text', $fieldConfig['type']);
$this->assertEquals('The Field', $fieldConfig['display']);

$this->assertEquals('max:543', $fieldConfig['validate']);
$this->assertEquals('read_only', $fieldConfig['visibility']);
}

#[Test]
public function it_merges_undefined_config_overrides_when_ensuring_a_field_that_already_exists_inside_an_imported_fieldset()
{
Expand Down
Loading
0