Validator::validatePattern(): fix value object support (fixes #205)

nette · Dec 28, 2018 · f3e84e6 · f3e84e6
1 parent acf270f
commit f3e84e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
@@ -254,7 +254,7 @@ public static function validatePattern(IControl $control, string $pattern, bool
 		$regexp = "\x01^(?:$pattern)\\z\x01u" . ($caseInsensitive ? 'i' : '');
 		foreach (static::toArray($control->getValue()) as $item) {
 			$value = $item instanceof Nette\Http\FileUpload ? $item->getName() : $item;
-			if (!Strings::match($value, $regexp)) {
+			if (!Strings::match((string) $value, $regexp)) {
 				return false;
 			}
 		}
@@ -353,6 +353,6 @@ public static function validateImage(Controls\UploadControl $control): bool
 
 	private static function toArray($value): array
 	{
-		return $value instanceof Nette\Http\FileUpload ? [$value] : (array) $value;
+		return is_object($value) ? [$value] : (array) $value;
 	}
 }
diff --git a/tests/Forms/Controls.TestBase.validators.phpt b/tests/Forms/Controls.TestBase.validators.phpt
@@ -95,6 +95,14 @@ test(function () {
 	Assert::false(Validator::validatePattern($control, '[0-9]+X'));
 });
 
+test(function () {
+	$control = new TextInput;
+	$control->value = new class () {public $lorem = 'ipsum'; public function __toString(): string {return '123x';}};
+	Assert::false(Validator::validatePattern($control, '[0-9]'));
+	Assert::true(Validator::validatePattern($control, '[0-9]+x'));
+	Assert::false(Validator::validatePattern($control, '[0-9]+X'));
+});
+
 test(function () {
 	$control = new TextInput;
 	$control->value = '123x';