File field set null value by default (#212)

* Update yiisoft/test-support. * File field set null value by default.
yiisoft · Jul 7, 2022 · 7e83954 · 7e83954
1 parent 9974ae2
commit 7e83954
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# _____ Change Log
+# Yii Form Change Log
 
 ## 1.0.0 under development
 

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "roave/infection-static-analysis-plugin": "^1.18",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.23",
-        "yiisoft/test-support": " ^1.4"
+        "yiisoft/test-support": " ^3.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Field/File.php b/src/Field/File.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Form\Field;
 
-use InvalidArgumentException;
 use Stringable;
 use Yiisoft\Form\Field\Base\EnrichmentFromRules\EnrichmentFromRulesInterface;
 use Yiisoft\Form\Field\Base\EnrichmentFromRules\EnrichmentFromRulesTrait;
@@ -28,6 +27,7 @@ final class File extends InputField implements EnrichmentFromRulesInterface, Val
 
     private bool|float|int|string|Stringable|null $uncheckValue = null;
     private array $uncheckInputAttributes = [];
+    private string|Stringable|null $value = null;
 
     /**
      * The accept attribute value is a string that defines the file types the file input should accept. This string is
@@ -153,6 +153,13 @@ public function addUncheckInputAttributes(array $attributes): self
         return $new;
     }
 
+    public function value(string|Stringable|null $value): self
+    {
+        $new = clone $this;
+        $new->value = $value;
+        return $new;
+    }
+
     /**
      * @psalm-suppress MixedAssignment,MixedArgument Remove after fix https://github.com/yiisoft/validator/issues/225
      */
@@ -177,20 +184,9 @@ protected function beforeRender(): void
 
     protected function generateInput(): string
     {
-        $value = $this->getFormAttributeValue();
-
-        if (!is_string($value)
-            && $value !== null
-            && (!$value instanceof Stringable)
-        ) {
-            throw new InvalidArgumentException(
-                'File field requires a string, Stringable or null value.'
-            );
-        }
-
         $inputAttributes = $this->getInputAttributes();
 
-        $tag = Html::file($this->getInputName(), $value, $inputAttributes);
+        $tag = Html::file($this->getInputName(), $this->value, $inputAttributes);
         if ($this->uncheckValue !== null) {
             $tag = $tag->uncheckValue($this->uncheckValue);
             if (!empty($this->uncheckInputAttributes)) {

diff --git a/tests/Field/FileTest.php b/tests/Field/FileTest.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Form\Tests\Field;
 
-use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Field\File;
 use Yiisoft\Form\Tests\Support\Form\FileForm;
@@ -265,14 +264,21 @@ public function testEnrichmentFromRulesWithWhen(): void
         $this->assertSame($expected, $result);
     }
 
-    public function testInvalidValue(): void
+    public function testValue(): void
     {
-        $field = File::widget()
-            ->formAttribute(new FileForm(), 'age');
+        $result = File::widget()
+            ->hideLabel()
+            ->formAttribute(new FileForm(), 'photo')
+            ->value('test')
+            ->render();
+
+        $expected = <<<HTML
+            <div>
+            <input type="file" id="fileform-photo" name="FileForm[photo]" value="test">
+            </div>
+            HTML;
 
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('File field requires a string, Stringable or null value.');
-        $field->render();
+        $this->assertSame($expected, $result);
     }
 
     public function testImmutability(): void
@@ -289,5 +295,6 @@ public function testImmutability(): void
         $this->assertNotSame($field, $field->uncheckValue(null));
         $this->assertNotSame($field, $field->uncheckInputAttributes([]));
         $this->assertNotSame($field, $field->addUncheckInputAttributes([]));
+        $this->assertNotSame($field, $field->value(null));
     }
 }
diff --git a/tests/Support/Form/FileForm.php b/tests/Support/Form/FileForm.php
@@ -12,7 +12,6 @@ final class FileForm extends FormModel
     private ?string $avatar = null;
     private ?string $image = null;
     private ?string $photo = null;
-    private ?int $age = 42;
 
     public function getRules(): array
     {