From 6faf3daf0a39d7e015b92702d475a91a204fed70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Tue, 19 Oct 2021 18:42:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Base/Model.php | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/Base/Model.php b/src/Base/Model.php index ca4aff9..5a2d75b 100644 --- a/src/Base/Model.php +++ b/src/Base/Model.php @@ -104,13 +104,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T protected array $rules = []; - /** - * @var Relation|null - */ - #[Inject(Relation::class)] - protected ?Relation $_relation; - - /** * @var array */ @@ -221,15 +214,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T } - /** - * @param Relation $relation - */ - public function setRelation(Relation $relation) - { - $this->_relation = $relation; - } - - /** * @throws Exception */ @@ -237,9 +221,6 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T { $an = Kiri::app()->getAnnotation(); $an->injectProperty($this); - - - var_dump($this->_relation); } @@ -786,7 +767,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T */ public function getRelation(): ?Relation { - return $this->_relation; + return Kiri::getDi()->get(Relation::class); }