[TASK] Create TaxClasses by TaxClassFactory

Relates: #505

Classes/Domain/Model/Cart/TaxClass.php

@@ -11,27 +11,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-class TaxClass
+final class TaxClass implements TaxClassInterface
 {
-    protected int $id;
-
-    protected string $value;
-
-    protected float $calc;
-
-    protected string $title;
-
     public function __construct(
-        int $id,
-        string $value,
-        float $calc,
-        string $title
-    ) {
-        $this->id = $id;
-        $this->value = $value;
-        $this->calc = $calc;
-        $this->title = $title;
-    }
+        private readonly int $id,
+        private readonly string $value,
+        private readonly float $calc,
+        private readonly string $title
+    ) {}
 
     public function getId(): int
     {

Classes/Domain/Model/Cart/TaxClassFactory.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Extcode\Cart\Domain\Model\Cart;
+
+/*
+ * This file is part of the package extcode/cart.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE file that was distributed with this source code.
+ */
+
+use Psr\Log\LoggerInterface;
+
+final class TaxClassFactory implements TaxClassFactoryInterface
+{
+    public function __construct(
+        private readonly LoggerInterface $logger
+    ) {}
+
+    public function getTaxClass(int $taxClassKey, array $taxClassValue): ?TaxClass
+    {
+        if ($this->isValidTaxClassConfig($taxClassKey, $taxClassValue)) {
+            return new TaxClass(
+                $taxClassKey,
+                $taxClassValue['value'],
+                (float)$taxClassValue['calc'],
+                $taxClassValue['name']
+            );
+        }
+
+        return null;
+    }
+
+    private function isValidTaxClassConfig(int $key, array $value): bool
+    {
+        if (empty($value) ||
+            empty($value['name']) ||
+            !isset($value['calc']) ||
+            !is_numeric($value['calc'])
+        ) {
+            $this->logger->error('Can\'t create tax class object for the configuration with the index=' . $key . '.', []);
+
+            return false;
+        }
+
+        return true;
+    }
+}

Classes/Domain/Model/Cart/TaxClassFactoryInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Extcode\Cart\Domain\Model\Cart;
+
+/*
+ * This file is part of the package extcode/cart.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE file that was distributed with this source code.
+ */
+
+interface TaxClassFactoryInterface
+{
+    public function getTaxClass(int $taxClassKey, array $taxClassValue): ?TaxClass;
+}

Classes/Domain/Model/Cart/TaxClassInterface.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Extcode\Cart\Domain\Model\Cart;
+
+/*
+ * This file is part of the package extcode/cart.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE file that was distributed with this source code.
+ */
+
+interface TaxClassInterface
+{
+    public function getId(): int;
+
+    public function getValue(): string;
+
+    public function getCalc(): float;
+
+    public function getTitle(): string;
+}

Classes/Service/TaxClassService.php

@@ -12,16 +12,17 @@
  */
 
 use Extcode\Cart\Domain\Model\Cart\TaxClass;
-use TYPO3\CMS\Core\Log\LogManager;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use Extcode\Cart\Domain\Model\Cart\TaxClassFactoryInterface;
+use Extcode\Cart\Domain\Model\Cart\TaxClassInterface;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 
-class TaxClassService implements TaxClassServiceInterface
+final class TaxClassService implements TaxClassServiceInterface
 {
-    protected array $settings;
+    private array $settings;
 
     public function __construct(
-        protected ConfigurationManagerInterface $configurationManager
+        private readonly ConfigurationManagerInterface $configurationManager,
+        private readonly TaxClassFactoryInterface $taxClassFactory
     ) {
         $this->settings = $this->configurationManager->getConfiguration(
             ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK,
@@ -50,33 +51,13 @@ public function getTaxClasses(string $countryCode = null): array
         }
 
         foreach ($taxClassSettings as $taxClassKey => $taxClassValue) {
-            if ($this->isValidTaxClassConfig($taxClassKey, $taxClassValue)) {
-                $taxClasses[$taxClassKey] = GeneralUtility::makeInstance(
-                    TaxClass::class,
-                    (int)$taxClassKey,
-                    $taxClassValue['value'],
-                    (float)$taxClassValue['calc'],
-                    $taxClassValue['name']
-                );
+            $taxClass = $this->taxClassFactory->getTaxClass($taxClassKey, $taxClassValue);
+
+            if ($taxClass instanceof TaxClassInterface) {
+                $taxClasses[$taxClassKey] = $taxClass;
             }
         }
 
         return $taxClasses;
     }
-
-    protected function isValidTaxClassConfig(int $key, array $value): bool
-    {
-        if (empty($value) ||
-            empty($value['name']) ||
-            !isset($value['calc']) ||
-            (isset($value['calc']) && !is_numeric($value['calc']))
-        ) {
-            $logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
-            $logger->error('Can\'t create tax class object for the configuration with the index=' . $key . '.', []);
-
-            return false;
-        }
-
-        return true;
-    }
 }