eee

src/Base/Controller.php

@@ -7,12 +7,15 @@ namespace Kiri\Router\Base;
 use Kiri;
 use Kiri\Router\Response;
 use Kiri\Router\Request;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Kiri\Di\Inject\Container;
 use ReflectionException;
+use Kiri\Error\StdoutLogger;
 
 /**
  * Class WebController
@@ -39,21 +42,20 @@ abstract class Controller
 
 
     /**
-	 * @return ContainerInterface
+     * @var ContainerInterface
      */
-	private function getContainer(): ContainerInterface
-	{
-		return Kiri::getDi();
-	}
+    #[Container(ContainerInterface::class)]
+    public ContainerInterface $container;
 
 
     /**
-     * @return Kiri\Error\StdoutLogger
-     * @throws ReflectionException
+     * @return StdoutLogger
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
-	private function getLogger(): Kiri\Error\StdoutLogger
+    protected function getLogger(): StdoutLogger
     {
-		return Kiri::getDi()->get(LoggerInterface::class);
+        return $this->container->get(LoggerInterface::class);
     }