geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 12:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324 from skipperbent/v3

Browse Source 
V3
This commit is contained in:
Simon Sessingø
2017-11-26 23:44:17 +01:00
committed by GitHub
parent 32bc46be81 5197ae2990
commit 1f00cf50e6
1 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Input/Input.php
+13 -31
View File
@@ -1,4 +1,5 @@
<?php <?php
namespace Pecee\Http\Input; namespace Pecee\Http\Input;
use Pecee\Http\Request; use Pecee\Http\Request;
@@ -65,7 +66,7 @@ class Input
// Handle array input // Handle array input
if (is_array($value['name']) === false) { if (is_array($value['name']) === false) {
$values['index'] = $key; $values['index'] = $key;
$list[$key] = InputFile::createFromArray(array_merge($value, $values)); $list[$key] = InputFile::createFromArray($values + $value);
continue; continue;
} }
@@ -73,7 +74,7 @@ class Input
$files = $this->rearrangeFiles($value['name'], $keys, $value); $files = $this->rearrangeFiles($value['name'], $keys, $value);
if (isset($list[$key])) { if (isset($list[$key]) === true) {
$list[$key][] = $files; $list[$key][] = $files;
} else { } else {
$list[$key] = $files; $list[$key] = $files;
@@ -92,38 +93,25 @@ class Input
$output = []; $output = [];
$getItem = function ($key, $property = 'name') use ($original, $index) {
$path = $original[$property];
$fileValues = array_values($index);
foreach ($fileValues as $i) {
$path = $path[$i];
}
return $path[$key];
};
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
if (is_array($getItem($key)) === false) { if (is_array($original['name'][$key]) === false) {
$file = InputFile::createFromArray([ $file = InputFile::createFromArray([
'index' => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key, 'index' => (empty($key) === true && empty($originalIndex) === false) ? $originalIndex : $key,
'filename' => $getItem($key), 'name' => $original['name'][$key],
'error' => $getItem($key, 'error'), 'error' => $original['error'][$key],
'tmp_name' => $getItem($key, 'tmp_name'), 'tmp_name' => $original['tmp_name'][$key],
'type' => $getItem($key, 'type'), 'type' => $original['type'][$key],
'size' => $getItem($key, 'size'), 'size' => $original['size'][$key],
]); ]);
if (isset($output[$key])) { if (isset($output[$key]) === true) {
$output[$key][] = $file; $output[$key][] = $file;
} else { continue;
$output[$key] = $file;
} }
$output[$key] = $file;
continue; continue;
} }
@@ -146,13 +134,7 @@ class Input
{ {
$list = []; $list = [];
$max = count($array) - 1; foreach ($array as $key => $value) {
$keys = array_keys($array);
for ($i = $max; $i >= 0; $i--) {
$key = $keys[$i];
$value = $array[$key];
// Handle array input // Handle array input
if (is_array($value) === false) { if (is_array($value) === false) {