update

Author: mevdschee

src/Bulma/FormField.php src/Bulma/Field.phpsrc/Bulma/FormField.php renamed to src/Bulma/Field.php

@@ -4,9 +4,9 @@
 
 use MintyPHP\Form\Checkbox;
 use MintyPHP\Form\Checkboxes;
-use MintyPHP\Form\FormField as Base;
+use MintyPHP\Form\Field as Base;
 
-class FormField extends Base
+class Field extends Base
 {
     public function __construct()
     {

src/Checkboxes.php

@@ -5,7 +5,7 @@
 use DOMElement;
 use MintyPHP\Form\Validator\Validator;
 
-class Checkboxes implements FormControl
+class Checkboxes implements Control
 {
     use HtmlElement;
 

src/FormControl.php src/Control.phpsrc/FormControl.php renamed to src/Control.php

@@ -4,7 +4,7 @@
 
 use MintyPHP\Form\Validator\Validator;
 
-interface FormControl
+interface Control
 {
     public function id(string $id): self;
     public function getId(): string;

src/Elements.php

@@ -14,7 +14,7 @@ class Elements
     ];
 
     /**
-     * @param FormField[] $fields
+     * @param Field[] $fields
      */
     public static function form(array $fields = []): Form
     {
@@ -29,10 +29,10 @@ public static function form(array $fields = []): Form
     /**
      * @param Validator[] $validators
      */
-    public static function field(?FormControl $control = null, ?Label $label = null, array $validators = []): FormField
+    public static function field(?Control $control = null, ?Label $label = null, array $validators = []): Field
     {
-        /** @var FormField */
-        $field = self::create('FormField');
+        /** @var Field */
+        $field = self::create('Field');
         if ($control) {
             $field->control($control);
         }
@@ -193,17 +193,17 @@ public static function label(string $caption = ''): Label
         return $label;
     }
 
-    public static function header(): FormHeader
+    public static function header(): Header
     {
-        /** @var FormHeader */
-        $header = self::create('FormHeader');
+        /** @var Header */
+        $header = self::create('Header');
         return $header;
     }
 
-    public static function legend(): FormLegend
+    public static function legend(): Legend
     {
-        /** @var FormLegend */
-        $legend = self::create('FormLegend');
+        /** @var Legend */
+        $legend = self::create('Legend');
         return $legend;
     }
 

src/FormField.php src/Field.phpsrc/FormField.php renamed to src/Field.php

@@ -5,12 +5,12 @@
 use DOMElement;
 use MintyPHP\Form\Validator\Validator;
 
-class FormField
+class Field
 {
     use HtmlElement;
 
     protected ?Label $label = null;
-    protected ?FormControl $control = null;
+    protected ?Control $control = null;
     protected ?Error $error = null;
     /** @var Validator[] */
     protected array $validators = [];
@@ -57,13 +57,13 @@ public function label(Label $label): self
         return $this;
     }
 
-    public function control(FormControl $control): self
+    public function control(Control $control): self
     {
         $this->control = $control;
         return $this;
     }
 
-    public function getControl(): ?FormControl
+    public function getControl(): ?Control
     {
         return $this->control;
     }

src/Fieldset.php

@@ -9,23 +9,24 @@ class Fieldset
 {
     use HtmlElement;
 
-    /** @var FormField[] */
+    /** @var Field[] */
     protected array $fields = [];
-    protected ?FormHeader $header = null;
+    protected ?Legend $legend = null;
+    protected ?Header $header = null;
 
     public function __construct()
     {
         $this->tag('div');
     }
 
-    public function field(FormField $field): self
+    public function field(Field $field): self
     {
         $this->fields[] = $field;
         return $this;
     }
 
     /**
-     * @param FormField[] $fields
+     * @param Field[] $fields
      */
     public function fields(array $fields): self
     {
@@ -35,7 +36,13 @@ public function fields(array $fields): self
         return $this;
     }
 
-    public function header(FormHeader $header): self
+    public function legend(Legend $legend): self
+    {
+        $this->legend = $legend;
+        return $this;
+    }
+
+    public function header(Header $header): self
     {
         $this->header = $header;
         return $this;
@@ -107,6 +114,10 @@ public function addErrors(array $messages): void
     public function renderDom(\DOMDocument $doc): \DOMElement
     {
         $fieldset = $this->renderElement($doc);
+        if ($this->legend) {
+            $legendElement = $this->legend->renderDom($doc);
+            $fieldset->appendChild($legendElement);
+        }
         if ($this->header) {
             $headerElement = $this->header->renderDom($doc);
             $fieldset->appendChild($headerElement);

src/Form.php

@@ -85,7 +85,7 @@ public function fieldsets(array $fieldsets): self
         return $this;
     }
 
-    public function field(FormField $field): self
+    public function field(Field $field): self
     {
         $this->hideFieldsets = true;
         $fieldset = new Fieldset();
@@ -95,7 +95,7 @@ public function field(FormField $field): self
     }
 
     /**
-     * @param FormField[] $fields
+     * @param Field[] $fields
      */
     public function fields(array $fields): self
     {

src/FormHeader.php src/Header.phpsrc/FormHeader.php renamed to src/Header.php

@@ -4,7 +4,7 @@
 
 use DOMElement;
 
-class FormHeader
+class Header
 {
     use HtmlElement;
 

src/Input.php

@@ -5,7 +5,7 @@
 use DOMElement;
 use MintyPHP\Form\Validator\Validator;
 
-class Input implements FormControl
+class Input implements Control
 {
     use HtmlElement;
 

src/FormLegend.php src/Legend.phpsrc/FormLegend.php renamed to src/Legend.php

@@ -4,7 +4,7 @@
 
 use DOMElement;
 
-class FormLegend
+class Legend
 {
     use HtmlElement;