eee

src/Base/Controller.php

@@ -14,15 +14,47 @@ use Psr\Log\LoggerInterface;
 /**
  * Class WebController
  * @package Kiri\Web
- * @property RequestInterface $request
- * @property ResponseInterface $response
- * @property ContainerInterface $container
- * @property Kiri\Error\StdoutLogger $logger
  */
 class Controller extends Kiri\Abstracts\Component
 {
 
 
+    /**
+     * @var RequestInterface
+     */
+    public RequestInterface $request
+        {
+            get => di(RequestInterface::class);
+        }
+
+
+    /**
+     * @var ResponseInterface
+     */
+    public ResponseInterface $response
+        {
+            get => di(ResponseInterface::class);
+        }
+
+
+    /**
+     * @var LoggerInterface
+     */
+    public LoggerInterface $logger
+        {
+            get => di(LoggerInterface::class);
+        }
+
+
+    /**
+     * @var ContainerInterface
+     */
+    public ContainerInterface $container
+        {
+            get => di(ContainerInterface::class);
+        }
+
+
     /**
      * @param Request $request
      * @return true
@@ -31,21 +63,4 @@ class Controller extends Kiri\Abstracts\Component
     {
         return true;
     }
-
-
-    /**
-     * @param string $name
-     * @return mixed|ContainerInterface|RequestInterface|ResponseInterface|LoggerInterface
-     * @throws \Exception
-     */
-    public function __get(string $name)
-    {
-        return match ($name) {
-            'request'   => di(RequestInterface::class),
-            'response'  => di(ResponseInterface::class),
-            'container' => di(ContainerInterface::class),
-            'logger'    => di(LoggerInterface::class),
-            default     => parent::__get($name)
-        }; // TODO: Change the autogenerated stub
-    }
 }