geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 16:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #391 from skipperbent/v4-development

Browse Source 
Bugfixes
This commit is contained in:
Simon Sessingø
2018-03-29 22:18:26 +02:00
committed by GitHub
parent 555afd04f1 a11595fb86
commit 87e1fa3775
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+3 -8
View File
@@ -331,18 +331,13 @@ function request(): Request
* Get input class * Get input class
* @param string|null $index Parameter index name * @param string|null $index Parameter index name
* @param string|null $defaultValue Default return value * @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 * @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 ($index !== null) {
return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
if ($defaultValue !== null) {
return request()->getInputHandler()->getValue($index, $defaultValue, $methods);
}
return request()->getInputHandler()->get($index, $methods);
} }
return request()->getInputHandler(); return request()->getInputHandler();
helpers.php
+3 -8
View File
@@ -48,18 +48,13 @@ function request(): Request
* Get input class * Get input class
* @param string|null $index Parameter index name * @param string|null $index Parameter index name
* @param string|null $defaultValue Default return value * @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 * @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 ($index !== null) {
return request()->getInputHandler()->get($index, ...$methods) ?? $defaultValue;
if ($defaultValue !== null) {
return request()->getInputHandler()->getValue($index, $defaultValue, $methods);
}
return request()->getInputHandler()->get($index, $methods);
} }
return request()->getInputHandler(); return request()->getInputHandler();
src/Pecee/Http/Input/InputHandler.php
+1 -1
View File
@@ -243,7 +243,7 @@ class InputHandler
*/ */
public function getValue(string $index, ?string $defaultValue = null, ...$methods): ?string 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(); return ($input === null || ($input !== null && trim($input->getValue()) === '')) ? $defaultValue : $input->getValue();
} }