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

改进Hook类exec方法支持指定类的方法执行 包括静态方法

Browse Source
This commit is contained in:
thinkphp
2016-12-18 09:44:26 +08:00
parent 48a1cf0699
commit efd34d53fd
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/think/Hook.php
View File

@@ -13,6 +13,7 @@ namespace think;
use think\App; use think\App;
use think\Debug; use think\Debug;
use think\Loader;
use think\Log; use think\Log;
class Hook class Hook
@@ -111,15 +112,23 @@ class Hook
public static function exec($class, $tag = '', &$params = null, $extra = null) public static function exec($class, $tag = '', &$params = null, $extra = null)
{ {
App::$debug && Debug::remark('behavior_start', 'time'); App::$debug && Debug::remark('behavior_start', 'time');
if (is_callable($class)) { $method = Loader::parseName($tag, 1, false);
if ($class instanceof \Closure) {
$result = call_user_func_array($class, [ & $params, $extra]); $result = call_user_func_array($class, [ & $params, $extra]);
$class = 'Closure'; $class = 'Closure';
} elseif (is_array($class)) {
list($class, $method) = $class;
$result = (new $class())->$method($params, $extra);
$class = $class . '->' . $method;
} elseif (is_object($class)) { } elseif (is_object($class)) {
$result = $class->$tag($params, $extra); $result = $class->$method($params, $extra);
$class = get_class($class); $class = get_class($class);
} elseif (strpos($class, '::')) {
$result = call_user_func_array($class, [ & $params, $extra]);
} else { } else {
$obj = new $class(); $obj = new $class();
$method = ($tag && is_callable([$obj, $tag])) ? $tag : 'run'; $method = ($tag && is_callable([$obj, $method])) ? $method : 'run';
$result = $obj->$method($params, $extra); $result = $obj->$method($params, $extra);
} }
if (App::$debug) { if (App::$debug) {