fix components initialize arguments

laraeast · Sep 15, 2020 · b2a1e94 · b2a1e94
1 parent 0257de7
commit b2a1e94
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 43 deletions.
diff --git a/src/Components/BaseComponent.php b/src/Components/BaseComponent.php
@@ -113,11 +113,10 @@ public function __construct($resource)
     /**
      * Initialized the input arguments.
      *
-     * @param null $name
-     * @param null $value
+     * @param mixed ...$arguments
      * @return $this
      */
-    abstract public function init($name = null, $value = null);
+    abstract public function init(...$arguments);
 
     /**
      * Set the default label for the input.

diff --git a/src/Components/CheckboxComponent.php b/src/Components/CheckboxComponent.php
@@ -43,18 +43,16 @@ public function __construct($resource)
     /**
      * Initialized the input arguments.
      *
-     * @param null $name
-     * @param null $value
-     * @param bool $checked
+     * @param mixed ...$arguments
      * @return $this
      */
-    public function init($name = null, $value = null, $checked = false)
+    public function init(...$arguments)
     {
-        $this->name($name);
+        $this->name($name = $arguments[0] ?? null);
 
-        $this->value($value ?: old($name));
+        $this->value($arguments[1] ?? null ?: old($name));
 
-        $this->checked = $checked;
+        $this->checked = $arguments[2] ?? false;
 
         $this->setDefaultLabel();
 

diff --git a/src/Components/FileComponent.php b/src/Components/FileComponent.php
@@ -14,13 +14,12 @@ class FileComponent extends BaseComponent
     /**
      * Initialized the input arguments.
      *
-     * @param null $name
-     * @param null $value
+     * @param mixed ...$arguments
      * @return $this
      */
-    public function init($name = null)
+    public function init(...$arguments)
     {
-        $this->name($name);
+        $this->name($name = $arguments[0] ?? null);
 
         $this->setDefaultLabel($name);
 
@@ -41,4 +40,4 @@ public function multiple($multiple = true)
 
         return $this;
     }
-}
+}
diff --git a/src/Components/RadioComponent.php b/src/Components/RadioComponent.php
@@ -19,18 +19,16 @@ class RadioComponent extends BaseComponent
     /**
      * Initialized the input arguments.
      *
-     * @param null $name
-     * @param null $value
-     * @param bool $checked
+     * @param mixed ...$arguments
      * @return $this
      */
-    public function init($name = null, $value = null, $checked = false)
+    public function init(...$arguments)
     {
-        $this->name($name);
+        $this->name($name = $arguments[0] ?? null);
 
-        $this->value($value ?: old($name));
+        $this->value($arguments[1] ?? null ?: old($name));
 
-        $this->checked = $checked;
+        $this->checked = $arguments[2] ?? false;
 
         $this->setDefaultLabel($name);
 
@@ -63,4 +61,4 @@ protected function viewComposer()
             'checked' => $this->checked,
         ];
     }
-}
+}
diff --git a/src/Components/SelectComponent.php b/src/Components/SelectComponent.php
@@ -23,17 +23,16 @@ class SelectComponent extends BaseComponent
     /**
      * Initialized the input arguments.
      *
-     * @param null $name
-     * @param null $value
+     * @param mixed ...$arguments
      * @return $this
      */
-    public function init($name = null, $options = [], $value = null)
+    public function init(...$arguments)
     {
-        $this->name($name);
+        $this->name($name = $arguments[0] ?? null);
 
-        $this->value($value ?: old($name) ?: request($name));
+        $this->value($arguments[2] ?? null ?: old($name) ?: request($name));
 
-        $this->options = $options;
+        $this->options = $arguments[1] ?? [];
 
         $this->setDefaultLabel($name);
 
@@ -79,4 +78,4 @@ protected function viewComposer()
             'options' => $this->options,
         ];
     }
-}
+}
diff --git a/src/Components/SubmitComponent.php b/src/Components/SubmitComponent.php
@@ -21,15 +21,13 @@ class SubmitComponent extends BaseComponent
     /**
      * Initialized the input arguments.
      *
-     * @param null $label
-     * @param null $name
-     * @param null $value
+     * @param mixed ...$arguments
      * @return $this
      */
-    public function init($label = null, $name = null)
+    public function init(...$arguments)
     {
-        $this->name($name);
-        $this->label($label);
+        $this->name($arguments[1] ?? null);
+        $this->label($arguments[0] ?? null);
 
         return $this;
     }
@@ -105,4 +103,4 @@ protected function viewComposer()
             'className' => $this->className,
         ];
     }
-}
+}
diff --git a/src/Components/TextualComponent.php b/src/Components/TextualComponent.php
@@ -11,15 +11,14 @@ abstract class TextualComponent extends BaseComponent
     /**
      * Initialized the input arguments.
      *
-     * @param null $name
-     * @param null $value
+     * @param mixed ...$arguments
      * @return $this
      */
-    public function init($name = null, $value = null)
+    public function init(...$arguments)
     {
-        $this->name($name);
+        $this->name($name = $arguments[0] ?? null);
 
-        $this->value($value ?: old($name));
+        $this->value($arguments[1] ?? null ?: old($name));
 
         $this->setDefaultLabel();
 
@@ -29,4 +28,4 @@ public function init($name = null, $value = null)
 
         return $this;
     }
-}
+}