mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

File类改进支持单元测试

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/File.php
View File

@@ -22,14 +22,17 @@ class File extends SplFileObject
private $error = '';
// 文件上传命名规则
protected $rule = 'date';
// 单元测试
protected $isTest;
// 上传文件信息
protected $info;
public function __construct($filename, $info = [])
public function __construct($filename, $info = [],$isTest=false)
{
parent::__construct($filename);
$this->info = $info;
$this->info = $info;
$this->isTest = $isTest;
}
/**
@@ -88,6 +91,9 @@ class File extends SplFileObject
*/
public function isValid()
{
if($this->isTest){
return is_file($this->getRealPath());
}
return is_uploaded_file($this->getRealPath());
}
@@ -122,7 +128,9 @@ class File extends SplFileObject
}
/* 移动文件 */
if (!move_uploaded_file($this->getRealPath(), $path . $savename)) {
if($this->isTest){
rename($this->getRealPath(),$path.$savename);
} elseif (!move_uploaded_file($this->getRealPath(), $path . $savename)) {
$this->error = '文件上传保存错误！';
return false;
}

12
library/think/Input.php
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;