code beautified

src/Command/FetchEmailsCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Command;
 
 use App\Service\MailFetcher;

src/Command/ImportFromXmlCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Command;
 
 use App\Presentation\PortfolioPresenter;
@@ -30,7 +32,6 @@ class ImportFromXmlCommand extends Command
     protected function configure(): void
     {
         $this
-            //->addArgument('xml-file', null, InputArgument::REQUIRED, 'XML file with portfolio data')
             ->addOption('xml-file', null, InputOption::VALUE_REQUIRED, 'XML file with Portfolio data')
             ->addOption('notify', null, InputOption::VALUE_NONE, 'Notify to telegram');
     }

src/Entity/Portfolio.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Entity;
 
 use App\Repository\PortfolioRepository;

src/Entity/PortfolioDetail.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Entity;
 
 use App\Repository\PortfolioDetailRepository;

src/Entity/PortfolioMovement.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Entity;
 
 use App\Repository\PortfolioMovementRepository;

src/Repository/PortfolioDetailRepository.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Repository;
 
 use App\Entity\PortfolioDetail;
@@ -15,29 +17,4 @@ class PortfolioDetailRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, PortfolioDetail::class);
     }
-
-    //    /**
-    //     * @return PortfolioDetail[] Returns an array of PortfolioDetail objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('p')
-    //            ->andWhere('p.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('p.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?PortfolioDetail
-    //    {
-    //        return $this->createQueryBuilder('p')
-    //            ->andWhere('p.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
 }

src/Repository/PortfolioMovementRepository.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Repository;
 
 use App\Entity\PortfolioMovement;
@@ -15,29 +17,4 @@ class PortfolioMovementRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, PortfolioMovement::class);
     }
-
-    //    /**
-    //     * @return PortfolioMovement[] Returns an array of PortfolioMovement objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('p')
-    //            ->andWhere('p.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('p.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?PortfolioMovement
-    //    {
-    //        return $this->createQueryBuilder('p')
-    //            ->andWhere('p.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
 }

src/Repository/PortfolioRepository.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Repository;
 
 use App\Entity\Portfolio;
@@ -15,29 +17,4 @@ class PortfolioRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Portfolio::class);
     }
-
-//    /**
-//     * @return ReportHeader[] Returns an array of ReportHeader objects
-//     */
-//    public function findByExampleField($value): array
-//    {
-//        return $this->createQueryBuilder('r')
-//            ->andWhere('r.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->orderBy('r.id', 'ASC')
-//            ->setMaxResults(10)
-//            ->getQuery()
-//            ->getResult()
-//        ;
-//    }
-
-//    public function findOneBySomeField($value): ?ReportHeader
-//    {
-//        return $this->createQueryBuilder('r')
-//            ->andWhere('r.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->getQuery()
-//            ->getOneOrNullResult()
-//        ;
-//    }
 }

src/Service/TelegramNotifier.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Service;
 
 use Psr\Log\LoggerInterface;

src/Service/XmlParser.php

@@ -11,34 +11,71 @@ use App\Domain\Entity\PortfolioMovementItem;
 
 class XmlParser
 {
+    private const XML_HEADER_AGRMT        = 'ШапкаГенСог';
+    private const XML_HEADER_PERIOD       = 'ШапкаПериод';
+    private const XML_PORTFOLIO_TABLE     = 'ШапкаПортфель';
+    private const XML_PORTFOLIO_SECTION   = 'ЗаголовокПортфель';
+    private const XML_MOVEMENTS_SECTION   = 'ШапкаДвиженияИОстаткиЦБ';
+    private const PREFIX_DETAILS          = 'Детали';
+
+    private const ATTR_CLIENT              = 'Клиент';
+    private const ATTR_START_DATE          = 'НачПериода';
+    private const ATTR_END_DATE            = 'КонПериода';
+    private const ATTR_PERIOD_LINE         = 'СтрокаПериода';
+    private const ATTR_PERIOD              = 'Период';
+    private const ATTR_SECURITY            = 'ЦБ';
+    private const ATTR_ISSUER              = 'Эмитент';
+    private const ATTR_PRICE_START         = 'НОЦена';
+    private const ATTR_PRICE_END           = 'КОЦена';
+    private const ATTR_QTY_START           = 'КоличествоНО';
+    private const ATTR_QTY_END             = 'КоличествоКО';
+    private const ATTR_SUM_START           = 'СуммаНКДНО';
+    private const ATTR_SUM_END             = 'СуммаНКДКО';
+    private const ATTR_SUM_TOTAL           = 'КОСумма';
+    private const ATTR_QTY_START_MV        = 'НО';
+    private const ATTR_QTY_END_MV          = 'КО';
+    private const ATTR_QTY_INCOME          = 'Приход';
+    private const ATTR_QTY_OUTCOME         = 'Расход';
+    private const DATE_FORMAT              = 'd.m.Y';
+
     public function processXml(\SimpleXMLElement $xml): ParsedPortfolio
     {
         return new ParsedPortfolio(
             header: $this->processXmlHeader($xml),
-            details: $this->processDetails($xml->{'ЗаголовокПортфель'}->{'ШапкаПортфель'}),
-            movements: $this->processMovements($xml->{'ШапкаДвиженияИОстаткиЦБ'}),
+            details: $this->processDetails(
+                $xml->{self::XML_PORTFOLIO_SECTION}->{self::XML_PORTFOLIO_TABLE}
+            ),
+            movements: $this->processMovements(
+                $xml->{self::XML_MOVEMENTS_SECTION}
+            ),
         );
     }
 
     private function processXmlHeader(\SimpleXMLElement $xml): PortfolioHeader
     {
         $attrs = [];
-        foreach (['ШапкаГенСог', 'ШапкаПериод'] as $section) {
+        foreach ([self::XML_HEADER_AGRMT, self::XML_HEADER_PERIOD] as $section) {
             foreach ($xml->{$section}->attributes() as $key => $value) {
                 $attrs[$key] = get_object_vars($value)[0];
             }
         }
 
-        if (array_key_exists('НачПериода', $attrs)) {
-            $startDate = \DateTimeImmutable::createFromFormat('d.m.Y', $attrs['НачПериода']);
-            $endDate   = \DateTimeImmutable::createFromFormat('d.m.Y', $attrs['КонПериода']);
-        } elseif (array_key_exists('СтрокаПериода', $attrs)) {
-            $chunks = explode(' ', $attrs['СтрокаПериода']);
+        if (array_key_exists(self::ATTR_START_DATE, $attrs)) {
+            $startDate = \DateTimeImmutable::createFromFormat(
+                self::DATE_FORMAT,
+                $attrs[self::ATTR_START_DATE],
+            );
+            $endDate = \DateTimeImmutable::createFromFormat(
+                self::DATE_FORMAT,
+                $attrs[self::ATTR_END_DATE],
+            );
+        } elseif (array_key_exists(self::ATTR_PERIOD_LINE, $attrs)) {
+            $chunks = explode(' ', $attrs[self::ATTR_PERIOD_LINE]);
             if (count($chunks) !== 4) {
                 throw new \RuntimeException('Unexpected period format');
             }
-            $startDate = \DateTimeImmutable::createFromFormat('d.m.Y', $chunks[1]);
-            $endDate   = \DateTimeImmutable::createFromFormat('d.m.Y', $chunks[3]);
+            $startDate = \DateTimeImmutable::createFromFormat(self::DATE_FORMAT, $chunks[1]);
+            $endDate   = \DateTimeImmutable::createFromFormat(self::DATE_FORMAT, $chunks[3]);
         } else {
             throw new \RuntimeException('Cannot detect XML header version');
         }
@@ -48,7 +85,7 @@ class XmlParser
         }
 
         return new PortfolioHeader(
-            clientAgreement: $attrs['Клиент'],
+            clientAgreement: $attrs[self::ATTR_CLIENT],
             startDate: $startDate,
             endDate: $endDate,
         );
@@ -59,7 +96,7 @@ class XmlParser
         $items = [];
 
         foreach (get_object_vars($xml) as $key => $value) {
-            if (mb_strpos($key, 'Детали') === false) {
+            if (mb_strpos($key, self::PREFIX_DETAILS) === false) {
                 continue;
             }
 
@@ -74,15 +111,15 @@ class XmlParser
                 }
 
                 $items[] = new PortfolioDetailItem(
-                    issuer:        $attr['Эмитент'],
-                    security:      $attr['ЦБ'],
-                    priceStart:    $attr['НОЦена'],
-                    priceEnd:      $attr['КОЦена'],
-                    quantityStart: (int) $attr['КоличествоНО'],
-                    quantityEnd:   (int) $attr['КоличествоКО'],
-                    sumStart:      $attr['СуммаНКДНО'],
-                    sumEnd:        $attr['СуммаНКДКО'],
-                    sumTotal:      $attr['КОСумма'],
+                    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],
                 );
             }
         }
@@ -95,7 +132,7 @@ class XmlParser
         $items = [];
 
         foreach (get_object_vars($xml) as $key => $value) {
-            if (mb_strpos($key, 'Детали') === false) {
+            if (mb_strpos($key, self::PREFIX_DETAILS) === false) {
                 continue;
             }
 
@@ -109,15 +146,13 @@ class XmlParser
                     $attr[$attrName] = get_object_vars($attrValue)[0];
                 }
 
-                $period = new \DateTimeImmutable($attr['Период']);
-
                 $items[] = new PortfolioMovementItem(
-                    security:       $attr['ЦБ'],
-                    period:         $period,
-                    quantityStart:  (int) $attr['НО'],
-                    quantityEnd:    (int) $attr['КО'],
-                    quantityIncome: (int) $attr['Приход'],
-                    quantityOutcome:(int) $attr['Расход'],
+                    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],
                 );
             }
         }