Merge pull request #49 from picamator/development

Release 5.4.1

Author: picamator

README.md

@@ -57,7 +57,7 @@ $customerTransfer->lastName = 'Kowalski';
 Key Features
 ------------
 
-**Symfony Compatability:**
+**Symfony Compatibility:**
 
  * Provides Symfony console command:
    * [TransferGeneratorCommand](/src/Command/TransferGeneratorCommand.php)

composer.lock

@@ -43,8 +43,8 @@ DefinitionProperty:
   propertyName:
     type: string
     required:
-  buildInType:
-    type: DefinitionBuildInType
+  builtInType:
+    type: DefinitionBuiltInType
   transferType:
     type: DefinitionEmbeddedType
   collectionType:
@@ -71,9 +71,9 @@ DefinitionAttribute:
     type: DefinitionNamespace
     required:
 
-DefinitionBuildInType:
+DefinitionBuiltInType:
   name:
-    enumType: "Picamator\\TransferObject\\TransferGenerator\\Definition\\Enum\\BuildInTypeEnum"
+    enumType: "Picamator\\TransferObject\\TransferGenerator\\Definition\\Enum\\BuiltInTypeEnum"
     required:
   docBlock:
     type: string

config/definition/transfer-generator.transfer.yml

@@ -7,7 +7,7 @@
 use Picamator\TransferObject\DefinitionGenerator\Content\Builder\ContentBuilder;
 use Picamator\TransferObject\DefinitionGenerator\Content\Builder\ContentBuilderInterface;
 use Picamator\TransferObject\DefinitionGenerator\Content\Expander\BuilderExpanderInterface;
-use Picamator\TransferObject\DefinitionGenerator\Content\Expander\BuildInTypeBuilderExpander;
+use Picamator\TransferObject\DefinitionGenerator\Content\Expander\BuiltInTypeBuilderExpander;
 use Picamator\TransferObject\DefinitionGenerator\Content\Expander\CollectionTypeBuilderExpander;
 use Picamator\TransferObject\DefinitionGenerator\Content\Expander\TransferTypeBuilderExpander;
 use Picamator\TransferObject\DefinitionGenerator\Content\Reader\ContentReader;
@@ -40,14 +40,14 @@ protected function createBuilderExpander(): BuilderExpanderInterface
 
         $builderExpander
             ->setNextExpander($this->createCollectionTypeBuilderExpander())
-            ->setNextExpander($this->createBuildInTypeBuilderExpander());
+            ->setNextExpander($this->createBuiltInTypeBuilderExpander());
 
         return $builderExpander;
     }
 
-    protected function createBuildInTypeBuilderExpander(): BuilderExpanderInterface
+    protected function createBuiltInTypeBuilderExpander(): BuilderExpanderInterface
     {
-        return new BuildInTypeBuilderExpander();
+        return new BuiltInTypeBuilderExpander();
     }
 
     protected function createCollectionTypeBuilderExpander(): BuilderExpanderInterface

src/DefinitionGenerator/Content/DefinitionContentFactory.php

@@ -12,13 +12,13 @@
 use Picamator\TransferObject\DefinitionGenerator\Content\Enum\ObjectTypeEnum;
 use Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException;
 use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
-use Picamator\TransferObject\Generated\DefinitionBuildInTypeTransfer;
+use Picamator\TransferObject\Generated\DefinitionBuiltInTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
 use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
 use Picamator\TransferObject\Shared\Parser\DocBlockParserTrait;
-use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
+use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuiltInTypeEnum;
 
-final class BuildInTypeBuilderExpander extends AbstractBuilderExpander
+final class BuiltInTypeBuilderExpander extends AbstractBuilderExpander
 {
     use DocBlockParserTrait;
 
@@ -130,23 +130,23 @@ private function createDateTimePropertyTransfer(string $propertyName): Definitio
         return $propertyTransfer;
     }
 
-    private function createPropertyTransfer(string $propertyName, string $buildInType): DefinitionPropertyTransfer
+    private function createPropertyTransfer(string $propertyName, string $builtInType): DefinitionPropertyTransfer
     {
-        $tapeWithDocBlock = $this->parseTypeWithDocBlock($buildInType) ?? [];
+        $tapeWithDocBlock = $this->parseTypeWithDocBlock($builtInType) ?? [];
 
         /** @var string $type */
         $type = array_key_first($tapeWithDocBlock);
-        $type = BuildInTypeEnum::from($type);
+        $type = BuiltInTypeEnum::from($type);
 
         $docBlock = array_first($tapeWithDocBlock);
 
-        $buildInTypeTransfer = new DefinitionBuildInTypeTransfer();
-        $buildInTypeTransfer->name = $type;
-        $buildInTypeTransfer->docBlock = $docBlock;
+        $builtInTypeTransfer = new DefinitionBuiltInTypeTransfer();
+        $builtInTypeTransfer->name = $type;
+        $builtInTypeTransfer->docBlock = $docBlock;
 
         $propertyTransfer = new DefinitionPropertyTransfer();
         $propertyTransfer->propertyName = $propertyName;
-        $propertyTransfer->buildInType = $buildInTypeTransfer;
+        $propertyTransfer->builtInType = $builtInTypeTransfer;
 
         return $propertyTransfer;
     }

…/Expander/BuildInTypeBuilderExpander.php …/Expander/BuiltInTypeBuilderExpander.phpsrc/DefinitionGenerator/Content/Expander/BuildInTypeBuilderExpander.php renamed to src/DefinitionGenerator/Content/Expander/BuiltInTypeBuilderExpander.php src/DefinitionGenerator/Content/Expander/BuildInTypeBuilderExpander.php renamed to src/DefinitionGenerator/Content/Expander/BuiltInTypeBuilderExpander.php

@@ -69,8 +69,8 @@ public function renderContent(DefinitionContentTransfer $contentTransfer): strin
     private function renderProperty(DefinitionPropertyTransfer $propertyTransfer): string
     {
         return match (true) {
-            $propertyTransfer->buildInType !== null
-                => $this->renderBuildInType($propertyTransfer),
+            $propertyTransfer->builtInType !== null
+                => $this->renderBuiltInType($propertyTransfer),
 
             $propertyTransfer->transferType !== null
                 => $this->renderTransferType($propertyTransfer),
@@ -125,22 +125,22 @@ private function renderTransferType(DefinitionPropertyTransfer $propertyTransfer
         );
     }
 
-    private function renderBuildInType(DefinitionPropertyTransfer $propertyTransfer): string
+    private function renderBuiltInType(DefinitionPropertyTransfer $propertyTransfer): string
     {
-        /** @var \Picamator\TransferObject\Generated\DefinitionBuildInTypeTransfer $buildInType */
-        $buildInType = $propertyTransfer->buildInType;
+        /** @var \Picamator\TransferObject\Generated\DefinitionBuiltInTypeTransfer $builtInType */
+        $builtInType = $propertyTransfer->builtInType;
 
-        return $buildInType->docBlock
+        return $builtInType->docBlock
             ? sprintf(
                 self::TYPE_WITH_DOC_BLOCK_TEMPLATE,
                 $propertyTransfer->propertyName,
-                $buildInType->name->value,
-                $buildInType->docBlock,
+                $builtInType->name->value,
+                $builtInType->docBlock,
             )
             : sprintf(
                 self::TYPE_TEMPLATE,
                 $propertyTransfer->propertyName,
-                $buildInType->name->value,
+                $builtInType->name->value,
             );
     }
 }

src/DefinitionGenerator/Generator/Render/TemplateRender.php

@@ -49,7 +49,7 @@ final public function __construct(?array $data = null)
     {
         $this->initData();
 
-        if ($data !== null && count($data) > 0) {
+        if ($data !== null && \count($data) > 0) {
             $this->hydrateData($data);
         }
     }
@@ -101,7 +101,7 @@ final public function getIterator(): Traversable
     final public function __clone(): void
     {
         /** @var \SplFixedArray<mixed> $data */
-        $data = unserialize(serialize($this->_data));
+        $data = \unserialize(\serialize($this->_data));
 
         $this->_data = $data;
     }
@@ -131,7 +131,7 @@ final public function fromArray(array $data): static
     {
         $this->initData();
 
-        if (count($data) > 0) {
+        if (\count($data) > 0) {
             $this->hydrateData($data);
         }
 
@@ -155,7 +155,7 @@ private function hydrateData(array $data): void
     {
         $this->filterData($data);
 
-        if (count($data) === 0) {
+        if (\count($data) === 0) {
             return;
         }