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.

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

[5.x] Merge config field defaults into field config #10139

Merged
merged 12 commits into from
Jun 3, 2024
Merged

[5.x] Merge config field defaults into field config #10139

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0fbdd16
Merge config field defaults into field config
duncanmcclean May 21, 2024
158091e
Tweak test assertions
duncanmcclean May 21, 2024
da00fc7
fix runtime markdown tests
duncanmcclean May 21, 2024
00669d6
`mode_selectable` defaults to true now
duncanmcclean May 21, 2024
972567b
Merge common field defaults into `Field:: preProcessedConfig`
duncanmcclean May 28, 2024
aae4aa3
Expect common field defaults in tests
duncanmcclean May 28, 2024
f416255
Expect common field defaults in some other tests
duncanmcclean May 28, 2024
78a4b75
Merge branch '5.x' into merge-config-field-defaults-into-field-config
jasonvarga May 31, 2024
ce2247c
revert stuff thatll go in a separate pr
jasonvarga May 31, 2024
ce4e460
Add a test that shows that it gets default values falling back to wha…
jasonvarga May 31, 2024
5f67f17
grab from the fieldtype's defaultValue if set, and dont filter them out.
jasonvarga May 31, 2024
0825403
since the array will have nulls and empty arrays etc, null coalesce i…
jasonvarga May 31, 2024
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
9 changes: 7 additions & 2 deletions src/Fields/Fieldtype.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,14 @@ public function config(?string $key = null, $fallback = null)
return $fallback;
}

$config = $this->configFields()->all()
->map->get('default')
->filter()
->merge($this->field->config());

return $key
? $this->field->get($key, $fallback)
: $this->field->config();
? $config->get($key, $fallback)
: $config->all();
}

public function preload()
Expand Down
10 changes: 5 additions & 5 deletions tests/Fieldtypes/MarkdownTest.php
View file
Open in desktop
jasonvarga marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function it_can_automatically_add_line_breaks_when_augmenting()
EOT;

$default = $this->fieldtype();
$this->assertEqualsTrimmed($withoutBreaks, $default->augment($value));
$this->assertEqualsTrimmed($withBreaks, $default->augment($value));

$enabled = $this->fieldtype(['automatic_line_breaks' => true]);
$this->assertEqualsTrimmed($withBreaks, $enabled->augment($value));
Expand Down Expand Up @@ -156,12 +156,12 @@ public function it_converts_statamic_asset_urls()

$expected = <<<'EOT'
<h1>Actual asset...</h1>
<p><a href="/assets/foo/hoff.jpg">link</a>
<img src="/assets/foo/hoff.jpg" alt="" />
<p><a href="/assets/foo/hoff.jpg">link</a><br />
<img src="/assets/foo/hoff.jpg" alt="" /><br />
<img src="/assets/foo/hoff.jpg" alt="Asset" /></p>
<h1>Non-existent asset...</h1>
<p><a href="">link</a>
<img src="" alt="" />
<p><a href="">link</a><br />
<img src="" alt="" /><br />
<a href="">Asset Link</a></p>

EOT;
Expand Down
Loading