From 5afc8d91b4c9722303c6ff31f7d089b1564dd54c Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <skobkin-ru@ya.ru>
Date: Tue, 28 Mar 2023 20:11:28 +0300
Subject: [PATCH] Ported AbstractFactory, UserFactory.

---
 .../Service/Factory/AbstractFactory.php       | 16 ---------
 src/Factory/AbstractFactory.php               | 14 ++++++++
 .../Service => src}/Factory/UserFactory.php   | 34 ++++++-------------
 3 files changed, 25 insertions(+), 39 deletions(-)
 delete mode 100644 old/src/PointToolsBundle/Service/Factory/AbstractFactory.php
 create mode 100644 src/Factory/AbstractFactory.php
 rename {old/src/PointToolsBundle/Service => src}/Factory/UserFactory.php (65%)

diff --git a/old/src/PointToolsBundle/Service/Factory/AbstractFactory.php b/old/src/PointToolsBundle/Service/Factory/AbstractFactory.php
deleted file mode 100644
index 8a8246f..0000000
--- a/old/src/PointToolsBundle/Service/Factory/AbstractFactory.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace src\PointToolsBundle\Service\Factory;
-
-use Psr\Log\LoggerInterface;
-
-abstract class AbstractFactory
-{
-    /** @var LoggerInterface */
-    protected $logger;
-
-    public function __construct(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-}
\ No newline at end of file
diff --git a/src/Factory/AbstractFactory.php b/src/Factory/AbstractFactory.php
new file mode 100644
index 0000000..a334d37
--- /dev/null
+++ b/src/Factory/AbstractFactory.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Factory;
+
+use Psr\Log\LoggerInterface;
+
+abstract class AbstractFactory
+{
+    public function __construct(
+        protected LoggerInterface $logger,
+    ) {
+    }
+}
diff --git a/old/src/PointToolsBundle/Service/Factory/UserFactory.php b/src/Factory/UserFactory.php
similarity index 65%
rename from old/src/PointToolsBundle/Service/Factory/UserFactory.php
rename to src/Factory/UserFactory.php
index 207dae7..26a4936 100644
--- a/old/src/PointToolsBundle/Service/Factory/UserFactory.php
+++ b/src/Factory/UserFactory.php
@@ -1,35 +1,25 @@
 <?php
+declare(strict_types=1);
 
-namespace src\PointToolsBundle\Service\Factory;
+namespace App\Factory;
 
 use Psr\Log\LoggerInterface;
-use src\PointToolsBundle\DTO\Api\User as UserDTO;
-use src\PointToolsBundle\Entity\User;
-use src\PointToolsBundle\Repository\UserRepository;
-use src\PointToolsBundle\Exception\Factory\InvalidUserDataException;
-use src\PointToolsBundle\Service\Factory\AbstractFactory;
+use App\DTO\Api\User as UserDTO;
+use App\Entity\User;
+use App\Exception\Factory\InvalidUserDataException;
+use App\Repository\UserRepository;
 
 class UserFactory extends AbstractFactory
 {
     public const DATE_FORMAT = 'Y-m-d_H:i:s';
 
-    /** @var UserRepository */
-    private $userRepository;
-
-
-    public function __construct(LoggerInterface $logger, UserRepository $userRepository)
-    {
+    public function __construct(
+        LoggerInterface $logger,
+        private readonly UserRepository $userRepository,
+    ) {
         parent::__construct($logger);
-        $this->userRepository = $userRepository;
     }
 
-    /**
-     * @param UserDTO $userData
-     *
-     * @return User
-     *
-     * @throws InvalidUserDataException
-     */
     public function findOrCreateFromDTO(UserDTO $userData): User
     {
         // @todo LOG
@@ -56,9 +46,7 @@ class UserFactory extends AbstractFactory
         return $user;
     }
 
-    /**
-     * @return User[]
-     */
+    /** @return User[] */
     public function findOrCreateFromDTOArray(array $usersData): array
     {
         // @todo LOG