Revert "改名"

This reverts commit fdf58326
2022-01-04 16:04:22 +08:00
parent c3ca24884e
commit c61842402a
3 changed files with 22 additions and 24 deletions
@@ -15,6 +15,7 @@ use JetBrains\PhpStorm\Pure;
 use Kiri\Di\Container;
 use Kiri\Events\EventProvider;
 use Kiri\Kiri;
+use Note\Inject;
 use Psr\Container\ContainerInterface;

 /**
@@ -26,6 +27,23 @@ use Psr\Container\ContainerInterface;
 class Component implements Configure
 {

+
+	/**
+	 * @var Container
+	 */
+	#[Inject(ContainerInterface::class)]
+	public ContainerInterface $container;
+
+
+
+	/**
+	 * @var EventProvider
+	 */
+	#[Inject(EventProvider::class)]
+	public EventProvider $eventProvider;
+
+
+
 	/**
 	 * BaseAbstract constructor.
 	 *
@@ -48,24 +66,6 @@ class Component implements Configure
 	}


-	/**
-	 * @return EventProvider
-	 * @throws \ReflectionException
-	 */
-	public function getEventProvider(): EventProvider
-	{
-		return Kiri::getDi()->get(EventProvider::class);
-	}
-
-
-	/**
-	 * @return Container
-	 */
-	#[Pure] public function getContainer(): ContainerInterface
-	{
-		return Kiri::getDi();
-	}
-

 	/**
 	 * @return string