From 28cf60897843dfce1261014ddd4f18ea6e52756f Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 6 Sep 2025 21:42:39 +0200
Subject: [PATCH 01/35] Refactored template render helper: replaced
 renderKeyValue to renderImports and renderMetaData

---
 .../Generator/Render/Template/Template.php    | 18 ++++-----
 .../Render/Template/TemplateHelper.php        | 40 ++++++++++---------
 .../Template/TemplateHelperInterface.php      | 16 ++++----
 .../Render/Template/TemplateHelperTest.php    |  2 +-
 4 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Template/Template.php b/src/TransferGenerator/Generator/Render/Template/Template.php
index aadf14db..71ffd2f4 100644
--- a/src/TransferGenerator/Generator/Render/Template/Template.php
+++ b/src/TransferGenerator/Generator/Render/Template/Template.php
@@ -19,14 +19,14 @@ public function __invoke(TemplateTransfer $templateTransfer): string
     {
         $this->helper->setTemplateTransfer($templateTransfer);
 
-        $fileContent = <<<TEMPLATE
+        $content = <<<TEMPLATE
 <?php
 
 declare(strict_types=1);
 
 namespace $templateTransfer->classNamespace;
 
-{$this->helper->renderKeyValue($templateTransfer->imports, 'use :value;')}
+{$this->helper->renderImports()}
 
 /**
  * Specification:
@@ -42,21 +42,21 @@ final class $templateTransfer->className extends AbstractTransfer
     protected const int META_DATA_SIZE = {$templateTransfer->properties->count()};
 
     protected const array META_DATA = [
-{$this->helper->renderKeyValue($templateTransfer->metaConstants, '        self:::key => self:::key_DATA_NAME,')}
+{$this->helper->renderMetaData()}
     ];
 
 TEMPLATE;
 
         $i = 0;
         foreach ($templateTransfer->metaConstants as $constant => $property) {
-            $fileContent .= <<<TEMPLATE
+            $content .= <<<TEMPLATE
 
-    // $property{$this->helper->getAttribute($property)}
+    // $property{$this->helper->renderAttribute($property)}
     public const string $constant = '$property';
     protected const string {$constant}_DATA_NAME = '$constant';
     protected const int {$constant}_DATA_INDEX = $i;
-{$this->helper->getDockBlock($property)}
-    public{$this->helper->getProtected($property)} {$this->helper->getNullable($property)}{$templateTransfer->properties[$property]} \$$property {
+{$this->helper->renderDockBlock($property)}
+    public{$this->helper->renderProtected($property)} {$this->helper->renderNullable($property)}{$templateTransfer->properties[$property]} \$$property {
         get => \$this->getData(self::{$constant}_DATA_INDEX);
         set => \$this->setData(self::{$constant}_DATA_INDEX, \$value);
     }
@@ -65,11 +65,11 @@ final class $templateTransfer->className extends AbstractTransfer
             $i++;
         }
 
-        $fileContent .= <<<TEMPLATE
+        $content .= <<<TEMPLATE
 }
 
 TEMPLATE;
 
-        return $fileContent;
+        return $content;
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php b/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
index 62c405b8..71bfd350 100644
--- a/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
+++ b/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
@@ -4,17 +4,14 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Template;
 
-use ArrayObject;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 
 class TemplateHelper implements TemplateHelperInterface
 {
     private TemplateTransfer $templateTransfer;
 
-    private const array KEY_VALUE_SEARCH = [
-        ':key',
-        ':value',
-    ];
+    private const string IMPORT_TEMPLATE = 'use %s;';
+    private const string META_DATA_TEMPLATE = '        self::%s => self::%s_DATA_NAME,';
 
     private const string PADDING_LEFT = PHP_EOL . '    ';
     private const string EMPTY_STRING = '';
@@ -29,21 +26,28 @@ public function setTemplateTransfer(TemplateTransfer $templateTransfer): self
         return $this;
     }
 
-    public function renderKeyValue(ArrayObject $data, string $template): string
+    public function renderImports(): string
     {
-        $iterateResult = [];
-        foreach ($data as $key => $value) {
-            $iterateResult[] = str_replace(
-                self::KEY_VALUE_SEARCH,
-                [$key, $value],
-                $template,
-            );
+        $imports = [];
+        /** @var string $import */
+        foreach ($this->templateTransfer->imports as $import) {
+            $imports[] = sprintf(self::IMPORT_TEMPLATE, $import);
         }
 
-        return implode(PHP_EOL, $iterateResult);
+        return implode(PHP_EOL, $imports);
     }
 
-    public function getAttribute(string $property): string
+    public function renderMetaData(): string
+    {
+        $metaData = [];
+        foreach ($this->templateTransfer->metaConstants as $key => $value) {
+            $metaData[] = sprintf(self::META_DATA_TEMPLATE, $key, $key);
+        }
+
+        return implode(PHP_EOL, $metaData);
+    }
+
+    public function renderAttribute(string $property): string
     {
         /** @var string|null $attribute */
         $attribute = $this->templateTransfer->attributes[$property] ?? null;
@@ -54,7 +58,7 @@ public function getAttribute(string $property): string
         return self::PADDING_LEFT . $attribute;
     }
 
-    public function getDockBlock(string $property): string
+    public function renderDockBlock(string $property): string
     {
         /** @var string|null $dockBlock */
         $dockBlock = $this->templateTransfer->dockBlocks[$property] ?? null;
@@ -65,7 +69,7 @@ public function getDockBlock(string $property): string
         return self::PADDING_LEFT . $dockBlock;
     }
 
-    public function getNullable(string $property): string
+    public function renderNullable(string $property): string
     {
         /** @var string $propertyType */
         $propertyType = $this->templateTransfer->properties[$property];
@@ -80,7 +84,7 @@ public function getNullable(string $property): string
         return self::NULLABLE_TYPE;
     }
 
-    public function getProtected(string $property): string
+    public function renderProtected(string $property): string
     {
         return $this->templateTransfer->protects[$property] ? self::PROTECTED_SET : self::EMPTY_STRING;
     }
diff --git a/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php b/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php
index 4778257d..4f369cda 100644
--- a/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php
+++ b/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php
@@ -4,23 +4,21 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Template;
 
-use ArrayObject;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 
 interface TemplateHelperInterface
 {
     public function setTemplateTransfer(TemplateTransfer $templateTransfer): self;
 
-    /**
-     * @param \ArrayObject<string, string> $data
-     */
-    public function renderKeyValue(ArrayObject $data, string $template): string;
+    public function renderImports(): string;
 
-    public function getAttribute(string $property): string;
+    public function renderMetaData(): string;
 
-    public function getDockBlock(string $property): string;
+    public function renderAttribute(string $property): string;
 
-    public function getNullable(string $property): string;
+    public function renderDockBlock(string $property): string;
 
-    public function getProtected(string $property): string;
+    public function renderNullable(string $property): string;
+
+    public function renderProtected(string $property): string;
 }
diff --git a/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php b/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php
index 56b8e96f..be0cbc1b 100644
--- a/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php
+++ b/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php
@@ -23,7 +23,7 @@ public function testGetNullable(array $templateData, string $property, string $e
         $templateHelper = new TemplateHelper()->setTemplateTransfer($templateTransfer);
 
         // Act
-        $actual = $templateHelper->getNullable($property);
+        $actual = $templateHelper->renderNullable($property);
 
         // Assert
         $this->assertSame($expected, $actual);

From 163868d1e6511af2cfdc2e4a1dfceef803f7d54e Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 6 Sep 2025 22:01:41 +0200
Subject: [PATCH 02/35] Optimized rendering imports

---
 .../Generator/Render/Template/TemplateHelper.php              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php b/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
index 71bfd350..863ab3e8 100644
--- a/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
+++ b/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
@@ -11,7 +11,7 @@ class TemplateHelper implements TemplateHelperInterface
     private TemplateTransfer $templateTransfer;
 
     private const string IMPORT_TEMPLATE = 'use %s;';
-    private const string META_DATA_TEMPLATE = '        self::%s => self::%s_DATA_NAME,';
+    private const string META_DATA_TEMPLATE = '        self::%1$s => self::%1$s_DATA_NAME,';
 
     private const string PADDING_LEFT = PHP_EOL . '    ';
     private const string EMPTY_STRING = '';
@@ -41,7 +41,7 @@ public function renderMetaData(): string
     {
         $metaData = [];
         foreach ($this->templateTransfer->metaConstants as $key => $value) {
-            $metaData[] = sprintf(self::META_DATA_TEMPLATE, $key, $key);
+            $metaData[] = sprintf(self::META_DATA_TEMPLATE, $key);
         }
 
         return implode(PHP_EOL, $metaData);

From 0db23084b5e4d289b11a844e7c041ffc2cc1aaf7 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 6 Sep 2025 22:06:46 +0200
Subject: [PATCH 03/35] Optimized rendering closing template part

---
 src/TransferGenerator/Generator/Render/Template/Template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TransferGenerator/Generator/Render/Template/Template.php b/src/TransferGenerator/Generator/Render/Template/Template.php
index 71ffd2f4..afd8a501 100644
--- a/src/TransferGenerator/Generator/Render/Template/Template.php
+++ b/src/TransferGenerator/Generator/Render/Template/Template.php
@@ -65,7 +65,7 @@ final class $templateTransfer->className extends AbstractTransfer
             $i++;
         }
 
-        $content .= <<<TEMPLATE
+        $content .= <<<'TEMPLATE'
 }
 
 TEMPLATE;

From 818f2f13ed95ca00610cb3fa3e3818c6e76f0ff8 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 6 Sep 2025 22:55:24 +0200
Subject: [PATCH 04/35] Refactored definition render, changed shared file
 reader code style

---
 .../Render/DefinitionRender.php               | 78 ++++++++++++-------
 src/Shared/Filesystem/FileReader.php          |  1 +
 2 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/src/DefinitionGenerator/Render/DefinitionRender.php b/src/DefinitionGenerator/Render/DefinitionRender.php
index 06e06cbe..8bde458f 100644
--- a/src/DefinitionGenerator/Render/DefinitionRender.php
+++ b/src/DefinitionGenerator/Render/DefinitionRender.php
@@ -10,31 +10,35 @@
 
 readonly class DefinitionRender implements DefinitionRenderInterface
 {
-    private const string SCHEMA = <<<'START'
+    private const string SCHEMA = <<<'TEMPLATE'
 # $schema: https://raw.githubusercontent.com/picamator/transfer-object/main/schema/definition.schema.json
 
 
-START;
+TEMPLATE;
 
-    private const string CLASS_TEMPLATE = <<<'START'
-# %s
-%s:
-START;
+    private const string CLASS_TEMPLATE = <<<'TEMPLATE'
+# %1$s
+%1$s:
 
-    private const string TYPE_TEMPLATE = <<<'START'
+TEMPLATE;
+
+    private const string TYPE_TEMPLATE = <<<'TEMPLATE'
   %s:
     type: %s
-START;
 
-    private const string COLLECTION_TYPE_TEMPLATE = <<<'START'
+TEMPLATE;
+
+    private const string COLLECTION_TYPE_TEMPLATE = <<<'TEMPLATE'
   %s:
     collectionType: %s
-START;
 
-    private const string DATE_TIME_TYPE_TEMPLATE = <<<'START'
+TEMPLATE;
+
+    private const string DATE_TIME_TYPE_TEMPLATE = <<<'TEMPLATE'
   %s:
     dateTimeType: %s
-START;
+
+TEMPLATE;
 
     public function renderSchema(): string
     {
@@ -43,10 +47,9 @@ public function renderSchema(): string
 
     public function renderDefinitionContent(DefinitionContentTransfer $contentTransfer): string
     {
-        $content = sprintf(self::CLASS_TEMPLATE, $contentTransfer->className, $contentTransfer->className) . PHP_EOL;
+        $content = sprintf(self::CLASS_TEMPLATE, $contentTransfer->className);
         foreach ($contentTransfer->properties as $propertyTransfer) {
             $content .= $this->renderProperty($propertyTransfer);
-            $content .= PHP_EOL;
         }
 
         $content .= PHP_EOL;
@@ -61,22 +64,16 @@ private function renderProperty(DefinitionPropertyTransfer $propertyTransfer): s
     {
         return match (true) {
             $propertyTransfer->buildInType !== null
-                => $this->renderType($propertyTransfer->propertyName, $propertyTransfer->buildInType->value),
+                => $this->renderBuildInType($propertyTransfer),
 
             $propertyTransfer->transferType !== null
-                => $this->renderType($propertyTransfer->propertyName, $propertyTransfer->transferType->name),
+                => $this->renderTransferType($propertyTransfer),
 
             $propertyTransfer->collectionType !== null
-                => $this->renderCollectionType(
-                    $propertyTransfer->propertyName,
-                    $propertyTransfer->collectionType->name,
-                ),
+                => $this->renderCollectionType($propertyTransfer),
 
             $propertyTransfer->dateTimeType !== null
-                => $this->renderDateTimeType(
-                    $propertyTransfer->propertyName,
-                    $propertyTransfer->dateTimeType->name,
-                ),
+                => $this->renderDateTimeType($propertyTransfer),
 
             default => $this->renderDefault($propertyTransfer),
         };
@@ -95,18 +92,39 @@ private function renderDefault(DefinitionPropertyTransfer $propertyTransfer): ne
         );
     }
 
-    private function renderDateTimeType(string $propertyName, string $typeName): string
+    private function renderDateTimeType(DefinitionPropertyTransfer $propertyTransfer): string
     {
-        return sprintf(self::DATE_TIME_TYPE_TEMPLATE, $propertyName, $typeName);
+        return sprintf(
+            self::DATE_TIME_TYPE_TEMPLATE,
+            $propertyTransfer->propertyName,
+            $propertyTransfer->dateTimeType?->name ?: '',
+        );
     }
 
-    private function renderCollectionType(string $propertyName, string $typeName): string
+    private function renderCollectionType(DefinitionPropertyTransfer $propertyTransfer): string
     {
-        return sprintf(self::COLLECTION_TYPE_TEMPLATE, $propertyName, $typeName);
+        return sprintf(
+            self::COLLECTION_TYPE_TEMPLATE,
+            $propertyTransfer->propertyName,
+            $propertyTransfer->collectionType?->name ?: '',
+        );
     }
 
-    private function renderType(string $propertyName, string $typeName): string
+    private function renderTransferType(DefinitionPropertyTransfer $propertyTransfer): string
     {
-        return sprintf(self::TYPE_TEMPLATE, $propertyName, $typeName);
+        return sprintf(
+            self::TYPE_TEMPLATE,
+            $propertyTransfer->propertyName,
+            $propertyTransfer->transferType?->name ?: '',
+        );
+    }
+
+    private function renderBuildInType(DefinitionPropertyTransfer $propertyTransfer): string
+    {
+        return sprintf(
+            self::TYPE_TEMPLATE,
+            $propertyTransfer->propertyName,
+            $propertyTransfer->buildInType?->value ?: '',
+        );
     }
 }
diff --git a/src/Shared/Filesystem/FileReader.php b/src/Shared/Filesystem/FileReader.php
index b8d6425e..781e5c53 100644
--- a/src/Shared/Filesystem/FileReader.php
+++ b/src/Shared/Filesystem/FileReader.php
@@ -81,6 +81,7 @@ private function getFile(string $filename)
 
         return $file;
     }
+
     /**
      * @return false|resource
      */

From 1e620307e7ceff2c621f8699433b628d670c4630 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 6 Sep 2025 23:22:57 +0200
Subject: [PATCH 05/35] Minor optimization and code style change

---
 .../Definition/Parser/ContentBuilder.php                 | 4 ++--
 .../Definition/Parser/Filter/PropertyFilterTrait.php     | 2 +-
 .../Content/Property/CollectionTypePropertyValidator.php | 9 +++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/TransferGenerator/Definition/Parser/ContentBuilder.php b/src/TransferGenerator/Definition/Parser/ContentBuilder.php
index 1a1e28ce..0efdb107 100644
--- a/src/TransferGenerator/Definition/Parser/ContentBuilder.php
+++ b/src/TransferGenerator/Definition/Parser/ContentBuilder.php
@@ -11,7 +11,7 @@
 
 readonly class ContentBuilder implements ContentBuilderInterface
 {
-    private const TypeSuffixEnum CLASS_SUFFIX = TypeSuffixEnum::TRANSFER;
+    private const TypeSuffixEnum TYPE_SUFFIX = TypeSuffixEnum::TRANSFER;
 
     public function __construct(
         private PropertyExpanderInterface $propertyExpander,
@@ -21,7 +21,7 @@ public function __construct(
     public function createContentTransfer(string $className, array $properties): DefinitionContentTransfer
     {
         $contentTransfer = new DefinitionContentTransfer();
-        $contentTransfer->className = self::CLASS_SUFFIX->getClassName($className);
+        $contentTransfer->className = self::TYPE_SUFFIX->getClassName($className);
 
         foreach ($properties as $propertyName => $propertyType) {
             $contentTransfer->properties[] = $this->createPropertyTransfer((string)$propertyName, $propertyType);
diff --git a/src/TransferGenerator/Definition/Parser/Filter/PropertyFilterTrait.php b/src/TransferGenerator/Definition/Parser/Filter/PropertyFilterTrait.php
index f8bd33f4..d9034ec3 100644
--- a/src/TransferGenerator/Definition/Parser/Filter/PropertyFilterTrait.php
+++ b/src/TransferGenerator/Definition/Parser/Filter/PropertyFilterTrait.php
@@ -36,7 +36,7 @@ private function filterPropertyType(mixed $propertyType): array
 
         $filteredType = [];
         foreach ($propertyType as $key => $typeItem) {
-            if (!is_string($key)) {
+            if (is_int($key)) {
                 continue;
             }
 
diff --git a/src/TransferGenerator/Definition/Validator/Content/Property/CollectionTypePropertyValidator.php b/src/TransferGenerator/Definition/Validator/Content/Property/CollectionTypePropertyValidator.php
index c3a64fa4..ce5b5ca7 100644
--- a/src/TransferGenerator/Definition/Validator/Content/Property/CollectionTypePropertyValidator.php
+++ b/src/TransferGenerator/Definition/Validator/Content/Property/CollectionTypePropertyValidator.php
@@ -8,15 +8,12 @@
 use Picamator\TransferObject\Generated\ValidatorMessageTransfer;
 use Picamator\TransferObject\Shared\Validator\ClassNameValidatorInterface;
 use Picamator\TransferObject\Shared\Validator\NamespaceValidatorInterface;
-use Picamator\TransferObject\Shared\Validator\ValidatorMessageTrait;
 
-class CollectionTypePropertyValidator implements PropertyValidatorInterface
+readonly class CollectionTypePropertyValidator implements PropertyValidatorInterface
 {
-    use ValidatorMessageTrait;
-
     public function __construct(
-        private readonly ClassNameValidatorInterface $classNameValidator,
-        private readonly NamespaceValidatorInterface $namespaceValidator,
+        private ClassNameValidatorInterface $classNameValidator,
+        private NamespaceValidatorInterface $namespaceValidator,
     ) {
     }
 

From 89e1a7e216f82887ead03d1b733b5d5c5da3c5e9 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 6 Sep 2025 23:27:56 +0200
Subject: [PATCH 06/35] Upgraded composer dependencies

---
 composer.lock | 88 +++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/composer.lock b/composer.lock
index 509ceb66..b49b7183 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1423,16 +1423,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "2.2.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8"
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/b9e61a61e39e02dd90944e9115241c7f7e76bfd8",
-                "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495",
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495",
                 "shasum": ""
             },
             "require": {
@@ -1464,9 +1464,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.2.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0"
             },
-            "time": "2025-07-13T07:04:09+00:00"
+            "time": "2025-08-30T15:50:23+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -1576,34 +1576,34 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "12.3.4",
+            "version": "12.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "7ad0e9bdc72b147600badccd694a2e57ffc9297a"
+                "reference": "da2cdaff87220fa641e7652364281b736e4347e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7ad0e9bdc72b147600badccd694a2e57ffc9297a",
-                "reference": "7ad0e9bdc72b147600badccd694a2e57ffc9297a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/da2cdaff87220fa641e7652364281b736e4347e0",
+                "reference": "da2cdaff87220fa641e7652364281b736e4347e0",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^5.4.0",
+                "nikic/php-parser": "^5.6.1",
                 "php": ">=8.3",
                 "phpunit/php-file-iterator": "^6.0",
                 "phpunit/php-text-template": "^5.0",
                 "sebastian/complexity": "^5.0",
-                "sebastian/environment": "^8.0",
+                "sebastian/environment": "^8.0.3",
                 "sebastian/lines-of-code": "^4.0",
                 "sebastian/version": "^6.0",
                 "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.1"
+                "phpunit/phpunit": "^12.3.7"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -1641,7 +1641,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.4"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.6"
             },
             "funding": [
                 {
@@ -1661,7 +1661,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-29T11:32:44+00:00"
+            "time": "2025-09-02T05:23:14+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1910,16 +1910,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.3.7",
+            "version": "12.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b8fa997c49682979ad6bfaa0d7fb25f54954965e"
+                "reference": "9d68c1b41fc21aac106c71cde4669fe7b99fca10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b8fa997c49682979ad6bfaa0d7fb25f54954965e",
-                "reference": "b8fa997c49682979ad6bfaa0d7fb25f54954965e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9d68c1b41fc21aac106c71cde4669fe7b99fca10",
+                "reference": "9d68c1b41fc21aac106c71cde4669fe7b99fca10",
                 "shasum": ""
             },
             "require": {
@@ -1933,7 +1933,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.3.3",
+                "phpunit/php-code-coverage": "^12.3.6",
                 "phpunit/php-file-iterator": "^6.0.0",
                 "phpunit/php-invoker": "^6.0.0",
                 "phpunit/php-text-template": "^5.0.0",
@@ -1943,7 +1943,7 @@
                 "sebastian/diff": "^7.0.0",
                 "sebastian/environment": "^8.0.3",
                 "sebastian/exporter": "^7.0.0",
-                "sebastian/global-state": "^8.0.0",
+                "sebastian/global-state": "^8.0.2",
                 "sebastian/object-enumerator": "^7.0.0",
                 "sebastian/type": "^6.0.3",
                 "sebastian/version": "^6.0.0",
@@ -1987,7 +1987,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.7"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.8"
             },
             "funding": [
                 {
@@ -2011,7 +2011,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-28T05:15:46+00:00"
+            "time": "2025-09-03T06:25:17+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -3002,16 +3002,16 @@
         },
         {
             "name": "sebastianfeldmann/git",
-            "version": "3.14.3",
+            "version": "3.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianfeldmann/git.git",
-                "reference": "22584df8df01d95b0700000cfd855779fae7d8ea"
+                "reference": "90cb5a32f54dbb0d7dcd87d02e664ec2b50c0c96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianfeldmann/git/zipball/22584df8df01d95b0700000cfd855779fae7d8ea",
-                "reference": "22584df8df01d95b0700000cfd855779fae7d8ea",
+                "url": "https://api.github.com/repos/sebastianfeldmann/git/zipball/90cb5a32f54dbb0d7dcd87d02e664ec2b50c0c96",
+                "reference": "90cb5a32f54dbb0d7dcd87d02e664ec2b50c0c96",
                 "shasum": ""
             },
             "require": {
@@ -3052,7 +3052,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianfeldmann/git/issues",
-                "source": "https://github.com/sebastianfeldmann/git/tree/3.14.3"
+                "source": "https://github.com/sebastianfeldmann/git/tree/3.15.1"
             },
             "funding": [
                 {
@@ -3060,36 +3060,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-05T16:05:10+00:00"
+            "time": "2025-09-05T08:07:09+00:00"
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.20.0",
+            "version": "8.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "b4f9f02edd4e6a586777f0cabe8d05574323f3eb"
+                "reference": "a4cef983bad2e70125612d22b2f6e2bd1333d5c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b4f9f02edd4e6a586777f0cabe8d05574323f3eb",
-                "reference": "b4f9f02edd4e6a586777f0cabe8d05574323f3eb",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/a4cef983bad2e70125612d22b2f6e2bd1333d5c2",
+                "reference": "a4cef983bad2e70125612d22b2f6e2bd1333d5c2",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.1.2",
                 "php": "^7.4 || ^8.0",
-                "phpstan/phpdoc-parser": "^2.2.0",
-                "squizlabs/php_codesniffer": "^3.13.2"
+                "phpstan/phpdoc-parser": "^2.3.0",
+                "squizlabs/php_codesniffer": "^3.13.4"
             },
             "require-dev": {
                 "phing/phing": "3.0.1|3.1.0",
                 "php-parallel-lint/php-parallel-lint": "1.4.0",
-                "phpstan/phpstan": "2.1.19",
+                "phpstan/phpstan": "2.1.22",
                 "phpstan/phpstan-deprecation-rules": "2.0.3",
                 "phpstan/phpstan-phpunit": "2.0.7",
                 "phpstan/phpstan-strict-rules": "2.0.6",
-                "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.27|12.2.7"
+                "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.3.8"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -3113,7 +3113,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.20.0"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.22.0"
             },
             "funding": [
                 {
@@ -3125,20 +3125,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-26T15:35:10+00:00"
+            "time": "2025-09-06T09:14:48+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.2",
+            "version": "3.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c"
+                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c",
-                "reference": "5b5e3821314f947dd040c70f7992a64eac89025c",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
+                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
                 "shasum": ""
             },
             "require": {
@@ -3209,7 +3209,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-06-17T22:17:01+00:00"
+            "time": "2025-09-05T05:47:09+00:00"
         },
         {
             "name": "staabm/side-effects-detector",

From 1d4638f060248f2db9b63815d37634108015f455 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 13:18:13 +0200
Subject: [PATCH 07/35] Optimized abstract transfer constant reflection for
 initial and array transformation

---
 src/Transfer/AbstractTransfer.php       | 25 ++++++++---
 src/Transfer/ConstantAttributeTrait.php | 57 ++++++++++++++++++-------
 2 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/src/Transfer/AbstractTransfer.php b/src/Transfer/AbstractTransfer.php
index 1d6eeeca..43838921 100644
--- a/src/Transfer/AbstractTransfer.php
+++ b/src/Transfer/AbstractTransfer.php
@@ -94,11 +94,16 @@ final public function __clone(): void
     final public function toArray(): array
     {
         $data = [];
+        $attributes = $this->getTypeAttributes();
+
         foreach (static::META_DATA as $metaKey => $metaName) {
-            $dataItem = $this->{$metaKey};
-            $attribute = $this->getConstantAttribute($metaName);
+            if (isset($attributes[$metaName])) {
+                $data[$metaKey] = $attributes[$metaName]->toArray($this->{$metaKey});
+
+                continue;
+            }
 
-            $data[$metaKey] = $attribute !== null ? $attribute->toArray($dataItem) : $dataItem;
+            $data[$metaKey] = $this->{$metaKey};
         }
 
         return $data;
@@ -119,13 +124,19 @@ final public function fromArray(array $data): static
             return $this;
         }
 
+        $attributes = $this->getTypeAttributes();
         foreach (static::META_DATA as $metaKey => $metaName) {
             if (!isset($data[$metaKey])) {
                 continue;
             }
 
-            $attribute = $this->getConstantAttribute($metaName);
-            $this->{$metaKey} = $attribute !== null ? $attribute->fromArray($data[$metaKey]) : $data[$metaKey];
+            if (isset($attributes[$metaName])) {
+                $this->{$metaKey} = $attributes[$metaName]->fromArray($data[$metaKey]);
+
+                continue;
+            }
+
+            $this->{$metaKey} = $data[$metaKey];
         }
 
         return $this;
@@ -145,10 +156,10 @@ private function initData(): void
     {
         $this->_data = new SplFixedArray(static::META_DATA_SIZE);
 
-        foreach (static::META_DATA as $metaName) {
+        foreach ($this->getInitialAttributes() as $metaName => $attribute) {
             $metaIndex = $metaName . self::DATA_INDEX_SUFFIX;
             // @phpstan-ignore offsetAssign.dimType
-            $this->_data[static::{$metaIndex}] = $this->getConstantInitialAttribute($metaName)?->getInitialValue();
+            $this->_data[static::{$metaIndex}] = $attribute->getInitialValue();
         }
     }
 }
diff --git a/src/Transfer/ConstantAttributeTrait.php b/src/Transfer/ConstantAttributeTrait.php
index 83357fad..b17ec040 100644
--- a/src/Transfer/ConstantAttributeTrait.php
+++ b/src/Transfer/ConstantAttributeTrait.php
@@ -4,36 +4,61 @@
 
 namespace Picamator\TransferObject\Transfer;
 
+use Generator;
 use Picamator\TransferObject\Transfer\Attribute\InitialPropertyTypeAttributeInterface;
 use Picamator\TransferObject\Transfer\Attribute\PropertyTypeAttributeInterface;
 use ReflectionAttribute;
+use ReflectionClass;
 use ReflectionClassConstant;
 
 trait ConstantAttributeTrait
 {
-    final protected function getConstantAttribute(string $constantName): ?PropertyTypeAttributeInterface
+    /**
+     * @return array<string, \Picamator\TransferObject\Transfer\Attribute\PropertyTypeAttributeInterface>
+     */
+    final protected function getTypeAttributes(): array
     {
-        $reflection = new ReflectionClassConstant($this, $constantName);
-        $attributeReflections = $reflection->getAttributes(
-            name: PropertyTypeAttributeInterface::class,
-            flags: ReflectionAttribute::IS_INSTANCEOF
-        );
+        $typeAttributes = [];
+        foreach ($this->getReflectionConstants() as $reflectionConstant) {
+            $attributeReflections = $reflectionConstant->getAttributes(
+                name: PropertyTypeAttributeInterface::class,
+                flags: ReflectionAttribute::IS_INSTANCEOF,
+            );
 
-        $attributeReflection = $attributeReflections[0] ?? null;
+            if (!isset($attributeReflections[0])) {
+                continue;
+            }
 
-        return $attributeReflection?->newInstance();
+            $typeAttributes[$reflectionConstant->getName()] = $attributeReflections[0]->newInstance();
+        }
+
+        return $typeAttributes;
     }
 
-    final protected function getConstantInitialAttribute(string $constantName): ?InitialPropertyTypeAttributeInterface
+    /**
+     * @return Generator<string, \Picamator\TransferObject\Transfer\Attribute\InitialPropertyTypeAttributeInterface>
+     */
+    final protected function getInitialAttributes(): Generator
     {
-        $reflection = new ReflectionClassConstant($this, $constantName);
-        $attributeReflections = $reflection->getAttributes(
-            name: InitialPropertyTypeAttributeInterface::class,
-            flags: ReflectionAttribute::IS_INSTANCEOF
-        );
+        foreach ($this->getReflectionConstants() as $reflectionConstant) {
+            $attributeReflections = $reflectionConstant->getAttributes(
+                name: InitialPropertyTypeAttributeInterface::class,
+                flags: ReflectionAttribute::IS_INSTANCEOF,
+            );
+
+            if (!isset($attributeReflections[0])) {
+                continue;
+            }
 
-        $attributeReflection = $attributeReflections[0] ?? null;
+            yield $reflectionConstant->getName() => $attributeReflections[0]->newInstance();
+        }
+    }
 
-        return $attributeReflection?->newInstance();
+    /**
+     * @return array<int, \ReflectionClassConstant>
+     */
+    private function getReflectionConstants(): array
+    {
+        return new ReflectionClass($this)->getReflectionConstants(ReflectionClassConstant::IS_PUBLIC);
     }
 }

From 404f27c4badd64414551d22d49d154aaac4fbb53 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 14:34:47 +0200
Subject: [PATCH 08/35] Refactored transfer generator render expanders: unified
 code style, removed null checks

---
 .../Expander/BuildInTypeTemplateExpander.php  | 15 +++++++-------
 .../CollectionTypeTemplateExpander.php        | 20 ++++++++++---------
 .../Expander/DateTimeTypeTemplateExpander.php | 17 ++++++++--------
 .../Expander/EnumTypeTemplateExpander.php     | 18 +++++++++--------
 .../Expander/NamespaceTemplateExpander.php    |  3 ++-
 .../Expander/NumberTypeTemplateExpander.php   | 17 ++++++++--------
 .../Expander/ProtectedTemplateExpander.php    |  3 +--
 .../Expander/TransferTypeTemplateExpander.php | 12 +++++++----
 8 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
index 61e7ac30..21c40a63 100644
--- a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
@@ -22,17 +22,20 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
+        /** @var \Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum $buildInTypeEnum */
+        $buildInTypeEnum = $propertyTransfer->buildInType;
+
         $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->properties[$propertyName] = $propertyTransfer->buildInType?->value;
+        $templateTransfer->properties[$propertyName] = $buildInTypeEnum->value;
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
 
-        if ($propertyTransfer->buildInType?->isArrayObject()) {
+        if ($buildInTypeEnum->isArrayObject()) {
             $this->expandArrayObjectType($propertyTransfer, $templateTransfer);
 
             return;
         }
 
-        if ($propertyTransfer->buildInType?->isArray()) {
+        if ($buildInTypeEnum->isArray()) {
             $this->expandArrayType($propertyTransfer, $templateTransfer);
         }
     }
@@ -41,11 +44,10 @@ private function expandArrayType(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $propertyName = $propertyTransfer->propertyName;
-
         $templateTransfer->imports[AttributeEnum::ARRAY_TYPE_ATTRIBUTE->value]
             ??= AttributeEnum::ARRAY_TYPE_ATTRIBUTE->value;
 
+        $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->attributes[$propertyName] = AttributeTemplateEnum::ARRAY_TYPE_ATTRIBUTE->value;
         $templateTransfer->dockBlocks[$propertyName] = DockBlockTemplateEnum::ARRAY->value;
         $templateTransfer->nullables[$propertyName] = false;
@@ -55,12 +57,11 @@ private function expandArrayObjectType(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $propertyName = $propertyTransfer->propertyName;
-
         $templateTransfer->imports[BuildInTypeEnum::ARRAY_OBJECT->value] ??= BuildInTypeEnum::ARRAY_OBJECT->value;
         $templateTransfer->imports[AttributeEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE->value]
             ??= AttributeEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE->value;
 
+        $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->attributes[$propertyName] = AttributeTemplateEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE->value;
         $templateTransfer->dockBlocks[$propertyName] = DockBlockTemplateEnum::ARRAY_OBJECT->value;
         $templateTransfer->nullables[$propertyName] = false;
diff --git a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
index 149de1fb..01c4c005 100644
--- a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
@@ -28,17 +29,20 @@ protected function handleExpander(
         $templateTransfer->imports[AttributeEnum::COLLECTION_TYPE_ATTRIBUTE->value]
             ??= AttributeEnum::COLLECTION_TYPE_ATTRIBUTE->value;
 
+        /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
+        $embeddedTypeTransfer = $propertyTransfer->collectionType;
+
         $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->properties[$propertyName] = BuildInTypeEnum::ARRAY_OBJECT->value;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($propertyTransfer);
-        $templateTransfer->dockBlocks[$propertyName] = $this->getPropertyDockBlock($propertyTransfer);
+        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
+        $templateTransfer->dockBlocks[$propertyName] = $this->getPropertyDockBlock($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = false;
     }
 
-    private function getPropertyDockBlock(DefinitionPropertyTransfer $propertyTransfer): string
+    private function getPropertyDockBlock(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        $propertyType = $propertyTransfer->collectionType?->name ?: '';
-        $namespaceTransfer = $propertyTransfer->collectionType?->namespace;
+        $propertyType = $embeddedTypeTransfer->name;
+        $namespaceTransfer = $embeddedTypeTransfer->namespace;
 
         if ($namespaceTransfer !== null) {
             $propertyType = $this->enforceTransferInterface($propertyType);
@@ -47,10 +51,8 @@ private function getPropertyDockBlock(DefinitionPropertyTransfer $propertyTransf
         return sprintf(DockBlockTemplateEnum::COLLECTION->value, $propertyType);
     }
 
-    private function getPropertyAttribute(DefinitionPropertyTransfer $propertyTransfer): string
+    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        $transferType = $propertyTransfer->collectionType?->name ?: '';
-
-        return sprintf(AttributeTemplateEnum::COLLECTION_TYPE_ATTRIBUTE->value, $transferType);
+        return sprintf(AttributeTemplateEnum::COLLECTION_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
index 53275ca6..fe3ea577 100644
--- a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
@@ -23,20 +24,20 @@ protected function handleExpander(
         $templateTransfer->imports[AttributeEnum::DATE_TIME_TYPE_ATTRIBUTE->value]
             ??= AttributeEnum::DATE_TIME_TYPE_ATTRIBUTE->value;
 
-        $importDateTime = $propertyTransfer->dateTimeType?->namespace?->fullName ?: '';
+        /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
+        $embeddedTypeTransfer = $propertyTransfer->dateTimeType;
 
-        $templateTransfer->imports[$importDateTime] ??= $importDateTime;
+        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
+        $templateTransfer->imports[$className] ??= $className;
 
         $propertyName = $propertyTransfer->propertyName;
-        $dateTimeClassName = $propertyTransfer->dateTimeType?->name ?: '';
-
-        $templateTransfer->properties[$propertyName] = $dateTimeClassName;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($dateTimeClassName);
+        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
+        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
     }
 
-    private function getPropertyAttribute(string $dateTimeClassName): string
+    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        return sprintf(AttributeTemplateEnum::DATE_TIME_TYPE_ATTRIBUTE->value, $dateTimeClassName);
+        return sprintf(AttributeTemplateEnum::DATE_TIME_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
index e8fcfa6c..fecc0aef 100644
--- a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
@@ -23,19 +24,20 @@ protected function handleExpander(
         $templateTransfer->imports[AttributeEnum::ENUM_TYPE_ATTRIBUTE->value]
             ??= AttributeEnum::ENUM_TYPE_ATTRIBUTE->value;
 
-        $importEnum = $propertyTransfer->enumType?->namespace?->fullName ?: '';
-        $templateTransfer->imports[$importEnum] ??= $importEnum;
+        /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
+        $embeddedTypeTransfer = $propertyTransfer->enumType;
 
-        $propertyName = $propertyTransfer->propertyName;
-        $enumClassName = $propertyTransfer->enumType?->name ?: '';
+        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
+        $templateTransfer->imports[$className] ??= $className;
 
-        $templateTransfer->properties[$propertyName] = $enumClassName;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($enumClassName);
+        $propertyName = $propertyTransfer->propertyName;
+        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
+        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
     }
 
-    private function getPropertyAttribute(string $enumClassName): string
+    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        return sprintf(AttributeTemplateEnum::ENUM_TYPE_ATTRIBUTE->value, $enumClassName);
+        return sprintf(AttributeTemplateEnum::ENUM_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
index 6d69ba11..84fd53fc 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
@@ -20,8 +20,9 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
+        /** @var \Picamator\TransferObject\Generated\DefinitionNamespaceTransfer $namespaceTransfer */
         $namespaceTransfer = $this->getNamespaceTransfer($propertyTransfer);
-        $namespace = $namespaceTransfer?->fullName ?: '';
+        $namespace = $namespaceTransfer->fullName;
 
         $templateTransfer->imports[$namespace] ??= $namespace;
         $templateTransfer->imports[TransferEnum::INTERFACE->value] ??= TransferEnum::INTERFACE->value;
diff --git a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
index 01ea58ca..5540bd32 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
@@ -23,20 +24,20 @@ protected function handleExpander(
         $templateTransfer->imports[AttributeEnum::NUMBER_TYPE_ATTRIBUTE->value]
             ??= AttributeEnum::NUMBER_TYPE_ATTRIBUTE->value;
 
-        $importNumber = $propertyTransfer->numberType?->namespace?->fullName ?: '';
+        /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
+        $embeddedTypeTransfer = $propertyTransfer->numberType;
 
-        $templateTransfer->imports[$importNumber] ??= $importNumber;
+        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
+        $templateTransfer->imports[$className] ??= $className;
 
         $propertyName = $propertyTransfer->propertyName;
-        $numberClassName = $propertyTransfer->numberType?->name ?: '';
-
-        $templateTransfer->properties[$propertyName] = $numberClassName;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($numberClassName);
+        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
+        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
     }
 
-    private function getPropertyAttribute(string $numberClassName): string
+    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        return sprintf(AttributeTemplateEnum::NUMBER_TYPE_ATTRIBUTE->value, $numberClassName);
+        return sprintf(AttributeTemplateEnum::NUMBER_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
index ffbd235f..81e9f7a2 100644
--- a/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
@@ -21,7 +21,6 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->protects[$propertyName] = $propertyTransfer->isProtected;
+        $templateTransfer->protects[$propertyTransfer->propertyName] = $propertyTransfer->isProtected;
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
index c7416bfe..988d1705 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
@@ -24,8 +25,11 @@ protected function handleExpander(
     ): void {
         $templateTransfer->imports[AttributeEnum::TYPE_ATTRIBUTE->value] ??= AttributeEnum::TYPE_ATTRIBUTE->value;
 
+        /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
+        $embeddedTypeTransfer = $propertyTransfer->transferType;
         $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->properties[$propertyName] = $this->getPropertyType($propertyTransfer);
+
+        $templateTransfer->properties[$propertyName] = $this->getPropertyType($embeddedTypeTransfer);
         $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($propertyTransfer);
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
     }
@@ -37,10 +41,10 @@ private function getPropertyAttribute(DefinitionPropertyTransfer $propertyTransf
         return sprintf(AttributeTemplateEnum::TYPE_ATTRIBUTE->value, $transferType);
     }
 
-    private function getPropertyType(DefinitionPropertyTransfer $propertyTransfer): string
+    private function getPropertyType(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        $propertyType = $propertyTransfer->transferType?->name ?: '';
-        $namespaceTransfer = $propertyTransfer->transferType?->namespace;
+        $propertyType = $embeddedTypeTransfer->name;
+        $namespaceTransfer = $embeddedTypeTransfer->namespace;
 
         if ($namespaceTransfer === null) {
             return $propertyType;

From 861ebf07addeb5b8a8bfc69c8685ae6e9e57097a Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 15:23:11 +0200
Subject: [PATCH 09/35] Refactored transfer generator render expanders: removed
 code duplication

---
 .../Expander/BuildInTypeTemplateExpander.php  | 10 +++----
 .../CollectionTypeTemplateExpander.php        |  5 ++--
 .../Expander/DateTimeTypeTemplateExpander.php | 15 +++++------
 .../Expander/EnumTypeTemplateExpander.php     | 15 +++++------
 .../Expander/NamespaceTemplateExpander.php    |  6 +++--
 .../Expander/NumberTypeTemplateExpander.php   | 15 +++++------
 .../Render/Expander/TemplateExpanderTrait.php | 27 +++++++++++++++++++
 .../Expander/TransferTypeTemplateExpander.php | 12 ++++-----
 8 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
index 21c40a63..584edeab 100644
--- a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
@@ -13,6 +13,8 @@
 
 final class BuildInTypeTemplateExpander extends AbstractTemplateExpander
 {
+    use TemplateExpanderTrait;
+
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->buildInType !== null;
@@ -44,8 +46,7 @@ private function expandArrayType(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[AttributeEnum::ARRAY_TYPE_ATTRIBUTE->value]
-            ??= AttributeEnum::ARRAY_TYPE_ATTRIBUTE->value;
+        $this->expandImports(AttributeEnum::ARRAY_TYPE_ATTRIBUTE, $templateTransfer);
 
         $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->attributes[$propertyName] = AttributeTemplateEnum::ARRAY_TYPE_ATTRIBUTE->value;
@@ -57,9 +58,8 @@ private function expandArrayObjectType(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[BuildInTypeEnum::ARRAY_OBJECT->value] ??= BuildInTypeEnum::ARRAY_OBJECT->value;
-        $templateTransfer->imports[AttributeEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE->value]
-            ??= AttributeEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE->value;
+        $this->expandImports(BuildInTypeEnum::ARRAY_OBJECT, $templateTransfer);
+        $this->expandImports(AttributeEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE, $templateTransfer);
 
         $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->attributes[$propertyName] = AttributeTemplateEnum::ARRAY_OBJECT_TYPE_ATTRIBUTE->value;
diff --git a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
index 01c4c005..1c53c694 100644
--- a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
@@ -25,9 +25,8 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[BuildInTypeEnum::ARRAY_OBJECT->value] ??= BuildInTypeEnum::ARRAY_OBJECT->value;
-        $templateTransfer->imports[AttributeEnum::COLLECTION_TYPE_ATTRIBUTE->value]
-            ??= AttributeEnum::COLLECTION_TYPE_ATTRIBUTE->value;
+        $this->expandImports(BuildInTypeEnum::ARRAY_OBJECT, $templateTransfer);
+        $this->expandImports(AttributeEnum::COLLECTION_TYPE_ATTRIBUTE, $templateTransfer);
 
         /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
         $embeddedTypeTransfer = $propertyTransfer->collectionType;
diff --git a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
index fe3ea577..28b7f6fa 100644
--- a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
@@ -12,6 +12,8 @@
 
 final class DateTimeTypeTemplateExpander extends AbstractTemplateExpander
 {
+    use TemplateExpanderTrait;
+
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->dateTimeType !== null;
@@ -21,19 +23,14 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[AttributeEnum::DATE_TIME_TYPE_ATTRIBUTE->value]
-            ??= AttributeEnum::DATE_TIME_TYPE_ATTRIBUTE->value;
+        $this->expandImports(AttributeEnum::DATE_TIME_TYPE_ATTRIBUTE, $templateTransfer);
 
         /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
         $embeddedTypeTransfer = $propertyTransfer->dateTimeType;
+        $this->expandEmbeddedType($propertyTransfer, $embeddedTypeTransfer, $templateTransfer);
 
-        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
-        $templateTransfer->imports[$className] ??= $className;
-
-        $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
-        $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
+        $templateTransfer->attributes[$propertyTransfer->propertyName]
+            = $this->getPropertyAttribute($embeddedTypeTransfer);
     }
 
     private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
diff --git a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
index fecc0aef..0500cdd6 100644
--- a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
@@ -12,6 +12,8 @@
 
 final class EnumTypeTemplateExpander extends AbstractTemplateExpander
 {
+    use TemplateExpanderTrait;
+
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->enumType !== null;
@@ -21,19 +23,14 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[AttributeEnum::ENUM_TYPE_ATTRIBUTE->value]
-            ??= AttributeEnum::ENUM_TYPE_ATTRIBUTE->value;
+        $this->expandImports(AttributeEnum::ENUM_TYPE_ATTRIBUTE, $templateTransfer);
 
         /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
         $embeddedTypeTransfer = $propertyTransfer->enumType;
+        $this->expandEmbeddedType($propertyTransfer, $embeddedTypeTransfer, $templateTransfer);
 
-        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
-        $templateTransfer->imports[$className] ??= $className;
-
-        $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
-        $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
+        $templateTransfer->attributes[$propertyTransfer->propertyName]
+            = $this->getPropertyAttribute($embeddedTypeTransfer);
     }
 
     private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
diff --git a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
index 84fd53fc..8cd6b78c 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
@@ -11,6 +11,8 @@
 
 final class NamespaceTemplateExpander extends AbstractTemplateExpander
 {
+    use TemplateExpanderTrait;
+
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $this->getNamespaceTransfer($propertyTransfer) !== null;
@@ -24,8 +26,8 @@ protected function handleExpander(
         $namespaceTransfer = $this->getNamespaceTransfer($propertyTransfer);
         $namespace = $namespaceTransfer->fullName;
 
-        $templateTransfer->imports[$namespace] ??= $namespace;
-        $templateTransfer->imports[TransferEnum::INTERFACE->value] ??= TransferEnum::INTERFACE->value;
+        $this->expandImports($namespace, $templateTransfer);
+        $this->expandImports(TransferEnum::INTERFACE, $templateTransfer);
     }
 
     private function getNamespaceTransfer(DefinitionPropertyTransfer $propertyTransfer): ?DefinitionNamespaceTransfer
diff --git a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
index 5540bd32..262fb582 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
@@ -12,6 +12,8 @@
 
 final class NumberTypeTemplateExpander extends AbstractTemplateExpander
 {
+    use TemplateExpanderTrait;
+
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->numberType !== null;
@@ -21,19 +23,14 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[AttributeEnum::NUMBER_TYPE_ATTRIBUTE->value]
-            ??= AttributeEnum::NUMBER_TYPE_ATTRIBUTE->value;
+        $this->expandImports(AttributeEnum::NUMBER_TYPE_ATTRIBUTE, $templateTransfer);
 
         /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
         $embeddedTypeTransfer = $propertyTransfer->numberType;
+        $this->expandEmbeddedType($propertyTransfer, $embeddedTypeTransfer, $templateTransfer);
 
-        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
-        $templateTransfer->imports[$className] ??= $className;
-
-        $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
-        $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
+        $templateTransfer->attributes[$propertyTransfer->propertyName]
+            = $this->getPropertyAttribute($embeddedTypeTransfer);
     }
 
     private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
diff --git a/src/TransferGenerator/Generator/Render/Expander/TemplateExpanderTrait.php b/src/TransferGenerator/Generator/Render/Expander/TemplateExpanderTrait.php
index ed0d9280..c5836e6f 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TemplateExpanderTrait.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TemplateExpanderTrait.php
@@ -4,10 +4,37 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use BackedEnum;
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
+use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
+use Picamator\TransferObject\Generated\TemplateTransfer;
+
 trait TemplateExpanderTrait
 {
     final protected function enforceTransferInterface(string $propertyType): string
     {
         return 'TransferInterface&' . $propertyType;
     }
+
+    final protected function expandImports(string|BackedEnum $className, TemplateTransfer $templateTransfer): void
+    {
+        if ($className instanceof BackedEnum) {
+            $className = $className->value;
+        }
+
+        $templateTransfer->imports[$className] ??= $className;
+    }
+
+    final protected function expandEmbeddedType(
+        DefinitionPropertyTransfer $propertyTransfer,
+        DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer,
+        TemplateTransfer $templateTransfer,
+    ): void {
+        $className = $embeddedTypeTransfer->namespace?->fullName ?: '';
+        $this->expandImports($className, $templateTransfer);
+
+        $propertyName = $propertyTransfer->propertyName;
+        $templateTransfer->properties[$propertyName] = $embeddedTypeTransfer->name;
+        $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
+    }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
index 988d1705..abe010ec 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
@@ -23,22 +23,20 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        $templateTransfer->imports[AttributeEnum::TYPE_ATTRIBUTE->value] ??= AttributeEnum::TYPE_ATTRIBUTE->value;
+        $this->expandImports(AttributeEnum::TYPE_ATTRIBUTE, $templateTransfer);
 
         /** @var \Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer */
         $embeddedTypeTransfer = $propertyTransfer->transferType;
-        $propertyName = $propertyTransfer->propertyName;
 
+        $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->properties[$propertyName] = $this->getPropertyType($embeddedTypeTransfer);
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($propertyTransfer);
+        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
     }
 
-    private function getPropertyAttribute(DefinitionPropertyTransfer $propertyTransfer): string
+    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        $transferType = $propertyTransfer->transferType?->name ?: '';
-
-        return sprintf(AttributeTemplateEnum::TYPE_ATTRIBUTE->value, $transferType);
+        return sprintf(AttributeTemplateEnum::TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
     }
 
     private function getPropertyType(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string

From 1363e7d28e0eac7a982148a337112f8b27beebb6 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 15:37:05 +0200
Subject: [PATCH 10/35] Refactored transfer generator render expanders: moved
 isApplicable to the abstract class

---
 .../Render/Expander/AbstractTemplateExpander.php          | 8 +++++++-
 .../Render/Expander/BuildInTypeTemplateExpander.php       | 2 ++
 .../Render/Expander/CollectionTypeTemplateExpander.php    | 2 ++
 .../Render/Expander/DateTimeTypeTemplateExpander.php      | 2 ++
 .../Render/Expander/EnumTypeTemplateExpander.php          | 2 ++
 .../Render/Expander/MetaConstantsTemplateExpander.php     | 8 --------
 .../Render/Expander/NamespaceTemplateExpander.php         | 2 ++
 .../Render/Expander/NumberTypeTemplateExpander.php        | 2 ++
 .../Render/Expander/ProtectedTemplateExpander.php         | 8 --------
 .../Render/Expander/TransferTypeTemplateExpander.php      | 2 ++
 10 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
index e4de8a9d..5786a84b 100644
--- a/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
@@ -29,7 +29,13 @@ public function expandTemplateTransfer(
         $this->nextExpander?->expandTemplateTransfer($propertyTransfer, $templateTransfer);
     }
 
-    abstract protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool;
+    /**
+     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
+    {
+        return true;
+    }
 
     abstract protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
diff --git a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
index 584edeab..8926be99 100644
--- a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
@@ -15,6 +16,7 @@ final class BuildInTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->buildInType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
index 1c53c694..269a535b 100644
--- a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
@@ -16,6 +17,7 @@ final class CollectionTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->collectionType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
index 28b7f6fa..bf9836a9 100644
--- a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
@@ -14,6 +15,7 @@ final class DateTimeTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->dateTimeType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
index 0500cdd6..771b0ecd 100644
--- a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
@@ -14,6 +15,7 @@ final class EnumTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->enumType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php
index ac9d52f6..d6cfd5a4 100644
--- a/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php
@@ -13,14 +13,6 @@ final class MetaConstantsTemplateExpander extends AbstractTemplateExpander
 
     private const string META_CONSTANT_ONLY_UPPER_CASE_REGEX = '#^[A-Z]+$#';
 
-    /**
-     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
-     */
-    protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): true
-    {
-        return true;
-    }
-
     protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
diff --git a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
index 8cd6b78c..ad9beef1 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\Generated\DefinitionNamespaceTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
@@ -13,6 +14,7 @@ final class NamespaceTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $this->getNamespaceTransfer($propertyTransfer) !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
index 262fb582..349eb6f7 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
@@ -14,6 +15,7 @@ final class NumberTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->numberType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
index 81e9f7a2..22bd619b 100644
--- a/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
@@ -9,14 +9,6 @@
 
 final class ProtectedTemplateExpander extends AbstractTemplateExpander
 {
-    /**
-     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
-     */
-    protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): true
-    {
-        return true;
-    }
-
     protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
diff --git a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
index abe010ec..c5b68748 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
+use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
@@ -14,6 +15,7 @@ final class TransferTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
+    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->transferType !== null;

From 5a5c8ed40b0e255e188eaae61fe55d8997698e8c Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 15:46:11 +0200
Subject: [PATCH 11/35] Optimized NamespaceTemplateExpander

---
 .../Generator/Render/Expander/NamespaceTemplateExpander.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
index ad9beef1..38b93b26 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
@@ -17,7 +17,8 @@ final class NamespaceTemplateExpander extends AbstractTemplateExpander
     #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
-        return $this->getNamespaceTransfer($propertyTransfer) !== null;
+        return $propertyTransfer->transferType?->namespace !== null
+            || $propertyTransfer->collectionType?->namespace !== null;
     }
 
     protected function handleExpander(

From 1c742813dcb0749057a973665adbd9120e3ff1a3 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 16:09:46 +0200
Subject: [PATCH 12/35] Extracted AttributeTemplateEnum cases to
 AttributeEmbeddedTemplateEnum and introduced render method

---
 .../Enum/AttributeEmbeddedTemplateEnum.php    | 21 +++++++++++++++++++
 .../Generator/Enum/AttributeTemplateEnum.php  |  5 -----
 .../CollectionTypeTemplateExpander.php        | 11 ++++------
 .../Expander/DateTimeTypeTemplateExpander.php | 10 ++-------
 .../Expander/EnumTypeTemplateExpander.php     | 10 ++-------
 .../Expander/NumberTypeTemplateExpander.php   | 10 ++-------
 .../Expander/TransferTypeTemplateExpander.php |  9 +++-----
 7 files changed, 34 insertions(+), 42 deletions(-)
 create mode 100644 src/TransferGenerator/Generator/Enum/AttributeEmbeddedTemplateEnum.php

diff --git a/src/TransferGenerator/Generator/Enum/AttributeEmbeddedTemplateEnum.php b/src/TransferGenerator/Generator/Enum/AttributeEmbeddedTemplateEnum.php
new file mode 100644
index 00000000..c6772c24
--- /dev/null
+++ b/src/TransferGenerator/Generator/Enum/AttributeEmbeddedTemplateEnum.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\TransferObject\TransferGenerator\Generator\Enum;
+
+use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
+
+enum AttributeEmbeddedTemplateEnum: string
+{
+    case TYPE_ATTRIBUTE = '#[PropertyTypeAttribute(%s::class)]';
+    case COLLECTION_TYPE_ATTRIBUTE = '#[CollectionPropertyTypeAttribute(%s::class)]';
+    case ENUM_TYPE_ATTRIBUTE = '#[EnumPropertyTypeAttribute(%s::class)]';
+    case DATE_TIME_TYPE_ATTRIBUTE = '#[DateTimePropertyTypeAttribute(%s::class)]';
+    case NUMBER_TYPE_ATTRIBUTE = '#[NumberPropertyTypeAttribute(%s::class)]';
+
+    public function renderTemplate(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
+    {
+        return sprintf($this->value, $embeddedTypeTransfer->name);
+    }
+}
diff --git a/src/TransferGenerator/Generator/Enum/AttributeTemplateEnum.php b/src/TransferGenerator/Generator/Enum/AttributeTemplateEnum.php
index b0153571..7c2e21e7 100644
--- a/src/TransferGenerator/Generator/Enum/AttributeTemplateEnum.php
+++ b/src/TransferGenerator/Generator/Enum/AttributeTemplateEnum.php
@@ -6,11 +6,6 @@
 
 enum AttributeTemplateEnum: string
 {
-    case TYPE_ATTRIBUTE = '#[PropertyTypeAttribute(%s::class)]';
-    case COLLECTION_TYPE_ATTRIBUTE = '#[CollectionPropertyTypeAttribute(%s::class)]';
-    case ENUM_TYPE_ATTRIBUTE = '#[EnumPropertyTypeAttribute(%s::class)]';
     case ARRAY_OBJECT_TYPE_ATTRIBUTE = '#[ArrayObjectPropertyTypeAttribute]';
     case ARRAY_TYPE_ATTRIBUTE = '#[ArrayPropertyTypeAttribute]';
-    case DATE_TIME_TYPE_ATTRIBUTE = '#[DateTimePropertyTypeAttribute(%s::class)]';
-    case NUMBER_TYPE_ATTRIBUTE = '#[NumberPropertyTypeAttribute(%s::class)]';
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
index 269a535b..169ec425 100644
--- a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
@@ -9,8 +9,8 @@
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
+use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
-use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\DockBlockTemplateEnum;
 
 final class CollectionTypeTemplateExpander extends AbstractTemplateExpander
@@ -35,9 +35,11 @@ protected function handleExpander(
 
         $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->properties[$propertyName] = BuildInTypeEnum::ARRAY_OBJECT->value;
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
         $templateTransfer->dockBlocks[$propertyName] = $this->getPropertyDockBlock($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = false;
+
+        $templateTransfer->attributes[$propertyName]
+            = AttributeEmbeddedTemplateEnum::COLLECTION_TYPE_ATTRIBUTE->renderTemplate($embeddedTypeTransfer);
     }
 
     private function getPropertyDockBlock(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
@@ -51,9 +53,4 @@ private function getPropertyDockBlock(DefinitionEmbeddedTypeTransfer $embeddedTy
 
         return sprintf(DockBlockTemplateEnum::COLLECTION->value, $propertyType);
     }
-
-    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
-    {
-        return sprintf(AttributeTemplateEnum::COLLECTION_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
-    }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
index bf9836a9..8b88fafd 100644
--- a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
@@ -5,9 +5,8 @@
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
 use Override;
-use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
+use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
-use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 
@@ -32,11 +31,6 @@ protected function handleExpander(
         $this->expandEmbeddedType($propertyTransfer, $embeddedTypeTransfer, $templateTransfer);
 
         $templateTransfer->attributes[$propertyTransfer->propertyName]
-            = $this->getPropertyAttribute($embeddedTypeTransfer);
-    }
-
-    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
-    {
-        return sprintf(AttributeTemplateEnum::DATE_TIME_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
+            = AttributeEmbeddedTemplateEnum::DATE_TIME_TYPE_ATTRIBUTE->renderTemplate($embeddedTypeTransfer);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
index 771b0ecd..48509eb6 100644
--- a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
@@ -5,9 +5,8 @@
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
 use Override;
-use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
+use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
-use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 
@@ -32,11 +31,6 @@ protected function handleExpander(
         $this->expandEmbeddedType($propertyTransfer, $embeddedTypeTransfer, $templateTransfer);
 
         $templateTransfer->attributes[$propertyTransfer->propertyName]
-            = $this->getPropertyAttribute($embeddedTypeTransfer);
-    }
-
-    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
-    {
-        return sprintf(AttributeTemplateEnum::ENUM_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
+            = AttributeEmbeddedTemplateEnum::ENUM_TYPE_ATTRIBUTE->renderTemplate($embeddedTypeTransfer);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
index 349eb6f7..b3770168 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
@@ -5,9 +5,8 @@
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
 use Override;
-use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
+use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
-use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 
@@ -32,11 +31,6 @@ protected function handleExpander(
         $this->expandEmbeddedType($propertyTransfer, $embeddedTypeTransfer, $templateTransfer);
 
         $templateTransfer->attributes[$propertyTransfer->propertyName]
-            = $this->getPropertyAttribute($embeddedTypeTransfer);
-    }
-
-    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
-    {
-        return sprintf(AttributeTemplateEnum::NUMBER_TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
+            = AttributeEmbeddedTemplateEnum::NUMBER_TYPE_ATTRIBUTE->renderTemplate($embeddedTypeTransfer);
     }
 }
diff --git a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
index c5b68748..2fccec35 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
@@ -8,8 +8,8 @@
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
+use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
-use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
 
 final class TransferTypeTemplateExpander extends AbstractTemplateExpander
 {
@@ -32,13 +32,10 @@ protected function handleExpander(
 
         $propertyName = $propertyTransfer->propertyName;
         $templateTransfer->properties[$propertyName] = $this->getPropertyType($embeddedTypeTransfer);
-        $templateTransfer->attributes[$propertyName] = $this->getPropertyAttribute($embeddedTypeTransfer);
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
-    }
 
-    private function getPropertyAttribute(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
-    {
-        return sprintf(AttributeTemplateEnum::TYPE_ATTRIBUTE->value, $embeddedTypeTransfer->name);
+        $templateTransfer->attributes[$propertyName]
+            = AttributeEmbeddedTemplateEnum::TYPE_ATTRIBUTE->renderTemplate($embeddedTypeTransfer);
     }
 
     private function getPropertyType(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string

From c727fd3e33c87cce17774286f7cd34df0df5f539 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 16:33:26 +0200
Subject: [PATCH 13/35] Optimized transfer object generator Template

---
 .../Generator/Render/Template/Template.php    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Template/Template.php b/src/TransferGenerator/Generator/Render/Template/Template.php
index afd8a501..a717f47c 100644
--- a/src/TransferGenerator/Generator/Render/Template/Template.php
+++ b/src/TransferGenerator/Generator/Render/Template/Template.php
@@ -45,11 +45,20 @@ final class $templateTransfer->className extends AbstractTransfer
 {$this->helper->renderMetaData()}
     ];
 
+    {$this->renderProperties($templateTransfer)}
+}
+
 TEMPLATE;
 
+        return $content;
+    }
+
+    private function renderProperties(TemplateTransfer $templateTransfer): string
+    {
         $i = 0;
+        $properties = [];
         foreach ($templateTransfer->metaConstants as $constant => $property) {
-            $content .= <<<TEMPLATE
+            $properties[] = <<<TEMPLATE
 
     // $property{$this->helper->renderAttribute($property)}
     public const string $constant = '$property';
@@ -60,16 +69,10 @@ final class $templateTransfer->className extends AbstractTransfer
         get => \$this->getData(self::{$constant}_DATA_INDEX);
         set => \$this->setData(self::{$constant}_DATA_INDEX, \$value);
     }
-
 TEMPLATE;
             $i++;
         }
 
-        $content .= <<<'TEMPLATE'
-}
-
-TEMPLATE;
-
-        return $content;
+        return trim(implode(PHP_EOL, $properties));
     }
 }

From b53bc19a5a27133f7587f103c28208e03241fc57 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 16:44:41 +0200
Subject: [PATCH 14/35] Optimized transfer object generator Template

---
 .../Generator/Render/Template/Template.php             |  5 +----
 .../Generator/Render/Template/TemplateHelper.php       | 10 +++++++++-
 .../Render/Template/TemplateHelperInterface.php        |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Template/Template.php b/src/TransferGenerator/Generator/Render/Template/Template.php
index a717f47c..13596ecb 100644
--- a/src/TransferGenerator/Generator/Render/Template/Template.php
+++ b/src/TransferGenerator/Generator/Render/Template/Template.php
@@ -6,9 +6,6 @@
 
 use Picamator\TransferObject\Generated\TemplateTransfer;
 
-/**
- * phpcs:disable Generic.Files.LineLength
- */
 readonly class Template
 {
     public function __construct(private TemplateHelperInterface $helper)
@@ -65,7 +62,7 @@ private function renderProperties(TemplateTransfer $templateTransfer): string
     protected const string {$constant}_DATA_NAME = '$constant';
     protected const int {$constant}_DATA_INDEX = $i;
 {$this->helper->renderDockBlock($property)}
-    public{$this->helper->renderProtected($property)} {$this->helper->renderNullable($property)}{$templateTransfer->properties[$property]} \$$property {
+    public{$this->helper->renderPropertyDeclaration($property)} \$$property {
         get => \$this->getData(self::{$constant}_DATA_INDEX);
         set => \$this->setData(self::{$constant}_DATA_INDEX, \$value);
     }
diff --git a/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php b/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
index 863ab3e8..a4b29ec4 100644
--- a/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
+++ b/src/TransferGenerator/Generator/Render/Template/TemplateHelper.php
@@ -69,6 +69,14 @@ public function renderDockBlock(string $property): string
         return self::PADDING_LEFT . $dockBlock;
     }
 
+    public function renderPropertyDeclaration(string $property): string
+    {
+        /** @var string $propertyType */
+        $propertyType = $this->templateTransfer->properties[$property];
+
+        return "{$this->renderProtected($property)} {$this->renderNullable($property)}$propertyType";
+    }
+
     public function renderNullable(string $property): string
     {
         /** @var string $propertyType */
@@ -84,7 +92,7 @@ public function renderNullable(string $property): string
         return self::NULLABLE_TYPE;
     }
 
-    public function renderProtected(string $property): string
+    private function renderProtected(string $property): string
     {
         return $this->templateTransfer->protects[$property] ? self::PROTECTED_SET : self::EMPTY_STRING;
     }
diff --git a/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php b/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php
index 4f369cda..c0ead0ee 100644
--- a/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php
+++ b/src/TransferGenerator/Generator/Render/Template/TemplateHelperInterface.php
@@ -18,7 +18,7 @@ public function renderAttribute(string $property): string;
 
     public function renderDockBlock(string $property): string;
 
-    public function renderNullable(string $property): string;
+    public function renderPropertyDeclaration(string $property): string;
 
-    public function renderProtected(string $property): string;
+    public function renderNullable(string $property): string;
 }

From 3d0c37ada2bf9c7fd97fecad60f9ad2cb836e3ae Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 20:03:56 +0200
Subject: [PATCH 15/35] Refactored definition generator expander

---
 .../Builder/Expander/AbstractBuilderExpander.php       |  8 +++++++-
 .../Builder/Expander/BuildInTypeBuilderExpander.php    |  8 --------
 .../Builder/Expander/CollectionTypeBuilderExpander.php |  2 ++
 .../Builder/Expander/TransferTypeBuilderExpander.php   |  2 ++
 .../Render/Expander/BuildInTypeTemplateExpander.php    | 10 +++++-----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php
index c72370b8..a4508ee6 100644
--- a/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php
@@ -31,7 +31,13 @@ public function expandBuilderTransfer(
         $this->nextExpander?->expandBuilderTransfer($content, $builderTransfer);
     }
 
-    abstract protected function isApplicable(BuilderContentInterface $content): bool;
+    /**
+     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    protected function isApplicable(BuilderContentInterface $content): bool
+    {
+        return true;
+    }
 
     abstract protected function handleExpander(
         BuilderContentInterface $content,
diff --git a/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php
index 4352a82a..d732af5c 100644
--- a/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php
@@ -18,14 +18,6 @@
 
 final class BuildInTypeBuilderExpander extends AbstractBuilderExpander
 {
-    /**
-     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
-     */
-    protected function isApplicable(BuilderContentInterface $content): true
-    {
-        return true;
-    }
-
     protected function handleExpander(
         BuilderContentInterface $content,
         DefinitionBuilderTransfer $builderTransfer,
diff --git a/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php
index 34798f57..ca42e28b 100644
--- a/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\DefinitionGenerator\Builder\Expander;
 
+use Override;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
 use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
@@ -13,6 +14,7 @@ final class CollectionTypeBuilderExpander extends AbstractBuilderExpander
 {
     use BuilderExpanderTrait;
 
+    #[Override]
     protected function isApplicable(BuilderContentInterface $content): bool
     {
         if (!$content->getType()->isArray() || empty($content->getPropertyValue())) {
diff --git a/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php
index 4c6907de..2a41ff0d 100644
--- a/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\DefinitionGenerator\Builder\Expander;
 
+use Override;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
 use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
@@ -15,6 +16,7 @@ final class TransferTypeBuilderExpander extends AbstractBuilderExpander
     use BuilderExpanderTrait;
     use VariableValidatorTrait;
 
+    #[Override]
     protected function isApplicable(BuilderContentInterface $content): bool
     {
         if (!$content->getType()->isArray() || empty($content->getPropertyValue())) {
diff --git a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
index 8926be99..eb56cfc0 100644
--- a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
@@ -26,20 +26,20 @@ protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
     ): void {
-        /** @var \Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum $buildInTypeEnum */
-        $buildInTypeEnum = $propertyTransfer->buildInType;
+        /** @var \Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum $buildInType */
+        $buildInType = $propertyTransfer->buildInType;
 
         $propertyName = $propertyTransfer->propertyName;
-        $templateTransfer->properties[$propertyName] = $buildInTypeEnum->value;
+        $templateTransfer->properties[$propertyName] = $buildInType->value;
         $templateTransfer->nullables[$propertyName] = $propertyTransfer->isNullable;
 
-        if ($buildInTypeEnum->isArrayObject()) {
+        if ($buildInType->isArrayObject()) {
             $this->expandArrayObjectType($propertyTransfer, $templateTransfer);
 
             return;
         }
 
-        if ($buildInTypeEnum->isArray()) {
+        if ($buildInType->isArray()) {
             $this->expandArrayType($propertyTransfer, $templateTransfer);
         }
     }

From 1b894dccf11774099e62163de5547dc500266a31 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 21:32:03 +0200
Subject: [PATCH 16/35] Reverted move isApplicable to abstract classes on
 expanders

---
 .../Builder/Expander/AbstractBuilderExpander.php          | 8 +-------
 .../Builder/Expander/BuildInTypeBuilderExpander.php       | 8 ++++++++
 .../Builder/Expander/CollectionTypeBuilderExpander.php    | 2 --
 .../Builder/Expander/TransferTypeBuilderExpander.php      | 2 --
 .../Render/Expander/AbstractTemplateExpander.php          | 5 +----
 .../Render/Expander/BuildInTypeTemplateExpander.php       | 2 --
 .../Render/Expander/CollectionTypeTemplateExpander.php    | 2 --
 .../Render/Expander/DateTimeTypeTemplateExpander.php      | 2 --
 .../Render/Expander/EnumTypeTemplateExpander.php          | 2 --
 .../Render/Expander/MetaConstantsTemplateExpander.php     | 8 ++++++++
 .../Render/Expander/NamespaceTemplateExpander.php         | 2 --
 .../Render/Expander/NumberTypeTemplateExpander.php        | 2 --
 .../Render/Expander/ProtectedTemplateExpander.php         | 8 ++++++++
 .../Render/Expander/TransferTypeTemplateExpander.php      | 2 --
 14 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php
index a4508ee6..c72370b8 100644
--- a/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/AbstractBuilderExpander.php
@@ -31,13 +31,7 @@ public function expandBuilderTransfer(
         $this->nextExpander?->expandBuilderTransfer($content, $builderTransfer);
     }
 
-    /**
-     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
-     */
-    protected function isApplicable(BuilderContentInterface $content): bool
-    {
-        return true;
-    }
+    abstract protected function isApplicable(BuilderContentInterface $content): bool;
 
     abstract protected function handleExpander(
         BuilderContentInterface $content,
diff --git a/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php
index d732af5c..4352a82a 100644
--- a/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpander.php
@@ -18,6 +18,14 @@
 
 final class BuildInTypeBuilderExpander extends AbstractBuilderExpander
 {
+    /**
+     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    protected function isApplicable(BuilderContentInterface $content): true
+    {
+        return true;
+    }
+
     protected function handleExpander(
         BuilderContentInterface $content,
         DefinitionBuilderTransfer $builderTransfer,
diff --git a/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php
index ca42e28b..34798f57 100644
--- a/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\DefinitionGenerator\Builder\Expander;
 
-use Override;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
 use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
@@ -14,7 +13,6 @@ final class CollectionTypeBuilderExpander extends AbstractBuilderExpander
 {
     use BuilderExpanderTrait;
 
-    #[Override]
     protected function isApplicable(BuilderContentInterface $content): bool
     {
         if (!$content->getType()->isArray() || empty($content->getPropertyValue())) {
diff --git a/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php b/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php
index 2a41ff0d..4c6907de 100644
--- a/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php
+++ b/src/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\DefinitionGenerator\Builder\Expander;
 
-use Override;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
 use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
@@ -16,7 +15,6 @@ final class TransferTypeBuilderExpander extends AbstractBuilderExpander
     use BuilderExpanderTrait;
     use VariableValidatorTrait;
 
-    #[Override]
     protected function isApplicable(BuilderContentInterface $content): bool
     {
         if (!$content->getType()->isArray() || empty($content->getPropertyValue())) {
diff --git a/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
index 5786a84b..8efbfb52 100644
--- a/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
@@ -32,10 +32,7 @@ public function expandTemplateTransfer(
     /**
      * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
      */
-    protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
-    {
-        return true;
-    }
+    abstract protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool;
 
     abstract protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
diff --git a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
index eb56cfc0..78051756 100644
--- a/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/BuildInTypeTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeTemplateEnum;
@@ -16,7 +15,6 @@ final class BuildInTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->buildInType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
index 169ec425..0803eb77 100644
--- a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
@@ -17,7 +16,6 @@ final class CollectionTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->collectionType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
index 8b88fafd..3614098f 100644
--- a/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/DateTimeTypeTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
@@ -14,7 +13,6 @@ final class DateTimeTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->dateTimeType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
index 48509eb6..20d236e4 100644
--- a/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/EnumTypeTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
@@ -14,7 +13,6 @@ final class EnumTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->enumType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php
index d6cfd5a4..ac9d52f6 100644
--- a/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/MetaConstantsTemplateExpander.php
@@ -13,6 +13,14 @@ final class MetaConstantsTemplateExpander extends AbstractTemplateExpander
 
     private const string META_CONSTANT_ONLY_UPPER_CASE_REGEX = '#^[A-Z]+$#';
 
+    /**
+     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): true
+    {
+        return true;
+    }
+
     protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
diff --git a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
index 38b93b26..1cc5f179 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\Generated\DefinitionNamespaceTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
@@ -14,7 +13,6 @@ final class NamespaceTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->transferType?->namespace !== null
diff --git a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
index b3770168..a0dda601 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NumberTypeTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEmbeddedTemplateEnum;
 use Picamator\TransferObject\TransferGenerator\Generator\Enum\AttributeEnum;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
@@ -14,7 +13,6 @@ final class NumberTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->numberType !== null;
diff --git a/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
index 22bd619b..81e9f7a2 100644
--- a/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/ProtectedTemplateExpander.php
@@ -9,6 +9,14 @@
 
 final class ProtectedTemplateExpander extends AbstractTemplateExpander
 {
+    /**
+     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): true
+    {
+        return true;
+    }
+
     protected function handleExpander(
         DefinitionPropertyTransfer $propertyTransfer,
         TemplateTransfer $templateTransfer,
diff --git a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
index 2fccec35..1f8d1026 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
@@ -4,7 +4,6 @@
 
 namespace Picamator\TransferObject\TransferGenerator\Generator\Render\Expander;
 
-use Override;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Generated\TemplateTransfer;
@@ -15,7 +14,6 @@ final class TransferTypeTemplateExpander extends AbstractTemplateExpander
 {
     use TemplateExpanderTrait;
 
-    #[Override]
     protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->transferType !== null;

From 8e4e6fcd45655c8be2eaa78196c5ca6cafea29f2 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 21:43:22 +0200
Subject: [PATCH 17/35] Simplified template expander code style

---
 .../Render/Expander/AbstractTemplateExpander.php         | 3 ---
 .../Render/Expander/CollectionTypeTemplateExpander.php   | 3 +--
 .../Render/Expander/NamespaceTemplateExpander.php        | 3 +--
 .../Render/Expander/TransferTypeTemplateExpander.php     | 9 +++------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
index 8efbfb52..e4de8a9d 100644
--- a/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/AbstractTemplateExpander.php
@@ -29,9 +29,6 @@ public function expandTemplateTransfer(
         $this->nextExpander?->expandTemplateTransfer($propertyTransfer, $templateTransfer);
     }
 
-    /**
-     * phpcs:disable SlevomatCodingStandard.Functions.UnusedParameter
-     */
     abstract protected function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool;
 
     abstract protected function handleExpander(
diff --git a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
index 0803eb77..ef6885b6 100644
--- a/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/CollectionTypeTemplateExpander.php
@@ -43,9 +43,8 @@ protected function handleExpander(
     private function getPropertyDockBlock(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
         $propertyType = $embeddedTypeTransfer->name;
-        $namespaceTransfer = $embeddedTypeTransfer->namespace;
 
-        if ($namespaceTransfer !== null) {
+        if ($embeddedTypeTransfer->namespace !== null) {
             $propertyType = $this->enforceTransferInterface($propertyType);
         }
 
diff --git a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
index 1cc5f179..bcf3b631 100644
--- a/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/NamespaceTemplateExpander.php
@@ -25,9 +25,8 @@ protected function handleExpander(
     ): void {
         /** @var \Picamator\TransferObject\Generated\DefinitionNamespaceTransfer $namespaceTransfer */
         $namespaceTransfer = $this->getNamespaceTransfer($propertyTransfer);
-        $namespace = $namespaceTransfer->fullName;
 
-        $this->expandImports($namespace, $templateTransfer);
+        $this->expandImports($namespaceTransfer->fullName, $templateTransfer);
         $this->expandImports(TransferEnum::INTERFACE, $templateTransfer);
     }
 
diff --git a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
index 1f8d1026..9fccdd1c 100644
--- a/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
+++ b/src/TransferGenerator/Generator/Render/Expander/TransferTypeTemplateExpander.php
@@ -38,13 +38,10 @@ protected function handleExpander(
 
     private function getPropertyType(DefinitionEmbeddedTypeTransfer $embeddedTypeTransfer): string
     {
-        $propertyType = $embeddedTypeTransfer->name;
-        $namespaceTransfer = $embeddedTypeTransfer->namespace;
-
-        if ($namespaceTransfer === null) {
-            return $propertyType;
+        if ($embeddedTypeTransfer->namespace === null) {
+            return $embeddedTypeTransfer->name;
         }
 
-        return $this->enforceTransferInterface($propertyType);
+        return $this->enforceTransferInterface($embeddedTypeTransfer->name);
     }
 }

From 5234e1c08828296d3166002df784cdd6669e1937 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sun, 7 Sep 2025 23:08:29 +0200
Subject: [PATCH 18/35] Covered by tests invalid definition key and empty
 config list, added data providers to cover transforming from to array tests

---
 src/Command/TransferGeneratorBulkCommand.php  |  4 ----
 .../Builder/DefinitionContentBuilder.php      |  9 +++++++
 src/Shared/Reader/FileReaderProgress.php      |  8 ++++++-
 .../DefinitionGeneratorCommandTest.php        | 24 +++++++++++++++++--
 .../Command/Generated/Definition/Error/.keep  |  0
 .../Definition/Error/customer.transfer.yml    |  2 ++
 .../{ => Success}/customer.transfer.yml       |  0
 .../TransferGeneratorBulkCommandTest.php      | 19 ++++++++++++++-
 .../data/api-response/error/customer.json     |  4 ++++
 .../data/config/error/config.empty.list.txt   |  0
 tests/integration/Transfer/TransferTest.php   |  1 +
 .../Shared/Reader/FileReaderProgressTest.php  | 23 ++++++++++++++++++
 12 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 tests/integration/Command/Generated/Definition/Error/.keep
 create mode 100644 tests/integration/Command/Generated/Definition/Error/customer.transfer.yml
 rename tests/integration/Command/Generated/Definition/{ => Success}/customer.transfer.yml (100%)
 create mode 100644 tests/integration/Command/data/api-response/error/customer.json
 create mode 100644 tests/integration/Command/data/config/error/config.empty.list.txt

diff --git a/src/Command/TransferGeneratorBulkCommand.php b/src/Command/TransferGeneratorBulkCommand.php
index 001abd43..8f58a199 100644
--- a/src/Command/TransferGeneratorBulkCommand.php
+++ b/src/Command/TransferGeneratorBulkCommand.php
@@ -126,10 +126,6 @@ private function advanceProgressBar(
         ?ProgressBar $progressBar,
     ): void {
         $step = $bulkTransfer->progress->progressBytes;
-        if ($step === 0) {
-            return;
-        }
-
         $progressBar?->advance($step);
     }
 
diff --git a/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php b/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php
index e7dfbc4a..037ae29d 100644
--- a/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php
+++ b/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php
@@ -11,6 +11,15 @@
 {
     public function createBuilderContent(string $propertyName, mixed $propertyValue): BuilderContentInterface
     {
+        if (is_numeric($propertyName)) {
+            throw new DefinitionGeneratorException(
+                sprintf(
+                    'Invalid property name "%s".',
+                    $propertyName,
+                ),
+            );
+        }
+
         $typeEnum = $this->getTypeEnum($propertyName, $propertyValue);
 
         return new BuilderContent($typeEnum, $propertyName, $propertyValue);
diff --git a/src/Shared/Reader/FileReaderProgress.php b/src/Shared/Reader/FileReaderProgress.php
index 67ee816e..3b560183 100644
--- a/src/Shared/Reader/FileReaderProgress.php
+++ b/src/Shared/Reader/FileReaderProgress.php
@@ -6,6 +6,7 @@
 
 use Generator;
 use Picamator\TransferObject\Generated\FileReaderProgressTransfer;
+use Picamator\TransferObject\Shared\Exception\FileReaderException;
 use Picamator\TransferObject\Shared\Filesystem\FileReaderInterface;
 
 readonly class FileReaderProgress implements FileReaderProgressInterface
@@ -17,9 +18,14 @@ public function __construct(
 
     public function readFile(string $filename): Generator
     {
-        $contentIterator = $this->fileReader->readFile($filename);
         $progressTransfer = $this->createProgressTransfer($filename);
+        if ($progressTransfer->totalBytes === 0) {
+            throw new FileReaderException(
+                sprintf('File "%s" is empty.', $filename),
+            );
+        }
 
+        $contentIterator = $this->fileReader->readFile($filename);
         foreach ($contentIterator as $content) {
             $progressTransfer->content = $content;
             $progressTransfer->progressBytes += strlen($content);
diff --git a/tests/integration/Command/DefinitionGeneratorCommandTest.php b/tests/integration/Command/DefinitionGeneratorCommandTest.php
index 23dab979..b79ad757 100644
--- a/tests/integration/Command/DefinitionGeneratorCommandTest.php
+++ b/tests/integration/Command/DefinitionGeneratorCommandTest.php
@@ -29,7 +29,7 @@ public function testRunCommandWithValidJsonShouldShowSuccessMessage(): void
     {
         // Act
         $this->commandTester->setInputs([
-            '/tests/integration/Command/Generated/Definition',
+            '/tests/integration/Command/Generated/Definition/Success',
             'Customer',
             '/tests/integration/Command/data/api-response/success/customer.json',
         ]);
@@ -43,6 +43,26 @@ public function testRunCommandWithValidJsonShouldShowSuccessMessage(): void
             'Successfully generated 1 definition file(s)!',
             $output,
         );
-        $this->assertFileExists(__DIR__ . '/Generated/Definition/customer.transfer.yml');
+        $this->assertFileExists(__DIR__ . '/Generated/Definition/Success/customer.transfer.yml');
+    }
+
+    public function testRunCommandWithInvalidJsonShouldShowErrorMessage(): void
+    {
+        // Act
+        $this->commandTester->setInputs([
+            '/tests/integration/Command/Generated/Definition/Error',
+            'Customer',
+            '/tests/integration/Command/data/api-response/error/customer.json',
+        ]);
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        // Assert
+        $this->assertSame(1, $this->commandTester->getStatusCode());
+        $this->assertStringContainsString(
+            '[ERROR] Invalid property name "0".',
+            $output,
+        );
     }
 }
diff --git a/tests/integration/Command/Generated/Definition/Error/.keep b/tests/integration/Command/Generated/Definition/Error/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/integration/Command/Generated/Definition/Error/customer.transfer.yml b/tests/integration/Command/Generated/Definition/Error/customer.transfer.yml
new file mode 100644
index 00000000..aa0c0ccd
--- /dev/null
+++ b/tests/integration/Command/Generated/Definition/Error/customer.transfer.yml
@@ -0,0 +1,2 @@
+# $schema: https://raw.githubusercontent.com/picamator/transfer-object/main/schema/definition.schema.json
+
diff --git a/tests/integration/Command/Generated/Definition/customer.transfer.yml b/tests/integration/Command/Generated/Definition/Success/customer.transfer.yml
similarity index 100%
rename from tests/integration/Command/Generated/Definition/customer.transfer.yml
rename to tests/integration/Command/Generated/Definition/Success/customer.transfer.yml
diff --git a/tests/integration/Command/TransferGeneratorBulkCommandTest.php b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
index a7066e5b..cc2a8110 100644
--- a/tests/integration/Command/TransferGeneratorBulkCommandTest.php
+++ b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
@@ -11,6 +11,10 @@
 class TransferGeneratorBulkCommandTest extends TestCase
 {
     private const string SUCCESS_CONFIG_LIST_PATH = '/tests/integration/Command/data/config/success/config.list.txt';
+
+    private const string ERROR_CONFIG_EMPTY_LIST_PATH
+        = '/tests/integration/Command/data/config/error/config.empty.list.txt';
+
     private const string ERROR_CONFIG_LIST_PATH = '/tests/integration/Command/data/config/error/config.list.txt';
 
     private CommandTester $commandTester;
@@ -41,7 +45,7 @@ public function testRunCommandWithInvalidConfigurationPathShouldShowErrorMessage
 
         // Assert
         $this->assertSame(1, $this->commandTester->getStatusCode());
-        $this->assertStringContainsString('Failed to open file', $output);
+        $this->assertStringContainsString('[ERROR] File', $output);
     }
 
     public function testRunCommandWithValidConfigurationShouldShowSuccessMessage(): void
@@ -57,6 +61,19 @@ public function testRunCommandWithValidConfigurationShouldShowSuccessMessage():
         $this->assertStringContainsString('All Transfer Objects were generated successfully!', $output);
     }
 
+    public function testRunCommandWithEmptyConfigurationShouldShowErrorMessage(): void
+    {
+        // Act
+        $this->commandTester->execute(
+            ['-b' => self::ERROR_CONFIG_EMPTY_LIST_PATH],
+        );
+        $output = $this->commandTester->getDisplay();
+
+        // Assert
+        $this->assertSame(1, $this->commandTester->getStatusCode());
+        $this->assertStringContainsString('[ERROR] File', $output);
+    }
+
     public function testRunCommandWithValidConfigurationButInvalidDefinitionShouldShowErrorMessage(): void
     {
         // Act
diff --git a/tests/integration/Command/data/api-response/error/customer.json b/tests/integration/Command/data/api-response/error/customer.json
new file mode 100644
index 00000000..e76efa06
--- /dev/null
+++ b/tests/integration/Command/data/api-response/error/customer.json
@@ -0,0 +1,4 @@
+{
+    "0": "Jan",
+    "lastName": "Kowalski"
+}
diff --git a/tests/integration/Command/data/config/error/config.empty.list.txt b/tests/integration/Command/data/config/error/config.empty.list.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/integration/Transfer/TransferTest.php b/tests/integration/Transfer/TransferTest.php
index bcadae0d..c57f7c96 100644
--- a/tests/integration/Transfer/TransferTest.php
+++ b/tests/integration/Transfer/TransferTest.php
@@ -236,6 +236,7 @@ public function testAccessRequiredPropertyBeforeInitialisingShouldRiseException(
     #[TestWith([[ItemTransfer::I_AM_ARRAY => true]])]
     #[TestWith([[ItemTransfer::I_AM_ARRAY_OBJECT => true]])]
     #[TestWith([[ItemTransfer::I_AM_ENUM => true]])]
+    #[TestWith([[ItemTransfer::I_AM_DATE_TIME => true]])]
     public function testItemTransferAttributeTypeMismatchFromArrayShouldRiseException(array $data): void
     {
         // Arrange
diff --git a/tests/unit/Shared/Reader/FileReaderProgressTest.php b/tests/unit/Shared/Reader/FileReaderProgressTest.php
index 56ca1e83..825e5fdf 100644
--- a/tests/unit/Shared/Reader/FileReaderProgressTest.php
+++ b/tests/unit/Shared/Reader/FileReaderProgressTest.php
@@ -8,6 +8,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Generated\FileReaderProgressTransfer;
+use Picamator\TransferObject\Shared\Exception\FileReaderException;
 use Picamator\TransferObject\Shared\Filesystem\FileReaderInterface;
 use Picamator\TransferObject\Shared\Reader\FileReaderProgress;
 
@@ -59,4 +60,26 @@ public function testReadFile(): void
         $this->assertSame($filesize, $actual->progressBytes);
         $this->assertSame($fileLine, $actual->content);
     }
+
+    public function testEmptyFileShouldThrowException(): void
+    {
+        // Arrange
+        $filename = 'some-path/test.txt';
+        $filesize = 0;
+
+        // Expect
+        $this->fileReaderMock->expects($this->never())
+            ->method('readFile');
+
+        $this->fileReaderProgressMock->expects($this->once())
+            ->method('filesize')
+            ->with($filename)
+            ->willReturn($filesize);
+
+        // Expect
+        $this->expectException(FileReaderException::class);
+
+        // Act
+        $this->fileReaderProgressMock->readFile($filename)->current();
+    }
 }

From 29a1c9f565d2f8e9124229da3f9af0160c996aa7 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 08:39:45 +0200
Subject: [PATCH 19/35] Replaced ReflectionClass by ReflectionObject

---
 src/Transfer/ConstantAttributeTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Transfer/ConstantAttributeTrait.php b/src/Transfer/ConstantAttributeTrait.php
index b17ec040..00420ae1 100644
--- a/src/Transfer/ConstantAttributeTrait.php
+++ b/src/Transfer/ConstantAttributeTrait.php
@@ -8,8 +8,8 @@
 use Picamator\TransferObject\Transfer\Attribute\InitialPropertyTypeAttributeInterface;
 use Picamator\TransferObject\Transfer\Attribute\PropertyTypeAttributeInterface;
 use ReflectionAttribute;
-use ReflectionClass;
 use ReflectionClassConstant;
+use ReflectionObject;
 
 trait ConstantAttributeTrait
 {
@@ -59,6 +59,6 @@ final protected function getInitialAttributes(): Generator
      */
     private function getReflectionConstants(): array
     {
-        return new ReflectionClass($this)->getReflectionConstants(ReflectionClassConstant::IS_PUBLIC);
+        return new ReflectionObject($this)->getReflectionConstants(ReflectionClassConstant::IS_PUBLIC);
     }
 }

From f094139b8f1675ea677a3265f736c6d0c34797e6 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 17:20:06 +0200
Subject: [PATCH 20/35] Added LazyGhost usage for transfer object creation and
 transfromation from array

---
 .../CollectionPropertyTypeAttribute.php        |  2 ++
 .../Attribute/PropertyTypeAttribute.php        |  2 ++
 .../Attribute/TransferBuilderTrait.php         | 18 +++++++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php b/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php
index 2ed6bdce..c0bbd09e 100644
--- a/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php
+++ b/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php
@@ -10,6 +10,8 @@
 
 /**
  * @api
+ *
+ * @property class-string $typeName
  */
 #[Attribute(Attribute::TARGET_CLASS_CONSTANT)]
 final readonly class CollectionPropertyTypeAttribute implements InitialPropertyTypeAttributeInterface
diff --git a/src/Transfer/Attribute/PropertyTypeAttribute.php b/src/Transfer/Attribute/PropertyTypeAttribute.php
index 497336ab..1e1901a8 100644
--- a/src/Transfer/Attribute/PropertyTypeAttribute.php
+++ b/src/Transfer/Attribute/PropertyTypeAttribute.php
@@ -9,6 +9,8 @@
 
 /**
  * @api
+ *
+ * @property class-string $typeName
  */
 #[Attribute(Attribute::TARGET_CLASS_CONSTANT)]
 final readonly class PropertyTypeAttribute implements PropertyTypeAttributeInterface
diff --git a/src/Transfer/Attribute/TransferBuilderTrait.php b/src/Transfer/Attribute/TransferBuilderTrait.php
index 2b2d698b..98b23192 100644
--- a/src/Transfer/Attribute/TransferBuilderTrait.php
+++ b/src/Transfer/Attribute/TransferBuilderTrait.php
@@ -6,12 +6,15 @@
 
 use Picamator\TransferObject\Transfer\AbstractTransfer;
 use Picamator\TransferObject\Transfer\TransferInterface;
+use ReflectionClass;
 
 trait TransferBuilderTrait
 {
     use DataAssertTrait;
 
     /**
+     * @param class-string $typeName
+     *
      * @throws \Picamator\TransferObject\Transfer\Exception\PropertyTypeTransferException
      */
     final protected function createTransfer(string $typeName, mixed $data): TransferInterface
@@ -19,13 +22,18 @@ final protected function createTransfer(string $typeName, mixed $data): Transfer
         $this->assertArray($data);
 
         /** @var array<string, mixed> $data */
+        $reflection = new ReflectionClass($typeName);
+
         if (is_subclass_of($typeName, AbstractTransfer::class)) {
-            return new $typeName($data);
+            // @phpstan-ignore argument.type, return.type
+            return $reflection->newLazyGhost(function (AbstractTransfer $object) use ($data): void {
+                $object->__construct($data);
+            });
         }
 
-        /** @var \Picamator\TransferObject\Transfer\TransferInterface $transfer */
-        $transfer = new $typeName();
-
-        return $transfer->fromArray($data);
+        // @phpstan-ignore argument.type, return.type
+        return $reflection->newLazyGhost(function (TransferInterface $object) use ($data): void {
+            $object->fromArray($data);
+        });
     }
 }

From f9e03b3286c2fff95febe3bc4676cbe1491a0339 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 18:23:19 +0200
Subject: [PATCH 21/35] Refactored TransferBuilderTrait: added dock-blocks and
 socumentation simplified checking subclass

---
 .../CollectionPropertyTypeAttribute.php       |  2 +-
 .../Attribute/PropertyTypeAttribute.php       |  2 +-
 .../Attribute/TransferBuilderTrait.php        | 33 ++++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php b/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php
index c0bbd09e..8ae38921 100644
--- a/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php
+++ b/src/Transfer/Attribute/CollectionPropertyTypeAttribute.php
@@ -11,7 +11,7 @@
 /**
  * @api
  *
- * @property class-string $typeName
+ * @property class-string<\Picamator\TransferObject\Transfer\AbstractTransfer|TransferInterface> $typeName
  */
 #[Attribute(Attribute::TARGET_CLASS_CONSTANT)]
 final readonly class CollectionPropertyTypeAttribute implements InitialPropertyTypeAttributeInterface
diff --git a/src/Transfer/Attribute/PropertyTypeAttribute.php b/src/Transfer/Attribute/PropertyTypeAttribute.php
index 1e1901a8..866124a6 100644
--- a/src/Transfer/Attribute/PropertyTypeAttribute.php
+++ b/src/Transfer/Attribute/PropertyTypeAttribute.php
@@ -10,7 +10,7 @@
 /**
  * @api
  *
- * @property class-string $typeName
+ * @property class-string<\Picamator\TransferObject\Transfer\AbstractTransfer|TransferInterface> $typeName
  */
 #[Attribute(Attribute::TARGET_CLASS_CONSTANT)]
 final readonly class PropertyTypeAttribute implements PropertyTypeAttributeInterface
diff --git a/src/Transfer/Attribute/TransferBuilderTrait.php b/src/Transfer/Attribute/TransferBuilderTrait.php
index 98b23192..ee01481f 100644
--- a/src/Transfer/Attribute/TransferBuilderTrait.php
+++ b/src/Transfer/Attribute/TransferBuilderTrait.php
@@ -13,27 +13,44 @@ trait TransferBuilderTrait
     use DataAssertTrait;
 
     /**
-     * @param class-string $typeName
+     * Specification:
+     * - Uses lazy loading to postpone initiating embedded transfer objects.
      *
-     * @throws \Picamator\TransferObject\Transfer\Exception\PropertyTypeTransferException
+     * @link https://www.php.net/manual/en/language.oop5.lazy-objects.php
+     * @link https://wiki.php.net/rfc/lazy-objects
+     *
+     * @param class-string<AbstractTransfer|TransferInterface> $typeName
      */
     final protected function createTransfer(string $typeName, mixed $data): TransferInterface
     {
         $this->assertArray($data);
 
-        /** @var array<string, mixed> $data */
         $reflection = new ReflectionClass($typeName);
 
-        if (is_subclass_of($typeName, AbstractTransfer::class)) {
-            // @phpstan-ignore argument.type, return.type
-            return $reflection->newLazyGhost(function (AbstractTransfer $object) use ($data): void {
+        if ($reflection->isSubclassOf(AbstractTransfer::class)) {
+            /**
+             * @var TransferInterface $transfer
+             * @var array<string, mixed> $data
+             *
+             * @phpstan-ignore argument.type
+             */
+            $transfer = $reflection->newLazyGhost(function (AbstractTransfer $object) use ($data): void {
                 $object->__construct($data);
             });
+
+            return $transfer;
         }
 
-        // @phpstan-ignore argument.type, return.type
-        return $reflection->newLazyGhost(function (TransferInterface $object) use ($data): void {
+        /**
+         * @var TransferInterface $transfer
+         * @var array<string, mixed> $data
+         *
+         * @phpstan-ignore argument.type
+         */
+        $transfer = $reflection->newLazyGhost(function (TransferInterface $object) use ($data): void {
             $object->fromArray($data);
         });
+
+        return $transfer;
     }
 }

From cd51231ad920e03f4917c3cc84ed32ba54200c96 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 18:35:11 +0200
Subject: [PATCH 22/35] Refactored TransferBuilderTrait: extracted lazy ghost
 to separate methods

---
 .../Attribute/TransferBuilderTrait.php        | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/Transfer/Attribute/TransferBuilderTrait.php b/src/Transfer/Attribute/TransferBuilderTrait.php
index ee01481f..0773a269 100644
--- a/src/Transfer/Attribute/TransferBuilderTrait.php
+++ b/src/Transfer/Attribute/TransferBuilderTrait.php
@@ -8,18 +8,21 @@
 use Picamator\TransferObject\Transfer\TransferInterface;
 use ReflectionClass;
 
+/**
+ * Specification:
+ * - Uses lazy loading to postpone initiating embedded transfer objects.
+ *
+ * @link https://www.php.net/manual/en/language.oop5.lazy-objects.php
+ * @link https://wiki.php.net/rfc/lazy-objects
+ */
 trait TransferBuilderTrait
 {
     use DataAssertTrait;
 
     /**
-     * Specification:
-     * - Uses lazy loading to postpone initiating embedded transfer objects.
-     *
-     * @link https://www.php.net/manual/en/language.oop5.lazy-objects.php
-     * @link https://wiki.php.net/rfc/lazy-objects
-     *
      * @param class-string<AbstractTransfer|TransferInterface> $typeName
+     *
+     * @throws \ReflectionException
      */
     final protected function createTransfer(string $typeName, mixed $data): TransferInterface
     {
@@ -28,23 +31,22 @@ final protected function createTransfer(string $typeName, mixed $data): Transfer
         $reflection = new ReflectionClass($typeName);
 
         if ($reflection->isSubclassOf(AbstractTransfer::class)) {
-            /**
-             * @var TransferInterface $transfer
-             * @var array<string, mixed> $data
-             *
-             * @phpstan-ignore argument.type
-             */
-            $transfer = $reflection->newLazyGhost(function (AbstractTransfer $object) use ($data): void {
-                $object->__construct($data);
-            });
-
-            return $transfer;
+            /** @var array<string, mixed> $data */
+            return $this->createLazyAbstractTransfer($reflection, $data);
         }
 
+        /** @var array<string, mixed> $data */
+        return $this->createLazyTransfer($reflection, $data);
+    }
+
+    /**
+     * @param ReflectionClass<TransferInterface> $reflection
+     * @param array<string, mixed> $data
+     */
+    private function createLazyTransfer(ReflectionClass $reflection, array $data): TransferInterface
+    {
         /**
          * @var TransferInterface $transfer
-         * @var array<string, mixed> $data
-         *
          * @phpstan-ignore argument.type
          */
         $transfer = $reflection->newLazyGhost(function (TransferInterface $object) use ($data): void {
@@ -53,4 +55,21 @@ final protected function createTransfer(string $typeName, mixed $data): Transfer
 
         return $transfer;
     }
+
+    /**
+     * @param ReflectionClass<AbstractTransfer> $reflection
+     * @param array<string, mixed> $data
+     */
+    private function createLazyAbstractTransfer(ReflectionClass $reflection, array $data): TransferInterface
+    {
+        /**
+         * @var TransferInterface $transfer
+         * @phpstan-ignore argument.type
+         */
+        $transfer = $reflection->newLazyGhost(function (AbstractTransfer $object) use ($data): void {
+            $object->__construct($data);
+        });
+
+        return $transfer;
+    }
 }

From 69e869e067bcf469c4275c9523fcb3ec43d5c8e9 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 19:08:01 +0200
Subject: [PATCH 23/35] Refactored FileReaderProgress: imporved error handling,
 covered by tests

---
 src/Shared/Reader/FileReaderProgress.php      | 54 ++++++++++++++-----
 .../Shared/Reader/FileReaderProgressTest.php  | 45 ++++++++++++++--
 2 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/src/Shared/Reader/FileReaderProgress.php b/src/Shared/Reader/FileReaderProgress.php
index 3b560183..b9492112 100644
--- a/src/Shared/Reader/FileReaderProgress.php
+++ b/src/Shared/Reader/FileReaderProgress.php
@@ -18,12 +18,8 @@ public function __construct(
 
     public function readFile(string $filename): Generator
     {
-        $progressTransfer = $this->createProgressTransfer($filename);
-        if ($progressTransfer->totalBytes === 0) {
-            throw new FileReaderException(
-                sprintf('File "%s" is empty.', $filename),
-            );
-        }
+        $totalBytes = $this->getTotalBytes($filename);
+        $progressTransfer = $this->createProgressTransfer($totalBytes);
 
         $contentIterator = $this->fileReader->readFile($filename);
         foreach ($contentIterator as $content) {
@@ -34,23 +30,53 @@ public function readFile(string $filename): Generator
         }
     }
 
-    private function createProgressTransfer(string $filename): FileReaderProgressTransfer
+    private function createProgressTransfer(int $totalBytes): FileReaderProgressTransfer
     {
-        $filesize = (int)$this->filesize($filename);
-
         $progressTransfer = new FileReaderProgressTransfer();
-        $progressTransfer->totalBytes = $filesize;
+        $progressTransfer->totalBytes = $totalBytes;
         $progressTransfer->progressBytes = 0;
 
         return $progressTransfer;
     }
 
-    protected function filesize(string $filename): int|false
+    /**
+     * @throws \Picamator\TransferObject\Shared\Exception\FileReaderException
+     */
+    private function getTotalBytes(string $filename): int
     {
-        if (!file_exists($filename)) {
-            return false;
+        if (!$this->fileExists($filename)) {
+            throw new FileReaderException(
+                sprintf('File "%s" is not exist.', $filename),
+            );
+        }
+
+        $fileSize = $this->filesize($filename);
+        if ($fileSize === 0) {
+            throw new FileReaderException(
+                sprintf('File size "%s" is empty.', $filename),
+            );
         }
 
-        return filesize($filename);
+        if ($fileSize === false) {
+            throw new FileReaderException(
+                sprintf(
+                    'Failed to get file size "%s". Error: "%s".',
+                    $filename,
+                    error_get_last()['message'] ?? '',
+                ),
+            );
+        }
+
+        return $fileSize;
+    }
+
+    protected function filesize(string $filename): int|false
+    {
+        return @filesize($filename);
+    }
+
+    protected function fileExists(string $filename): bool
+    {
+        return file_exists($filename);
     }
 }
diff --git a/tests/unit/Shared/Reader/FileReaderProgressTest.php b/tests/unit/Shared/Reader/FileReaderProgressTest.php
index 825e5fdf..1bcf0500 100644
--- a/tests/unit/Shared/Reader/FileReaderProgressTest.php
+++ b/tests/unit/Shared/Reader/FileReaderProgressTest.php
@@ -5,6 +5,7 @@
 namespace Picamator\Tests\Unit\TransferObject\Shared\Reader;
 
 use Generator;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Generated\FileReaderProgressTransfer;
@@ -24,7 +25,10 @@ protected function setUp(): void
 
         $this->fileReaderProgressMock = $this->getMockBuilder(FileReaderProgress::class)
             ->setConstructorArgs([ $this->fileReaderMock])
-            ->onlyMethods(['filesize'])
+            ->onlyMethods([
+                'filesize',
+                'fileExists',
+            ])
             ->getMock();
     }
 
@@ -46,6 +50,11 @@ public function testReadFile(): void
             ->with($filename)
             ->willReturn($contentGenerator());
 
+        $this->fileReaderProgressMock->expects($this->once())
+            ->method('fileExists')
+            ->with($filename)
+            ->willReturn(true);
+
         $this->fileReaderProgressMock->expects($this->once())
             ->method('filesize')
             ->with($filename)
@@ -61,16 +70,22 @@ public function testReadFile(): void
         $this->assertSame($fileLine, $actual->content);
     }
 
-    public function testEmptyFileShouldThrowException(): void
+    #[TestWith([0])]
+    #[TestWith([false])]
+    public function testEmptyFileShouldThrowException(int|false $filesize): void
     {
         // Arrange
         $filename = 'some-path/test.txt';
-        $filesize = 0;
 
         // Expect
         $this->fileReaderMock->expects($this->never())
             ->method('readFile');
 
+        $this->fileReaderProgressMock->expects($this->once())
+            ->method('fileExists')
+            ->with($filename)
+            ->willReturn(true);
+
         $this->fileReaderProgressMock->expects($this->once())
             ->method('filesize')
             ->with($filename)
@@ -82,4 +97,28 @@ public function testEmptyFileShouldThrowException(): void
         // Act
         $this->fileReaderProgressMock->readFile($filename)->current();
     }
+
+    public function testFileNotExistShouldThrowException(): void
+    {
+        // Arrange
+        $filename = 'some-path/test.txt';
+
+        // Expect
+        $this->fileReaderMock->expects($this->never())
+            ->method('readFile');
+
+        $this->fileReaderProgressMock->expects($this->once())
+            ->method('fileExists')
+            ->with($filename)
+            ->willReturn(false);
+
+        $this->fileReaderProgressMock->expects($this->never())
+            ->method('filesize');
+
+        // Expect
+        $this->expectException(FileReaderException::class);
+
+        // Act
+        $this->fileReaderProgressMock->readFile($filename)->current();
+    }
 }

From e2509cea7c8d1c98542e7de242ce6e060dc2a411 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 19:16:17 +0200
Subject: [PATCH 24/35] Added property name validator to the definition content
 builder

---
 .../Builder/DefinitionContentBuilder.php      | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php b/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php
index 037ae29d..34fbc3fb 100644
--- a/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php
+++ b/src/DefinitionGenerator/Builder/DefinitionContentBuilder.php
@@ -6,20 +6,15 @@
 
 use Picamator\TransferObject\DefinitionGenerator\Builder\Enum\GetTypeEnum;
 use Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException;
+use Picamator\TransferObject\Shared\Validator\VariableValidatorTrait;
 
 readonly class DefinitionContentBuilder implements DefinitionContentBuilderInterface
 {
+    use VariableValidatorTrait;
+
     public function createBuilderContent(string $propertyName, mixed $propertyValue): BuilderContentInterface
     {
-        if (is_numeric($propertyName)) {
-            throw new DefinitionGeneratorException(
-                sprintf(
-                    'Invalid property name "%s".',
-                    $propertyName,
-                ),
-            );
-        }
-
+        $this->assertPropertyName($propertyName);
         $typeEnum = $this->getTypeEnum($propertyName, $propertyValue);
 
         return new BuilderContent($typeEnum, $propertyName, $propertyValue);
@@ -37,11 +32,21 @@ private function getTypeEnum(string $propertyName, mixed $propertyValue): GetTyp
         }
 
         throw new DefinitionGeneratorException(
-            sprintf(
-                'Property "%s" with type "%s" is not supported.',
-                $propertyName,
-                $propertyType,
-            ),
+            sprintf('Property "%s" with type "%s" is not supported.', $propertyName, $propertyType),
+        );
+    }
+
+    /**
+     * @throws \Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException
+     */
+    private function assertPropertyName(string $propertyName): void
+    {
+        if ($this->isValidVariable($propertyName)) {
+            return;
+        }
+
+        throw new DefinitionGeneratorException(
+            sprintf('Invalid property name "%s".', $propertyName),
         );
     }
 }

From 632574e676b596994376a38effacdddc7fe95a29 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Fri, 12 Sep 2025 19:25:28 +0200
Subject: [PATCH 25/35] Actualised composer dependencies

---
 composer.lock | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/composer.lock b/composer.lock
index b49b7183..fb70d320 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1470,16 +1470,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.22",
+            "version": "2.1.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4"
+                "reference": "4087d28bd252895874e174d65e26b2c202ed893a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4",
-                "reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4087d28bd252895874e174d65e26b2c202ed893a",
+                "reference": "4087d28bd252895874e174d65e26b2c202ed893a",
                 "shasum": ""
             },
             "require": {
@@ -1524,7 +1524,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-04T19:17:37+00:00"
+            "time": "2025-09-12T14:26:42+00:00"
         },
         {
             "name": "phpstan/phpstan-strict-rules",
@@ -1576,16 +1576,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "12.3.6",
+            "version": "12.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "da2cdaff87220fa641e7652364281b736e4347e0"
+                "reference": "bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/da2cdaff87220fa641e7652364281b736e4347e0",
-                "reference": "da2cdaff87220fa641e7652364281b736e4347e0",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9",
+                "reference": "bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9",
                 "shasum": ""
             },
             "require": {
@@ -1641,7 +1641,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.6"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.7"
             },
             "funding": [
                 {
@@ -1661,7 +1661,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-02T05:23:14+00:00"
+            "time": "2025-09-10T09:59:06+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1910,16 +1910,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.3.8",
+            "version": "12.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "9d68c1b41fc21aac106c71cde4669fe7b99fca10"
+                "reference": "0d401d0df2e3c1703be425ecdc2d04f5c095938d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9d68c1b41fc21aac106c71cde4669fe7b99fca10",
-                "reference": "9d68c1b41fc21aac106c71cde4669fe7b99fca10",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d401d0df2e3c1703be425ecdc2d04f5c095938d",
+                "reference": "0d401d0df2e3c1703be425ecdc2d04f5c095938d",
                 "shasum": ""
             },
             "require": {
@@ -1933,7 +1933,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.3.6",
+                "phpunit/php-code-coverage": "^12.3.7",
                 "phpunit/php-file-iterator": "^6.0.0",
                 "phpunit/php-invoker": "^6.0.0",
                 "phpunit/php-text-template": "^5.0.0",
@@ -1987,7 +1987,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.8"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.10"
             },
             "funding": [
                 {
@@ -2011,7 +2011,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-03T06:25:17+00:00"
+            "time": "2025-09-11T10:35:19+00:00"
         },
         {
             "name": "sebastian/cli-parser",

From cae89bf751127dd9a8360ad00589e14c8184ccfd Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 14:20:04 +0200
Subject: [PATCH 26/35] Changed console width for the
 TransferGeneratorBulkCommandTest to specify error output assert

---
 .../Command/TransferGeneratorBulkCommandTest.php          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/integration/Command/TransferGeneratorBulkCommandTest.php b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
index cc2a8110..412c8fdc 100644
--- a/tests/integration/Command/TransferGeneratorBulkCommandTest.php
+++ b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
@@ -21,6 +21,7 @@ class TransferGeneratorBulkCommandTest extends TestCase
 
     protected function setUp(): void
     {
+        putenv('COLUMNS=120');
         $command = new TransferGeneratorBulkCommand();
 
         $this->commandTester = new CommandTester($command);
@@ -45,7 +46,10 @@ public function testRunCommandWithInvalidConfigurationPathShouldShowErrorMessage
 
         // Assert
         $this->assertSame(1, $this->commandTester->getStatusCode());
-        $this->assertStringContainsString('[ERROR] File', $output);
+        $this->assertStringContainsString(
+            '[ERROR] File "/home/transfer/transfer-object/some-invalid-path.list.txt" is not exist.',
+            $output,
+        );
     }
 
     public function testRunCommandWithValidConfigurationShouldShowSuccessMessage(): void
@@ -71,7 +75,7 @@ public function testRunCommandWithEmptyConfigurationShouldShowErrorMessage(): vo
 
         // Assert
         $this->assertSame(1, $this->commandTester->getStatusCode());
-        $this->assertStringContainsString('[ERROR] File', $output);
+        $this->assertStringContainsString('[ERROR] File size', $output);
     }
 
     public function testRunCommandWithValidConfigurationButInvalidDefinitionShouldShowErrorMessage(): void

From d9444d9201b10b30b78d211e7dddb21e11ee77d2 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 14:36:17 +0200
Subject: [PATCH 27/35] Added tests groups

---
 tests/integration/Command/DefinitionGeneratorCommandTest.php   | 2 ++
 tests/integration/Command/TransferGeneratorBulkCommandTest.php | 2 ++
 tests/integration/Command/TransferGeneratorCommandTest.php     | 2 ++
 .../DefinitionGenerator/DefinitionGeneratorFacadeTest.php      | 2 ++
 tests/integration/Transfer/DummyTransferAdapterTest.php        | 2 ++
 tests/integration/Transfer/TransferAdapterTest.php             | 2 ++
 tests/integration/Transfer/TransferTest.php                    | 2 ++
 .../TransferGenerator/Config/Loader/ConfigLoaderTest.php       | 2 ++
 .../TransferGenerator/TransferGeneratorFacadeErrorTest.php     | 2 ++
 .../TransferGenerator/TransferGeneratorFacadeSuccessTest.php   | 2 ++
 tests/unit/Command/Helper/InputNormalizerTest.php              | 2 ++
 .../Builder/DefinitionContentBuilderTest.php                   | 2 ++
 .../Builder/Expander/BuildInTypeBuilderExpanderTest.php        | 2 ++
 .../Builder/Expander/CollectionTypeBuilderExpanderTest.php     | 3 ++-
 .../Builder/Expander/TransferTypeBuilderExpanderTest.php       | 3 ++-
 .../Generator/Builder/DefinitionGeneratorBuilderTest.php       | 2 ++
 tests/unit/DefinitionGenerator/Render/DefinitionRenderTest.php | 2 ++
 tests/unit/Dependency/DependencyContainerTest.php              | 2 ++
 tests/unit/Shared/Filesystem/FileAppenderTest.php              | 2 ++
 tests/unit/Shared/Filesystem/FileReaderTest.php                | 2 ++
 tests/unit/Shared/Reader/FileReaderProgressTest.php            | 2 ++
 tests/unit/Shared/Reader/JsonReaderTest.php                    | 2 ++
 tests/unit/Shared/Validator/NamespaceValidatorTest.php         | 2 ++
 tests/unit/TransferGenerator/Config/Config/ConfigProxyTest.php | 2 ++
 .../Config/Environment/ConfigEnvironmentRenderTest.php         | 2 ++
 .../Parser/Expander/Builder/NamespaceBuilderTest.php           | 2 ++
 .../Generator/Filesystem/GeneratorFilesystemTest.php           | 2 ++
 .../Generator/Processor/Command/PostProcessCommandTest.php     | 2 ++
 .../Generator/Processor/Command/PreProcessCommandTest.php      | 2 ++
 .../Generator/Generator/ServiceTransferGeneratorTest.php       | 2 ++
 .../Generator/Render/Template/TemplateHelperTest.php           | 2 ++
 .../TransferGenerator/Generator/Render/TemplateRenderTest.php  | 2 ++
 32 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/tests/integration/Command/DefinitionGeneratorCommandTest.php b/tests/integration/Command/DefinitionGeneratorCommandTest.php
index b79ad757..3018a71c 100644
--- a/tests/integration/Command/DefinitionGeneratorCommandTest.php
+++ b/tests/integration/Command/DefinitionGeneratorCommandTest.php
@@ -4,12 +4,14 @@
 
 namespace Picamator\Tests\Integration\TransferObject\Command;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Command\DefinitionGeneratorCommand;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Tester\CommandTester;
 
+#[Group('command')]
 class DefinitionGeneratorCommandTest extends TestCase
 {
     private CommandTester $commandTester;
diff --git a/tests/integration/Command/TransferGeneratorBulkCommandTest.php b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
index 412c8fdc..e0481fa4 100644
--- a/tests/integration/Command/TransferGeneratorBulkCommandTest.php
+++ b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
@@ -4,10 +4,12 @@
 
 namespace Command;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Command\TransferGeneratorBulkCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 
+#[Group('command')]
 class TransferGeneratorBulkCommandTest extends TestCase
 {
     private const string SUCCESS_CONFIG_LIST_PATH = '/tests/integration/Command/data/config/success/config.list.txt';
diff --git a/tests/integration/Command/TransferGeneratorCommandTest.php b/tests/integration/Command/TransferGeneratorCommandTest.php
index 53dc4392..2dae802b 100644
--- a/tests/integration/Command/TransferGeneratorCommandTest.php
+++ b/tests/integration/Command/TransferGeneratorCommandTest.php
@@ -4,11 +4,13 @@
 
 namespace Picamator\Tests\Integration\TransferObject\Command;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Command\TransferGeneratorCommand;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 
+#[Group('command')]
 class TransferGeneratorCommandTest extends TestCase
 {
     private const string SUCCESS_CONFIG_PATH = '/tests/integration/Command/data/config/success/generator.config.yml';
diff --git a/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php b/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
index afd80408..ec8cb5fd 100644
--- a/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
+++ b/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
@@ -7,6 +7,7 @@
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Frankfurter\ExchangeRateTransfer;
 use Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\GoogleShoppingContent\ProductTransfer;
@@ -18,6 +19,7 @@
 use Picamator\TransferObject\DefinitionGenerator\DefinitionGeneratorFacade;
 use Picamator\TransferObject\DefinitionGenerator\DefinitionGeneratorFacadeInterface;
 
+#[Group('definition-generator')]
 class DefinitionGeneratorFacadeTest extends TestCase
 {
     use DefinitionGeneratorHelperTrait;
diff --git a/tests/integration/Transfer/DummyTransferAdapterTest.php b/tests/integration/Transfer/DummyTransferAdapterTest.php
index 9f808b52..eee3c005 100644
--- a/tests/integration/Transfer/DummyTransferAdapterTest.php
+++ b/tests/integration/Transfer/DummyTransferAdapterTest.php
@@ -4,9 +4,11 @@
 
 namespace Picamator\Tests\Integration\TransferObject\Transfer;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\Transfer\Advanced\BookmarkData;
 
+#[Group('transfer')]
 class DummyTransferAdapterTest extends TestCase
 {
     private BookmarkData $bookmarkData;
diff --git a/tests/integration/Transfer/TransferAdapterTest.php b/tests/integration/Transfer/TransferAdapterTest.php
index d81f0e84..a89a2be0 100644
--- a/tests/integration/Transfer/TransferAdapterTest.php
+++ b/tests/integration/Transfer/TransferAdapterTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Integration\TransferObject\Transfer;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\Transfer\Advanced\BcMathBookData;
@@ -11,6 +12,7 @@
 use Picamator\Tests\Integration\TransferObject\Transfer\Enum\CountryEnum;
 use Picamator\Tests\Integration\TransferObject\Transfer\Generated\AuthorTransfer;
 
+#[Group('transfer')]
 class TransferAdapterTest extends TestCase
 {
     public function testFromArrayToArray(): void
diff --git a/tests/integration/Transfer/TransferTest.php b/tests/integration/Transfer/TransferTest.php
index c57f7c96..193a90b6 100644
--- a/tests/integration/Transfer/TransferTest.php
+++ b/tests/integration/Transfer/TransferTest.php
@@ -7,6 +7,7 @@
 use ArrayObject;
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\Attributes\WithoutErrorHandler;
@@ -23,6 +24,7 @@
 use ReflectionProperty;
 use TypeError;
 
+#[Group('transfer')]
 class TransferTest extends TestCase
 {
     use TransferGeneratorHelperTrait;
diff --git a/tests/integration/TransferGenerator/Config/Loader/ConfigLoaderTest.php b/tests/integration/TransferGenerator/Config/Loader/ConfigLoaderTest.php
index 0a65411b..a08874be 100644
--- a/tests/integration/TransferGenerator/Config/Loader/ConfigLoaderTest.php
+++ b/tests/integration/TransferGenerator/Config/Loader/ConfigLoaderTest.php
@@ -6,10 +6,12 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\TransferGenerator\Config\ConfigFactory;
 use Picamator\TransferObject\TransferGenerator\Config\Loader\ConfigLoaderInterface;
 
+#[Group('transfer-generator')]
 class ConfigLoaderTest extends TestCase
 {
     private const string CONFIG_PATH = __DIR__ . '/../../data/config/error/';
diff --git a/tests/integration/TransferGenerator/TransferGeneratorFacadeErrorTest.php b/tests/integration/TransferGenerator/TransferGeneratorFacadeErrorTest.php
index b5023eb2..fa3fc69e 100644
--- a/tests/integration/TransferGenerator/TransferGeneratorFacadeErrorTest.php
+++ b/tests/integration/TransferGenerator/TransferGeneratorFacadeErrorTest.php
@@ -6,12 +6,14 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\Helper\TransferGeneratorHelperTrait;
 use Picamator\TransferObject\Generated\TransferGeneratorTransfer;
 use Picamator\TransferObject\TransferGenerator\Exception\TransferGeneratorException;
 use Picamator\TransferObject\TransferGenerator\TransferGeneratorFacade;
 
+#[Group('transfer-generator')]
 class TransferGeneratorFacadeErrorTest extends TestCase
 {
     use TransferGeneratorHelperTrait;
diff --git a/tests/integration/TransferGenerator/TransferGeneratorFacadeSuccessTest.php b/tests/integration/TransferGenerator/TransferGeneratorFacadeSuccessTest.php
index 70312b52..045dd2fd 100644
--- a/tests/integration/TransferGenerator/TransferGeneratorFacadeSuccessTest.php
+++ b/tests/integration/TransferGenerator/TransferGeneratorFacadeSuccessTest.php
@@ -4,9 +4,11 @@
 
 namespace Picamator\Tests\Integration\TransferObject\TransferGenerator;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\Helper\TransferGeneratorHelperTrait;
 
+#[Group('transfer-generator')]
 class TransferGeneratorFacadeSuccessTest extends TestCase
 {
     use TransferGeneratorHelperTrait;
diff --git a/tests/unit/Command/Helper/InputNormalizerTest.php b/tests/unit/Command/Helper/InputNormalizerTest.php
index ad7a0cb2..1f5dbfef 100644
--- a/tests/unit/Command/Helper/InputNormalizerTest.php
+++ b/tests/unit/Command/Helper/InputNormalizerTest.php
@@ -6,9 +6,11 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Command\Helper\InputNormalizerTrait;
 
+#[Group('command')]
 class InputNormalizerTest extends TestCase
 {
     private InputNormalizerInterface $inputNormalizer;
diff --git a/tests/unit/DefinitionGenerator/Builder/DefinitionContentBuilderTest.php b/tests/unit/DefinitionGenerator/Builder/DefinitionContentBuilderTest.php
index 89f5bf3c..da9a8eed 100644
--- a/tests/unit/DefinitionGenerator/Builder/DefinitionContentBuilderTest.php
+++ b/tests/unit/DefinitionGenerator/Builder/DefinitionContentBuilderTest.php
@@ -4,12 +4,14 @@
 
 namespace Picamator\Tests\Unit\TransferObject\DefinitionGenerator\Builder;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Unit\TransferObject\Helper\FileStreamHelperTrait;
 use Picamator\TransferObject\DefinitionGenerator\Builder\DefinitionContentBuilder;
 use Picamator\TransferObject\DefinitionGenerator\Builder\DefinitionContentBuilderInterface;
 use Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException;
 
+#[Group('definition-generator')]
 class DefinitionContentBuilderTest extends TestCase
 {
     use FileStreamHelperTrait;
diff --git a/tests/unit/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpanderTest.php b/tests/unit/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpanderTest.php
index e80159ca..c4625719 100644
--- a/tests/unit/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpanderTest.php
+++ b/tests/unit/DefinitionGenerator/Builder/Expander/BuildInTypeBuilderExpanderTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\DefinitionGenerator\Builder\Expander;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
@@ -14,6 +15,7 @@
 use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
 use stdClass;
 
+#[Group('definition-generator')]
 class BuildInTypeBuilderExpanderTest extends TestCase
 {
     private BuilderExpanderInterface $expander;
diff --git a/tests/unit/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpanderTest.php b/tests/unit/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpanderTest.php
index 8859ec1d..59da25e4 100644
--- a/tests/unit/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpanderTest.php
+++ b/tests/unit/DefinitionGenerator/Builder/Expander/CollectionTypeBuilderExpanderTest.php
@@ -6,6 +6,7 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
@@ -14,6 +15,7 @@
 use Picamator\TransferObject\DefinitionGenerator\Builder\Expander\CollectionTypeBuilderExpander;
 use ReflectionMethod;
 
+#[Group('definition-generator')]
 class CollectionTypeBuilderExpanderTest extends TestCase
 {
     private BuilderExpanderInterface $expander;
@@ -32,7 +34,6 @@ protected function setUp(): void
             CollectionTypeBuilderExpander::class,
             'isApplicable',
         );
-        $this->isApplicableReflection->setAccessible(true);
     }
 
     /**
diff --git a/tests/unit/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpanderTest.php b/tests/unit/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpanderTest.php
index 8e0bea15..a607bb0f 100644
--- a/tests/unit/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpanderTest.php
+++ b/tests/unit/DefinitionGenerator/Builder/Expander/TransferTypeBuilderExpanderTest.php
@@ -6,6 +6,7 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\DefinitionGenerator\Builder\BuilderContentInterface;
@@ -14,6 +15,7 @@
 use Picamator\TransferObject\DefinitionGenerator\Builder\Expander\TransferTypeBuilderExpander;
 use ReflectionMethod;
 
+#[Group('definition-generator')]
 class TransferTypeBuilderExpanderTest extends TestCase
 {
     private BuilderExpanderInterface $expander;
@@ -32,7 +34,6 @@ protected function setUp(): void
             TransferTypeBuilderExpander::class,
             'isApplicable',
         );
-        $this->isApplicableReflection->setAccessible(true);
     }
 
     /**
diff --git a/tests/unit/DefinitionGenerator/Generator/Builder/DefinitionGeneratorBuilderTest.php b/tests/unit/DefinitionGenerator/Generator/Builder/DefinitionGeneratorBuilderTest.php
index f3de2f37..f1a5ef9c 100644
--- a/tests/unit/DefinitionGenerator/Generator/Builder/DefinitionGeneratorBuilderTest.php
+++ b/tests/unit/DefinitionGenerator/Generator/Builder/DefinitionGeneratorBuilderTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\DefinitionGenerator\Generator\Builder;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException;
@@ -15,6 +16,7 @@
 use Picamator\TransferObject\Shared\Validator\ClassNameValidatorInterface;
 use Picamator\TransferObject\Shared\Validator\PathLocalValidatorInterface;
 
+#[Group('definition-generator')]
 class DefinitionGeneratorBuilderTest extends TestCase
 {
     private DefinitionGeneratorBuilderInterface $builder;
diff --git a/tests/unit/DefinitionGenerator/Render/DefinitionRenderTest.php b/tests/unit/DefinitionGenerator/Render/DefinitionRenderTest.php
index 25d0e7a5..c553967f 100644
--- a/tests/unit/DefinitionGenerator/Render/DefinitionRenderTest.php
+++ b/tests/unit/DefinitionGenerator/Render/DefinitionRenderTest.php
@@ -6,6 +6,7 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException;
 use Picamator\TransferObject\DefinitionGenerator\Render\DefinitionRender;
@@ -14,6 +15,7 @@
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 
+#[Group('definition-generator')]
 class DefinitionRenderTest extends TestCase
 {
     private const string TEST_CLASS_NAME = 'TestClass';
diff --git a/tests/unit/Dependency/DependencyContainerTest.php b/tests/unit/Dependency/DependencyContainerTest.php
index cae95656..555f6d88 100644
--- a/tests/unit/Dependency/DependencyContainerTest.php
+++ b/tests/unit/Dependency/DependencyContainerTest.php
@@ -4,11 +4,13 @@
 
 namespace Picamator\Tests\Unit\TransferObject\Dependency;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Dependency\DependencyContainer;
 use Picamator\TransferObject\Dependency\Exception\ServiceNotFoundException;
 use Psr\Container\ContainerInterface;
 
+#[Group('dependency')]
 class DependencyContainerTest extends TestCase
 {
     private ContainerInterface $container;
diff --git a/tests/unit/Shared/Filesystem/FileAppenderTest.php b/tests/unit/Shared/Filesystem/FileAppenderTest.php
index 25e6b3c3..a868e471 100644
--- a/tests/unit/Shared/Filesystem/FileAppenderTest.php
+++ b/tests/unit/Shared/Filesystem/FileAppenderTest.php
@@ -4,12 +4,14 @@
 
 namespace Picamator\Tests\Unit\TransferObject\Shared\Filesystem;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Unit\TransferObject\Helper\FileStreamHelperTrait;
 use Picamator\TransferObject\Shared\Exception\FileAppenderException;
 use Picamator\TransferObject\Shared\Filesystem\FileAppender;
 
+#[Group('shared')]
 class FileAppenderTest extends TestCase
 {
     use FileStreamHelperTrait;
diff --git a/tests/unit/Shared/Filesystem/FileReaderTest.php b/tests/unit/Shared/Filesystem/FileReaderTest.php
index 9989d4be..ebabb615 100644
--- a/tests/unit/Shared/Filesystem/FileReaderTest.php
+++ b/tests/unit/Shared/Filesystem/FileReaderTest.php
@@ -4,12 +4,14 @@
 
 namespace Picamator\Tests\Unit\TransferObject\Shared\Filesystem;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Unit\TransferObject\Helper\FileStreamHelperTrait;
 use Picamator\TransferObject\Shared\Exception\FileReaderException;
 use Picamator\TransferObject\Shared\Filesystem\FileReader;
 
+#[Group('shared')]
 class FileReaderTest extends TestCase
 {
     use FileStreamHelperTrait;
diff --git a/tests/unit/Shared/Reader/FileReaderProgressTest.php b/tests/unit/Shared/Reader/FileReaderProgressTest.php
index 1bcf0500..faf7c5e1 100644
--- a/tests/unit/Shared/Reader/FileReaderProgressTest.php
+++ b/tests/unit/Shared/Reader/FileReaderProgressTest.php
@@ -5,6 +5,7 @@
 namespace Picamator\Tests\Unit\TransferObject\Shared\Reader;
 
 use Generator;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -13,6 +14,7 @@
 use Picamator\TransferObject\Shared\Filesystem\FileReaderInterface;
 use Picamator\TransferObject\Shared\Reader\FileReaderProgress;
 
+#[Group('shared')]
 class FileReaderProgressTest extends TestCase
 {
     private FileReaderProgress&MockObject $fileReaderProgressMock;
diff --git a/tests/unit/Shared/Reader/JsonReaderTest.php b/tests/unit/Shared/Reader/JsonReaderTest.php
index 950a65aa..38bb0ce1 100644
--- a/tests/unit/Shared/Reader/JsonReaderTest.php
+++ b/tests/unit/Shared/Reader/JsonReaderTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\Shared\Reader;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Dependency\Exception\FilesystemException;
@@ -12,6 +13,7 @@
 use Picamator\TransferObject\Shared\Reader\JsonReader;
 use Picamator\TransferObject\Shared\Reader\JsonReaderInterface;
 
+#[Group('shared')]
 class JsonReaderTest extends TestCase
 {
     private const string FILE_PATH = 'test.json';
diff --git a/tests/unit/Shared/Validator/NamespaceValidatorTest.php b/tests/unit/Shared/Validator/NamespaceValidatorTest.php
index 260996cf..e34e271e 100644
--- a/tests/unit/Shared/Validator/NamespaceValidatorTest.php
+++ b/tests/unit/Shared/Validator/NamespaceValidatorTest.php
@@ -6,9 +6,11 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Shared\Validator\NamespaceValidatorTrait;
 
+#[Group('shared')]
 class NamespaceValidatorTest extends TestCase
 {
     private NamespaceValidatorInterface $validator;
diff --git a/tests/unit/TransferGenerator/Config/Config/ConfigProxyTest.php b/tests/unit/TransferGenerator/Config/Config/ConfigProxyTest.php
index 8cce0bcc..5fd824ef 100644
--- a/tests/unit/TransferGenerator/Config/Config/ConfigProxyTest.php
+++ b/tests/unit/TransferGenerator/Config/Config/ConfigProxyTest.php
@@ -4,11 +4,13 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Config\Config;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\TransferGenerator\Config\Config\ConfigInterface;
 use Picamator\TransferObject\TransferGenerator\Config\Config\ConfigProxy;
 use Picamator\TransferObject\TransferGenerator\Exception\TransferGeneratorConfigNotFoundException;
 
+#[Group('transfer-generator')]
 class ConfigProxyTest extends TestCase
 {
     private ConfigInterface $proxy;
diff --git a/tests/unit/TransferGenerator/Config/Environment/ConfigEnvironmentRenderTest.php b/tests/unit/TransferGenerator/Config/Environment/ConfigEnvironmentRenderTest.php
index 408cdc8a..e77d7e93 100644
--- a/tests/unit/TransferGenerator/Config/Environment/ConfigEnvironmentRenderTest.php
+++ b/tests/unit/TransferGenerator/Config/Environment/ConfigEnvironmentRenderTest.php
@@ -4,10 +4,12 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Config\Environment;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\TransferGenerator\Config\Environment\ConfigEnvironmentRender;
 
+#[Group('transfer-generator')]
 class ConfigEnvironmentRenderTest extends TestCase
 {
     private ConfigEnvironmentRender&MockObject $renderMock;
diff --git a/tests/unit/TransferGenerator/Definition/Parser/Expander/Builder/NamespaceBuilderTest.php b/tests/unit/TransferGenerator/Definition/Parser/Expander/Builder/NamespaceBuilderTest.php
index 9222ceff..dde8d72d 100644
--- a/tests/unit/TransferGenerator/Definition/Parser/Expander/Builder/NamespaceBuilderTest.php
+++ b/tests/unit/TransferGenerator/Definition/Parser/Expander/Builder/NamespaceBuilderTest.php
@@ -6,11 +6,13 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Generated\DefinitionNamespaceTransfer;
 use Picamator\TransferObject\TransferGenerator\Definition\Parser\Expander\Builder\NamespaceBuilder;
 use Picamator\TransferObject\TransferGenerator\Definition\Parser\Expander\Builder\NamespaceBuilderInterface;
 
+#[Group('transfer-generator')]
 class NamespaceBuilderTest extends TestCase
 {
     private NamespaceBuilderInterface $builder;
diff --git a/tests/unit/TransferGenerator/Generator/Filesystem/GeneratorFilesystemTest.php b/tests/unit/TransferGenerator/Generator/Filesystem/GeneratorFilesystemTest.php
index 3d4e8661..4ecf498c 100644
--- a/tests/unit/TransferGenerator/Generator/Filesystem/GeneratorFilesystemTest.php
+++ b/tests/unit/TransferGenerator/Generator/Filesystem/GeneratorFilesystemTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Generator\Filesystem;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Dependency\Filesystem\FilesystemInterface;
@@ -14,6 +15,7 @@
 use Picamator\TransferObject\TransferGenerator\Generator\Filesystem\GeneratorFilesystem;
 use Picamator\TransferObject\TransferGenerator\Generator\Filesystem\GeneratorFilesystemInterface;
 
+#[Group('transfer-generator')]
 class GeneratorFilesystemTest extends TestCase
 {
     private GeneratorFilesystemInterface $generatorFilesystem;
diff --git a/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PostProcessCommandTest.php b/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PostProcessCommandTest.php
index b3dc2140..85823f4a 100644
--- a/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PostProcessCommandTest.php
+++ b/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PostProcessCommandTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Generator\Generator\Processor\Command;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Dependency\Exception\FilesystemException;
@@ -12,6 +13,7 @@
 use Picamator\TransferObject\TransferGenerator\Generator\Generator\Processor\Command\PostProcessCommand;
 use Picamator\TransferObject\TransferGenerator\Generator\Generator\Processor\Command\PostProcessCommandInterface;
 
+#[Group('transfer-generator')]
 class PostProcessCommandTest extends TestCase
 {
     private PostProcessCommandInterface $command;
diff --git a/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PreProcessCommandTest.php b/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PreProcessCommandTest.php
index 64dabf54..4eb5f904 100644
--- a/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PreProcessCommandTest.php
+++ b/tests/unit/TransferGenerator/Generator/Generator/Processor/Command/PreProcessCommandTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Generator\Generator\Processor\Command;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Dependency\Exception\FilesystemException;
@@ -15,6 +16,7 @@
 use Picamator\TransferObject\TransferGenerator\Generator\Generator\Processor\Command\PreProcessCommand;
 use Picamator\TransferObject\TransferGenerator\Generator\Generator\Processor\Command\PreProcessCommandInterface;
 
+#[Group('transfer-generator')]
 class PreProcessCommandTest extends TestCase
 {
     private PreProcessCommandInterface $command;
diff --git a/tests/unit/TransferGenerator/Generator/Generator/ServiceTransferGeneratorTest.php b/tests/unit/TransferGenerator/Generator/Generator/ServiceTransferGeneratorTest.php
index 894be5b6..6e51b881 100644
--- a/tests/unit/TransferGenerator/Generator/Generator/ServiceTransferGeneratorTest.php
+++ b/tests/unit/TransferGenerator/Generator/Generator/ServiceTransferGeneratorTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Generator\Generator;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Generated\TransferGeneratorTransfer;
@@ -13,6 +14,7 @@
 use Picamator\TransferObject\TransferGenerator\Generator\Generator\TransferGeneratorServiceInterface;
 use Picamator\TransferObject\TransferGenerator\Generator\Generator\Workflow\TransferGeneratorWorkflowInterface;
 
+#[Group('transfer-generator')]
 class ServiceTransferGeneratorTest extends TestCase
 {
     private TransferGeneratorServiceInterface $serviceGenerator;
diff --git a/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php b/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php
index be0cbc1b..4ba1f317 100644
--- a/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php
+++ b/tests/unit/TransferGenerator/Generator/Render/Template/TemplateHelperTest.php
@@ -6,10 +6,12 @@
 
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Generated\TemplateTransfer;
 use Picamator\TransferObject\TransferGenerator\Generator\Render\Template\TemplateHelper;
 
+#[Group('transfer-generator')]
 class TemplateHelperTest extends TestCase
 {
     /**
diff --git a/tests/unit/TransferGenerator/Generator/Render/TemplateRenderTest.php b/tests/unit/TransferGenerator/Generator/Render/TemplateRenderTest.php
index 978209bd..b041e406 100644
--- a/tests/unit/TransferGenerator/Generator/Render/TemplateRenderTest.php
+++ b/tests/unit/TransferGenerator/Generator/Render/TemplateRenderTest.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\Tests\Unit\TransferObject\TransferGenerator\Generator\Render;
 
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Picamator\TransferObject\Generated\DefinitionContentTransfer;
@@ -16,6 +17,7 @@
 use Picamator\TransferObject\TransferGenerator\Generator\Render\TemplateRender;
 use Picamator\TransferObject\TransferGenerator\Generator\Render\TemplateRenderInterface;
 
+#[Group('transfer-generator')]
 class TemplateRenderTest extends TestCase
 {
     private TemplateRenderInterface $render;

From bd18707b3371b170996585b3e2a3a4348705b512 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 14:44:49 +0200
Subject: [PATCH 28/35] Used special json assert

---
 tests/integration/Transfer/DummyTransferAdapterTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/Transfer/DummyTransferAdapterTest.php b/tests/integration/Transfer/DummyTransferAdapterTest.php
index eee3c005..2f1ce086 100644
--- a/tests/integration/Transfer/DummyTransferAdapterTest.php
+++ b/tests/integration/Transfer/DummyTransferAdapterTest.php
@@ -75,6 +75,6 @@ public function testJsonSerialize(): void
         $actual = json_encode($this->bookmarkData, flags: JSON_THROW_ON_ERROR);
 
         // Assert
-        $this->assertSame('[]', $actual);
+        $this->assertJsonStringEqualsJsonString('[]', $actual);
     }
 }

From f8c04320b930f827837ce02d8d9c8d83ce2c4e28 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 15:08:39 +0200
Subject: [PATCH 29/35] Added Destatis find api data provider to test
 definition generator

---
 .../DefinitionGeneratorFacadeTest.php         |  16 ++
 .../Generated/Destatis/DestatisTransfer.php   | 135 ++++++++++++++
 .../Generated/Destatis/IdentTransfer.php      |  46 +++++
 .../Generated/Destatis/ParameterTransfer.php  |  90 +++++++++
 .../Generated/Destatis/StatisticsTransfer.php |  68 +++++++
 .../Generated/Destatis/StatusTransfer.php     |  57 ++++++
 .../Generated/Destatis/TablesTransfer.php     |  57 ++++++
 .../Generated/Destatis/VariablesTransfer.php  |  79 ++++++++
 .../DefinitionGenerator/data/README.md        |  15 +-
 .../api-response/genesis-destatis-find.json   | 174 ++++++++++++++++++
 .../definition/destatis.transfer.yml          |  87 +++++++++
 .../generator.config.yml                      |   5 +
 12 files changed, 822 insertions(+), 7 deletions(-)
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/DestatisTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/IdentTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/ParameterTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/StatisticsTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/StatusTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/TablesTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/Generated/Destatis/VariablesTransfer.php
 create mode 100644 tests/integration/DefinitionGenerator/data/api-response/genesis-destatis-find.json
 create mode 100644 tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml
 create mode 100644 tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/generator.config.yml

diff --git a/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php b/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
index ec8cb5fd..d2f3fc4b 100644
--- a/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
+++ b/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
@@ -9,6 +9,7 @@
 use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
+use Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis\DestatisTransfer;
 use Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Frankfurter\ExchangeRateTransfer;
 use Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\GoogleShoppingContent\ProductTransfer;
 use Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\NasaNeo\AsteroidTransfer;
@@ -99,6 +100,12 @@ public static function generateDefinitionDataProvider(): Generator
             'sampleFileName' => 'tagesschau-api-bund-dev-v2.json',
             'definitionFileName' => 'ardNews.transfer.yml',
         ];
+
+        yield 'Destatis' => [
+            'className' => 'Destatis',
+            'sampleFileName' => 'genesis-destatis-find.json',
+            'definitionFileName' => 'destatis.transfer.yml',
+        ];
     }
 
     #[DataProvider('configPathDataProvider')]
@@ -141,6 +148,10 @@ public static function configPathDataProvider(): Generator
         yield 'Tagesschau' => [
             'tagesschau-api-bund-dev-v2.json',
         ];
+
+        yield 'Destatis' => [
+            'genesis-destatis-find.json',
+        ];
     }
 
     #[DataProvider('matchDefinitionDataProvider')]
@@ -190,6 +201,11 @@ public static function matchDefinitionDataProvider(): Generator
             ExchangeRateTransfer::class,
             'frankfurter-dev-v1.json',
         ];
+
+        yield 'Destatis' => [
+            DestatisTransfer::class,
+            'genesis-destatis-find.json',
+        ];
     }
 
     #[DataProvider('matchFilteredDefinitionDataProvider')]
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/DestatisTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/DestatisTransfer.php
new file mode 100644
index 00000000..d53edb6c
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/DestatisTransfer.php
@@ -0,0 +1,135 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use ArrayObject;
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+use Picamator\TransferObject\Transfer\Attribute\CollectionPropertyTypeAttribute;
+use Picamator\TransferObject\Transfer\Attribute\PropertyTypeAttribute;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class DestatisTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 9;
+
+    protected const array META_DATA = [
+        self::COPYRIGHT => self::COPYRIGHT_DATA_NAME,
+        self::CUBES => self::CUBES_DATA_NAME,
+        self::IDENT => self::IDENT_DATA_NAME,
+        self::PARAMETER => self::PARAMETER_DATA_NAME,
+        self::STATISTICS => self::STATISTICS_DATA_NAME,
+        self::STATUS => self::STATUS_DATA_NAME,
+        self::TABLES => self::TABLES_DATA_NAME,
+        self::TIMESERIES => self::TIMESERIES_DATA_NAME,
+        self::VARIABLES => self::VARIABLES_DATA_NAME,
+    ];
+
+    // Copyright
+    public const string COPYRIGHT = 'Copyright';
+    protected const string COPYRIGHT_DATA_NAME = 'COPYRIGHT';
+    protected const int COPYRIGHT_DATA_INDEX = 0;
+
+    public ?string $Copyright {
+        get => $this->getData(self::COPYRIGHT_DATA_INDEX);
+        set => $this->setData(self::COPYRIGHT_DATA_INDEX, $value);
+    }
+
+    // Cubes
+    public const string CUBES = 'Cubes';
+    protected const string CUBES_DATA_NAME = 'CUBES';
+    protected const int CUBES_DATA_INDEX = 1;
+
+    public ?string $Cubes {
+        get => $this->getData(self::CUBES_DATA_INDEX);
+        set => $this->setData(self::CUBES_DATA_INDEX, $value);
+    }
+
+    // Ident
+    #[PropertyTypeAttribute(IdentTransfer::class)]
+    public const string IDENT = 'Ident';
+    protected const string IDENT_DATA_NAME = 'IDENT';
+    protected const int IDENT_DATA_INDEX = 2;
+
+    public ?IdentTransfer $Ident {
+        get => $this->getData(self::IDENT_DATA_INDEX);
+        set => $this->setData(self::IDENT_DATA_INDEX, $value);
+    }
+
+    // Parameter
+    #[PropertyTypeAttribute(ParameterTransfer::class)]
+    public const string PARAMETER = 'Parameter';
+    protected const string PARAMETER_DATA_NAME = 'PARAMETER';
+    protected const int PARAMETER_DATA_INDEX = 3;
+
+    public ?ParameterTransfer $Parameter {
+        get => $this->getData(self::PARAMETER_DATA_INDEX);
+        set => $this->setData(self::PARAMETER_DATA_INDEX, $value);
+    }
+
+    // Statistics
+    #[CollectionPropertyTypeAttribute(StatisticsTransfer::class)]
+    public const string STATISTICS = 'Statistics';
+    protected const string STATISTICS_DATA_NAME = 'STATISTICS';
+    protected const int STATISTICS_DATA_INDEX = 4;
+
+    /** @var \ArrayObject<int,StatisticsTransfer> */
+    public ArrayObject $Statistics {
+        get => $this->getData(self::STATISTICS_DATA_INDEX);
+        set => $this->setData(self::STATISTICS_DATA_INDEX, $value);
+    }
+
+    // Status
+    #[PropertyTypeAttribute(StatusTransfer::class)]
+    public const string STATUS = 'Status';
+    protected const string STATUS_DATA_NAME = 'STATUS';
+    protected const int STATUS_DATA_INDEX = 5;
+
+    public ?StatusTransfer $Status {
+        get => $this->getData(self::STATUS_DATA_INDEX);
+        set => $this->setData(self::STATUS_DATA_INDEX, $value);
+    }
+
+    // Tables
+    #[CollectionPropertyTypeAttribute(TablesTransfer::class)]
+    public const string TABLES = 'Tables';
+    protected const string TABLES_DATA_NAME = 'TABLES';
+    protected const int TABLES_DATA_INDEX = 6;
+
+    /** @var \ArrayObject<int,TablesTransfer> */
+    public ArrayObject $Tables {
+        get => $this->getData(self::TABLES_DATA_INDEX);
+        set => $this->setData(self::TABLES_DATA_INDEX, $value);
+    }
+
+    // Timeseries
+    public const string TIMESERIES = 'Timeseries';
+    protected const string TIMESERIES_DATA_NAME = 'TIMESERIES';
+    protected const int TIMESERIES_DATA_INDEX = 7;
+
+    public ?string $Timeseries {
+        get => $this->getData(self::TIMESERIES_DATA_INDEX);
+        set => $this->setData(self::TIMESERIES_DATA_INDEX, $value);
+    }
+
+    // Variables
+    #[CollectionPropertyTypeAttribute(VariablesTransfer::class)]
+    public const string VARIABLES = 'Variables';
+    protected const string VARIABLES_DATA_NAME = 'VARIABLES';
+    protected const int VARIABLES_DATA_INDEX = 8;
+
+    /** @var \ArrayObject<int,VariablesTransfer> */
+    public ArrayObject $Variables {
+        get => $this->getData(self::VARIABLES_DATA_INDEX);
+        set => $this->setData(self::VARIABLES_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/IdentTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/IdentTransfer.php
new file mode 100644
index 00000000..bd99c47e
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/IdentTransfer.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class IdentTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 2;
+
+    protected const array META_DATA = [
+        self::METHOD => self::METHOD_DATA_NAME,
+        self::SERVICE => self::SERVICE_DATA_NAME,
+    ];
+
+    // Method
+    public const string METHOD = 'Method';
+    protected const string METHOD_DATA_NAME = 'METHOD';
+    protected const int METHOD_DATA_INDEX = 0;
+
+    public ?string $Method {
+        get => $this->getData(self::METHOD_DATA_INDEX);
+        set => $this->setData(self::METHOD_DATA_INDEX, $value);
+    }
+
+    // Service
+    public const string SERVICE = 'Service';
+    protected const string SERVICE_DATA_NAME = 'SERVICE';
+    protected const int SERVICE_DATA_INDEX = 1;
+
+    public ?string $Service {
+        get => $this->getData(self::SERVICE_DATA_INDEX);
+        set => $this->setData(self::SERVICE_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/ParameterTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/ParameterTransfer.php
new file mode 100644
index 00000000..f9e6bbff
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/ParameterTransfer.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class ParameterTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 6;
+
+    protected const array META_DATA = [
+        self::CATEGORY => self::CATEGORY_DATA_NAME,
+        self::LANGUAGE => self::LANGUAGE_DATA_NAME,
+        self::PAGELENGTH => self::PAGELENGTH_DATA_NAME,
+        self::PASSWORD => self::PASSWORD_DATA_NAME,
+        self::TERM => self::TERM_DATA_NAME,
+        self::USERNAME => self::USERNAME_DATA_NAME,
+    ];
+
+    // category
+    public const string CATEGORY = 'category';
+    protected const string CATEGORY_DATA_NAME = 'CATEGORY';
+    protected const int CATEGORY_DATA_INDEX = 0;
+
+    public ?string $category {
+        get => $this->getData(self::CATEGORY_DATA_INDEX);
+        set => $this->setData(self::CATEGORY_DATA_INDEX, $value);
+    }
+
+    // language
+    public const string LANGUAGE = 'language';
+    protected const string LANGUAGE_DATA_NAME = 'LANGUAGE';
+    protected const int LANGUAGE_DATA_INDEX = 1;
+
+    public ?string $language {
+        get => $this->getData(self::LANGUAGE_DATA_INDEX);
+        set => $this->setData(self::LANGUAGE_DATA_INDEX, $value);
+    }
+
+    // pagelength
+    public const string PAGELENGTH = 'pagelength';
+    protected const string PAGELENGTH_DATA_NAME = 'PAGELENGTH';
+    protected const int PAGELENGTH_DATA_INDEX = 2;
+
+    public ?string $pagelength {
+        get => $this->getData(self::PAGELENGTH_DATA_INDEX);
+        set => $this->setData(self::PAGELENGTH_DATA_INDEX, $value);
+    }
+
+    // password
+    public const string PASSWORD = 'password';
+    protected const string PASSWORD_DATA_NAME = 'PASSWORD';
+    protected const int PASSWORD_DATA_INDEX = 3;
+
+    public ?string $password {
+        get => $this->getData(self::PASSWORD_DATA_INDEX);
+        set => $this->setData(self::PASSWORD_DATA_INDEX, $value);
+    }
+
+    // term
+    public const string TERM = 'term';
+    protected const string TERM_DATA_NAME = 'TERM';
+    protected const int TERM_DATA_INDEX = 4;
+
+    public ?string $term {
+        get => $this->getData(self::TERM_DATA_INDEX);
+        set => $this->setData(self::TERM_DATA_INDEX, $value);
+    }
+
+    // username
+    public const string USERNAME = 'username';
+    protected const string USERNAME_DATA_NAME = 'USERNAME';
+    protected const int USERNAME_DATA_INDEX = 5;
+
+    public ?string $username {
+        get => $this->getData(self::USERNAME_DATA_INDEX);
+        set => $this->setData(self::USERNAME_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/StatisticsTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/StatisticsTransfer.php
new file mode 100644
index 00000000..f1b6f8d8
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/StatisticsTransfer.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class StatisticsTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 4;
+
+    protected const array META_DATA = [
+        self::CODE => self::CODE_DATA_NAME,
+        self::CONTENT => self::CONTENT_DATA_NAME,
+        self::CUBES => self::CUBES_DATA_NAME,
+        self::INFORMATION => self::INFORMATION_DATA_NAME,
+    ];
+
+    // Code
+    public const string CODE = 'Code';
+    protected const string CODE_DATA_NAME = 'CODE';
+    protected const int CODE_DATA_INDEX = 0;
+
+    public ?string $Code {
+        get => $this->getData(self::CODE_DATA_INDEX);
+        set => $this->setData(self::CODE_DATA_INDEX, $value);
+    }
+
+    // Content
+    public const string CONTENT = 'Content';
+    protected const string CONTENT_DATA_NAME = 'CONTENT';
+    protected const int CONTENT_DATA_INDEX = 1;
+
+    public ?string $Content {
+        get => $this->getData(self::CONTENT_DATA_INDEX);
+        set => $this->setData(self::CONTENT_DATA_INDEX, $value);
+    }
+
+    // Cubes
+    public const string CUBES = 'Cubes';
+    protected const string CUBES_DATA_NAME = 'CUBES';
+    protected const int CUBES_DATA_INDEX = 2;
+
+    public ?string $Cubes {
+        get => $this->getData(self::CUBES_DATA_INDEX);
+        set => $this->setData(self::CUBES_DATA_INDEX, $value);
+    }
+
+    // Information
+    public const string INFORMATION = 'Information';
+    protected const string INFORMATION_DATA_NAME = 'INFORMATION';
+    protected const int INFORMATION_DATA_INDEX = 3;
+
+    public ?string $Information {
+        get => $this->getData(self::INFORMATION_DATA_INDEX);
+        set => $this->setData(self::INFORMATION_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/StatusTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/StatusTransfer.php
new file mode 100644
index 00000000..b5447ebe
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/StatusTransfer.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class StatusTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 3;
+
+    protected const array META_DATA = [
+        self::CODE => self::CODE_DATA_NAME,
+        self::CONTENT => self::CONTENT_DATA_NAME,
+        self::TYPE => self::TYPE_DATA_NAME,
+    ];
+
+    // Code
+    public const string CODE = 'Code';
+    protected const string CODE_DATA_NAME = 'CODE';
+    protected const int CODE_DATA_INDEX = 0;
+
+    public ?int $Code {
+        get => $this->getData(self::CODE_DATA_INDEX);
+        set => $this->setData(self::CODE_DATA_INDEX, $value);
+    }
+
+    // Content
+    public const string CONTENT = 'Content';
+    protected const string CONTENT_DATA_NAME = 'CONTENT';
+    protected const int CONTENT_DATA_INDEX = 1;
+
+    public ?string $Content {
+        get => $this->getData(self::CONTENT_DATA_INDEX);
+        set => $this->setData(self::CONTENT_DATA_INDEX, $value);
+    }
+
+    // Type
+    public const string TYPE = 'Type';
+    protected const string TYPE_DATA_NAME = 'TYPE';
+    protected const int TYPE_DATA_INDEX = 2;
+
+    public ?string $Type {
+        get => $this->getData(self::TYPE_DATA_INDEX);
+        set => $this->setData(self::TYPE_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/TablesTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/TablesTransfer.php
new file mode 100644
index 00000000..4482c077
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/TablesTransfer.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class TablesTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 3;
+
+    protected const array META_DATA = [
+        self::CODE => self::CODE_DATA_NAME,
+        self::CONTENT => self::CONTENT_DATA_NAME,
+        self::TIME => self::TIME_DATA_NAME,
+    ];
+
+    // Code
+    public const string CODE = 'Code';
+    protected const string CODE_DATA_NAME = 'CODE';
+    protected const int CODE_DATA_INDEX = 0;
+
+    public ?string $Code {
+        get => $this->getData(self::CODE_DATA_INDEX);
+        set => $this->setData(self::CODE_DATA_INDEX, $value);
+    }
+
+    // Content
+    public const string CONTENT = 'Content';
+    protected const string CONTENT_DATA_NAME = 'CONTENT';
+    protected const int CONTENT_DATA_INDEX = 1;
+
+    public ?string $Content {
+        get => $this->getData(self::CONTENT_DATA_INDEX);
+        set => $this->setData(self::CONTENT_DATA_INDEX, $value);
+    }
+
+    // Time
+    public const string TIME = 'Time';
+    protected const string TIME_DATA_NAME = 'TIME';
+    protected const int TIME_DATA_INDEX = 2;
+
+    public ?string $Time {
+        get => $this->getData(self::TIME_DATA_INDEX);
+        set => $this->setData(self::TIME_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/Generated/Destatis/VariablesTransfer.php b/tests/integration/DefinitionGenerator/Generated/Destatis/VariablesTransfer.php
new file mode 100644
index 00000000..0df7ab09
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/Generated/Destatis/VariablesTransfer.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\Tests\Integration\TransferObject\DefinitionGenerator\Generated\Destatis;
+
+use Picamator\TransferObject\Transfer\AbstractTransfer;
+
+/**
+ * Specification:
+ * - Class is automatically generated based on a definition file.
+ * - To modify it, please update the corresponding definition file and run the generator again.
+ *
+ * Note: Do not manually edit this file, as changes will be overwritten.
+ *
+ * @see /tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml Definition file path.
+ */
+final class VariablesTransfer extends AbstractTransfer
+{
+    protected const int META_DATA_SIZE = 5;
+
+    protected const array META_DATA = [
+        self::CODE => self::CODE_DATA_NAME,
+        self::CONTENT => self::CONTENT_DATA_NAME,
+        self::INFORMATION => self::INFORMATION_DATA_NAME,
+        self::TYPE => self::TYPE_DATA_NAME,
+        self::VALUES => self::VALUES_DATA_NAME,
+    ];
+
+    // Code
+    public const string CODE = 'Code';
+    protected const string CODE_DATA_NAME = 'CODE';
+    protected const int CODE_DATA_INDEX = 0;
+
+    public ?string $Code {
+        get => $this->getData(self::CODE_DATA_INDEX);
+        set => $this->setData(self::CODE_DATA_INDEX, $value);
+    }
+
+    // Content
+    public const string CONTENT = 'Content';
+    protected const string CONTENT_DATA_NAME = 'CONTENT';
+    protected const int CONTENT_DATA_INDEX = 1;
+
+    public ?string $Content {
+        get => $this->getData(self::CONTENT_DATA_INDEX);
+        set => $this->setData(self::CONTENT_DATA_INDEX, $value);
+    }
+
+    // Information
+    public const string INFORMATION = 'Information';
+    protected const string INFORMATION_DATA_NAME = 'INFORMATION';
+    protected const int INFORMATION_DATA_INDEX = 2;
+
+    public ?string $Information {
+        get => $this->getData(self::INFORMATION_DATA_INDEX);
+        set => $this->setData(self::INFORMATION_DATA_INDEX, $value);
+    }
+
+    // Type
+    public const string TYPE = 'Type';
+    protected const string TYPE_DATA_NAME = 'TYPE';
+    protected const int TYPE_DATA_INDEX = 3;
+
+    public ?string $Type {
+        get => $this->getData(self::TYPE_DATA_INDEX);
+        set => $this->setData(self::TYPE_DATA_INDEX, $value);
+    }
+
+    // Values
+    public const string VALUES = 'Values';
+    protected const string VALUES_DATA_NAME = 'VALUES';
+    protected const int VALUES_DATA_INDEX = 4;
+
+    public ?string $Values {
+        get => $this->getData(self::VALUES_DATA_INDEX);
+        set => $this->setData(self::VALUES_DATA_INDEX, $value);
+    }
+}
diff --git a/tests/integration/DefinitionGenerator/data/README.md b/tests/integration/DefinitionGenerator/data/README.md
index 64667344..613d4731 100644
--- a/tests/integration/DefinitionGenerator/data/README.md
+++ b/tests/integration/DefinitionGenerator/data/README.md
@@ -1,10 +1,11 @@
 API Response Reference
 ======================
 
-| File                                                                                                                            | Source                                                                                                        |
-|---------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
-| [nasa-neo-rest-v1-neo-2465633.json](/tests/integration/DefinitionGenerator/data/api-response/nasa-neo-rest-v1-neo-2465633.json) | [NASA Open Api](https://api.nasa.gov/neo/rest/v1/neo/2465633?api_key=DEMO_KEY)                                |
-| [open-weather.json](/tests/integration/DefinitionGenerator/data/api-response/open-weather.json)                                 | [OpenWeather](https://openweathermap.org/current#example_JSON)                                                |
-| [google-shopping-content.json](/tests/integration/DefinitionGenerator/data/api-response/google-shopping-content.json)           | [Content API for Shopping](https://developers.google.com/shopping-content/guides/products/products-api?hl=en) |
-| [frankfurter-dev.json](/tests/integration/DefinitionGenerator/data/api-response/frankfurter-dev-v1.json)                        | [Frankfurter is a free, open-source currency data API](https://api.frankfurter.dev/v1/latest)                 |
-| [tagesschau-api-bund-dev.json](/tests/integration/DefinitionGenerator/data/api-response/tagesschau-api-bund-dev-v2.json)        | [Tagesschau API](https://tagesschau.api.bund.dev)                                                             |
+| File                                                                                                                            | Source                                                                                                               |
+|---------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|
+| [nasa-neo-rest-v1-neo-2465633.json](/tests/integration/DefinitionGenerator/data/api-response/nasa-neo-rest-v1-neo-2465633.json) | [NASA Open Api](https://api.nasa.gov/neo/rest/v1/neo/2465633?api_key=DEMO_KEY)                                       |
+| [open-weather.json](/tests/integration/DefinitionGenerator/data/api-response/open-weather.json)                                 | [OpenWeather](https://openweathermap.org/current#example_JSON)                                                       |
+| [google-shopping-content.json](/tests/integration/DefinitionGenerator/data/api-response/google-shopping-content.json)           | [Content API for Shopping](https://developers.google.com/shopping-content/guides/products/products-api?hl=en)        |
+| [frankfurter-dev.json](/tests/integration/DefinitionGenerator/data/api-response/frankfurter-dev-v1.json)                        | [Frankfurter is a free, open-source currency data API](https://api.frankfurter.dev/v1/latest)                        |
+| [tagesschau-api-bund-dev.json](/tests/integration/DefinitionGenerator/data/api-response/tagesschau-api-bund-dev-v2.json)        | [Tagesschau API](https://tagesschau.api.bund.dev)                                                                    |
+| [genesis-destatis-find.json](/tests/integration/DefinitionGenerator/data/api-response/genesis-destatis-find.json)               | [Statistisches Bundesamt (Destatis)](https://www-genesis.destatis.de/genesisWS/swagger-ui/index.html#/find/findPost) |
diff --git a/tests/integration/DefinitionGenerator/data/api-response/genesis-destatis-find.json b/tests/integration/DefinitionGenerator/data/api-response/genesis-destatis-find.json
new file mode 100644
index 00000000..6990452b
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/data/api-response/genesis-destatis-find.json
@@ -0,0 +1,174 @@
+{
+    "Ident": {
+        "Service": "find",
+        "Method": "find"
+    },
+    "Status": {
+        "Code": 0,
+        "Content": "erfolgreich",
+        "Type": "Information"
+    },
+    "Parameter": {
+        "username": "********************",
+        "password": "********************",
+        "term": "Verbraucherpreisindex",
+        "category": "Alle",
+        "pagelength": "100",
+        "language": "de"
+    },
+    "Cubes": null,
+    "Statistics": [
+        {
+            "Code": "61111",
+            "Content": "Verbraucherpreisindex für Deutschland",
+            "Cubes": "22",
+            "Information": "true"
+        },
+        {
+            "Code": "61121",
+            "Content": "Harmonisierter Verbraucherpreisindex",
+            "Cubes": "12",
+            "Information": "true"
+        }
+    ],
+    "Tables": [
+        {
+            "Code": "61111-0001",
+            "Content": "Verbraucherpreisindex: Deutschland, Jahre",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0002",
+            "Content": "Verbraucherpreisindex: Deutschland, Monate",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0003",
+            "Content": "Verbraucherpreisindex: Deutschland, Jahre,\nKlassifikation der Verwendungszwecke des Individualkonsums\n(COICOP 2-5-Steller Hierarchie)",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0004",
+            "Content": "Verbraucherpreisindex: Deutschland, Monate,\nKlassifikation der Verwendungszwecke des Individualkonsums\n(COICOP 2-5-Steller Hierarchie)",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0005",
+            "Content": "Verbraucherpreisindex: Deutschland, Jahre,\nKlassifikation der Verwendungszwecke des Individualkonsums\n(COICOP 2-/3-/4-/5-/10-Steller/Sonderpositionen)",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0006",
+            "Content": "Verbraucherpreisindex: Deutschland, Monate,\nKlassifikation der Verwendungszwecke des Individualkonsums\n(COICOP 2-/3-/4-/5-/10-Steller/Sonderpositionen)",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0007",
+            "Content": "Wägungsschema des Verbraucherpreisindex: Deutschland, Jahre,\nKlassifikation der Verwendungszwecke des Individualkonsums\n(COICOP 2-5-Steller Hierarchie)",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0010",
+            "Content": "Verbraucherpreisindex: Bundesländer, Jahre",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0011",
+            "Content": "Verbraucherpreisindex: Bundesländer, Monate",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0020",
+            "Content": "Index der Nettokaltmieten: Bundesländer, Jahre",
+            "Time": ""
+        },
+        {
+            "Code": "61111-0021",
+            "Content": "Index der Nettokaltmieten: Bundesländer, Monate",
+            "Time": ""
+        },
+        {
+            "Code": "61121-0001",
+            "Content": "Harmonisierter Verbraucherpreisindex: Deutschland, Jahre",
+            "Time": ""
+        },
+        {
+            "Code": "61121-0002",
+            "Content": "Harmonisierter Verbraucherpreisindex: Deutschland, Monate",
+            "Time": ""
+        },
+        {
+            "Code": "61121-0003",
+            "Content": "Harmonisierter Verbraucherpreisindex: Deutschland, Jahre, Europäische Klassifikation der Verwendungszwecke des Individualkonsums (ECOICOP 2-5-Steller Hierarchie)",
+            "Time": ""
+        },
+        {
+            "Code": "61121-0004",
+            "Content": "Harmonisierter Verbraucherpreisindex: Deutschland, Monate,\nEuropäische Klassifikation der Verwendungszwecke des\nIndividualkonsums (ECOICOP 2-5-Steller Hierarchie)",
+            "Time": ""
+        },
+        {
+            "Code": "61121-0005",
+            "Content": "Harmonisierter Verbraucherpreisindex: Deutschland, Jahre, Europäische Klassifikation der Verwendungszwecke des Individualkonsums (ECOICOP 2-/3-/4-/5-Steller/Sonderpositionen)",
+            "Time": ""
+        },
+        {
+            "Code": "61121-0006",
+            "Content": "Harmonisierter Verbraucherpreisindex: Deutschland, Monate, Europäische Klassifikation der Verwendungszwecke des Individualkonsums (ECOICOP 2-/3-/4-/5-Steller/Sonderpositionen)",
+            "Time": ""
+        }
+    ],
+    "Timeseries": null,
+    "Variables": [
+        {
+            "Code": "EC12A2",
+            "Content": "ECOICOP: Harmon. Verbraucherpreisindex, 2-Steller",
+            "Type": "sachlich",
+            "Values": "12",
+            "Information": "true"
+        },
+        {
+            "Code": "EC12A3",
+            "Content": "ECOICOP: Harmon. Verbraucherpreisindex, 3-Steller",
+            "Type": "sachlich",
+            "Values": "43",
+            "Information": "true"
+        },
+        {
+            "Code": "EC12A4",
+            "Content": "ECOICOP: Harmon. Verbraucherpreisindex, 4-Steller",
+            "Type": "sachlich",
+            "Values": "108",
+            "Information": "true"
+        },
+        {
+            "Code": "EC12A5",
+            "Content": "ECOICOP: Harmon. Verbraucherpreisindex, 5-Steller",
+            "Type": "sachlich",
+            "Values": "274",
+            "Information": "true"
+        },
+        {
+            "Code": "EC12B1",
+            "Content": "ECOICOP: Harmon. Verbraucherpreisindex, Sonderpos.",
+            "Type": "sachlich",
+            "Values": "9",
+            "Information": "true"
+        },
+        {
+            "Code": "PREIS1",
+            "Content": "Verbraucherpreisindex",
+            "Type": "Wert",
+            "Values": "-1",
+            "Information": "true"
+        },
+        {
+            "Code": "PREIS3",
+            "Content": "Harmonisierter Verbraucherpreisindex",
+            "Type": "Wert",
+            "Values": "-1",
+            "Information": "true"
+        }
+    ],
+    "Copyright": "© Statistisches Bundesamt (Destatis), 2025"
+}
diff --git a/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml b/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml
new file mode 100644
index 00000000..75f6bcac
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition/destatis.transfer.yml
@@ -0,0 +1,87 @@
+# $schema: https://raw.githubusercontent.com/picamator/transfer-object/main/schema/definition.schema.json
+
+# Destatis
+Destatis:
+  Ident:
+    type: Ident
+  Status:
+    type: Status
+  Parameter:
+    type: Parameter
+  Cubes:
+    type: string
+  Statistics:
+    collectionType: Statistics
+  Tables:
+    collectionType: Tables
+  Timeseries:
+    type: string
+  Variables:
+    collectionType: Variables
+  Copyright:
+    type: string
+
+# Ident
+Ident:
+  Service:
+    type: string
+  Method:
+    type: string
+
+# Status
+Status:
+  Code:
+    type: int
+  Content:
+    type: string
+  Type:
+    type: string
+
+# Parameter
+Parameter:
+  username:
+    type: string
+  password:
+    type: string
+  term:
+    type: string
+  category:
+    type: string
+  pagelength:
+    type: string
+  language:
+    type: string
+
+# Statistics
+Statistics:
+  Code:
+    type: string
+  Content:
+    type: string
+  Cubes:
+    type: string
+  Information:
+    type: string
+
+# Tables
+Tables:
+  Code:
+    type: string
+  Content:
+    type: string
+  Time:
+    type: string
+
+# Variables
+Variables:
+  Code:
+    type: string
+  Content:
+    type: string
+  Type:
+    type: string
+  Values:
+    type: string
+  Information:
+    type: string
+
diff --git a/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/generator.config.yml b/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/generator.config.yml
new file mode 100644
index 00000000..30231cbd
--- /dev/null
+++ b/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/generator.config.yml
@@ -0,0 +1,5 @@
+# $schema: ./../../../../../../schema/config.schema.json
+generator:
+  transferNamespace: "Picamator\\Tests\\Integration\\TransferObject\\DefinitionGenerator\\Generated\\Destatis"
+  transferPath: "${PROJECT_ROOT}/tests/integration/DefinitionGenerator/Generated/Destatis"
+  definitionPath: "${PROJECT_ROOT}/tests/integration/DefinitionGenerator/data/config/genesis-destatis-find/definition"

From 52fdca404261f2ba333ec9b4130d85a57ac79907 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 15:34:41 +0200
Subject: [PATCH 30/35] Added phpunit-group script command

---
 composer.json                            |  2 ++
 composer.lock                            | 16 ++++++++--------
 docker/bash/sdk-autocomplete.sh          |  4 ++--
 docker/php/bash/composer-autocomplete.sh |  2 +-
 docker/sdk                               |  4 ++++
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 2007d971..43297740 100644
--- a/composer.json
+++ b/composer.json
@@ -71,6 +71,7 @@
     "prefer-stable": true,
     "scripts": {
         "phpunit": "./vendor/bin/phpunit --no-progress",
+        "phpunit-group": "./vendor/bin/phpunit --no-progress --group",
         "phpstan": "./vendor/bin/phpstan analyse -c phpstan.neon --no-progress --memory-limit=512M",
         "transfer-generate": "php ./bin/transfer-generate",
         "transfer-generate-bulk": "php ./bin/transfer-generate-bulk",
@@ -81,6 +82,7 @@
     },
     "scripts-descriptions": {
         "phpunit": "Run unit and integration tests.",
+        "phpunit-group": "Run unit and integration tests assigned to the group.",
         "phpstan": "Perform static code analysis using PHPStan.",
         "transfer-generate": "Generate Transfer Objects from YML definition templates.",
         "transfer-generate-bulk": "Generate Transfer Objects based on configuration list.",
diff --git a/composer.lock b/composer.lock
index fb70d320..17bd77b5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3064,16 +3064,16 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "8.22.0",
+            "version": "8.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "a4cef983bad2e70125612d22b2f6e2bd1333d5c2"
+                "reference": "1dd80bf3b93692bedb21a6623c496887fad05fec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/a4cef983bad2e70125612d22b2f6e2bd1333d5c2",
-                "reference": "a4cef983bad2e70125612d22b2f6e2bd1333d5c2",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/1dd80bf3b93692bedb21a6623c496887fad05fec",
+                "reference": "1dd80bf3b93692bedb21a6623c496887fad05fec",
                 "shasum": ""
             },
             "require": {
@@ -3085,11 +3085,11 @@
             "require-dev": {
                 "phing/phing": "3.0.1|3.1.0",
                 "php-parallel-lint/php-parallel-lint": "1.4.0",
-                "phpstan/phpstan": "2.1.22",
+                "phpstan/phpstan": "2.1.24",
                 "phpstan/phpstan-deprecation-rules": "2.0.3",
                 "phpstan/phpstan-phpunit": "2.0.7",
                 "phpstan/phpstan-strict-rules": "2.0.6",
-                "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.3.8"
+                "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.3.10"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -3113,7 +3113,7 @@
             ],
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/8.22.0"
+                "source": "https://github.com/slevomat/coding-standard/tree/8.22.1"
             },
             "funding": [
                 {
@@ -3125,7 +3125,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-06T09:14:48+00:00"
+            "time": "2025-09-13T08:53:30+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
diff --git a/docker/bash/sdk-autocomplete.sh b/docker/bash/sdk-autocomplete.sh
index 77477684..6e873038 100644
--- a/docker/bash/sdk-autocomplete.sh
+++ b/docker/bash/sdk-autocomplete.sh
@@ -8,12 +8,12 @@ _docker_sdk_autocomplete() {
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     # define the main commands for docker/sdk
-    opts="build start stop cli composer phpstan phpunit phpcs phpcbf hook-install hook to-generate to-generate-bulk df-generate"
+    opts="build start stop cli composer phpstan phpunit phpunit-group phpcs phpcbf hook-install hook to-generate to-generate-bulk df-generate"
 
     case "${prev}" in
         composer)
             # define subcommands for 'composer'
-            COMPREPLY=( $(compgen -W "install update why phpunit phpstan transfer-generate transfer-generate-bulk definition-generate captainhook phpcs phpcbf list" -- "${cur}") )
+            COMPREPLY=( $(compgen -W "install update why phpunit phpunit-group phpstan transfer-generate transfer-generate-bulk definition-generate captainhook phpcs phpcbf list" -- "${cur}") )
             return 0
             ;;
         hook)
diff --git a/docker/php/bash/composer-autocomplete.sh b/docker/php/bash/composer-autocomplete.sh
index ba68aad5..92249ae1 100644
--- a/docker/php/bash/composer-autocomplete.sh
+++ b/docker/php/bash/composer-autocomplete.sh
@@ -6,7 +6,7 @@ _composer_autocomplete() {
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="install update why phpunit phpstan transfer-generate transfer-generate-bulk definition-generate captainhook phpcs phpcbf list"
+    opts="install update why phpunit phpunit-group phpstan transfer-generate transfer-generate-bulk definition-generate captainhook phpcs phpcbf list"
 
     if [[ ${prev} == "composer" ]]; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
diff --git a/docker/sdk b/docker/sdk
index 717488f1..d332c14d 100755
--- a/docker/sdk
+++ b/docker/sdk
@@ -26,6 +26,7 @@ function show_usage() {
   echo -e "  $(wrap_in_yellow "composer <command>")         Run composer command"
   echo -e "  $(wrap_in_yellow "phpstan")                    Run PHPStan"
   echo -e "  $(wrap_in_yellow "phpunit")                    Run PHPUnit"
+  echo -e "  $(wrap_in_yellow "phpunit-group")              Run PHPUnit test assigned to the group"
   echo -e "  $(wrap_in_yellow "phpcs")                      Run PHP CodeSniffer"
   echo -e "  $(wrap_in_yellow "phpcbf")                     Run PHP Code Beautifier and Fixer"
   echo -e "  $(wrap_in_yellow "hook-install")               Install CaptainHook"
@@ -91,6 +92,9 @@ case $1 in
   phpunit)
     $DOCKER_EXEC composer phpunit
     ;;
+  phpunit-group)
+    $DOCKER_EXEC composer phpunit-group $2
+    ;;
   phpcs)
     $DOCKER_EXEC composer phpcs
     ;;

From b5496a9849247cc7ee515c8721dc93537887c130 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 15:40:08 +0200
Subject: [PATCH 31/35] Added authors role on composer.json

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 43297740..b5d122c8 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Sergii Pryz"
+            "name": "Sergii Pryz",
+            "role": "Developer"
         },
         {
             "name": "Community",

From a3aadc243bdb44c9ba122a56b32f329a56c09312 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 15:56:00 +0200
Subject: [PATCH 32/35] Marked as deprecated Transfer interface method
 toFilterArray

---
 src/Transfer/AbstractTransfer.php                           | 2 ++
 src/Transfer/DummyTransferAdapterTrait.php                  | 2 ++
 src/Transfer/TransferAdapterTrait.php                       | 2 ++
 src/Transfer/TransferInterface.php                          | 4 ++++
 .../DefinitionGenerator/DefinitionGeneratorFacadeTest.php   | 6 +++++-
 tests/integration/Transfer/DummyTransferAdapterTest.php     | 2 ++
 tests/integration/Transfer/TransferAdapterTest.php          | 2 ++
 7 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/Transfer/AbstractTransfer.php b/src/Transfer/AbstractTransfer.php
index 43838921..8e0708e4 100644
--- a/src/Transfer/AbstractTransfer.php
+++ b/src/Transfer/AbstractTransfer.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\Transfer;
 
+use Deprecated;
 use SplFixedArray;
 use Traversable;
 
@@ -109,6 +110,7 @@ final public function toArray(): array
         return $data;
     }
 
+    #[Deprecated(message: 'Method will be removed in version 3.0.0. Use FilterArrayTrait instead.', since: '2.3.0')]
     final public function toFilterArray(?callable $callback = null): array
     {
         $data = $this->toArray();
diff --git a/src/Transfer/DummyTransferAdapterTrait.php b/src/Transfer/DummyTransferAdapterTrait.php
index ad3035ce..fb6f964f 100644
--- a/src/Transfer/DummyTransferAdapterTrait.php
+++ b/src/Transfer/DummyTransferAdapterTrait.php
@@ -4,6 +4,7 @@
 
 namespace Picamator\TransferObject\Transfer;
 
+use Deprecated;
 use EmptyIterator;
 use Traversable;
 
@@ -45,6 +46,7 @@ public function toArray(): array
     /**
      * @return array<string,mixed>
      */
+    #[Deprecated(message: 'Method will be removed in version 3.0.0. Use FilterArrayTrait instead.', since: '2.3.0')]
     public function toFilterArray(?callable $callback = null): array
     {
         $data = $this->toArray();
diff --git a/src/Transfer/TransferAdapterTrait.php b/src/Transfer/TransferAdapterTrait.php
index 73c1b1a2..4d93d4e1 100644
--- a/src/Transfer/TransferAdapterTrait.php
+++ b/src/Transfer/TransferAdapterTrait.php
@@ -10,6 +10,7 @@
 use DateTime;
 use DateTimeImmutable;
 use DateTimeInterface;
+use Deprecated;
 use ReflectionClass;
 use ReflectionProperty;
 use stdClass;
@@ -89,6 +90,7 @@ public function toArray(): array
     /**
      * @return array<string,mixed>
      */
+    #[Deprecated(message: 'Method will be removed in version 3.0.0. Use FilterArrayTrait instead.', since: '2.3.0')]
     public function toFilterArray(?callable $callback = null): array
     {
         $data = $this->toArray();
diff --git a/src/Transfer/TransferInterface.php b/src/Transfer/TransferInterface.php
index 014a30af..f9ecde01 100644
--- a/src/Transfer/TransferInterface.php
+++ b/src/Transfer/TransferInterface.php
@@ -5,6 +5,7 @@
 namespace Picamator\TransferObject\Transfer;
 
 use Countable;
+use Deprecated;
 use IteratorAggregate;
 use JsonSerializable;
 
@@ -36,10 +37,13 @@ public function toArray(): array;
      *
      * @api
      *
+     * @deprecated Method will be removed in version 3.0.0. Use FilterArrayTrait instead.
+     *
      * @param callable|null $callback Optional. A callback function to apply to each property.
      *                                If null, empty entries will be removed.
      * @return array<string,mixed>
      */
+    #[Deprecated(message: 'Method will be removed in version 3.0.0. Use FilterArrayTrait instead.', since: '2.3.0')]
     public function toFilterArray(?callable $callback = null): array;
 
     /**
diff --git a/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php b/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
index d2f3fc4b..76cc2f8f 100644
--- a/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
+++ b/tests/integration/DefinitionGenerator/DefinitionGeneratorFacadeTest.php
@@ -19,12 +19,14 @@
 use Picamator\Tests\Integration\TransferObject\Helper\TransferGeneratorHelperTrait;
 use Picamator\TransferObject\DefinitionGenerator\DefinitionGeneratorFacade;
 use Picamator\TransferObject\DefinitionGenerator\DefinitionGeneratorFacadeInterface;
+use Picamator\TransferObject\Transfer\FilterArrayTrait;
 
 #[Group('definition-generator')]
 class DefinitionGeneratorFacadeTest extends TestCase
 {
     use DefinitionGeneratorHelperTrait;
     use TransferGeneratorHelperTrait;
+    use FilterArrayTrait;
 
     private const string SAMPLE_JSON_PATH = __DIR__ . '/data/api-response/';
 
@@ -225,7 +227,9 @@ public function testCompareFilteredSampleDataWithTransferObjectShouldSuccessfull
 
         // Act
         $transfer->fromArray($sampleContent);
-        $actual = $transfer->toFilterArray(fn (mixed $item): bool => $item !== null);
+
+        $filterCallback = fn (mixed $item): bool => $item !== null;
+        $actual = $this->filterArrayRecursive($transfer->toArray(), $filterCallback);
 
         // Assert
         $this->assertEquals($sampleContent, $actual);
diff --git a/tests/integration/Transfer/DummyTransferAdapterTest.php b/tests/integration/Transfer/DummyTransferAdapterTest.php
index 2f1ce086..57b18ad5 100644
--- a/tests/integration/Transfer/DummyTransferAdapterTest.php
+++ b/tests/integration/Transfer/DummyTransferAdapterTest.php
@@ -5,10 +5,12 @@
 namespace Picamator\Tests\Integration\TransferObject\Transfer;
 
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\Transfer\Advanced\BookmarkData;
 
 #[Group('transfer')]
+#[IgnoreDeprecations]
 class DummyTransferAdapterTest extends TestCase
 {
     private BookmarkData $bookmarkData;
diff --git a/tests/integration/Transfer/TransferAdapterTest.php b/tests/integration/Transfer/TransferAdapterTest.php
index a89a2be0..68b661d4 100644
--- a/tests/integration/Transfer/TransferAdapterTest.php
+++ b/tests/integration/Transfer/TransferAdapterTest.php
@@ -5,6 +5,7 @@
 namespace Picamator\Tests\Integration\TransferObject\Transfer;
 
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Picamator\Tests\Integration\TransferObject\Transfer\Advanced\BcMathBookData;
@@ -13,6 +14,7 @@
 use Picamator\Tests\Integration\TransferObject\Transfer\Generated\AuthorTransfer;
 
 #[Group('transfer')]
+#[IgnoreDeprecations]
 class TransferAdapterTest extends TestCase
 {
     public function testFromArrayToArray(): void

From 385bc44efb55dd57a2dab0784608a1071b64ed87 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 16:04:18 +0200
Subject: [PATCH 33/35] Actualised readme with Destatis test data provider

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b6b1e276..40382031 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ Definition Files and Transfer Object generators have been tested against the fol
 * [Content API for Shopping](https://developers.google.com/shopping-content/guides/products/products-api?hl=en)
 * [Frankfurter is a free, open-source currency data API](https://api.frankfurter.dev/v1/latest)
 * [Tagesschau API](https://tagesschau.api.bund.dev)
+* [Statistisches Bundesamt (Destatis)](https://www-genesis.destatis.de/genesisWS/swagger-ui/index.html#/find/findPost)
 
 ### Scenario
 

From 42a10f4397cf25a3b59ec1933c83702829686029 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 16:25:44 +0200
Subject: [PATCH 34/35] Fixed failed phpunit action

---
 tests/integration/Command/TransferGeneratorBulkCommandTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/integration/Command/TransferGeneratorBulkCommandTest.php b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
index e0481fa4..14639b23 100644
--- a/tests/integration/Command/TransferGeneratorBulkCommandTest.php
+++ b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
@@ -23,7 +23,6 @@ class TransferGeneratorBulkCommandTest extends TestCase
 
     protected function setUp(): void
     {
-        putenv('COLUMNS=120');
         $command = new TransferGeneratorBulkCommand();
 
         $this->commandTester = new CommandTester($command);
@@ -49,7 +48,7 @@ public function testRunCommandWithInvalidConfigurationPathShouldShowErrorMessage
         // Assert
         $this->assertSame(1, $this->commandTester->getStatusCode());
         $this->assertStringContainsString(
-            '[ERROR] File "/home/transfer/transfer-object/some-invalid-path.list.txt" is not exist.',
+            '[ERROR] File "/home/transfer/transfer-object/some-invalid-path.list.txt"',
             $output,
         );
     }

From 6537e61011839e94677571fb7378eae5580287c9 Mon Sep 17 00:00:00 2001
From: Sergii Pryz <picamator@gmail.com>
Date: Sat, 13 Sep 2025 16:30:26 +0200
Subject: [PATCH 35/35] Fixed failed phpunit action

---
 .../integration/Command/TransferGeneratorBulkCommandTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/integration/Command/TransferGeneratorBulkCommandTest.php b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
index 14639b23..3a9689b4 100644
--- a/tests/integration/Command/TransferGeneratorBulkCommandTest.php
+++ b/tests/integration/Command/TransferGeneratorBulkCommandTest.php
@@ -47,10 +47,7 @@ public function testRunCommandWithInvalidConfigurationPathShouldShowErrorMessage
 
         // Assert
         $this->assertSame(1, $this->commandTester->getStatusCode());
-        $this->assertStringContainsString(
-            '[ERROR] File "/home/transfer/transfer-object/some-invalid-path.list.txt"',
-            $output,
-        );
+        $this->assertStringContainsString('[ERROR] File', $output);
     }
 
     public function testRunCommandWithValidConfigurationShouldShowSuccessMessage(): void