Skip to content

fix(Helpers): handle array POST values when inferring selected options in form_dropdown() #10755

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

Open
banghamid wants to merge 1 commit into
base: develop
Choose a base branch
from
+57 −4
Open

fix(Helpers): handle array POST values when inferring selected options in form_dropdown() #10755

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
8 changes: 4 additions & 4 deletions system/Helpers/form_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,14 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
if ($selected === []) {
$superglobals = service('superglobals');
if (is_array($data)) {
$postValue = $superglobals->post($data['name'] ?? '');
$postValue = $superglobals->post(preg_replace('/\[\]$/', '', $data['name'] ?? ''));
if (isset($data['name']) && $postValue !== null) {
$selected = [$postValue];
$selected = is_array($postValue) ? $postValue : [$postValue];
}
} else {
$postValue = $superglobals->post($data);
$postValue = $superglobals->post(preg_replace('/\[\]$/', '', $data));
if ($postValue !== null) {
$selected = [$postValue];
$selected = is_array($postValue) ? $postValue : [$postValue];
}
}
}
Expand Down
53 changes: 53 additions & 0 deletions tests/system/Helpers/FormHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,36 @@ public function testFormDropdownInferred(): void
service('superglobals')->unsetPost('cars');
}

public function testFormDropdownInferredArray(): void
{
$options = [
'Swedish Cars' => [
'volvo' => 'Volvo',
'saab' => 'Saab',
],
'German Cars' => [
'mercedes' => 'Mercedes',
'audi' => 'Audi',
],
];
$expected = <<<EOH
<select name="cars" multiple="multiple">
<optgroup label="Swedish Cars">
<option value="volvo" selected="selected">Volvo</option>
<option value="saab">Saab</option>
</optgroup>
<optgroup label="German Cars">
<option value="mercedes">Mercedes</option>
<option value="audi" selected="selected">Audi</option>
</optgroup>
</select>\n
EOH;
service('superglobals')->setPost('cars', ['volvo', 'audi']);
$this->assertSame($expected, form_dropdown('cars', $options));
$this->assertSame($expected, form_dropdown(['name' => 'cars'], $options));
service('superglobals')->unsetPost('cars');
}

public function testFormDropdownWithSelectedAttribute(): void
{
$expected = <<<'EOH'
Expand Down Expand Up @@ -684,6 +714,29 @@ public function testFormMultiselectArrayData(): void
$this->assertSame($expected, form_multiselect($data));
}

public function testFormMultiselectInferred(): void
{
$expected = <<<EOH
<select name="shirts[]" multiple="multiple">
<option value="small">Small Shirt</option>
<option value="med" selected="selected">Medium Shirt</option>
<option value="large" selected="selected">Large Shirt</option>
<option value="xlarge">Extra Large Shirt</option>
</select>\n
EOH;
$options = [
'small' => 'Small Shirt',
'med' => 'Medium Shirt',
'large' => 'Large Shirt',
'xlarge' => 'Extra Large Shirt',
];

service('superglobals')->setPost('shirts', ['med', 'large']);
$this->assertSame($expected, form_multiselect('shirts[]', $options));
$this->assertSame($expected, form_multiselect(['name' => 'shirts[]', 'options' => $options]));
service('superglobals')->unsetPost('shirts');
}

public function testFormFieldset(): void
{
$expected = <<<EOH
Expand Down
Loading