From 5fd2abcb69dfe0ef3b5694c7a1f427b6fb56af19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Tue, 4 Jan 2022 16:22:37 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fdf58326 --- kiri-engine/Abstracts/Component.php | 22 ++++++++++++++++++++++ kiri-engine/Di/Container.php | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/kiri-engine/Abstracts/Component.php b/kiri-engine/Abstracts/Component.php index 59a29254..c423c9e3 100644 --- a/kiri-engine/Abstracts/Component.php +++ b/kiri-engine/Abstracts/Component.php @@ -16,7 +16,9 @@ use Kiri\Di\Container; use Kiri\Events\EventProvider; use Kiri\Kiri; use Note\Inject; +use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; +use Psr\Container\NotFoundExceptionInterface; /** * Class Component @@ -58,6 +60,26 @@ class Component implements Configure } + /** + * @return Container|ContainerInterface + */ + #[Pure] public function getContainer(): ContainerInterface|Container + { + return Kiri::getDi(); + } + + + /** + * @return EventProvider + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + */ + public function getEventProvider(): EventProvider + { + return $this->getContainer()->get(EventProvider::class); + } + + /** * @throws Exception */ diff --git a/kiri-engine/Di/Container.php b/kiri-engine/Di/Container.php index 66d715ae..8138c256 100644 --- a/kiri-engine/Di/Container.php +++ b/kiri-engine/Di/Container.php @@ -27,7 +27,7 @@ use Psr\Container\ContainerInterface; * Class Container * @package Kiri\Di */ -class Container extends Component implements ContainerInterface +class Container implements ContainerInterface { /**