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

#100616

Author: MsNatali

src/Data/OpenApi3/OpenApi3Object.php

@@ -24,10 +24,19 @@ public function fillFromStdObject(stdClass $object): void
                 /** @var OpenApi3ObjectProperty $objectProperty */
                 $objectProperty = $this->properties->get($propertyName);
                 if (!$objectProperty) {
-                    $objectProperty = new OpenApi3ObjectProperty(type: $property->type, name: $propertyName);
+                    do_with_all_of($property, function (stdClass $p) use (&$objectProperty, $propertyName) {
+                        if (!$objectProperty && std_object_has($p, 'type')) {
+                            $objectProperty = new OpenApi3ObjectProperty(type: $p->type, name: $propertyName);
+                        }
+                    });
+                    if (!$objectProperty) {
+                        continue;
+                    }
                     $this->properties->put($propertyName, $objectProperty);
                 }
-                $objectProperty->fillFromStdProperty($propertyName, $property);
+                do_with_all_of($property, function (stdClass $p) use ($objectProperty, $propertyName) {
+                    $objectProperty->fillFromStdProperty($propertyName, $p);
+                });
             }
         }
         if (std_object_has($object, 'required') && is_array($object->required)) {

src/Data/OpenApi3/OpenApi3ObjectProperty.php

@@ -34,29 +34,26 @@ public function fillFromStdProperty(string $propertyName, stdClass $stdProperty)
             $this->enumClass = $stdProperty->{'x-lg-enum-class'};
         }
 
-        switch (OpenApi3PropertyTypeEnum::from($stdProperty->type)) {
-            case OpenApi3PropertyTypeEnum::OBJECT:
-                $this->object = new OpenApi3Object();
-                $this->object->fillFromStdObject($stdProperty);
-
-                break;
-            case OpenApi3PropertyTypeEnum::ARRAY:
-                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);
+        if (std_object_has($stdProperty, 'type')) {
+            switch (OpenApi3PropertyTypeEnum::from($stdProperty->type)) {
+                case OpenApi3PropertyTypeEnum::OBJECT:
+                    $this->object = new OpenApi3Object();
+                    $this->object->fillFromStdObject($stdProperty);
+
+                    break;
+                case OpenApi3PropertyTypeEnum::ARRAY:
+                    if (std_object_has($stdProperty, 'items')) {
+                        do_with_all_of($stdProperty->items, function (stdClass $p) use ($propertyName) {
+                            if (!$this->items && std_object_has($p, 'type')) {
+                                $this->items = new OpenApi3ObjectProperty(type: $p->type);
                             }
-                            $this->items?->fillFromStdProperty("{$propertyName}.*", $allOfItem);
-                        }
+                            $this->items?->fillFromStdProperty("{$propertyName}.*", $p);
+                        });
                     }
-                }
 
-                break;
-            default:
+                    break;
+                default:
+            }
         }
     }
 

src/Data/OpenApi3/OpenApi3Schema.php

@@ -20,13 +20,9 @@ public function fillFromStdRequestBody(OpenApi3ContentTypeEnum $contentType, std
         switch ($contentType) {
             case OpenApi3ContentTypeEnum::APPLICATION_JSON:
                 $schema = $requestBody->content->{OpenApi3ContentTypeEnum::APPLICATION_JSON->value}->schema;
-                if (std_object_has($schema, 'allOf')) {
-                    foreach ($schema->allOf as $object) {
-                        $this->object->fillFromStdObject($object);
-                    }
-                } else {
-                    $this->object->fillFromStdObject($schema);
-                }
+                do_with_all_of($schema, function (stdClass $p) {
+                    $this->object->fillFromStdObject($p);
+                });
 
                 break;
             case OpenApi3ContentTypeEnum::MULTIPART_FROM_DATA:

src/helpers.php

@@ -6,3 +6,15 @@ function std_object_has(stdClass $object, string $propertyName): bool
         return isset(get_object_vars($object)[$propertyName]);
     }
 }
+
+if (!function_exists('do_with_all_of')) {
+    function do_with_all_of(stdClass $object, callable $fn): void
+    {
+        $fn($object);
+        if (std_object_has($object, 'allOf')) {
+            foreach ($object->allOf as $allOfItem) {
+                $fn($allOfItem);
+            }
+        }
+    }
+}

tests/expects/LaravelValidationsApplicationJsonRequest.php

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

tests/resources/schemas/resources.yaml

@@ -32,6 +32,11 @@ ResourceReadonlyForTestValidationRules:
           - type: string
           - type: string
             x-lg-enum-class: 'TestStringEnum'
+    field_allOf_readonly:
+      allOf:
+        - type: string
+        - type: string
+          x-lg-enum-class: 'TestStringEnum'
     field_object_readonly:
       type: object
       description: Поле типа object