Improve type detection

Author: sandrokeil

src/Type/ArrayType.php

@@ -82,16 +82,21 @@ public static function fromDefinition(array $definition, ?string $name = null):
                 return;
             }
             foreach ($definitionValue as $propertyDefinition) {
-                if (isset($propertyDefinition['type'])) {
-                    $self->$key[] = Type::fromDefinition($propertyDefinition, '');
-                } elseif (isset($propertyDefinition['$ref'])) {
+                if (isset($propertyDefinition['$ref'])) {
                     $ref = ReferenceType::fromDefinition($propertyDefinition, '');
 
                     if ($resolvedType = $resolveReference($propertyDefinition['$ref'])) {
                         $ref->setResolvedType($resolveReference($propertyDefinition['$ref']));
                     }
 
                     $self->$key[] = new TypeSet($ref);
+                } else {
+                    $self->$key[] = Type::fromDefinition(
+                        isset($propertyDefinition[0])
+                            ? $definitionValue
+                            : $propertyDefinition,
+                        ''
+                    );
                 }
             }
         };

src/Type/ObjectType.php

@@ -83,34 +83,36 @@ public static function fromDefinition(array $definition, ?string $name = null):
 
         foreach ($definition as $definitionKey => $definitionValue) {
             switch ($definitionKey) {
-                    case 'properties':
-                        foreach ($definitionValue as $propertyName => $propertyDefinition) {
-                            if (isset($propertyDefinition['type'])) {
-                                $self->properties[$propertyName] = Type::fromDefinition($propertyDefinition, $propertyName);
-                            } elseif (isset($propertyDefinition['$ref'])) {
-                                $ref = ReferenceType::fromDefinition($propertyDefinition, '');
-
-                                if ($resolvedType = $resolveReference($propertyDefinition['$ref'])) {
-                                    $ref->setResolvedType($resolvedType);
-                                }
-
-                                $self->properties[$propertyName] = new TypeSet($ref);
+                case 'properties':
+                    foreach ($definitionValue as $propertyName => $propertyDefinition) {
+                        if (isset($propertyDefinition['$ref'])) {
+                            $ref = ReferenceType::fromDefinition($propertyDefinition, '');
+
+                            if ($resolvedType = $resolveReference($propertyDefinition['$ref'])) {
+                                $ref->setResolvedType($resolvedType);
                             }
+                            $self->properties[$propertyName] = new TypeSet($ref);
+                        } else {
+                            $self->properties[$propertyName] = Type::fromDefinition(
+                                $propertyDefinition,
+                                $propertyName
+                            );
                         }
-                        break;
-                    case 'additionalProperties':
-                        $self->additionalProperties = \is_array($definitionValue)
-                            ? Type::fromDefinition($definitionValue, '')
-                            : $definitionValue;
-                        break;
-                    case 'definitions':
-                        // handled beforehand
-                        break;
-                    default:
-                        if (\property_exists($self, $definitionKey)) {
-                            $self->$definitionKey = $definitionValue;
-                        }
-                        break;
+                    }
+                    break;
+                case 'additionalProperties':
+                    $self->additionalProperties = \is_array($definitionValue)
+                        ? Type::fromDefinition($definitionValue, '')
+                        : $definitionValue;
+                    break;
+                case 'definitions':
+                    // handled beforehand
+                    break;
+                default:
+                    if (\property_exists($self, $definitionKey)) {
+                        $self->$definitionKey = $definitionValue;
+                    }
+                    break;
             }
         }
 

src/Type/ScalarType.php

@@ -10,6 +10,9 @@
 
 namespace OpenCodeModeling\JsonSchemaToPhp\Type;
 
+/**
+ * @internal
+ */
 abstract class ScalarType implements TypeDefinition, RequiredAware, NullableAware, TitleAware
 {
     protected ?string $format = null;