as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-06-04 18:30:47 +08:00
parent 3d9266dc16
commit 10805c1022
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/ActiveRecord.php
+2 -2
View File
@@ -310,8 +310,8 @@ class ActiveRecord extends BaseActiveRecord
} }
$data = array_merge($data, $this->runRelate()); $data = array_merge($data, $this->runRelate());
$class = Snowflake::app()->getChannel(); // $class = Snowflake::app()->getChannel();
$class->push($this, static::class); // $class->push($this, static::class);
return $data; return $data;
} }
Database/Base/BaseActiveRecord.php
+6 -5
View File
@@ -1053,11 +1053,12 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
*/ */
public static function populate(array $data): static public static function populate(array $data): static
{ {
$class = Snowflake::app()->getChannel(); // $class = Snowflake::app()->getChannel();
/** @var static $model */ // /** @var static $model */
$model = $class->pop(static::class, function () { // $model = $class->pop(static::class, function () {
return new static(); // return new static();
}); // });
$model = new static();
$model->_attributes = $data; $model->_attributes = $data;
$model->_oldAttributes = $data; $model->_oldAttributes = $data;
$model->setIsCreate(false); $model->setIsCreate(false);