Validator: do not require BaseControl instance for filled and blank validation

Author: xificurk

src/Forms/Validator.php

@@ -131,18 +131,23 @@ public static function validateStatic(IControl $control, bool $arg): bool
 	/**
 	 * Is control filled?
 	 */
-	public static function validateFilled(Controls\BaseControl $control): bool
+	public static function validateFilled(IControl $control): bool
 	{
-		return $control->isFilled();
+		if ($control instanceof Controls\BaseControl) {
+			return $control->isFilled();
+		}
+
+		$value = $control->getValue();
+		return $value !== null && $value !== [] && $value !== '';
 	}
 
 
 	/**
 	 * Is control not filled?
 	 */
-	public static function validateBlank(Controls\BaseControl $control): bool
+	public static function validateBlank(IControl $control): bool
 	{
-		return !$control->isFilled();
+		return !static::validateFilled($control);
 	}
 
 

tests/Forms/Validator.customControl.phpt

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Test: Nette\Forms\Controls\BaseControl
+ */
+
+declare(strict_types=1);
+
+use Nette\Forms\Form;
+use Nette\Forms\Validator;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class CustomControl implements \Nette\Forms\IControl
+{
+
+	private $value;
+
+
+	public function __construct($value)
+	{
+		$this->value = $value;
+	}
+
+
+	public function setValue($value)
+	{
+		$this->value = $value;
+	}
+
+
+	public function getValue()
+	{
+		return $this->value;
+	}
+
+
+	public function validate(): void
+	{
+	}
+
+
+	public function getErrors(): array
+	{
+		return [];
+	}
+
+
+	public function isOmitted(): bool
+	{
+		return false;
+	}
+
+}
+
+
+test(function () { // filled, blank
+	$input = new CustomControl('');
+	Assert::false(Validator::validateFilled($input));
+	Assert::true(Validator::validateBlank($input));
+
+	$input = new CustomControl(null);
+	Assert::false(Validator::validateFilled($input));
+	Assert::true(Validator::validateBlank($input));
+
+	$input = new CustomControl([]);
+	Assert::false(Validator::validateFilled($input));
+	Assert::true(Validator::validateBlank($input));
+
+	$input = new CustomControl(42);
+	Assert::true(Validator::validateFilled($input));
+	Assert::false(Validator::validateBlank($input));
+});