This commit is contained in:
2021-11-30 15:10:01 +08:00
parent f50782c930
commit 6936b5cc8f
6 changed files with 16 additions and 16 deletions
+6 -6
View File
@@ -221,7 +221,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
*/ */
public function init() public function init()
{ {
$an = Kiri::app()->getAnnotation(); $an = Kiri::app()->getNote();
$an->injectProperty($this); $an->injectProperty($this);
} }
@@ -682,8 +682,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
*/ */
public function getAttribute(string $name) public function getAttribute(string $name)
{ {
if ($this->hasAnnotation($name)) { if ($this->hasNote($name)) {
return $this->runAnnotation($name, $this->_attributes[$name]); return $this->runNote($name, $this->_attributes[$name]);
} }
return $this->_attributes[$name] ?? null; return $this->_attributes[$name] ?? null;
} }
@@ -695,7 +695,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
* @param string $type * @param string $type
* @return mixed * @return mixed
*/ */
protected function runAnnotation(string $name, mixed $value, string $type = self::GET): mixed protected function runNote(string $name, mixed $value, string $type = self::GET): mixed
{ {
return call_user_func($this->_annotations[$type][$name], $value); return call_user_func($this->_annotations[$type][$name], $value);
} }
@@ -922,7 +922,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
* @param string $type * @param string $type
* @return array * @return array
*/ */
protected function getAnnotation(string $type = self::GET): array protected function getNote(string $type = self::GET): array
{ {
return $this->_annotations[$type] ?? []; return $this->_annotations[$type] ?? [];
} }
@@ -933,7 +933,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
* @param string $type * @param string $type
* @return bool * @return bool
*/ */
protected function hasAnnotation($name, string $type = self::GET): bool protected function hasNote($name, string $type = self::GET): bool
{ {
if (!isset($this->_annotations[$type])) { if (!isset($this->_annotations[$type])) {
return false; return false;
+1 -1
View File
@@ -11,7 +11,7 @@ declare(strict_types=1);
namespace Database; namespace Database;
use Annotation\Inject; use Note\Inject;
use Database\Affair\BeginTransaction; use Database\Affair\BeginTransaction;
use Database\Affair\Commit; use Database\Affair\Commit;
use Database\Affair\Rollback; use Database\Affair\Rollback;
+1 -1
View File
@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Database; namespace Database;
use Annotation\Inject; use Note\Inject;
use Exception; use Exception;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Abstracts\Providers; use Kiri\Abstracts\Providers;
+3 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
namespace Database\Annotation; namespace Database\Note;
use Attribute; use Attribute;
@@ -11,9 +11,9 @@ use Exception;
/** /**
* Class Get * Class Get
* @package Annotation\Model * @package Note\Model
*/ */
#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Annotation\Attribute #[Attribute(Attribute::TARGET_METHOD)] class Get extends \Note\Attribute
{ {
@@ -1,17 +1,17 @@
<?php <?php
namespace Database\Annotation; namespace Database\Note;
use Annotation\Attribute; use Note\Attribute;
use Database\Base\Relate; use Database\Base\Relate;
use Exception; use Exception;
/** /**
* Class Relation * Class Relation
* @package Annotation\Model * @package Note\Model
*/ */
#[\Attribute(\Attribute::TARGET_METHOD)] class Relation extends Attribute #[\Attribute(\Attribute::TARGET_METHOD)] class Relation extends Attribute
{ {
+2 -2
View File
@@ -1,10 +1,10 @@
<?php <?php
namespace Database\Annotation; namespace Database\Note;
use Annotation\Attribute; use Note\Attribute;
use Database\Base\Setter; use Database\Base\Setter;
use Exception; use Exception;