Use dynamic instead of Object for mixed type

riverwaysoft · Apr 20, 2023 · 77c9236 · 77c9236
1 parent 7783d59
commit 77c9236
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Language/Dart/DartClassFactoryGenerator.php b/src/Language/Dart/DartClassFactoryGenerator.php
@@ -82,7 +82,7 @@ private function resolveFactoryProperty(
                     $collectionType->equalsTo(PhpBaseType::float()) => 'double',
                     $collectionType->equalsTo(PhpBaseType::string()) => 'String',
                     $collectionType->equalsTo(PhpBaseType::bool()) => 'bool',
-                    $collectionType->equalsTo(PhpBaseType::mixed()), $collectionType->equalsTo(PhpBaseType::iterable()), $collectionType->equalsTo(PhpBaseType::array()) => 'Object',
+                    $collectionType->equalsTo(PhpBaseType::mixed()), $collectionType->equalsTo(PhpBaseType::iterable()), $collectionType->equalsTo(PhpBaseType::array()) => 'dynamic',
                     $collectionType->equalsTo(PhpBaseType::null()) => 'null',
                     $collectionType->equalsTo(PhpBaseType::self()) => $dto->getName(),
                     default => throw new \Exception(sprintf("Unknown base PHP type: %s", $type->jsonSerialize()))

diff --git a/src/Language/Dart/DartGenerator.php b/src/Language/Dart/DartGenerator.php
@@ -117,7 +117,7 @@ private function getDartTypeFromPhp(PhpTypeInterface $type, DtoType $dto, DtoLis
                 $type->equalsTo(PhpBaseType::float()) => 'double',
                 $type->equalsTo(PhpBaseType::string()) => 'String',
                 $type->equalsTo(PhpBaseType::bool()) => 'bool',
-                $type->equalsTo(PhpBaseType::mixed()), $type->equalsTo(PhpBaseType::iterable()), $type->equalsTo(PhpBaseType::array()) => 'Object',
+                $type->equalsTo(PhpBaseType::mixed()), $type->equalsTo(PhpBaseType::iterable()), $type->equalsTo(PhpBaseType::array()) => 'dynamic',
                 $type->equalsTo(PhpBaseType::null()) => 'null',
                 $type->equalsTo(PhpBaseType::self()) => $dto->getName(),
                 default => throw new \Exception(sprintf("Unknown base PHP type: %s", $type->jsonSerialize()))