tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ExtensibleSet: do not override validators

Browse Source
This commit is contained in:
Thomas Gelf 2019-04-30 13:02:00 +02:00
parent db8895ae10
commit a14ab4d8a1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Director/Web/Form/Element/ExtensibleSet.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Director\Web\Form\Element; namespace Icinga\Module\Director\Web\Form\Element;
use Icinga\Exception\ProgrammingError; use InvalidArgumentException;
/** /**
* Input control for extensible sets * Input control for extensible sets
@ -21,12 +21,12 @@ class ExtensibleSet extends FormElement
{ {
$value = parent::getValue(); $value = parent::getValue();
if (is_string($value)) { if (is_string($value)) {
$value = array($value); $value = [$value];
} elseif ($value === null) { } elseif ($value === null) {
return $value; return $value;
} }
if (! is_array($value)) { if (! is_array($value)) {
throw new ProgrammingError( throw new InvalidArgumentException(
'ExtensibleSet expects to work with Arrays, got %s', 'ExtensibleSet expects to work with Arrays, got %s',
var_export($value, 1) var_export($value, 1)
); );
@ -69,7 +69,7 @@ class ExtensibleSet extends FormElement
public function isValid($value, $context = null) public function isValid($value, $context = null)
{ {
if ($value === null) { if ($value === null) {
$value = array(); $value = [];
} }
$value = array_filter($value, 'strlen'); $value = array_filter($value, 'strlen');
@ -84,6 +84,6 @@ class ExtensibleSet extends FormElement
return false; return false;
} }
return true; return parent::isValid($value, $context);
} }
} }