Fix properties

Author: vjik

src/Modern/Middleware/AbstractDataResponseMiddleware.php

@@ -13,7 +13,9 @@
 
 abstract class AbstractDataResponseMiddleware implements MiddlewareInterface
 {
-    protected readonly FormatterInterface $formatter;
+    public function __construct(
+        private readonly FormatterInterface $formatter,
+    ) {}
 
     final public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {

src/Modern/Middleware/DataResponseMiddleware.php

@@ -4,12 +4,4 @@
 
 namespace Yiisoft\DataResponse\Modern\Middleware;
 
-use Yiisoft\DataResponse\Modern\Formatter\FormatterInterface;
-
-final class DataResponseMiddleware extends AbstractDataResponseMiddleware
-{
-    public function __construct(FormatterInterface $formatter)
-    {
-        $this->formatter = $formatter;
-    }
-}
+final class DataResponseMiddleware extends AbstractDataResponseMiddleware {}

src/Modern/Middleware/HtmlDataResponseMiddleware.php

@@ -10,6 +10,6 @@ final class HtmlDataResponseMiddleware extends AbstractDataResponseMiddleware
 {
     public function __construct(HtmlFormatter $formatter = new HtmlFormatter())
     {
-        $this->formatter = $formatter;
+        parent::__construct($formatter);
     }
 }

src/Modern/Middleware/JsonDataResponseMiddleware.php

@@ -10,6 +10,6 @@ final class JsonDataResponseMiddleware extends AbstractDataResponseMiddleware
 {
     public function __construct(JsonFormatter $formatter = new JsonFormatter())
     {
-        $this->formatter = $formatter;
+        parent::__construct($formatter);
     }
 }

src/Modern/Middleware/PlainTextDataResponseMiddleware.php

@@ -10,6 +10,6 @@ final class PlainTextDataResponseMiddleware extends AbstractDataResponseMiddlewa
 {
     public function __construct(PlainTextFormatter $formatter = new PlainTextFormatter())
     {
-        $this->formatter = $formatter;
+        parent::__construct($formatter);
     }
 }

src/Modern/Middleware/XmlDataResponseMiddleware.php

@@ -10,6 +10,6 @@ final class XmlDataResponseMiddleware extends AbstractDataResponseMiddleware
 {
     public function __construct(XmlFormatter $formatter = new XmlFormatter())
     {
-        $this->formatter = $formatter;
+        parent::__construct($formatter);
     }
 }

src/Modern/ResponseFactory/AbstractFormattedResponseFactory.php

@@ -12,8 +12,10 @@
 
 abstract class AbstractFormattedResponseFactory implements FormattedResponseFactoryInterface
 {
-    protected ResponseFactoryInterface $responseFactory;
-    protected FormatterInterface $formatter;
+    public function __construct(
+        private readonly ResponseFactoryInterface $responseFactory,
+        private readonly FormatterInterface $formatter,
+    ) {}
 
     final public function createResponse(
         mixed $data = null,

src/Modern/ResponseFactory/FormattedResponseFactory.php

@@ -4,16 +4,4 @@
 
 namespace Yiisoft\DataResponse\Modern\ResponseFactory;
 
-use Psr\Http\Message\ResponseFactoryInterface;
-use Yiisoft\DataResponse\Modern\Formatter\FormatterInterface;
-
-final class FormattedResponseFactory extends AbstractFormattedResponseFactory
-{
-    public function __construct(
-        ResponseFactoryInterface $responseFactory,
-        FormatterInterface $formatter,
-    ) {
-        $this->responseFactory = $responseFactory;
-        $this->formatter = $formatter;
-    }
-}
+final class FormattedResponseFactory extends AbstractFormattedResponseFactory {}

src/Modern/ResponseFactory/HtmlResponseFactory.php

@@ -13,7 +13,6 @@ public function __construct(
         ResponseFactoryInterface $responseFactory,
         HtmlFormatter $formatter,
     ) {
-        $this->responseFactory = $responseFactory;
-        $this->formatter = $formatter;
+        parent::__construct($responseFactory, $formatter);
     }
 }

src/Modern/ResponseFactory/JsonResponseFactory.php

@@ -13,7 +13,6 @@ public function __construct(
         ResponseFactoryInterface $responseFactory,
         JsonFormatter $formatter,
     ) {
-        $this->responseFactory = $responseFactory;
-        $this->formatter = $formatter;
+        parent::__construct($responseFactory, $formatter);
     }
 }