tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2752 from Icinga/bugfix/configform-transformemptyvaluestonull-does-not-handle-values-correctly-2751 

ConfigForm: transformEmptyValuesToNull does not handle values correctly
This commit is contained in:
lippserd 2017-11-10 10:11:37 +01:00 committed by GitHub
parent e41f4504a1 f0ad3d5188
commit fd1ee57a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 99 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/forms/ConfigForm.php
View File

@ -57,11 +57,7 @@ class ConfigForm extends Form
public function onSuccess()
{
$sections = array();
foreach ($this->getValues() as $sectionAndPropertyName => $value) {
if (empty($value)) {
$value = null; // Causes the config writer to unset it
}
foreach (static::transformEmptyValuesToNull($this->getValues()) as $sectionAndPropertyName => $value) {
list($section, $property) = explode('_', $sectionAndPropertyName, 2);
$sections[$section][$property] = $value;
}
@ -137,8 +133,12 @@ class ConfigForm extends Form
*/
public static function transformEmptyValuesToNull(array $values)
{
return array_map(function ($v) {
return empty($v) ? null : $v;
}, $values);
array_walk($values, function (&$v) {
if ($v === '' || $v === false || $v === array()) {
$v = null;
}
});
return $values;
}
}

91
test/php/library/Icinga/Web/ConfigFormTest.php Normal file
View File

@ -0,0 +1,91 @@
<?php
/* Icinga Web 2 | (c) 2017 Icinga Development Team | GPLv2+ */
namespace Tests\Icinga\Web;
use Icinga\Forms\ConfigForm;
use Icinga\Test\BaseTestCase;
class ConfigFormTest extends BaseTestCase
{
public function testWhetherTransformEmptyValuesToNullHandlesValuesCorrectly()
{
$values = array(
'empty_string' => '',
'example_string' => 'this is a test',
'empty_array' => array(),
'example_array' => array('test1', 'test2'),
'zero_as_int' => 0,
'one_as_int' => 1,
'zero_as_string' => '0',
'one_as_string' => '1',
'bool_true' => true,
'bool_false' => false,
'null' => null
);
$values = ConfigForm::transformEmptyValuesToNull($values);
$this->assertNull(
$values['empty_string'],
'ConfigForm::transformEmptyValuesToNull() does not handle empty strings correctly'
);
$this->assertSame(
'this is a test',
$values['example_string'],
'ConfigForm::transformEmptyValuesToNull() does not handle strings correctly'
);
$this->assertNull(
$values['empty_array'],
'ConfigForm::transformEmptyValuesToNull() does not handle empty arrays correctly'
);
$this->assertSame(
'test1',
$values['example_array'][0],
'ConfigForm::transformEmptyValuesToNull() does not handle arrays correctly'
);
$this->assertSame(
0,
$values['zero_as_int'],
'ConfigForm::transformEmptyValuesToNull() does not handle zeros correctly'
);
$this->assertSame(
1,
$values['one_as_int'],
'ConfigForm::transformEmptyValuesToNull() does not handle numbers correctly'
);
$this->assertSame(
'0',
$values['zero_as_string'],
'ConfigForm::transformEmptyValuesToNull() does not handle zeros correctly'
);
$this->assertSame(
'1',
$values['one_as_string'],
'ConfigForm::transformEmptyValuesToNull() does not handle numbers correctly'
);
$this->assertSame(
true,
$values['bool_true'],
'ConfigForm::transformEmptyValuesToNull() does not handle bool true correctly'
);
$this->assertNull(
$values['bool_false'],
'ConfigForm::transformEmptyValuesToNull() does not handle bool false correctly'
);
$this->assertNull(
$values['null'],
'ConfigForm::transformEmptyValuesToNull() does not handle null correctly'
);
}
}