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
Annotation/Annotation.php
+139 -71
View File
@@ -16,92 +16,160 @@ class Annotation extends Component
{
private Loader $_loader;
private Loader $_loader;
public function init(): void
{
$this->_loader = new Loader();
}
private array $_model_sets = [];
private array $_model_gets = [];
private array $_model_relate = [];
/**
* @return Loader
*/
public function getLoader(): Loader
{
return $this->_loader;
}
/**
* @param string $class
* @param string $setName
* @param string $method
*/
public function addSets(string $class, string $setName, string $method)
{
$this->_model_sets[$class . '::' . $setName] = $method;
}
/**
* @param string $class
* @param string $setName
* @param string $method
*/
public function addGets(string $class, string $setName, string $method)
{
$this->_model_gets[$class . '::' . $setName] = $method;
}
/**
* @param string $class
* @param string $setName
* @param string $method
*/
public function addRelate(string $class, string $setName, string $method)
{
$this->_model_relate[$class . '::' . $setName] = $method;
}
/**
* @param Loader $loader
* @return Loader
*/
public function setLoader(Loader $loader): Loader
{
return $this->_loader = $loader;
}
/**
* @param string $class
* @param string $setName
* @return mixed|null
*/
public function getGetMethodName(string $class, string $setName): ?string
{
if (isset($this->_model_relate[$class . '::' . $setName])) {
return $this->_model_relate[$class . '::' . $setName];
}
if (isset($this->_model_gets[$class . '::' . $setName])) {
return $this->_model_gets[$class . '::' . $setName];
}
return null;
}
/**
* @param string $className
* @param string $method
* @return array 根据类名获取注解
* 根据类名获取注解
*/
public function getMethods(string $className, string $method = ''): mixed
{
return $this->_loader->getMethod($className, $method);
}
/**
* @param string $class
* @param string $setName
* @return mixed|null
*/
public function getSetMethodName(string $class, string $setName): ?string
{
if (isset($this->_model_sets[$class . '::' . $setName])) {
return $this->_model_relate[$class . '::' . $setName];
}
return null;
}
/**
* @param object $class
*/
public function injectProperty(object $class)
{
$this->_loader->injectProperty(get_class($class), $class);
}
public function init(): void
{
$this->_loader = new Loader();
}
/**
* @param string $path
* @param string $namespace
* @param string $alias
* @return void
* @throws Exception
*/
public function read(string $path, string $namespace, string $alias = 'root'): void
{
$this->_loader->_scanDir(new DirectoryIterator($path), $namespace);
}
/**
* @return Loader
*/
public function getLoader(): Loader
{
return $this->_loader;
}
/**
* @param string $dir
* @param string|array $outPath
* @throws Exception
*/
public function runtime(string $dir, string|array $outPath = '')
{
if (empty($outPath)) {
$outPath = [];
} else if (is_string($outPath)) {
$outPath = [$outPath];
}
$this->_loader->loadByDirectory($dir, $outPath);
}
/**
* @param Loader $loader
* @return Loader
*/
public function setLoader(Loader $loader): Loader
{
return $this->_loader = $loader;
}
/**
* @param string $filename
* @return mixed
*/
public function getFilename(string $filename): mixed
{
return $this->_loader->getClassByFilepath($filename);
}
/**
* @param string $className
* @param string $method
* @return array 根据类名获取注解
* 根据类名获取注解
*/
public function getMethods(string $className, string $method = ''): mixed
{
return $this->_loader->getMethod($className, $method);
}
/**
* @param object $class
*/
public function injectProperty(object $class)
{
$this->_loader->injectProperty(get_class($class), $class);
}
/**
* @param string $path
* @param string $namespace
* @param string $alias
* @return void
* @throws Exception
*/
public function read(string $path, string $namespace, string $alias = 'root'): void
{
$this->_loader->_scanDir(new DirectoryIterator($path), $namespace);
}
/**
* @param string $dir
* @param string|array $outPath
* @throws Exception
*/
public function runtime(string $dir, string|array $outPath = '')
{
if (empty($outPath)) {
$outPath = [];
} else if (is_string($outPath)) {
$outPath = [$outPath];
}
$this->_loader->loadByDirectory($dir, $outPath);
}
/**
* @param string $filename
* @return mixed
*/
public function getFilename(string $filename): mixed
{
return $this->_loader->getClassByFilepath($filename);
}
}
Annotation/Loader.php
+17 -2
View File
@@ -4,6 +4,9 @@
namespace Annotation;
use Annotation\Model\Get;
use Annotation\Model\Relation;
use Annotation\Model\Set;
use Attribute;
use DirectoryIterator;
use Exception;
@@ -394,19 +397,31 @@ class Loader extends BaseObject
if (empty($classes)) {
return;
}
$annotation = Snowflake::app()->getAnnotation();
foreach ($classes as $className) {
$annotations = $this->_classes[$className] ?? null;
if ($annotations === null) {
continue;
}
$class = Snowflake::createObject($annotations['handler']);
foreach ($annotations['target'] ?? [] as $value) {
$value->execute([$class]);
}
$isGet = $annotations instanceof Get;
$isSet = $annotations instanceof Set;
$isRelate = $annotations instanceof Relation;
foreach ($annotations['methods'] as $name => $attribute) {
foreach ($attribute as $value) {
$value->execute([$class, $name]);
if ($isGet) {
$annotation->addGets($annotations['handler'], $value->name, $name);
} else if ($isSet) {
$annotation->addSets($annotations['handler'], $value->name, $name);
} else if ($isRelate) {
$annotation->addRelate($annotations['handler'], $value->name, $name);
} else {
$value->execute([$class, $name]);
}
}
}
}
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);
}