Bugfix arrays

Author: RobertGroot

src/Data/Property.php

@@ -3,11 +3,10 @@
 namespace Xolvio\OpenApiGenerator\Data;
 
 use ReflectionClass;
+use ReflectionProperty;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Data as LaravelData;
 use Spatie\LaravelData\DataCollection;
-use Spatie\LaravelData\Support\DataClass;
-use Spatie\LaravelData\Support\DataProperty;
 
 class Property extends Data
 {
@@ -31,23 +30,25 @@ public static function fromDataClass(string $class): DataCollection
             throw new \RuntimeException('Class does not extend LaravelData');
         }
 
-        /** @var class-string<LaravelData> $class */
-        $data_class = DataClass::create(new ReflectionClass($class));
-
-        $properties = $data_class->properties
-            ->map(fn (DataProperty $property) => self::fromProperty($property));
+        $reflection = new ReflectionClass($class);
+        $properties = $reflection->getProperties(ReflectionProperty::IS_PUBLIC);
 
         /** @var DataCollection<int,self> */
-        $collection = self::collection($properties->all());
+        $collection = self::collection(
+            array_map(
+                fn (ReflectionProperty $property) => self::fromProperty($property),
+                $properties
+            )
+        );
 
         return $collection;
     }
 
-    public static function fromProperty(DataProperty $property): self
+    public static function fromProperty(ReflectionProperty $reflection): self
     {
         return new self(
-            name: $property->name,
-            type: Schema::fromDataPropery($property),
+            name: $reflection->getName(),
+            type: Schema::fromReflectopnProperty($reflection),
         );
     }
 }

src/Data/Schema.php

@@ -43,12 +43,20 @@ public function __construct(
         $this->nullable = $this->nullable ? $this->nullable : null;
     }
 
-    public static function fromDataPropery(DataProperty $property): self
+    public static function fromReflectopnProperty(ReflectionProperty $reflection): self
     {
+        $property = DataProperty::create($reflection);
+
         $type = $property->type;
 
-        if ($type->dataClass) {
-            return self::fromData($type->dataClass, $type->isNullable || $type->isOptional);
+        /** @var null|string */
+        $data_class = $type->dataClass;
+
+        if ($type->isDataObject && $data_class) {
+            return self::fromData($data_class, $type->isNullable || $type->isOptional);
+        }
+        if ($type->isDataCollectable && $data_class) {
+            return self::fromDataCollection($data_class, $type->isNullable || $type->isOptional);
         }
 
         /** @var null|string */
@@ -58,7 +66,7 @@ public static function fromDataPropery(DataProperty $property): self
             throw new \RuntimeException("Parameter {$property->name} has no type defined");
         }
 
-        return self::fromDataReflection(type_name: $other_type, nullable: $type->isNullable);
+        return self::fromDataReflection(type_name: $other_type, reflection: $reflection, nullable: $type->isNullable);
     }
 
     public static function fromDataReflection(
@@ -187,6 +195,21 @@ protected static function fromData(string $type_name, bool $nullable): self
         );
     }
 
+    protected static function fromDataCollection(string $type_name, bool $nullable): self
+    {
+        $type_name = ltrim($type_name, '\\');
+
+        if (! is_a($type_name, LaravelData::class, true)) {
+            throw new \RuntimeException("Type {$type_name} is not a Data class");
+        }
+
+        return new self(
+            type: 'array',
+            items: self::fromData($type_name, false),
+            nullable: $nullable,
+        );
+    }
+
     protected static function fromListDocblock(ReflectionMethod|ReflectionFunction|ReflectionProperty $reflection, bool $nullable): self
     {
         $docs = $reflection->getDocComment();

tests/Unit/PropertyTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use Spatie\LaravelData\Support\DataProperty;
 use Xolvio\OpenApiGenerator\Data\Property;
 use Xolvio\OpenApiGenerator\Test\ContentTypeData;
 use Xolvio\OpenApiGenerator\Test\NotData;
@@ -21,7 +20,7 @@
 
         expect($types)
             ->toBe([
-                'message' => [
+                [
                     'type' => 'string',
                 ],
             ]);
@@ -32,44 +31,44 @@
 
     expect($types)
         ->toBe([
-            'integer' => [
+            [
                 'type' => 'integer',
             ],
-            'nullable_integer' => [
+            [
                 'type'     => 'integer',
                 'nullable' => true,
             ],
-            'string' => [
+            [
                 'type' => 'string',
             ],
-            'nullable_string' => [
+            [
                 'type'     => 'string',
                 'nullable' => true,
             ],
-            'bool' => [
+            [
                 'type' => 'boolean',
             ],
-            'nullable_bool' => [
+            [
                 'type'     => 'boolean',
                 'nullable' => true,
             ],
-            'float' => [
+            [
                 'type' => 'number',
             ],
-            'nullable_float' => [
+            [
                 'type'     => 'number',
                 'nullable' => true,
             ],
-            'nullable_self' => [
+            [
                 'nullable' => true,
                 'allOf'    => [
                     ['$ref' => '#/components/schemas/RequestData'],
                 ],
             ],
-            'other' => [
+            [
                 '$ref' => '#/components/schemas/ReturnData',
             ],
-            'nullable_other' => [
+            [
                 'nullable' => true,
                 'allOf'    => [
                     ['$ref' => '#/components/schemas/ReturnData'],
@@ -83,7 +82,7 @@
         $reflection = new ReflectionClass($class);
 
         foreach ($reflection->getProperties(ReflectionProperty::IS_PUBLIC) as $reflection_property) {
-            $property = Property::fromProperty(DataProperty::create($reflection_property));
+            $property = Property::fromProperty($reflection_property);
 
             expect($property->getName())
                 ->toBe($reflection_property->getName());