prefer "not empty" over "not null" for better UX

atk4 · Oct 14, 2023 · 0bb6ff0 · 0bb6ff0
1 parent 0b343f3
commit 0bb6ff0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Field.php b/src/Field.php
@@ -199,7 +199,9 @@ public function normalize($value)
             $value = $this->normalizeUsingTypecast($value);
 
             if ($value === null) {
-                if (!$this->nullable || $this->required) {
+                if ($this->required) {
+                    throw new Exception('Must not be empty');
+                } elseif (!$this->nullable) {
                     throw new Exception('Must not be null');
                 }
 

diff --git a/tests/FieldTest.php b/tests/FieldTest.php
@@ -88,7 +88,18 @@ public function testRequiredNullException(): void
         $m = $m->createEntity();
 
         $this->expectException(ValidationException::class);
-        $this->expectExceptionMessage('Must not be null');
+        $this->expectExceptionMessage('Must not be empty');
+        $m->set('foo', null);
+    }
+
+    public function testNotNullableAndRequiredNullException(): void
+    {
+        $m = new Model();
+        $m->addField('foo', ['nullable' => false, 'required' => true]);
+        $m = $m->createEntity();
+
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessage('Must not be empty');
         $m->set('foo', null);
     }
 
@@ -859,7 +870,7 @@ public function testSetNull(): void
         self::assertNull($m->get('c'));
 
         $this->expectException(ValidationException::class);
-        $this->expectExceptionMessage('Must not be null');
+        $this->expectExceptionMessage('Must not be empty');
         $m->set('c', null);
     }