UploadControl: when file is uploaded with error, automatically shows error and isFilled() returns TRUE (BC break)

Author: michallohnisky

src/Forms/Controls/UploadControl.php

@@ -8,6 +8,7 @@
 namespace Nette\Forms\Controls;
 
 use Nette;
+use Nette\Forms;
 use Nette\Http\FileUpload;
 
 
@@ -16,6 +17,8 @@
  */
 class UploadControl extends BaseControl
 {
+	/** validation rule */
+	const VALID = ':uploadControlValid';
 
 	/**
 	 * @param  string  label
@@ -27,6 +30,8 @@ public function __construct($label = NULL, $multiple = FALSE)
 		$this->control->type = 'file';
 		$this->control->multiple = (bool) $multiple;
 		$this->setOption('type', 'file');
+		$this->addCondition(Forms\Form::FILLED)
+			->addRule([$this, 'isOk'], Forms\Validator::$messages[self::VALID]);
 	}
 
 
@@ -86,7 +91,9 @@ public function setValue($value)
 	 */
 	public function isFilled()
 	{
-		return $this->value instanceof FileUpload ? $this->value->isOk() : (bool) $this->value; // ignore NULL object
+		return $this->value instanceof FileUpload
+			? $this->value->getError() !== UPLOAD_ERR_NO_FILE // ignore NULL object
+			: (bool) $this->value;
 	}
 
 

src/Forms/Validator.php

@@ -39,6 +39,7 @@ class Validator extends Nette\Object
 		Form::MIME_TYPE => 'The uploaded file is not in the expected format.',
 		Form::IMAGE => 'The uploaded file must be image in format JPEG, GIF or PNG.',
 		Controls\SelectBox::VALID => 'Please select a valid option.',
+		Controls\UploadControl::VALID => 'An error occurred during file upload.',
 	];
 
 

tests/Forms/Controls.UploadControl.loadData.phpt

@@ -52,6 +52,13 @@ $_FILES = [
 		'size' => [NULL],
 	],
 	'invalid2' => '',
+	'partial' => [
+		'name' => 'license.txt',
+		'type' => 'text/plain',
+		'tmp_name' => __DIR__ . '/files/logo.gif',
+		'error' => UPLOAD_ERR_PARTIAL,
+		'size' => 3013,
+	],
 ];
 
 
@@ -171,6 +178,24 @@ test(function () { // malformed data
 });
 
 
+test(function () { // partial uploaded (error)
+	$form = new Form;
+	$input = $form->addUpload('partial')
+		->setRequired();
+
+	Assert::false($form->isValid());
+	Assert::equal(new FileUpload([
+		'name' => 'license.txt',
+		'type' => '',
+		'tmp_name' => __DIR__ . '/files/logo.gif',
+		'error' => UPLOAD_ERR_PARTIAL,
+		'size' => 3013,
+	]), $input->getValue());
+	Assert::true($input->isFilled());
+	Assert::false($input->isOk());
+});
+
+
 test(function () { // validators
 	$form = new Form;
 	$input = $form->addUpload('avatar')