Merge pull request #18 from ensi-platform/task-100616

#100616

Author: MsNatali

src/Data/OpenApi3/OpenApi3ObjectProperty.php

@@ -41,8 +41,19 @@ public function fillFromStdProperty(string $propertyName, stdClass $stdProperty)
 
                 break;
             case OpenApi3PropertyTypeEnum::ARRAY:
-                $this->items = new OpenApi3ObjectProperty(type: $stdProperty->items->type);
-                $this->items->fillFromStdProperty("{$propertyName}.*", $stdProperty->items);
+                if (std_object_has($stdProperty, 'items')) {
+                    if (std_object_has($stdProperty->items, 'type')) {
+                        $this->items = new OpenApi3ObjectProperty(type: $stdProperty->items->type);
+                        $this->items->fillFromStdProperty("{$propertyName}.*", $stdProperty->items);
+                    } elseif (std_object_has($stdProperty->items, 'allOf')) {
+                        foreach ($stdProperty->items->allOf as $allOfItem) {
+                            if (!$this->items && std_object_has($allOfItem, 'type')) {
+                                $this->items = new OpenApi3ObjectProperty(type: $allOfItem->type);
+                            }
+                            $this->items?->fillFromStdProperty("{$propertyName}.*", $allOfItem);
+                        }
+                    }
+                }
 
                 break;
             default:

tests/expects/LaravelValidationsApplicationJsonRequest.php

@@ -38,6 +38,8 @@
             'field_integer_double_fillable' => ['integer'],
             'field_integer_fillable' => ['integer'],
             'field_object_readonly.field' => ['integer'],
+            'field_array_allOf_readonly' => ['array'],
+            'field_array_allOf_readonly.*' => [new Enum(TestStringEnum::class)],
             'field_array_readonly' => ['array'],
             'field_array_readonly.*.field' => ['integer'],
             'field_enum_readonly' => [new Enum(TestIntegerEnum::class)],

tests/resources/schemas/resources.yaml

@@ -24,6 +24,14 @@ ResourceReadonlyForTestValidationRules:
         properties:
           field:
             type: integer
+    field_array_allOf_readonly:
+      type: array
+      description: Поле типа array с allOf
+      items:
+        allOf:
+          - type: string
+          - type: string
+            x-lg-enum-class: 'TestStringEnum'
     field_object_readonly:
       type: object
       description: Поле типа object