- Fixed `$methods` argument not properly passed in `InputHandler` class.
- Updated helpers.php with latest changes.
This commit is contained in:
Simon Sessingø
2018-03-29 22:17:53 +02:00
parent e6db83c97a
commit a11595fb86
3 changed files with 7 additions and 17 deletions

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();
}