code beautifying

src/Entity/PortfolioDetail.php

@@ -4,11 +4,10 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
-use App\Repository\PortfolioDetailRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-#[ORM\Entity(repositoryClass: PortfolioDetailRepository::class)]
+#[ORM\Entity]
 class PortfolioDetail
 {
     #[ORM\Id]

src/Entity/PortfolioMovement.php

@@ -4,10 +4,9 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
-use App\Repository\PortfolioMovementRepository;
 use Doctrine\ORM\Mapping as ORM;
 
-#[ORM\Entity(repositoryClass: PortfolioMovementRepository::class)]
+#[ORM\Entity]
 class PortfolioMovement
 {
     #[ORM\Id]

src/Presentation/PortfolioPresenter.php

@@ -19,7 +19,8 @@ class PortfolioPresenter implements PortfolioPresenterInterface
     {
     }
 
-    public function toText(ParsedPortfolio $parsedPortfolio): string
+    /** @return array<int, string> */
+    public function toLines(ParsedPortfolio $parsedPortfolio): array
     {
         $header = $parsedPortfolio->header;
         $periodTitle = $header->startDate->format('d.m.y') . ' - ' . $header->endDate->format('d.m.y');
@@ -27,52 +28,87 @@ class PortfolioPresenter implements PortfolioPresenterInterface
         $total = $this->calcTotalSum($parsedPortfolio);
 
         $output = new BufferedOutput();
+        $cellStyle = $this->createCellStyle();
 
-        $tableStyle = new TableStyle();
-        $tableStyle->setPadType(STR_PAD_LEFT);
-
-        $cellStyle = new TableStyle();
-        $cellStyle->setPadType(STR_PAD_RIGHT);
-
-        $table = new Table($output);
-        $table->setHeaderTitle('ПОРТФЕЛЬ: ' . $periodTitle);
-        $table->setHeaders(['ЦБ', 'Кол-во', 'Цн', 'Цк', 'Сумм', '%']);
-
+        $portfolioRows = [];
         foreach ($parsedPortfolio->details as $detail) {
-            $table->addRow([
+            $portfolioRows[] = [
                 $this->titleResolver->resolve($detail->security, $detail->issuer),
                 $this->formatQuantity($detail->quantityStart, $detail->quantityEnd),
                 $detail->priceStart,
                 $detail->priceEnd,
                 round((float) $detail->sumTotal),
                 round(100 * (float) $detail->sumTotal / $total, 2),
-            ]);
+            ];
         }
+        $lines = $this->renderTable($output, 'ПОРТФЕЛЬ: ' . $periodTitle,
+            ['ЦБ', 'Кол-во', 'Цн', 'Цк', 'Сумм', '%'],
+            $portfolioRows, $cellStyle,
+        );
 
-        $table->setColumnStyle(0, $cellStyle);
-        $table->setStyle($tableStyle)->render();
-
-        $txt = $output->fetch();
-
-        $table = new Table($output);
-        $table->setHeaderTitle('ДВИЖ: ' . $periodTitle);
-        $table->setHeaders(['ЦБ', 'Кн', 'In', 'Out', 'Кк']);
-
+        $movementRows = [];
         foreach ($parsedPortfolio->movements as $movement) {
-            $table->addRow([
+            $movementRows[] = [
                 $this->titleResolver->resolve($movement->security),
                 $movement->quantityStart,
                 $movement->quantityIncome > 0 ? '+' . $movement->quantityIncome : $movement->quantityIncome,
                 $movement->quantityOutcome > 0 ? '-' . $movement->quantityOutcome : $movement->quantityOutcome,
                 $movement->quantityEnd,
-            ]);
+            ];
+        }
+        $mvLines = $this->renderTable($output, 'ДВИЖ: ' . $periodTitle,
+            ['ЦБ', 'Кн', 'In', 'Out', 'Кк'],
+            $movementRows, $cellStyle,
+        );
+
+        $lines[] = '';
+        foreach ($mvLines as $line) {
+            $lines[] = $line;
+        }
+        $lines[count($lines) - 1] = rtrim($lines[count($lines) - 1]) . self::COPYRIGHT_MARK;
+
+        return $lines;
+    }
+
+    public function toText(ParsedPortfolio $parsedPortfolio): string
+    {
+        return implode("\n", $this->toLines($parsedPortfolio));
+    }
+
+    /**
+     * @param array<int, array<string|int>> $rows
+     * @return array<int, string>
+     */
+    private function renderTable(
+        BufferedOutput $output,
+        string $title,
+        array $headers,
+        array $rows,
+        TableStyle $cellStyle,
+    ): array {
+        $table = new Table($output);
+        $table->setHeaderTitle($title);
+        $table->setHeaders($headers);
+
+        foreach ($rows as $row) {
+            $table->addRow($row);
         }
 
         $table->setColumnStyle(0, $cellStyle);
-        $table->setStyle($tableStyle)->render();
-        $txt .= PHP_EOL . rtrim($output->fetch()) . self::COPYRIGHT_MARK;
 
-        return $txt;
+        $padStyle = new TableStyle();
+        $padStyle->setPadType(STR_PAD_LEFT);
+        $table->setStyle($padStyle)->render();
+
+        return explode("\n", rtrim($output->fetch()));
+    }
+
+    private function createCellStyle(): TableStyle
+    {
+        $style = new TableStyle();
+        $style->setPadType(STR_PAD_RIGHT);
+
+        return $style;
     }
 
     private function calcTotalSum(ParsedPortfolio $parsedPortfolio): float

src/Repository/PortfolioDetailRepository.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Repository;
-
-use App\Entity\PortfolioDetail;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @extends ServiceEntityRepository<PortfolioDetail>
- */
-class PortfolioDetailRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, PortfolioDetail::class);
-    }
-}

src/Repository/PortfolioMovementRepository.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Repository;
-
-use App\Entity\PortfolioMovement;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @extends ServiceEntityRepository<PortfolioMovement>
- */
-class PortfolioMovementRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, PortfolioMovement::class);
-    }
-}

src/Service/PortfolioImageRenderer.php

@@ -27,7 +27,7 @@ readonly class PortfolioImageRenderer
         $grey = imagecolorallocate($im, 48, 48, 48);
         imagefill($im, 0, 0, $grey);
 
-        $lines = explode("\n", $this->presenter->toText($parsedPortfolio));
+        $lines = $this->presenter->toLines($parsedPortfolio);
 
         $height = self::FONT_SIZE;
         foreach ($lines as $line) {

src/Service/PortfolioPresenterInterface.php

@@ -8,5 +8,8 @@ use App\Domain\Entity\ParsedPortfolio;
 
 interface PortfolioPresenterInterface
 {
+    /** @return array<int, string> */
+    public function toLines(ParsedPortfolio $parsedPortfolio): array;
+
     public function toText(ParsedPortfolio $parsedPortfolio): string;
 }

src/Service/SecurityTitleResolver.php

@@ -6,8 +6,8 @@ namespace App\Service;
 
 final class SecurityTitleResolver
 {
-    /** @var array{list<string>, list<string>} */
-    private readonly array $mapPrintable;
+    /** @var array<string, string> */
+    private readonly array $replacements;
 
     /** @var array<string, string> */
     private array $cache;
@@ -15,19 +15,15 @@ final class SecurityTitleResolver
     public function __construct(array $securitiesMap)
     {
         $this->cache = [];
-        $this->mapPrintable = [
-            array_merge(['(в пути)'], array_keys($securitiesMap)),
-            array_merge(['±'], array_values($securitiesMap)),
-        ];
+        $this->replacements = array_merge(
+            ['(в пути)' => '±'],
+            $securitiesMap,
+        );
     }
 
     public function resolve(string $security, ?string $issuer = null): string
     {
-        $security = str_replace(
-            $this->mapPrintable[0],
-            $this->mapPrintable[1],
-            $security,
-        );
+        $security = strtr($security, $this->replacements);
 
         if (!str_starts_with($security, 'RU00')) {
             return $security;

src/Service/XmlParser.php

@@ -95,33 +95,18 @@ class XmlParser implements XmlParserInterface
     {
         $items = [];
 
-        foreach (get_object_vars($xml) as $key => $value) {
-            if (mb_strpos($key, self::PREFIX_DETAILS) === false) {
-                continue;
-            }
-
-            if (!is_array($value)) {
-                $value = [$value];
-            }
-
-            foreach ($value as $line) {
-                $attr = [];
-                foreach ($line->attributes() as $attrName => $attrValue) {
-                    $attr[$attrName] = get_object_vars($attrValue)[0];
-                }
-
-                $items[] = new PortfolioDetailItem(
-                    issuer:        $attr[self::ATTR_ISSUER],
-                    security:      $attr[self::ATTR_SECURITY],
-                    priceStart:    $attr[self::ATTR_PRICE_START],
-                    priceEnd:      $attr[self::ATTR_PRICE_END],
-                    quantityStart: (int) $attr[self::ATTR_QTY_START],
-                    quantityEnd:   (int) $attr[self::ATTR_QTY_END],
-                    sumStart:      $attr[self::ATTR_SUM_START],
-                    sumEnd:        $attr[self::ATTR_SUM_END],
-                    sumTotal:      $attr[self::ATTR_SUM_TOTAL],
-                );
-            }
+        foreach ($this->iterateDetailElements($xml) as $attr) {
+            $items[] = new PortfolioDetailItem(
+                issuer:        $attr[self::ATTR_ISSUER],
+                security:      $attr[self::ATTR_SECURITY],
+                priceStart:    $attr[self::ATTR_PRICE_START],
+                priceEnd:      $attr[self::ATTR_PRICE_END],
+                quantityStart: (int) $attr[self::ATTR_QTY_START],
+                quantityEnd:   (int) $attr[self::ATTR_QTY_END],
+                sumStart:      $attr[self::ATTR_SUM_START],
+                sumEnd:        $attr[self::ATTR_SUM_END],
+                sumTotal:      $attr[self::ATTR_SUM_TOTAL],
+            );
         }
 
         return $items;
@@ -131,6 +116,22 @@ class XmlParser implements XmlParserInterface
     {
         $items = [];
 
+        foreach ($this->iterateDetailElements($xml) as $attr) {
+            $items[] = new PortfolioMovementItem(
+                security:       $attr[self::ATTR_SECURITY],
+                period:         new \DateTimeImmutable($attr[self::ATTR_PERIOD]),
+                quantityStart:  (int) $attr[self::ATTR_QTY_START_MV],
+                quantityEnd:    (int) $attr[self::ATTR_QTY_END_MV],
+                quantityIncome: (int) $attr[self::ATTR_QTY_INCOME],
+                quantityOutcome:(int) $attr[self::ATTR_QTY_OUTCOME],
+            );
+        }
+
+        return $items;
+    }
+
+    private function iterateDetailElements(\SimpleXMLElement $xml): iterable
+    {
         foreach (get_object_vars($xml) as $key => $value) {
             if (mb_strpos($key, self::PREFIX_DETAILS) === false) {
                 continue;
@@ -146,17 +147,8 @@ class XmlParser implements XmlParserInterface
                     $attr[$attrName] = get_object_vars($attrValue)[0];
                 }
 
-                $items[] = new PortfolioMovementItem(
-                    security:       $attr[self::ATTR_SECURITY],
-                    period:         new \DateTimeImmutable($attr[self::ATTR_PERIOD]),
-                    quantityStart:  (int) $attr[self::ATTR_QTY_START_MV],
-                    quantityEnd:    (int) $attr[self::ATTR_QTY_END_MV],
-                    quantityIncome: (int) $attr[self::ATTR_QTY_INCOME],
-                    quantityOutcome:(int) $attr[self::ATTR_QTY_OUTCOME],
-                );
+                yield $attr;
             }
         }
-
-        return $items;
     }
 }