Allow using form without property type-hints (#102)

yiisoft · Oct 18, 2021 · f1461a5 · f1461a5
1 parent 1fac60c
commit f1461a5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/FormModel.php b/src/FormModel.php
@@ -20,7 +20,6 @@
 use function explode;
 use function is_subclass_of;
 use function reset;
-use function sprintf;
 use function strpos;
 
 /**
@@ -224,6 +223,7 @@ public function load(array $data, ?string $formName = null): bool
     public function setAttribute(string $name, $value): void
     {
         [$realName] = $this->getNestedAttribute($name);
+
         if (isset($this->attributes[$realName])) {
             switch ($this->attributes[$realName]) {
                 case 'bool':
@@ -289,15 +289,8 @@ protected function collectAttributes(): array
 
             /** @var ReflectionNamedType|null $type */
             $type = $property->getType();
-            if ($type === null) {
-                throw new InvalidArgumentException(sprintf(
-                    'You must specify the type hint for "%s" property in "%s" class.',
-                    $property->getName(),
-                    $property->getDeclaringClass()->getName(),
-                ));
-            }
 
-            $attributes[$property->getName()] = $type->getName();
+            $attributes[$property->getName()] = $type !== null ? $type->getName() : '';
         }
 
         return $attributes;

diff --git a/tests/FormModelTest.php b/tests/FormModelTest.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Form\Tests;
 
-use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\FormModel;
 use Yiisoft\Form\Tests\TestSupport\Form\FormWithNestedAttribute;
@@ -44,14 +43,24 @@ public function testCustomFormName(): void
 
     public function testUnknownPropertyType(): void
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessageMatches(sprintf(
-            '/You must specify the type hint for "%s" property in "([^"]+)" class./',
-            'property',
-        ));
         $form = new class () extends FormModel {
             private $property;
         };
+
+        $form->setAttribute('property', true);
+        $this->assertSame(true, $form->getAttributeValue('property'));
+
+        $form->setAttribute('property', 'string');
+        $this->assertSame('string', $form->getAttributeValue('property'));
+
+        $form->setAttribute('property', 0);
+        $this->assertSame(0, $form->getAttributeValue('property'));
+
+        $form->setAttribute('property', 1.2563);
+        $this->assertSame(1.2563, $form->getAttributeValue('property'));
+
+        $form->setAttribute('property', []);
+        $this->assertSame([], $form->getAttributeValue('property'));
     }
 
     public function testGetAttributeValue(): void
@@ -66,10 +75,6 @@ public function testGetAttributeValue(): void
 
         $form->rememberMe(true);
         $this->assertEquals(true, $form->getAttributeValue('rememberMe'));
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Undefined property: "Yiisoft\Form\Tests\TestSupport\Form\LoginForm::noExist".');
-        $form->getAttributeValue('noExist');
     }
 
     public function testGetAttributeValueWithNestedAttribute(): void