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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-04-24 19:20:48 +08:00
parent e44e64fd03
commit 02396d2199
3 changed files with 173 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Base/BaseActiveRecord.php
+17 -17
View File
@@ -134,6 +134,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
*/
public function init()
{
$this->event = Snowflake::app()->getEvent();
if (!Context::hasContext(Relation::class)) {
$relation = Snowflake::createObject(Relation::class);
$this->_relation = Context::setContext(Relation::class, $relation);
@@ -149,14 +150,14 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
*/
public function createAnnotation()
{
$annotation = Snowflake::getAnnotation();
$annotation->injectProperty($this);
$methods = $annotation->getMethods(get_called_class());
foreach ($methods as $method => $attributes) {
foreach ($attributes as $attribute) {
$attribute->execute([$this, $method]);
}
}
// $annotation = Snowflake::getAnnotation();
// $annotation->injectProperty($this);
// $methods = $annotation->getMethods(get_called_class());
// foreach ($methods as $method => $attributes) {
// foreach ($attributes as $attribute) {
// $attribute->execute([$this, $method]);
// }
// }
}
@@ -833,11 +834,11 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
parent::__set($name, $value);
return;
}
if ($this->hasAnnotation($name, 'set')) {
$this->runAnnotation($name, $value, self::ANNOTATION_SET);
} else {
$this->_attributes[$name] = $value;
$method = annotation()->getSetMethodName(get_called_class(), $name);
if (!empty($method)) {
$value = $this->{$method}($value);
}
$this->_attributes[$name] = $value;
}
@@ -849,15 +850,14 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
public function __get($name): mixed
{
$value = $this->_attributes[$name] ?? null;
if ($this->hasAnnotation($name)) {
return $this->runAnnotation($name, $value);
$loader = Snowflake::app()->getAnnotation();
if (!empty($method = $loader->getGetMethodName(get_called_class(), $name))) {
return $this->{$method}();
}
if (array_key_exists($name, $this->_attributes)) {
return static::getColumns()->_decode($name, $value);
}
if (in_array($name, $this->_with)) {
return $this->with($name);
}
if (Snowflake::app()->has($name)) {
return Snowflake::app()->get($name);
}