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

Merge branch 'bugfix/ini-writer-must-not-persist-section-keys-with-a-null-value-11743' 

fixes #11743
This commit is contained in:
Alexander A. Klimov 2016-10-18 14:21:24 +02:00
parent 6a6d354539 e2f6c81bfa
commit b16c64443b
7 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/forms/Config/UserBackendConfigForm.php
View File

@ -200,12 +200,6 @@ class UserBackendConfigForm extends ConfigForm
}
$backendConfig->merge($data);
foreach ($backendConfig->toArray() as $k => $v) {
if ($v === null) {
unset($backendConfig->$k);
}
}
$this->config->setSection($name, $backendConfig);
return $this;
}

9
application/forms/Config/UserGroup/UserGroupBackendForm.php
View File

@ -127,14 +127,7 @@ class UserGroupBackendForm extends ConfigForm
unset($data['name']);
}
$backendConfig->merge($data);
foreach ($backendConfig->toArray() as $k => $v) {
if ($v === null) {
unset($backendConfig->$k);
}
}
$this->config->setSection($name, $backendConfig);
$this->config->setSection($name, $backendConfig->merge($data));
return $this;
}

5
application/forms/Navigation/NavigationConfigForm.php
View File

@ -426,11 +426,6 @@ class NavigationConfigForm extends ConfigForm
}
$itemConfig->merge($data);
foreach ($itemConfig->toArray() as $k => $v) {
if ($v === null) {
unset($itemConfig->$k);
}
}
if ($shared) {
// Share all descendant children

4
library/Icinga/File/Ini/IniWriter.php
View File

@ -149,6 +149,10 @@ class IniWriter
$domSection = $doc->getSection($section);
}
foreach ($directives as $key => $value) {
if ($value === null) {
continue;
}
if ($value instanceof ConfigObject) {
throw new ProgrammingError('Cannot diff recursive configs');
}

6
modules/monitoring/application/forms/Config/BackendConfigForm.php
View File

@ -147,12 +147,6 @@ class BackendConfigForm extends ConfigForm
}
$backendConfig->merge($data);
foreach ($backendConfig->toArray() as $k => $v) {
if ($v === null) {
unset($backendConfig->$k);
}
}
$this->config->setSection($name, $backendConfig);
return $this;
}

6
modules/monitoring/application/forms/Config/TransportConfigForm.php
View File

@ -167,12 +167,6 @@ class TransportConfigForm extends ConfigForm
}
$transportConfig->merge($data);
foreach ($transportConfig->toArray() as $k => $v) {
if ($v === null) {
unset($transportConfig->$k);
}
}
$this->config->setSection($name, $transportConfig);
return $this;
}

49
test/php/library/Icinga/File/Ini/IniWriterTest.php
View File

@ -400,4 +400,53 @@ EOD;
file_put_contents($this->tempFile, $config);
return $this->tempFile;
}
public function testWhetherNullValuesGetPersisted()
{
$config = Config::fromArray(array());
$section = $config->getSection('garbage');
$section->foobar = null;
$config->setSection('garbage', $section);
$iniWriter = new IniWriter($config, '/dev/null');
$this->assertNotContains(
'foobar',
$iniWriter->render(),
'IniWriter persists section keys with null values'
);
}
public function testWhetherEmptyValuesGetPersisted()
{
$config = Config::fromArray(array());
$section = $config->getSection('garbage');
$section->foobar = '';
$config->setSection('garbage', $section);
$iniWriter = new IniWriter($config, '/dev/null');
$this->assertContains(
'foobar',
$iniWriter->render(),
'IniWriter doesn\'t persist section keys with empty values'
);
}
public function testExplicitRemove()
{
$filename = tempnam(sys_get_temp_dir(), 'iw2');
$config = Config::fromArray(array('garbage' => array('foobar' => 'lolcat')));
$iniWriter = new IniWriter($config, $filename);
$iniWriter->write();
$section = $config->getSection('garbage');
$section->foobar = null;
$iniWriter = new IniWriter($config, $filename);
$this->assertNotContains(
'foobar',
$iniWriter->render(),
'IniWriter doesn\'t remove section keys with null values'
);
unlink($filename);
}
}