fix tests

Author: astral-data

src/OpenApi/Storage/OpenAPI/ResponseStorage.php

@@ -25,9 +25,12 @@ public function withParameter(SchemaStorage $schema): static
 
     public function addGlobParameters(array $vols): void
     {
-        foreach ($vols as $field => $description){
-            $parameters = $this->parameter;
+        $dates = $this->parameter['properties'] ?? [];
+        $required = $this->parameter['required'] ?? [];
+
+        $this->parameter['properties'] = [];
 
+        foreach ($vols as $field => $description){
             if($description !== 'object'){
                 $this->parameter['properties'][$field] = [
                     'type'        => 'string',
@@ -37,9 +40,11 @@ public function addGlobParameters(array $vols): void
                 $this->parameter['properties'][$field] = [
                     'type'        => 'object',
                     'description' => $description,
-                    'properties' => $parameters,
+                    'properties' => $dates,
+                    'required' => $required,
                 ];
             }
+
         }
 
     }

tests/Openapi/BaseGroupOpenApiTest.php

@@ -78,7 +78,7 @@ public function one(TestBaseGroupRequest $request): void
     expect($schema['properties'])->toHaveCount(3)->toHaveKeys(['input_change_group_1_33_2_11', 'input_group_2_22', 'input_group_2_33']);
 
 
-    $schema = $post->responses[200]['content']['application/json']['schema'];
+    $schema = $post->responses[200]['content']['application/json']['schema']['properties']['data'];
     expect($schema['properties'])->toHaveCount(3)->toHaveKeys(['out_group_1_11', 'out_group_1_22', 'out_group_1_33_2_11']);
 
 });

tests/Openapi/EnumOpenApiTest.php

@@ -59,32 +59,34 @@ public function one(OpenapiEnumRequest $request): void
     $requestBody = $post->requestBody;
     $schema      = $requestBody['content']['application/json']['schema'];
 
-    expect($schema['properties'])
+
+    expect($schema)->toHaveKey('properties')
+        ->and($schema['properties'])
         ->toHaveKeys([
             'test_enum',
             'test_string_enum',
             'test_string_2_enum',
             'test_one_of_enum',
         ])
         ->and($schema['properties']['test_enum'])->toMatchArray([
-            'type'        => 'string',
+            'type' => 'string',
             'description' => 'optional values：ENUM_1、ENUM_2',
-            'example'     => '',
+            'example' => '',
         ])
         ->and($schema['properties']['test_string_enum'])->toMatchArray([
-            'type'        => 'string',
+            'type' => 'string',
             'description' => 'optional values：ENUM_1、ENUM_2、ENUM_3、ENUM_4',
-            'example'     => '',
+            'example' => '',
         ])
         ->and($schema['properties']['test_string_2_enum'])->toMatchArray([
-            'type'        => 'string',
+            'type' => 'string',
             'description' => 'optional values：ENUM_1、ENUM_2、ENUM_3、ENUM_4',
-            'example'     => '',
+            'example' => '',
         ])
         ->and($schema['properties']['test_one_of_enum'])->toMatchArray([
-            'type'        => 'oneOf',
+            'type' => 'oneOf',
             'description' => 'optional values：ENUM_1、ENUM_2、ENUM_3、ENUM_4',
-            'example'     => '',
+            'example' => '',
         ])
         ->and($schema['properties']['test_one_of_enum']['oneOf'])->toBeArray()->toHaveCount(2)
         ->and($schema['properties']['test_one_of_enum']['oneOf'][0])->toMatchArray(['type' => 'string'])

tests/Openapi/OpenApiTest.php

@@ -93,9 +93,10 @@ public function one(TestOpenApiRequest $request): TestOpenApiResponse
     $response200 = $post->responses[200];
     expect($response200['description'])->toBe('成功');
 
-    $schema = $response200['content']['application/json']['schema'];
-    expect($schema['properties'])->toHaveKeys(['name', 'id'])
-        ->and($schema['required'])->toHaveCount(1)
-        ->and($schema['required'][0])->toBeString('id');
+    $data = $response200['content']['application/json']['schema']['properties']['data'];
+
+    expect($data['properties'])->toHaveKeys(['name', 'id'])
+        ->and($data['required'])->toHaveCount(1)
+        ->and($data['required'][0])->toBeString('id');
 
 });