变更

src/Base/Controller.php

@@ -5,10 +5,12 @@ namespace Kiri\Router\Base;
 
 
 use Kiri;
-use Kiri\Message\Constrict\RequestInterface;
-use Kiri\Message\Constrict\ResponseInterface;
 use Kiri\Di\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Kiri\Di\Inject\Service;
+use Kiri\Di\Inject\Container;
 
 /**
  * Class WebController
@@ -17,20 +19,17 @@ use Psr\Log\LoggerInterface;
 abstract class Controller
 {
 
+	#[Service('request')]
+	readonly public RequestInterface $request;
 
-	/**
+	#[Service('response')]
-	 * @param RequestInterface $request
+	readonly public ResponseInterface $response;
-	 * @param ResponseInterface $response
+
-	 * @param LoggerInterface $logger
+
-	 * @param ContainerInterface $container
+	#[Container(LoggerInterface::class)]
-	 */
+	readonly public LoggerInterface $logger;
-	public function __construct(
+
-		public RequestInterface   $request,
+
-		public ResponseInterface  $response,
+	#[Container(ContainerInterface::class)]
-		public LoggerInterface    $logger,
+	readonly public ContainerInterface $container;
-		public ContainerInterface $container)
-	{
-	}
-
-
 }