update

Author: mevdschee

src/Bulma/FormCheckboxes.php src/Bulma/Checkboxes.phpsrc/Bulma/FormCheckboxes.php renamed to src/Bulma/Checkboxes.php

@@ -3,9 +3,9 @@
 namespace MintyPHP\Form\Bulma;
 
 use DOMElement;
-use MintyPHP\Form\FormCheckboxes as Base;
+use MintyPHP\Form\Checkboxes as Base;
 
-class FormCheckboxes extends Base
+class Checkboxes extends Base
 {
     public function __construct()
     {

src/Bulma/FormError.php src/Bulma/Error.phpsrc/Bulma/FormError.php renamed to src/Bulma/Error.php

@@ -2,9 +2,9 @@
 
 namespace MintyPHP\Form\Bulma;
 
-use MintyPHP\Form\FormError as Base;
+use MintyPHP\Form\Error as Base;
 
-class FormError extends Base
+class Error extends Base
 {
     public function __construct()
     {

src/Bulma/FormField.php

@@ -2,8 +2,8 @@
 
 namespace MintyPHP\Form\Bulma;
 
-use MintyPHP\Form\FormCheckbox;
-use MintyPHP\Form\FormCheckboxes;
+use MintyPHP\Form\Checkbox;
+use MintyPHP\Form\Checkboxes;
 use MintyPHP\Form\FormField as Base;
 
 class FormField extends Base
@@ -22,7 +22,7 @@ public function setError(string $message): void
 
     public function renderDom(\DOMDocument $doc): \DOMElement
     {
-        if ($this->control instanceof FormCheckbox && $this->label) {
+        if ($this->control instanceof Checkbox && $this->label) {
             $this->label->removeClass('label');
             $this->label->addClass('checkbox');
             $control = $this->control->renderDom($doc);
@@ -38,7 +38,7 @@ public function renderDom(\DOMDocument $doc): \DOMElement
             }
             return $field;
         }
-        if ($this->control instanceof FormCheckboxes && $this->label) {
+        if ($this->control instanceof Checkboxes && $this->label) {
             $field = $this->renderElement($doc);
             $field->appendChild($this->label->renderDom($doc));
             $field->appendChild($this->control->renderDom($doc));

src/FormCheckbox.php src/Checkbox.phpsrc/FormCheckbox.php renamed to src/Checkbox.php

@@ -5,7 +5,7 @@
 use DOMElement;
 use MintyPHP\Form\Validator\Validator;
 
-class FormCheckbox extends Input
+class Checkbox extends Input
 {
     use HtmlElement;
 

src/FormCheckboxes.php src/Checkboxes.phpsrc/FormCheckboxes.php renamed to src/Checkboxes.php

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

src/Elements.php

@@ -138,10 +138,10 @@ public static function textarea(string $name = '', string $placeholder = ''): Te
         return $textarea;
     }
 
-    public static function checkbox(string $name = '', string $value = 'on'): FormCheckbox
+    public static function checkbox(string $name = '', string $value = 'on'): Checkbox
     {
-        /** @var FormCheckbox */
-        $input = self::create('FormCheckbox');
+        /** @var Checkbox */
+        $input = self::create('Checkbox');
         if ($name) {
             $input->name($name);
         }
@@ -170,10 +170,10 @@ public static function select(string $name = '', array $options = []): Select
     /**
      * @param array<string, string> $options
      */
-    public static function checkboxes(string $name = '', array $options = []): FormCheckboxes
+    public static function checkboxes(string $name = '', array $options = []): Checkboxes
     {
-        /** @var FormCheckboxes */
-        $checkboxes = self::create('FormCheckboxes');
+        /** @var Checkboxes */
+        $checkboxes = self::create('Checkboxes');
         if ($name) {
             $checkboxes->name($name);
         }
@@ -207,17 +207,17 @@ public static function legend(): FormLegend
         return $legend;
     }
 
-    public static function error(): FormError
+    public static function error(): Error
     {
-        /** @var FormError */
-        $error = self::create('FormError');
+        /** @var Error */
+        $error = self::create('Error');
         return $error;
     }
 
-    public static function fieldset(): FormFieldset
+    public static function fieldset(): Fieldset
     {
-        /** @var FormFieldset */
-        $fieldset = self::create('FormFieldset');
+        /** @var Fieldset */
+        $fieldset = self::create('Fieldset');
         return $fieldset;
     }
 }

src/FormError.php src/Error.phpsrc/FormError.php renamed to src/Error.php

@@ -4,7 +4,7 @@
 
 use DOMElement;
 
-class FormError
+class Error
 {
     use HtmlElement;
 

src/FormFieldset.php src/Fieldset.phpsrc/FormFieldset.php renamed to src/Fieldset.php

@@ -5,7 +5,7 @@
 use MintyPHP\Form\HtmlElement;
 use DOMElement;
 
-class FormFieldset
+class Fieldset
 {
     use HtmlElement;
 

src/Form.php

@@ -9,7 +9,7 @@ class Form
     protected string $action = '';
     protected string $method = 'POST';
     protected string $enctype = 'application/x-www-form-urlencoded';
-    /** @var FormFieldset[] */
+    /** @var Fieldset[] */
     protected array $fieldsets = [];
 
     protected bool $hideFieldsets = false;
@@ -68,14 +68,14 @@ public function attributes(array $attributes): self
         return $this;
     }
 
-    public function fieldset(FormFieldset $fieldset): self
+    public function fieldset(Fieldset $fieldset): self
     {
         $this->fieldsets[] = $fieldset;
         return $this;
     }
 
     /**
-     * @param FormFieldset[] $fieldsets
+     * @param Fieldset[] $fieldsets
      */
     public function fieldsets(array $fieldsets): self
     {
@@ -88,7 +88,7 @@ public function fieldsets(array $fieldsets): self
     public function field(FormField $field): self
     {
         $this->hideFieldsets = true;
-        $fieldset = new FormFieldset();
+        $fieldset = new Fieldset();
         $fieldset->field($field);
         $this->fieldset($fieldset);
         return $this;

src/FormField.php

@@ -11,7 +11,7 @@ class FormField
 
     protected ?Label $label = null;
     protected ?FormControl $control = null;
-    protected ?FormError $error = null;
+    protected ?Error $error = null;
     /** @var Validator[] */
     protected array $validators = [];
 
@@ -79,7 +79,7 @@ public function validators(array $validators): self
         return $this;
     }
 
-    public function error(FormError $error): self
+    public function error(Error $error): self
     {
         $this->error = $error;
         return $this;
@@ -136,8 +136,8 @@ public function setError(string $message): void
         }
         if ($message) {
             if (!$this->error) {
-                /** @var FormError */
-                $error = Elements::create('FormError');
+                /** @var Error */
+                $error = Elements::create('Error');
                 $this->error = $error;
             }
         } else if ($this->hideError) {