More type hinting

sdebacker · sdebacker · commit 5a1296f8441a · 2022-04-26T09:54:16.000+02:00
diff --git a/src/Binding/BoundData.php b/src/Binding/BoundData.php
@@ -4,10 +4,7 @@
 
 class BoundData
 {
-    /**
-     * @var mixed
-     */
-    protected $data;
+    protected mixed $data;
 
     public function __construct(mixed $data)
     {
diff --git a/src/Elements/Button.php b/src/Elements/Button.php
@@ -4,17 +4,11 @@
 
 class Button extends FormControl
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'button',
     ];
 
-    /**
-     * @var string
-     */
-    protected $value;
+    protected string $value;
 
     public function __construct(string $value, ?string $name = null)
     {
diff --git a/src/Elements/Checkbox.php b/src/Elements/Checkbox.php
@@ -4,22 +4,13 @@
 
 class Checkbox extends Input
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'checkbox',
     ];
 
-    /**
-     * @var ?bool
-     */
-    protected $checked;
+    protected ?bool $checked;
 
-    /**
-     * @var mixed
-     */
-    protected $oldValue;
+    protected mixed $oldValue = null;
 
     public function __construct(string $name, mixed $value = 1)
     {
diff --git a/src/Elements/Date.php b/src/Elements/Date.php
@@ -4,10 +4,7 @@
 
 class Date extends Text
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'date',
     ];
 
diff --git a/src/Elements/DateTimeLocal.php b/src/Elements/DateTimeLocal.php
@@ -4,10 +4,7 @@
 
 class DateTimeLocal extends Text
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'datetime-local',
     ];
 
diff --git a/src/Elements/Element.php b/src/Elements/Element.php
@@ -4,10 +4,7 @@
 
 abstract class Element
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [];
+    protected array $attributes = [];
 
     protected function setAttribute(string $attribute, mixed $value = null): void
     {
diff --git a/src/Elements/Email.php b/src/Elements/Email.php
@@ -4,10 +4,7 @@
 
 class Email extends Text
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'email',
     ];
 }
diff --git a/src/Elements/File.php b/src/Elements/File.php
@@ -4,10 +4,7 @@
 
 class File extends Input
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'file',
     ];
 }
diff --git a/src/Elements/FormOpen.php b/src/Elements/FormOpen.php
@@ -4,23 +4,14 @@
 
 class FormOpen extends Element
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'method' => 'POST',
         'action' => '',
     ];
 
-    /**
-     * @var ?Hidden
-     */
-    protected $token;
+    protected ?Hidden $token;
 
-    /**
-     * @var ?Hidden
-     */
-    protected $hiddenMethod;
+    protected ?Hidden $hiddenMethod;
 
     public function render(): string
     {
diff --git a/src/Elements/Hidden.php b/src/Elements/Hidden.php
@@ -4,10 +4,7 @@
 
 class Hidden extends Input
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'hidden',
     ];
 }
diff --git a/src/Elements/Label.php b/src/Elements/Label.php
@@ -4,20 +4,11 @@
 
 class Label extends Element
 {
-    /**
-     * @var ?Element
-     */
-    protected $element;
-
-    /**
-     * @var bool
-     */
-    protected $labelBefore;
-
-    /**
-     * @var string
-     */
-    protected $label;
+    protected ?Element $element = null;
+
+    protected ?bool $labelBefore = null;
+
+    protected string $label;
 
     public function __construct(string $label)
     {
diff --git a/src/Elements/Number.php b/src/Elements/Number.php
@@ -4,10 +4,7 @@
 
 class Number extends Input
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'number',
     ];
 
diff --git a/src/Elements/Password.php b/src/Elements/Password.php
@@ -4,10 +4,7 @@
 
 class Password extends Text
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'password',
     ];
 }
diff --git a/src/Elements/RadioButton.php b/src/Elements/RadioButton.php
@@ -4,10 +4,7 @@
 
 class RadioButton extends Checkbox
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'radio',
     ];
 
diff --git a/src/Elements/Select.php b/src/Elements/Select.php
@@ -4,15 +4,9 @@
 
 class Select extends FormControl
 {
-    /**
-     * @var array
-     */
-    protected $options;
-
-    /**
-     * @var ?bool
-     */
-    protected $selected;
+    protected array $options;
+
+    protected mixed $selected = null;
 
     public function __construct(string $name, array $options = [])
     {
diff --git a/src/Elements/Text.php b/src/Elements/Text.php
@@ -4,10 +4,7 @@
 
 class Text extends Input
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'type' => 'text',
     ];
 
diff --git a/src/Elements/TextArea.php b/src/Elements/TextArea.php
@@ -4,19 +4,13 @@
 
 class TextArea extends FormControl
 {
-    /**
-     * @var array
-     */
-    protected $attributes = [
+    protected array $attributes = [
         'name' => '',
         'rows' => 10,
         'cols' => 50,
     ];
 
-    /**
-     * @var ?string
-     */
-    protected $value;
+    protected ?string $value = null;
 
     public function render(): string
     {
diff --git a/src/ErrorStore/IlluminateErrorStore.php b/src/ErrorStore/IlluminateErrorStore.php
@@ -6,10 +6,7 @@
 
 class IlluminateErrorStore implements ErrorStoreInterface
 {
-    /**
-     * @var Session
-     */
-    private $session;
+    private Session $session;
 
     public function __construct(Session $session)
     {
diff --git a/src/FormBuilder.php b/src/FormBuilder.php
@@ -23,25 +23,13 @@
 
 class FormBuilder
 {
-    /**
-     * @var ?OldInputInterface
-     */
-    protected $oldInput;
-
-    /**
-     * @var ?ErrorStoreInterface
-     */
-    protected $errorStore;
-
-    /**
-     * @var ?string
-     */
-    protected $csrfToken;
-
-    /**
-     * @var ?\TypiCMS\Form\Binding\BoundData
-     */
-    protected $boundData;
+    protected ?OldInputInterface $oldInput;
+
+    protected ?ErrorStoreInterface $errorStore;
+
+    protected ?string $csrfToken;
+
+    protected ?BoundData $boundData;
 
     public function setOldInputProvider(OldInputInterface $oldInputProvider): void
     {
diff --git a/src/OldInput/IlluminateOldInputProvider.php b/src/OldInput/IlluminateOldInputProvider.php
@@ -6,10 +6,7 @@
 
 class IlluminateOldInputProvider implements OldInputInterface
 {
-    /**
-     * @var Session
-     */
-    private $session;
+    private Session $session;
 
     public function __construct(Session $session)
     {

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,7 @@`
`4`	`4`
`5`	`5`	`class BoundData`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @var mixed`
`9`		`- */`
`10`		`- protected $data;`
	`7`	`+ protected mixed $data;`
`11`	`8`
`12`	`9`	`public function __construct(mixed $data)`
`13`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,7 @@`
`4`	`4`
`5`	`5`	`abstract class Element`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @var array`
`9`		`- */`
`10`		`- protected $attributes = [];`
	`7`	`+ protected array $attributes = [];`
`11`	`8`
`12`	`9`	`protected function setAttribute(string $attribute, mixed $value = null): void`
`13`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,7 @@`
`4`	`4`
`5`	`5`	`class Email extends Text`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @var array`
`9`		`- */`
`10`		`- protected $attributes = [`
	`7`	`+ protected array $attributes = [`
`11`	`8`	`'type' => 'email',`
`12`	`9`	`];`
`13`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,7 @@`
`4`	`4`
`5`	`5`	`class File extends Input`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @var array`
`9`		`- */`
`10`		`- protected $attributes = [`
	`7`	`+ protected array $attributes = [`
`11`	`8`	`'type' => 'file',`
`12`	`9`	`];`
`13`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,7 @@`
`4`	`4`
`5`	`5`	`class Hidden extends Input`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @var array`
`9`		`- */`
`10`		`- protected $attributes = [`
	`7`	`+ protected array $attributes = [`
`11`	`8`	`'type' => 'hidden',`
`12`	`9`	`];`
`13`	`10`	`}`