Рефакторинг, выделил общую ДТО документа

Author: Denis Korolev

src/Entities/Document/MakeAction/Response/Attachment.php src/Entities/Document/Common/AccountingAttachment.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\MakeAction\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 
-class Attachment
+final class AccountingAttachment
 {
     /**
      * @Serializer\SerializedName("ВерсияФормата")
@@ -20,24 +20,12 @@ class Attachment
      */
     public ?string $date = null;
 
-    /**
-     * @Serializer\SerializedName("Идентификатор")
-     * @Serializer\Type("string")
-     */
-    public ?string $id = null;
-
     /**
      * @Serializer\SerializedName("Название")
      * @Serializer\Type("string")
      */
     public ?string $name = null;
 
-    /**
-     * @Serializer\SerializedName("Направление")
-     * @Serializer\Type("string")
-     */
-    public ?string $direction = null;
-
     /**
      * @Serializer\SerializedName("Номер")
      * @Serializer\Type("string")
@@ -63,8 +51,9 @@ class Attachment
     public ?string $type = null;
 
     /**
-     * @Serializer\SerializedName("Редакция")
-     * @Serializer\Type("MagDv\Sbis\Entities\Document\MakeAction\Response\Redaction")
+     * @var File|null
+     * @Serializer\SerializedName("Файл")
+     * @Serializer\Type("MagDv\Sbis\Entities\Document\Common\File")
      */
-    public ?Redaction $redaction = null;
+    public ?File $file = null;
 }

src/Entities/Document/SendDocument/Response/Action.php src/Entities/Document/Common/Action.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\SendDocument\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 
@@ -39,9 +39,9 @@ class Action
     public ?string $needDecode = null;
 
     /**
-     * @var \MagDv\Sbis\Entities\Document\SendDocument\Response\Certificate[]|null
+     * @var ActionCertificate[]|null
      * @Serializer\SerializedName("Сертификат")
-     * @Serializer\Type("array<MagDv\Sbis\Entities\Document\SendDocument\Response\Certificate>")
+     * @Serializer\Type("array<MagDv\Sbis\Entities\Document\Common\ActionCertificate>")
      */
     public ?array $certificates = null;
 }

src/Entities/Document/Common/ActionCertificate.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MagDv\Sbis\Entities\Document\Common;
+
+use JMS\Serializer\Annotation as Serializer;
+
+class ActionCertificate
+{
+    /**
+     * @Serializer\SerializedName("ДвоичныеДанные")
+     * @Serializer\Type("string")
+     */
+    public ?string $data = null;
+
+    /**
+     * @Serializer\SerializedName("ДействителенПо")
+     * @Serializer\Type("string")
+     */
+    public ?string $activeTo = null;
+
+    /**
+     * @Serializer\SerializedName("ДействителенС")
+     * @Serializer\Type("string")
+     */
+    public ?string $activeFrom = null;
+
+    /**
+     * @Serializer\SerializedName("Должность")
+     * @Serializer\Type("string")
+     */
+    public ?string $position = null;
+
+    /**
+     * @Serializer\SerializedName("ИНН")
+     * @Serializer\Type("string")
+     */
+    public ?string $inn = null;
+
+    /**
+     * @Serializer\SerializedName("КодСтраны")
+     * @Serializer\Type("string")
+     */
+    public ?string $countryCode = null;
+    /**
+     * @Serializer\SerializedName("Издатель")
+     * @Serializer\Type("string")
+     */
+    public ?string $publisher = null;
+    /**
+     * @Serializer\SerializedName("Квалифицированный")
+     * @Serializer\Type("string")
+     */
+    public ?string $isQualified = null;
+    /**
+     * @Serializer\SerializedName("Название")
+     * @Serializer\Type("string")
+     */
+    public ?string $name = null;
+    /**
+     * @Serializer\SerializedName("Отпечаток")
+     * @Serializer\Type("string")
+     */
+    public ?string $fingerPrint = null;
+    /**
+     * @Serializer\SerializedName("СерийныйНомер")
+     * @Serializer\Type("string")
+     */
+    public ?string $serialNumber = null;
+    /**
+     * @Serializer\SerializedName("ФИО")
+     * @Serializer\Type("string")
+     */
+    public ?string $fio = null;
+
+    /**
+     * @var Key|null
+     * @Serializer\SerializedName("Ключ")
+     * @Serializer\Type("MagDv\Sbis\Entities\Document\Common\Key")
+     */
+    public ?Key $key = null;
+}

src/Entities/Document/ListOfChanges/Response/Attachment.php src/Entities/Document/Common/Attachment.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\ListOfChanges\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 
@@ -13,11 +13,18 @@ class Attachment
      * @Serializer\Type("string")
      */
     public ?string $version = null;
+    /**
+     * @Serializer\SerializedName("ПодверсияФормата")
+     * @Serializer\Type("string")
+     */
+    public ?string $subVersion = null;
+
     /**
      * @Serializer\SerializedName("Дата")
      * @Serializer\Type("string")
      */
     public ?string $date = null;
+
     /**
      * @Serializer\SerializedName("Идентификатор")
      * @Serializer\Type("string")
@@ -28,16 +35,19 @@ class Attachment
      * @Serializer\Type("string")
      */
     public ?string $isModify = null;
+
     /**
      * @Serializer\SerializedName("Название")
      * @Serializer\Type("string")
      */
     public ?string $name = null;
+
     /**
      * @Serializer\SerializedName("Направление")
      * @Serializer\Type("string")
      */
     public ?string $direction = null;
+
     /**
      * @Serializer\SerializedName("Номер")
      * @Serializer\Type("string")
@@ -47,9 +57,17 @@ class Attachment
     /**
      * @var Sign[] $sign
      * @Serializer\SerializedName("Подпись")
-     * @Serializer\Type("array<MagDv\Sbis\Entities\Document\ListOfChanges\Response\Sign>")
+     * @Serializer\Type("array<MagDv\Sbis\Entities\Document\Common\Sign>")
      */
     public ?array $sign = null;
+
+    /**
+     * @var Substitution[] $sign
+     * @Serializer\SerializedName("Подстановка")
+     * @Serializer\Type("array<MagDv\Sbis\Entities\Document\Common\Substitution>")
+     */
+    public ?array $substitution = null;
+
     /**
      * @Serializer\SerializedName("Подтип")
      * @Serializer\Type("string")
@@ -78,6 +96,11 @@ class Attachment
      * @Serializer\Type("string")
      */
     public ?string $sum = null;
+    /**
+     * @Serializer\SerializedName("СуммаБезНдс")
+     * @Serializer\Type("string")
+     */
+    public ?string $sumNoNds = null;
 
     /**
      * @Serializer\SerializedName("Тип")
@@ -91,7 +114,6 @@ class Attachment
      */
     public ?string $isDelete = null;
 
-
     /**
      * @Serializer\SerializedName("УдаленКонтрагентом")
      * @Serializer\Type("string")
@@ -104,7 +126,6 @@ class Attachment
      */
     public ?string $isEncrypt = null;
 
-
     /**
      * @Serializer\SerializedName("ТипШифрования")
      * @Serializer\Type("string")
@@ -114,14 +135,13 @@ class Attachment
     /**
      * @var File|null
      * @Serializer\SerializedName("Файл")
-     * @Serializer\Type("MagDv\Sbis\Entities\Document\ListOfChanges\Response\File")
+     * @Serializer\Type("MagDv\Sbis\Entities\Document\Common\File")
      */
     public ?File $file = null;
 
     /**
-     * @var \MagDv\Sbis\Entities\Document\ListOfChanges\Response\Redaction|null
      * @Serializer\SerializedName("Редакция")
-     * @Serializer\Type("MagDv\Sbis\Entities\Document\ListOfChanges\Response\Redaction")
+     * @Serializer\Type("MagDv\Sbis\Entities\Document\Common\AttachmentRedaction")
      */
-    public ?Redaction $redaction = null;
+    public ?AttachmentRedaction $attachmentRedaction = null;
 }

src/Entities/Document/MakeAction/Response/Redaction.php src/Entities/Document/Common/AttachmentRedaction.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\MakeAction\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 
-class Redaction
+class AttachmentRedaction
 {
     /**
      * @Serializer\SerializedName("ДатаВремя")

src/Entities/Document/SendDocument/Response/Author.php src/Entities/Document/Common/Author.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\SendDocument\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 

src/Entities/Document/SendDocument/Response/Document.php src/Entities/Document/Common/BaseDocument.php

@@ -2,23 +2,23 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\SendDocument\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 
-class Document
+final class BaseDocument
 {
     /**
-     * @Serializer\SerializedName("Дата")
+     * @Serializer\SerializedName("Идентификатор")
      * @Serializer\Type("string")
      */
-    public ?string $date = null;
+    public ?string $id = null;
 
     /**
-     * @Serializer\SerializedName("Идентификатор")
+     * @Serializer\SerializedName("Дата")
      * @Serializer\Type("string")
      */
-    public ?string $id = null;
+    public ?string $data = null;
 
     /**
      * @Serializer\SerializedName("Номер")

src/Entities/Document/SendDocument/Response/DocumentConsequence.php src/Entities/Document/Common/BaseDocuments.php

@@ -2,25 +2,27 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\SendDocument\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;
 
-class DocumentConsequence
+final class BaseDocuments
 {
+    /**
+     * @Serializer\SerializedName("Документ")
+     * @Serializer\Type("MagDv\Sbis\Entities\Document\Common\BaseDocument")
+     */
+    public ?BaseDocument $document = null;
+
     /**
      * @Serializer\SerializedName("ВидСвязи")
      * @Serializer\Type("string")
      */
     public ?string $type = null;
+
     /**
      * @Serializer\SerializedName("Сумма")
      * @Serializer\Type("string")
      */
     public ?string $sum = null;
-    /**
-     * @Serializer\SerializedName("Документ")
-     * @Serializer\Type("MagDv\Sbis\Entities\Document\SendDocument\Response\Document")
-     */
-    public ?Document $document = null;
 }

src/Entities/Document/MakeAction/Response/Branch.php src/Entities/Document/Common/Branch.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MagDv\Sbis\Entities\Document\MakeAction\Response;
+namespace MagDv\Sbis\Entities\Document\Common;
 
 use JMS\Serializer\Annotation as Serializer;