fix tests

Author: astral-data

composer.json

@@ -39,9 +39,6 @@
             "Astral\\Benchmarks\\": "benchmarks/"
         }
     },
-    "bin": [
-        "src/OpenApi/bin/art"
-    ],
     "config": {
         "allow-plugins": {
             "pestphp/pest-plugin": true

src/OpenApi/Enum/ParameterTypeEnum.php

@@ -98,14 +98,32 @@ public static function getByTypes(array $types): ParameterTypeEnum
         }
 
         $hasUnion = false;
+        $unionTypes = [];
         foreach ($types as $type){
+
+            if($type->kind === TypeKindEnum::ENUM){
+                $unionTypes[TypeKindEnum::STRING->name] =  $type;
+            }else{
+                $unionTypes[$type->kind->name] =  $type;
+            }
+
             if($type->kind === TypeKindEnum::COLLECT_UNION_OBJECT){
                 $hasUnion = true;
             }
         }
 
-        return $hasUnion ? self::ANY_OF : self::ONE_OF;
+        if(!$hasUnion && count($unionTypes) === 1){
+            $type = current($types)->kind;
+            return match (true){
+                $type === TypeKindEnum::INT => self::INTEGER,
+                $type === TypeKindEnum::FLOAT => self::NUMBER,
+                $type === TypeKindEnum::BOOLEAN => self::BOOLEAN,
+                in_array($type, [TypeKindEnum::OBJECT, TypeKindEnum::CLASS_OBJECT, TypeKindEnum::ARRAY, TypeKindEnum::COLLECT_SINGLE_OBJECT, TypeKindEnum::COLLECT_UNION_OBJECT], true) => self::ONE_OF,
+                default => self::STRING,
+            };
+        }
 
+        return $hasUnion ? self::ANY_OF : self::ONE_OF;
 
     }
 }

src/OpenApi/Handler/Config.php

@@ -15,7 +15,7 @@
 
 class Config
 {
-    public static array $config;
+    public static ?array $config = null;
 
     public static function rootPath(): string
     {

src/OpenApi/Storage/OpenAPI/SchemaStorage.php

@@ -98,10 +98,12 @@ public function buildOfProperties(ParameterCollection $topParameter, array &$cur
         $node = &$currentNode['properties'][$propertyName][$topParameter->type->value];
 
         $i = 0;
+        $addedTypes = [];
         foreach ($topParameter->types as $kindType){
             $type = ParameterTypeEnum::getBaseEnumByTypeKindEnum($kindType);
-            if($type){
-                $node[$i] = ['type'=> $type];
+            if ($type && !in_array($type->value, $addedTypes, true)) {
+                $node[$i] = ['type' => $type->value];
+                $addedTypes[] = $type->value;
                 $i++;
             }
         }
@@ -175,7 +177,7 @@ public function getDescriptions(ParameterCollection $parameter):string
             }
         }
 
-        $descriptions .= ' Optional values: ：' . implode('、', $names);
+        $descriptions .= 'Optional values：' . implode('、', $names);
 
         return $descriptions;
     }

tests/Openapi/EnumOpenApiTest.php

@@ -0,0 +1,99 @@
+<?php
+
+use Astral\Serialize\OpenApi;
+use Astral\Serialize\Serialize;
+
+beforeAll(static function () {
+
+    enum OpenapiEnum
+    {
+        case ENUM_1;
+        case ENUM_2;
+    }
+
+    enum OpenapiUnionEnum
+    {
+        case ENUM_2;
+        case ENUM_3;
+
+        case ENUM_4;
+
+    }
+
+
+
+    class OpenapiEnumRequest extends Serialize
+    {
+        public OpenapiEnum $test_enum;
+        public OpenapiEnum|OpenapiUnionEnum $test_string_enum;
+
+        public OpenapiEnum|OpenapiUnionEnum|string $test_string_2_enum;
+
+        public OpenapiEnum|OpenapiUnionEnum|string|int $test_one_of_enum;
+
+    }
+
+    #[\Astral\Serialize\OpenApi\Annotations\Tag('接口测试')]
+    class OpenapiEnumController{
+
+        #[\Astral\Serialize\OpenApi\Annotations\Summary('测试方法一')]
+        #[\Astral\Serialize\OpenApi\Annotations\Route('/test/enum-action')]
+        public function one(OpenapiEnumRequest $request): void
+        {
+        }
+
+    }
+
+});
+
+test('OpenAPI enums auto create description', function () {
+
+    $api =  new OpenApi();
+    $api->buildByClass(OpenapiEnumController::class);
+
+    $openApi = $api::$OpenAPI;
+
+
+    $paths = $openApi->paths;
+    $post = $paths['/test/enum-action']['post'];
+    $requestBody = $post->requestBody;
+    $schema = $requestBody['content']['application/json']['schema'];
+
+    expect($schema['properties'])
+        ->toHaveKeys([
+            'test_enum',
+            'test_string_enum',
+            'test_string_2_enum',
+            'test_one_of_enum',
+        ])
+        ->and($schema['properties']['test_enum'])->toMatchArray([
+            'type' => 'string',
+            'description' => 'Optional values：ENUM_1、ENUM_2',
+            'example' => '',
+        ])
+        ->and($schema['properties']['test_string_enum'])->toMatchArray([
+            'type' => 'string',
+            'description' => 'Optional values：ENUM_1、ENUM_2、ENUM_3、ENUM_4',
+            'example' => '',
+        ])
+        ->and($schema['properties']['test_string_2_enum'])->toMatchArray([
+            'type' => 'string',
+            'description' => 'Optional values：ENUM_1、ENUM_2、ENUM_3、ENUM_4',
+            'example' => '',
+        ])
+        ->and($schema['properties']['test_one_of_enum'])->toMatchArray([
+            'type' => 'oneOf',
+            'description' => 'Optional values：ENUM_1、ENUM_2、ENUM_3、ENUM_4',
+            'example' => '',
+        ])
+        ->and($schema['properties']['test_one_of_enum']['oneOf'])->toBeArray()->toHaveCount(2)
+        ->and($schema['properties']['test_one_of_enum']['oneOf'][0])->toMatchArray(['type' => 'string'])
+        ->and($schema['properties']['test_one_of_enum']['oneOf'][1])->toMatchArray(['type' => 'integer'])
+        ->and($schema['required'])->toBeArray()->toEqualCanonicalizing([
+            'test_enum',
+            'test_string_enum',
+            'test_string_2_enum',
+            'test_one_of_enum',
+        ]);
+
+});

tests/Openapi/OpenApi.php tests/Openapi/OpenApiTest.phptests/Openapi/OpenApi.php renamed to tests/Openapi/OpenApiTest.php

@@ -81,7 +81,7 @@ public function one(TestOpenApiRequest $request): TestOpenApiResponse
 
     // id 字段是 oneOf 并包含 string, integer, number
     $idOneOf = $schema['properties']['id']['oneOf'];
-    $types = array_map(static fn($item) => $item['type']->value, $idOneOf);
+    $types = array_map(static fn($item) => $item['type'], $idOneOf);
     expect($types)->toMatchArray(['string', 'integer', 'number']);
 
     // any_array 是 oneOf 并包含至少一个 array 类型

tests/Openapi/RouteOrewriteOpenApi.php …sts/Openapi/RouteOrewriteOpenApiTest.phptests/Openapi/RouteOrewriteOpenApi.php renamed to tests/Openapi/RouteOrewriteOpenApiTest.php tests/Openapi/RouteOrewriteOpenApi.php renamed to tests/Openapi/RouteOrewriteOpenApiTest.php

@@ -32,7 +32,7 @@ public function one(TestCustomerRouteRequest $request): void
 
 });
 
-test('OpenAPI structure is correct', function () {
+test('OpenAPI customer route', function () {
 
     $api =  new OpenApi();
     $api->buildByClass(TestCustomerRouteController::class);