fix phpstan RC2

Author: astral-data

src/OpenApi/Annotations/RequestBody.php

@@ -11,7 +11,7 @@
 class RequestBody
 {
     public function __construct(
-        /** @var class-string $className */
+        /** @var class-string|string $className */
         public string $className = '',
         public ContentTypeEnum $contentType = ContentTypeEnum::JSON,
         public array|null $group = null

src/OpenApi/Collections/OpenApiCollection.php

@@ -19,6 +19,7 @@
 use Astral\Serialize\Support\Factories\ContextFactory;
 use Psr\SimpleCache\InvalidArgumentException;
 use ReflectionMethod;
+use ReflectionNamedType;
 
 class OpenApiCollection
 {
@@ -73,7 +74,8 @@ public function buildRequestBodyByParameters(): RequestBodyStorage
     {
         $openAPIRequestBody = new RequestBodyStorage(ContentTypeEnum::JSON);
         $methodParam = $this->reflectionMethod->getParameters()[0] ?? null;
-        $requestBodyClass = $methodParam ? $methodParam->getType()?->getName() : '';
+        $type = $methodParam?->getType();
+        $requestBodyClass = $type instanceof ReflectionNamedType  ? $type->getName() : '';
         if (is_subclass_of($requestBodyClass, Serialize::class)) {
             $schemaStorage = (new SchemaStorage())->build($this->buildRequestBodyParameterCollections($requestBodyClass),$node);
             $openAPIRequestBody->withParameter($schemaStorage);
@@ -96,7 +98,7 @@ public function buildResponse(): ResponseStorage
     /**
      * @param string $className
      * @param array $groups
-     * @return array<string, ParameterCollection>
+     * @return array<ParameterCollection>
      * @throws InvalidArgumentException
      */
     public function buildRequestBodyParameterCollections(string $className, array $groups = ['default']): array
@@ -111,9 +113,9 @@ public function buildRequestBodyParameterCollections(string $className, array $g
             $vol = new ParameterCollection(
                 className: $className,
                 name: current($property->getInputNamesByGroups($groups,$className)),
-                descriptions: '',
                 types: $property->getTypes(),
                 type: ParameterTypeEnum::getByTypes($property->getTypes()),
+                descriptions: '',
                 required: !$property->isNullable(),
                 ignore: false,
             );
@@ -132,7 +134,7 @@ className: $className,
     }
 
     /**
-     * @return array<string, ParameterCollection>
+     * @return array<ParameterCollection>
      * @throws InvalidArgumentException
      */
     public function buildResponseParameterCollections(): array
@@ -157,10 +159,10 @@ public function buildResponseParameterCollections(): array
         foreach ($properties as $property){
             $vol  =  new  ParameterCollection(
                 className: $responseClass,
-                name:current($property->getOutNamesByGroups($groups,$responseClass)),
-                descriptions: '',
+                name: current($property->getOutNamesByGroups($groups,$responseClass)),
                 types: $property->getTypes(),
                 type: ParameterTypeEnum::getByTypes($property->getTypes()),
+                descriptions: '',
                 required: !$property->isNullable(),
                 ignore: false,
             );

src/OpenApi/Collections/ParameterChildrenCollection.php

@@ -13,30 +13,17 @@ class ParameterCollection
 {
     public function __construct(
         public string $className,
-        /** @var string 元素变量名 */
         public string       $name,
-        /** @var string descriptions  */
-        public string       $descriptions = '',
         /** @var TypeCollection[] $types */
         public array $types,
         public ParameterTypeEnum $type,
-        /** @var mixed 示例值 */
+        public string       $descriptions = '',
         public mixed        $example = '',
-        /** @var bool 是否必填 */
         public bool         $required = false,
-        /** @var bool 是否忽略显示 */
         public bool         $ignore = false,
         /** @var array<ParameterCollection[]> $children */
         public array        $children  = [],
     ){
     }
-
-    public function addChildren(array $collections,ParameterTypeEnum $type = ParameterTypeEnum::STRING): void
-    {
-        $children = new ParameterChildrenCollection();
-        $children->type = $type;
-        $children->children = $collections;
-        $this->children[] = $children;
-    }
 }
 

src/OpenApi/Collections/ParameterCollection.php

@@ -32,15 +32,13 @@ public function isOf(): bool
         return $this === self::ONE_OF ||  $this === self::ANY_OF || $this === self::ALL_OF;
     }
 
-    public static function getBaseEnumByTypeKindEnum(TypeCollection $collection, string $className = null): ?ParameterTypeEnum
+    public static function getBaseEnumByTypeKindEnum(TypeCollection $collection): ?ParameterTypeEnum
     {
         return match (true){
-            $collection->kind === TypeKindEnum::STRING && !$className => self::STRING,
-            $collection->kind === TypeKindEnum::INT && !$className => self::INTEGER,
-            $collection->kind === TypeKindEnum::FLOAT && !$className => self::NUMBER,
-            $collection->kind === TypeKindEnum::BOOLEAN  && !$className=> self::BOOLEAN,
-            in_array($collection->kind, [TypeKindEnum::CLASS_OBJECT, TypeKindEnum::OBJECT], true) && $className === $collection->className => self::OBJECT,
-            in_array($collection->kind, [TypeKindEnum::ARRAY, TypeKindEnum::COLLECT_SINGLE_OBJECT, TypeKindEnum::COLLECT_UNION_OBJECT], true) && $className === $collection->className => self::ARRAY,
+            $collection->kind === TypeKindEnum::STRING => self::STRING,
+            $collection->kind === TypeKindEnum::INT => self::INTEGER,
+            $collection->kind === TypeKindEnum::FLOAT => self::NUMBER,
+            $collection->kind === TypeKindEnum::BOOLEAN => self::BOOLEAN,
             default => null,
         };
     }

src/OpenApi/Enum/ParameterTypeEnum.php

@@ -129,12 +129,7 @@ protected function scanFolderRecursively(string $folder, string $namespace): voi
 
             // 如果类尚未加载，则尝试 include
             if (! class_exists($className)) {
-                include_once $path;
-                @ob_clean();
-                if (! class_exists($className)) {
-                    // 如果 include 后仍然不存在该类，跳过
-                    continue;
-                }
+                continue;
             }
 
             // 调用子类实现的 buildByClass