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

改进File类 支持闭包规则 参数为当前的文件对象

Browse Source
This commit is contained in:
thinkphp
2016-05-18 15:43:16 +08:00
parent 690839ddc9
commit 2af19639cb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/File.php
View File

@@ -120,18 +120,18 @@ class File extends SplFileObject
if (true === $savename) { if (true === $savename) {
// 自动生成文件名 // 自动生成文件名
if ($this->rule instanceof \Closure) { if ($this->rule instanceof \Closure) {
$savename = call_user_func_array($this->rule, [$this->getFilename()]); $savename = call_user_func_array($this->rule, [$this]);
} else { } else {
switch ($this->rule) { switch ($this->rule) {
case 'uniqid': case 'uniqid':
$savename = uniqid(); $savename = uniqid();
break; break;
case 'md5': case 'md5':
$md5 = md5_file($this->getFilename()); $md5 = md5_file($this->getRealPath());
$savename = substr($md5, 0, 2) . DS . substr($md5, 2); $savename = substr($md5, 0, 2) . DS . substr($md5, 2);
break; break;
case 'sha1': case 'sha1':
$sha1 = sha1_file($this->getFilename()); $sha1 = sha1_file($this->getRealPath());
$savename = substr($sha1, 0, 2) . DS . substr($sha1, 2); $savename = substr($sha1, 0, 2) . DS . substr($sha1, 2);
break; break;
case 'date': case 'date':