Skip to content

Commit

Permalink
Bugfixes
Browse files Browse the repository at this point in the history
- Fixed `$methods` argument not properly passed in `InputHandler` class.
- Updated helpers.php with latest changes.
  • Loading branch information
skipperbent committed Mar 29, 2018
1 parent e6db83c commit a11595f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
11 changes: 3 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
11 changes: 3 additions & 8 deletions helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Pecee/Http/Input/InputHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public function get(string $index, ...$methods): ?IInputItem
*/
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();
}

Expand Down

0 comments on commit a11595f

Please sign in to comment.