fixed mixed type

yzen-dev · Mar 14, 2022 · 0871cca · 0871cca
1 parent d7f8c02
commit 0871cca
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "yzen.dev/plain-to-class",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Class-transformer to transform your dataset into a structured object",
   "minimum-stability": "dev",
   "prefer-stable": true,

diff --git a/composer.lock b/composer.lock
diff --git a/src/ClassTransformer.php b/src/ClassTransformer.php
@@ -199,9 +199,9 @@ private static function dataConverting(string $className, ...$args)
     private static function propertyIsScalar(array|string $type): bool
     {
         if (is_array($type)) {
-            return count(array_intersect($type, ['int', 'float', 'string', 'bool'])) > 0;
+            return count(array_intersect($type, ['int', 'float', 'string', 'bool', 'mixed'])) > 0;
         }
-        return in_array($type, ['int', 'float', 'string', 'bool']);
+        return in_array($type, ['int', 'float', 'string', 'bool', 'mixed']);
     }
 
     /**

diff --git a/tests/ClassTransformerFromObjectTest.php b/tests/ClassTransformerFromObjectTest.php
@@ -65,6 +65,21 @@ public function testBaseObjectPhp8(): void
         self::assertIsFloat($userDTO->balance);
     }
 
+    /**
+     * @throws ReflectionException|ClassNotFoundException
+     */
+    public function testMixedType(): void
+    {
+        $data = [
+            'id'=>1,
+            'email'=>'test',
+            'balance'=>1,
+            'mixed'=> ['1'],
+        ];
+        $userDTO = ClassTransformer::transform(UserDTO::class,$data);
+        self::assertInstanceOf(UserDTO::class, $userDTO);
+    }
+
     /**
      * @throws ReflectionException|ClassNotFoundException
      */

diff --git a/tests/DTO/UserDTO.php b/tests/DTO/UserDTO.php
@@ -8,4 +8,5 @@ class UserDTO
     public int $id;
     public string $email;
     public float $balance;
+    public mixed $mixed;
 }