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-04-25 17:56:00 +08:00
parent 5e11a4f03e
commit 1ccaf39705
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Base/BaseActiveRecord.php
+13 -16
View File
@@ -126,22 +126,6 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
} }
/**
* BaseActiveRecord constructor.
* @param array $config
* @throws Exception
*/
public function __construct($config = [])
{
$annotation = Snowflake::app()->getAnnotation();
$this->_annotations[self::ANNOTATION_GET] = $annotation->getGets(static::class);
$this->_annotations[self::ANNOTATION_SET] = $annotation->getSets(static::class);
$this->_relate = $annotation->getRelateMethods(static::class);
parent::__construct($config);
}
/** /**
* @throws NotFindClassException * @throws NotFindClassException
* @throws ReflectionException * @throws ReflectionException
@@ -155,6 +139,11 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
} else { } else {
$this->_relation = Context::getContext(Relation::class); $this->_relation = Context::getContext(Relation::class);
} }
$annotation = Snowflake::app()->getAnnotation();
$this->_annotations[self::ANNOTATION_GET] = $annotation->getGets(static::class);
$this->_annotations[self::ANNOTATION_SET] = $annotation->getSets(static::class);
$this->_relate = $annotation->getRelateMethods(static::class);
} }
@@ -837,9 +826,17 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
* @param $name * @param $name
* @param string $method * @param string $method
* @return string|null * @return string|null
* @throws Exception
*/ */
protected function _get_annotation(string $name = null, string $method = self::ANNOTATION_GET): ?string protected function _get_annotation(string $name = null, string $method = self::ANNOTATION_GET): ?string
{ {
$annotation = Snowflake::app()->getAnnotation();
if (!isset($this->_annotations[self::ANNOTATION_GET])) {
$this->_annotations[self::ANNOTATION_GET] = $annotation->getGets(static::class);
}
if (!isset($this->_annotations[self::ANNOTATION_SET])) {
$this->_annotations[self::ANNOTATION_SET] = $annotation->getSets(static::class);
}
$matches = match ($method) { $matches = match ($method) {
self::ANNOTATION_GET => $this->_annotations[self::ANNOTATION_GET], self::ANNOTATION_GET => $this->_annotations[self::ANNOTATION_GET],
self::ANNOTATION_SET => $this->_annotations[self::ANNOTATION_SET], self::ANNOTATION_SET => $this->_annotations[self::ANNOTATION_SET],