Support array with one type - Close #2

Author: sandrokeil

src/Type/ArrayType.php

@@ -76,7 +76,7 @@ public static function fromDefinition(array $definition, ?string $name = null):
         };
 
         $populateArrayType = static function (string $key, array $definitionValue) use ($resolveReference, $self) {
-            if (isset($definitionValue['type'])) {
+            if (isset($definitionValue['type']) || isset($definitionValue['$ref'])) {
                 $self->$key[] = Type::fromDefinition($definitionValue, '');
 
                 return;
@@ -86,7 +86,11 @@ public static function fromDefinition(array $definition, ?string $name = null):
                     $self->$key[] = Type::fromDefinition($propertyDefinition, '');
                 } elseif (isset($propertyDefinition['$ref'])) {
                     $ref = ReferenceType::fromDefinition($propertyDefinition, '');
-                    $ref->setResolvedType($resolveReference($propertyDefinition['$ref']));
+
+                    if ($resolvedType = $resolveReference($propertyDefinition['$ref'])) {
+                        $ref->setResolvedType($resolveReference($propertyDefinition['$ref']));
+                    }
+
                     $self->$key[] = new TypeSet($ref);
                 }
             }

src/Type/ObjectType.php

@@ -89,7 +89,11 @@ public static function fromDefinition(array $definition, ?string $name = null):
                                 $self->properties[$propertyName] = Type::fromDefinition($propertyDefinition, $propertyName);
                             } elseif (isset($propertyDefinition['$ref'])) {
                                 $ref = ReferenceType::fromDefinition($propertyDefinition, '');
-                                $ref->setResolvedType($resolveReference($propertyDefinition['$ref']));
+
+                                if ($resolvedType = $resolveReference($propertyDefinition['$ref'])) {
+                                    $ref->setResolvedType($resolvedType);
+                                }
+
                                 $self->properties[$propertyName] = new TypeSet($ref);
                             }
                         }

tests/Type/ArrayTypeTest.php

@@ -42,6 +42,56 @@ public function it_supports_array_type(): void
         $this->assertItemFour($items[3]);
     }
 
+    /**
+     * @test
+     */
+    public function it_supports_array_with_one_type(): void
+    {
+        $json = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'schema_with_array_one_type.json');
+        $decodedJson = \json_decode($json, true, 512, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
+
+        $typeSet = Type::fromDefinition($decodedJson);
+
+        $this->assertCount(1, $typeSet);
+
+        /** @var ArrayType $type */
+        $type = $typeSet->first();
+
+        $this->assertInstanceOf(ArrayType::class, $type);
+
+        $items = $type->items();
+        $this->assertCount(1, $items);
+
+        $this->assertItemOne($items[0]);
+    }
+
+    /**
+     * @test
+     */
+    public function it_supports_array_shorthand_with_no_ref(): void
+    {
+        $json = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'schema_with_array_shorthand_no_ref.json');
+        $decodedJson = \json_decode($json, true, 512, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
+
+        $typeSet = Type::fromShorthand($decodedJson);
+
+        $this->assertCount(1, $typeSet);
+
+        /** @var ArrayType $type */
+        $type = $typeSet->first();
+
+        $this->assertInstanceOf(ArrayType::class, $type);
+
+        $items = $type->items();
+        $this->assertCount(1, $items);
+
+        /** @var ReferenceType $item */
+        $item = $items[0]->first();
+
+        $this->assertInstanceOf(ReferenceType::class, $item);
+        $this->assertNull($item->resolvedType());
+    }
+
     private function assertItemOne(TypeSet $itemOne): void
     {
         $this->assertCount(1, $itemOne);

tests/Type/_files/schema_with_array_one_type.json

@@ -0,0 +1,6 @@
+{
+    "type": "array",
+    "items": {
+        "type": "number"
+    }
+}

tests/Type/_files/schema_with_array_shorthand_no_ref.json

@@ -0,0 +1,3 @@
+{
+    "$items": "Name"
+}