Validator: method validatePattern() for FileUpload uses file name (#175)

Author: h4kuna

src/Forms/Validator.php

@@ -274,7 +274,8 @@ public static function validateUrl(IControl $control)
 	 */
 	public static function validatePattern(IControl $control, $pattern)
 	{
-		return (bool) Strings::match($control->getValue(), "\x01^(?:$pattern)\\z\x01u");
+		$value = $control->getValue() instanceof Nette\Http\FileUpload ? $control->getValue()->getName() : $control->getValue();
+		return (bool) Strings::match($value, "\x01^(?:$pattern)\\z\x01u");
 	}
 
 

tests/Forms/Controls.TestBase.validators.phpt

@@ -5,7 +5,9 @@
  */
 
 use Nette\Forms\Controls\TextInput;
+use Nette\Forms\Controls\UploadControl;
 use Nette\Forms\Validator;
+use Nette\Http\FileUpload;
 use Tester\Assert;
 
 
@@ -92,6 +94,25 @@ test(function () {
 });
 
 
+test(function () {
+	class MockUploadControl extends UploadControl
+	{
+		public function setValue($value)
+		{
+			$this->value = $value;
+			return $this;
+		}
+	}
+
+	$control = new MockUploadControl;
+	$control->value = new FileUpload([
+		'name' => '123x', 'size' => 1, 'tmp_name' => '456y', 'error' => UPLOAD_ERR_OK, 'type' => '',
+	]);
+	Assert::false(Validator::validatePattern($control, '[4-6]+y'));
+	Assert::true(Validator::validatePattern($control, '[1-3]+x'));
+});
+
+
 test(function () {
 	$control = new TextInput;
 	$control->value = '';