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

改进Model类event方法

Browse Source
This commit is contained in:
thinkphp
2016-06-05 13:29:09 +08:00
parent 690ae910ef
commit 8647534372
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/think/Model.php
View File

@@ -38,7 +38,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 当前类名称 // 当前类名称
protected $class; protected $class;
// 回调事件 // 回调事件
protected static $event = []; private static $event = [];
// 数据表主键 复合主键使用数组定义 // 数据表主键 复合主键使用数组定义
protected $pk; protected $pk;
@@ -775,10 +775,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
public static function event($event, $callback, $override = false) public static function event($event, $callback, $override = false)
{ {
$class = get_called_class();
if ($override) { if ($override) {
static::$event[$event] = []; self::$event[$class][$event] = [];
} }
static::$event[$event][] = $callback; self::$event[$class][$event][] = $callback;
} }
/** /**
@@ -790,8 +791,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
protected function trigger($event, &$params) protected function trigger($event, &$params)
{ {
if (isset(static::$event[$event])) { if (isset(self::$event[$this->class][$event])) {
foreach (static::$event[$event] as $callback) { foreach (self::$event[$this->class][$event] as $callback) {
if (is_callable($callback)) { if (is_callable($callback)) {
$result = call_user_func_array($callback, [ & $params]); $result = call_user_func_array($callback, [ & $params]);
if (false === $result) { if (false === $result) {