Merge pull request #42 from r-st/signal-type-check

Add type checks to multi choice signal procesing
NasExt · Aug 20, 2021 · 47ac676 · 47ac676
2 parents 4bbac6b + d549e3c
commit 47ac676
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Controls/DependentMultiSelectBox.php b/src/Controls/DependentMultiSelectBox.php
@@ -80,8 +80,12 @@ public function signalReceived(string $signal) : void
 				$value = $presenter->getParameter($this->getNormalizeName($parent));
 
 				if ($parent instanceof Nette\Forms\Controls\MultiChoiceControl) {
-					$value = explode(',', $value);
-				    	$value = array_filter($value, static function ($val) {return !in_array($val, [null, '', []], true);});
+					if (is_string($value)) {
+						$value = explode(',', $value);
+					}
+					if ($value !== null) {
+						$value = array_filter($value, static function ($val) {return !in_array($val, [null, '', []], true);});
+					}
 				}
 
 				$parent->setValue($value);

diff --git a/src/Controls/DependentSelectBox.php b/src/Controls/DependentSelectBox.php
@@ -54,8 +54,13 @@ public function signalReceived(string $signal) : void
 				$value = $presenter->getParameter($this->getNormalizeName($parent));
 
 				if ($parent instanceof Nette\Forms\Controls\MultiChoiceControl) {
-					$value = explode(',', $value);
-				    	$value = array_filter($value, static function ($val) {return !in_array($val, [null, '', []], true);});
+					if (is_string($value)) {
+						$value = explode(',', $value);
+					}
+
+					if ($value !== null) {
+						$value = array_filter($value, static function ($val) {return !in_array($val, [null, '', []], true);});
+					}
 				}
 
 				$parent->setValue($value);