fix: scalar array

Author: Яценко Андрей

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "yzen.dev/plain-to-class",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Class-transformer to transform your dataset into a structured object",
   "minimum-stability": "dev",
   "prefer-stable": true,
@@ -48,6 +48,9 @@
     "phpcs": [
       "./vendor/bin/phpcs --standard=./phpcs.xml -n --no-cache -s"
     ],
+    "phpcbf": [
+      "./vendor/bin/phpcbf --standard=./phpcs.xml -n --no-cache -s"
+    ],
     "coverage": [
       "./vendor/phpunit/phpunit/phpunit --configuration ./phpunit.xml --coverage-text --colors=never --coverage-clover coverage.xml"
     ],

composer.lock

@@ -155,7 +155,7 @@ private static function dataConverting(string $className, ...$args)
             $propertyType = $property->getType();
             $propertyClassTypeName = self::getPropertyTypes($propertyType);
 
-            if (count(array_intersect($propertyClassTypeName, ['int', 'float', 'string', 'bool'])) > 0) {
+            if (self::propertyIsScalar($propertyClassTypeName)) {
                 $instance->{$item->name} = $value;
                 continue;
             }
@@ -169,6 +169,10 @@ private static function dataConverting(string $className, ...$args)
                     $arrayType = self::getClassFromPhpDoc($property->getDocComment());
                 }
                 if (!empty($arrayType)) {
+                    if (self::propertyIsScalar($arrayType)) {
+                        $instance->{$item->name} = $value;
+                        continue;
+                    }
                     foreach ($value as $el) {
                         /** @phpstan-ignore-next-line */
                         $instance->{$item->name}[] = self::dataConverting($arrayType, $el);
@@ -190,6 +194,19 @@ private static function dataConverting(string $className, ...$args)
         return $instance;
     }
 
+    /**
+     * @param array<string>|string $type
+     *
+     * @return bool
+     */
+    private static function propertyIsScalar(array|string $type): bool
+    {
+        if (is_array($type)) {
+            return count(array_intersect($type, ['int', 'float', 'string', 'bool'])) > 0;
+        }
+        return in_array($type, ['int', 'float', 'string', 'bool']);
+    }
+
     /**
      * @param string|false $phpDoc
      *

src/ClassTransformer.php

@@ -4,6 +4,7 @@
 
 namespace Tests;
 
+use Tests\DTO\ArrayScalarDTO;
 use Tests\DTO\UserDTO;
 use Tests\DTO\BasketDTO;
 use ReflectionException;
@@ -39,6 +40,16 @@ public function testBaseArray(): void
         self::assertIsFloat($userDTO->balance);
     }
 
+    /**
+     * @throws ReflectionException|ClassNotFoundException
+     */
+    public function testScalarArray(): void
+    {
+        $data = $this->getDataWithScalarArray();
+        $userDTO = ClassTransformer::transform(ArrayScalarDTO::class, $data);
+        self::assertInstanceOf(ArrayScalarDTO::class, $userDTO);
+    }
+
     /**
      * @throws ReflectionException|ClassNotFoundException
      */

tests/ClassTransformerFromArrayTest.php

@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\DTO;
+
+class ArrayScalarDTO
+{
+    public $id;
+    
+    /** @var array<string>  */
+    public array $history;
+}

tests/DTO/ArrayScalarDTO.php

@@ -15,6 +15,14 @@ public function getBaseArrayData(): array
         ];
     }
 
+    public function getDataWithScalarArray(): array
+    {
+        return [
+            'id' => 1,
+            'history' => ['test1', 'test2', 'test3']
+        ];
+    }
+
     public function getArrayUsers(): array
     {
         return [