More type hinting

sdebacker · sdebacker · commit 5f291ad7017b · 2022-04-26T09:49:23.000+02:00
diff --git a/src/BasicFormBuilder.php b/src/BasicFormBuilder.php
@@ -13,10 +13,7 @@
 
 class BasicFormBuilder
 {
-    /**
-     * @var FormBuilder
-     */
-    protected $builder;
+    protected FormBuilder $builder;
 
     public function __construct(FormBuilder $builder)
     {
diff --git a/src/BootForm.php b/src/BootForm.php
@@ -6,20 +6,11 @@
 
 class BootForm
 {
-    /**
-     * @var BasicFormBuilder
-     */
-    protected $builder;
-
-    /**
-     * @var BasicFormBuilder
-     */
-    protected $basicFormBuilder;
-
-    /**
-     * @var HorizontalFormBuilder
-     */
-    protected $horizontalFormBuilder;
+    protected BasicFormBuilder $builder;
+
+    protected BasicFormBuilder $basicFormBuilder;
+
+    protected HorizontalFormBuilder $horizontalFormBuilder;
 
     public function __construct(BasicFormBuilder $basicFormBuilder, HorizontalFormBuilder $horizontalFormBuilder)
     {
diff --git a/src/BootFormsServiceProvider.php b/src/BootFormsServiceProvider.php
@@ -10,9 +10,6 @@
 
 class BootFormsServiceProvider extends ServiceProvider implements DeferrableProvider
 {
-    /**
-     * Register the service provider.
-     */
     public function register()
     {
         $this->registerErrorStore();
diff --git a/src/Elements/CheckGroup.php b/src/Elements/CheckGroup.php
@@ -7,14 +7,9 @@
 
 class CheckGroup extends FormGroup
 {
-    protected $label;
-
-    /**
-     * BootForm implementation.
-     *
-     * @var \TypiCMS\Form\Elements\Element
-     */
-    protected $control;
+    protected Label $label;
+
+    protected Element $control;
 
     public function __construct(Label $label, Element $control)
     {
diff --git a/src/Elements/FormGroup.php b/src/Elements/FormGroup.php
@@ -7,25 +7,13 @@
 
 class FormGroup extends Element
 {
-    /**
-     * @var Label
-     */
-    protected $label;
-
-    /**
-     * @var \TypiCMS\Form\Elements\Element
-     */
-    protected $control;
-
-    /**
-     * @var ?FormText
-     */
-    protected $formText;
-
-    /**
-     * @var ?InvalidFeedback
-     */
-    protected $invalidFeedback;
+    protected Label $label;
+
+    protected Element $control;
+
+    protected ?FormText $formText = null;
+
+    protected ?InvalidFeedback $invalidFeedback = null;
 
     public function __construct(Label $label, Element $control)
     {
diff --git a/src/Elements/FormText.php b/src/Elements/FormText.php
@@ -6,10 +6,7 @@
 
 class FormText extends Element
 {
-    /**
-     * @var string
-     */
-    private $message;
+    private string $message;
 
     public function __construct(string $message)
     {
diff --git a/src/Elements/GroupWrapper.php b/src/Elements/GroupWrapper.php
@@ -2,17 +2,13 @@
 
 namespace TypiCMS\BootForms\Elements;
 
+use TypiCMS\Form\Elements\Element;
+
 class GroupWrapper
 {
-    /**
-     * @var FormGroup
-     */
-    protected $formGroup;
-
-    /**
-     * @var \TypiCMS\Form\Elements\Element
-     */
-    protected $target;
+    protected FormGroup $formGroup;
+
+    protected Element $target;
 
     public function __construct(FormGroup $formGroup)
     {
diff --git a/src/Elements/HorizontalFormGroup.php b/src/Elements/HorizontalFormGroup.php
@@ -7,10 +7,7 @@
 
 class HorizontalFormGroup extends FormGroup
 {
-    /**
-     * @var array
-     */
-    protected $controlSizes;
+    protected array $controlSizes;
 
     public function __construct(Label $label, Element $control, array $controlSizes)
     {
diff --git a/src/Elements/InputGroup.php b/src/Elements/InputGroup.php
@@ -6,15 +6,9 @@
 
 class InputGroup extends Text
 {
-    /**
-     * @var array
-     */
-    protected $beforeAddon = [];
+    protected array $beforeAddon = [];
 
-    /**
-     * @var array
-     */
-    protected $afterAddon = [];
+    protected array $afterAddon = [];
 
     public function beforeAddon(string $addon): self
     {
@@ -37,7 +31,7 @@ public function type(string $type): self
         return $this;
     }
 
-    protected function renderAddons(array $addons, string $class): string
+    protected function renderAddons(array $addons): string
     {
         $html = '';
 
@@ -51,9 +45,9 @@ protected function renderAddons(array $addons, string $class): string
     public function render(): string
     {
         $html = '<div class="input-group">';
-        $html .= $this->renderAddons($this->beforeAddon, 'prepend');
+        $html .= $this->renderAddons($this->beforeAddon);
         $html .= parent::render();
-        $html .= $this->renderAddons($this->afterAddon, 'append');
+        $html .= $this->renderAddons($this->afterAddon);
         $html .= '</div>';
 
         return $html;
diff --git a/src/Elements/InvalidFeedback.php b/src/Elements/InvalidFeedback.php
@@ -6,10 +6,7 @@
 
 class InvalidFeedback extends Element
 {
-    /**
-     * @var string
-     */
-    private $message;
+    private string $message;
 
     public function __construct(string $message)
     {
diff --git a/src/Elements/OffsetFormGroup.php b/src/Elements/OffsetFormGroup.php
@@ -4,15 +4,9 @@
 
 class OffsetFormGroup
 {
-    /**
-     * @var mixed
-     */
-    protected $control;
-
-    /**
-     * @var array
-     */
-    protected $columnSizes;
+    protected mixed $control;
+
+    protected array $columnSizes;
 
     public function __construct(mixed $control, array $columnSizes)
     {
diff --git a/src/HorizontalFormBuilder.php b/src/HorizontalFormBuilder.php
@@ -11,15 +11,9 @@
 
 class HorizontalFormBuilder extends BasicFormBuilder
 {
-    /**
-     * @var array
-     */
-    protected $columnSizes;
-
-    /**
-     * @var FormBuilder
-     */
-    protected $builder;
+    protected array $columnSizes;
+
+    protected FormBuilder $builder;
 
     public function __construct(FormBuilder $builder, array $columnSizes = ['lg' => [2, 10]])
     {

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,7 @@`
`13`	`13`
`14`	`14`	`class BasicFormBuilder`
`15`	`15`	`{`
`16`		`- /**`
`17`		`- * @var FormBuilder`
`18`		`- */`
`19`		`- protected $builder;`
	`16`	`+ protected FormBuilder $builder;`
`20`	`17`
`21`	`18`	`public function __construct(FormBuilder $builder)`
`22`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,6 @@`
`10`	`10`
`11`	`11`	`class BootFormsServiceProvider extends ServiceProvider implements DeferrableProvider`
`12`	`12`	`{`
`13`		`- /**`
`14`		`- * Register the service provider.`
`15`		`- */`
`16`	`13`	`public function register()`
`17`	`14`	`{`
`18`	`15`	`$this->registerErrorStore();`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@`
`6`	`6`
`7`	`7`	`class FormText extends Element`
`8`	`8`	`{`
`9`		`- /**`
`10`		`- * @var string`
`11`		`- */`
`12`		`- private $message;`
	`9`	`+ private string $message;`
`13`	`10`
`14`	`11`	`public function __construct(string $message)`
`15`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,7 @@`
`7`	`7`
`8`	`8`	`class HorizontalFormGroup extends FormGroup`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * @var array`
`12`		`- */`
`13`		`- protected $controlSizes;`
	`10`	`+ protected array $controlSizes;`
`14`	`11`
`15`	`12`	`public function __construct(Label $label, Element $control, array $controlSizes)`
`16`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@`
`6`	`6`
`7`	`7`	`class InvalidFeedback extends Element`
`8`	`8`	`{`
`9`		`- /**`
`10`		`- * @var string`
`11`		`- */`
`12`		`- private $message;`
	`9`	`+ private string $message;`
`13`	`10`
`14`	`11`	`public function __construct(string $message)`
`15`	`12`	`{`