update

Author: mevdschee

src/Checkboxes.php

@@ -14,6 +14,7 @@ class Checkboxes implements Control
     protected array $options = [];
     /** @var string[] $values */
     protected array $values = [];
+    protected bool $required = false;
 
     public function __construct()
     {
@@ -31,6 +32,12 @@ public function getName(): string
         return $this->name;
     }
 
+    public function required(): self
+    {
+        $this->required = true;
+        return $this;
+    }
+
     /**
      * @param array<string,string> $options
      */
@@ -71,6 +78,9 @@ public function extract(): array
 
     public function validate(Validator $validator): string
     {
+        if (!$this->required && !$this->values) {
+            return '';
+        }
         if (array_diff($this->values, array_keys($this->options))) {
             return 'Invalid checkbox value';
         }

src/Control.php

@@ -11,6 +11,7 @@ public function getId(): string;
     public function name(string $name): self;
     public function getName(): string;
     public function value(string $value): self;
+    public function required(): self;
     /**
      * @param array<string, string|string[]|null> $data
      */

src/Field.php

@@ -25,10 +25,12 @@ class Field
     public function __construct()
     {
         $this->tag('div');
+        $this->class('form-group');
     }
 
     public function disabled(): self
     {
+        $this->class('disabled');
         $this->disabled = true;
         return $this;
     }
@@ -101,7 +103,7 @@ public function fill(array $data): void
     public function extract(): array
     {
         $data = [];
-        if ($this->control) {
+        if ($this->control && !$this->disabled) {
             $data = $this->control->extract();
         }
         return $data;

src/Input.php

@@ -13,6 +13,7 @@ class Input implements Control
     protected string $value = '';
     protected string $type = 'text';
     protected string $placeholder = '';
+    protected bool $required = false;
 
     public function __construct()
     {
@@ -36,6 +37,12 @@ public function getName(): string
         return $this->name;
     }
 
+    public function required(): self
+    {
+        $this->required = true;
+        return $this;
+    }
+
     public function value(string $value): self
     {
         $this->value = $value;
@@ -77,6 +84,9 @@ public function extract(): array
 
     public function validate(Validator $validator): string
     {
+        if (!$this->required && !$this->value) {
+            return '';
+        }
         return $validator->validate($this->value);
     }
 

src/Select.php

@@ -14,6 +14,7 @@ class Select implements Control
     protected array $options = [];
     /** @var string[] $values */
     protected array $values = [];
+    protected bool $required = false;
     protected bool $multiple = false;
 
     public function __construct()
@@ -38,6 +39,12 @@ public function getName(): string
         return $this->name;
     }
 
+    public function required(): self
+    {
+        $this->required = true;
+        return $this;
+    }
+
     /**
      * @param array<string|int,string> $options
      */
@@ -81,6 +88,9 @@ public function extract(): array
 
     public function validate(Validator $validator): string
     {
+        if (!$this->required && !$this->values) {
+            return '';
+        }
         if (array_diff($this->values, array_keys($this->options))) {
             return 'Invalid option value';
         }