diff --git a/README.md b/README.md index 18ec07d..de1bf4e 100644 --- a/README.md +++ b/README.md @@ -331,18 +331,13 @@ function request(): Request * Get input class * @param string|null $index Parameter index name * @param string|null $defaultValue Default return value - * @param string|array|null $methods Default method + * @param array ...$methods Default methods * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string */ -function input($index = null, $defaultValue = null, $methods = null) +function input($index = null, $defaultValue = null, ...$methods) { if ($index !== null) { - - if ($defaultValue !== null) { - return request()->getInputHandler()->getValue($index, $defaultValue, $methods); - } - - return request()->getInputHandler()->get($index, $methods); + return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue; } return request()->getInputHandler(); diff --git a/helpers.php b/helpers.php index f7234a3..914c445 100644 --- a/helpers.php +++ b/helpers.php @@ -48,18 +48,13 @@ function request(): Request * Get input class * @param string|null $index Parameter index name * @param string|null $defaultValue Default return value - * @param string|array|null $methods Default method + * @param array ...$methods Default methods * @return \Pecee\Http\Input\InputHandler|\Pecee\Http\Input\IInputItem|string */ -function input($index = null, $defaultValue = null, $methods = null) +function input($index = null, $defaultValue = null, ...$methods) { if ($index !== null) { - - if ($defaultValue !== null) { - return request()->getInputHandler()->getValue($index, $defaultValue, $methods); - } - - return request()->getInputHandler()->get($index, $methods); + return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue; } return request()->getInputHandler(); diff --git a/src/Pecee/Http/Input/InputHandler.php b/src/Pecee/Http/Input/InputHandler.php index 051a187..6275c5d 100644 --- a/src/Pecee/Http/Input/InputHandler.php +++ b/src/Pecee/Http/Input/InputHandler.php @@ -243,7 +243,7 @@ class InputHandler */ public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string { - $input = $this->get($index, $methods); + $input = $this->get($index, ...$methods); return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue(); }