File类改进支持单元测试

This commit is contained in:
thinkphp
2016-06-14 12:53:45 +08:00
parent c5bde96086
commit fb188291d5
2 changed files with 21 additions and 5 deletions

View File

@@ -241,11 +241,19 @@ class Input
if (empty($val['tmp_name'])) {
continue;
}
$item[$key] = new File($val['tmp_name'], $val);
if($val instanceof File){
$item[$key] = $val;
}else{
$item[$key] = new File($val['tmp_name'], $val);
}
}
return $item;
} elseif (isset($array[$name])) {
return new File($array[$name]['tmp_name'], $array[$name]);
if($array[$name] instanceof File){
return $array[$name];
}else{
return new File($array[$name]['tmp_name'], $array[$name]);
}
}
}
return null;