eee

src/Base/Controller.php

@@ -10,6 +10,7 @@ use Psr\Container\ContainerInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
+use Kiri\Di\Inject\Container;
 use Kiri\Error\StdoutLogger;
 
 /**
@@ -23,37 +24,29 @@ class Controller extends Kiri\Abstracts\Component
     /**
      * @var RequestInterface
      */
-    public RequestInterface $request
-        {
-            get => di(RequestInterface::class);
-        }
+    #[Container(RequestInterface::class)]
+    public RequestInterface $request;
 
 
     /**
      * @var ResponseInterface
      */
-    public ResponseInterface $response
-        {
-            get => di(ResponseInterface::class);
-        }
+    #[Container(ResponseInterface::class)]
+    public ResponseInterface $response;
 
 
     /**
      * @var LoggerInterface|StdoutLogger
      */
-    public LoggerInterface|StdoutLogger $logger
-        {
-            get => di(LoggerInterface::class);
-        }
+    #[Container(LoggerInterface::class)]
+    public LoggerInterface|StdoutLogger $logger;
 
 
     /**
      * @var ContainerInterface
      */
-    public ContainerInterface $container
-        {
-            get => di(ContainerInterface::class);
-        }
+    #[Container(ContainerInterface::class)]
+    public ContainerInterface $container;
 
 
     /**