update 5.0.3

- Query/Param/Returned注解支持children子参数注解中直接使用ref。
- 支持接口调试响应参数的Hover提示。
- 修正ref引用文件/方法不存在时，异常提示不准确问题。
- 修正Laravel异常显示问题。

Author: HGthecode

README.md

@@ -13,6 +13,8 @@
 <div align="center" style="margin-top:10px;margin-bottom:50px;">
 <a href="https://packagist.org/packages/hg/apidoc"><img src="https://img.shields.io/packagist/v/hg/apidoc"></a>
 <a href="https://packagist.org/packages/hg/apidoc"><img src="https://img.shields.io/packagist/dt/hg/apidoc"></a>
+<a href="https://packagist.org/packages/hg/apidoc"><img src="https://img.shields.io/packagist/dm/hg/apidoc"></a>
+<a href="https://packagist.org/packages/hg/apidoc"><img src="https://img.shields.io/packagist/dd/hg/apidoc"></a>
 <a href="https://packagist.org/packages/hg/apidoc"><img src="https://img.shields.io/packagist/l/hg/apidoc"></a>
 <a href="https://github.com/HGthecode/apidoc-php"><img src="https://img.shields.io/github/issues/HGthecode/apidoc-php"></a>
 <a href="https://github.com/HGthecode/apidoc-php"><img src="https://img.shields.io/github/forks/HGthecode/apidoc-php"></a>
@@ -46,7 +48,7 @@ Apidoc是一个通过解析注解生成Api接口文档的PHP composer扩展，
 |框架|版本|说明|
 |-|-|-|
 |ThinkPHP|5.1、6.x||
-|Laravel|8.x、9.x||
+|Laravel|8.x、9.x、10.x||
 |Webman|1.x||
 |Hyperf|2.x、3.x||
 

src/parses/ParseApiDetail.php

@@ -429,8 +429,13 @@ protected function handleAnnotationsParamItem($param,$field){
             $childrenData = [];
             foreach ($data['children'] as $child) {
                 $paramItem=$this->handleAnnotationsParamItem($child,$field);
+
                 if ($paramItem!==false){
-                    $childrenData[] = $paramItem;
+                    if (!empty($paramItem) && is_array($paramItem) && array_key_first($paramItem)===0){
+                        $childrenData = Helper::arrayMergeAndUnique("name",$childrenData,$paramItem);
+                    }else{
+                        $childrenData[] = $paramItem;
+                    }
                 }
             }
             $data['children'] = $childrenData;
@@ -559,7 +564,7 @@ protected function renderRef($refPath,$field): array
             return [$field=>$modelParams];
 
         } catch (\ReflectionException $e) {
-            throw new ErrorException('Class '.$classPath.' '.$e->getMessage());
+            throw new ErrorException($e->getMessage());
         }
 
 
@@ -587,6 +592,11 @@ protected function handleRefData($annotation,$refParams, string $field): array
             }
             return $annotation;
         }
+//        else{
+//            if (!empty($annotation[$field])) {
+//                $annotation[$field] = Helper::arrayMergeAndUnique("name",$refParams,$annotation[$field]);
+//            }
+//        }
         return $refParams;
     }
 

src/parses/ParseModel.php

@@ -60,7 +60,7 @@ public function parseModelTable($model,$classReflect,$methodName=""){
             }
             return $table;
         } catch (\ReflectionException $e) {
-            throw new ErrorException('Class '.$path.' '.$e->getMessage());
+            throw new ErrorException('Class '.get_class($model).' '.$e->getMessage());
         }
 
     }

src/providers/BaseService.php

@@ -11,16 +11,16 @@ trait BaseService
 {
 
     static $routes = [
-        ['rule'=>'config','route'=>'getConfig','method'=>'GET'],
-        ['rule'=>'apiMenus','route'=>'getApiMenus','method'=>'POST'],
-        ['rule'=>'apiDetail','route'=>'getApiDetail','method'=>'POST'],
-        ['rule'=>'docMenus','route'=>'getMdMenus','method'=>'POST'],
-        ['rule'=>'docDetail','route'=>'getMdDetail','method'=>'POST'],
-        ['rule'=>'verifyAuth','route'=>'verifyAuth','method'=>'POST'],
-        ['rule'=>'generator','route'=>'createGenerator','method'=>'POST'],
-        ['rule'=>'cancelAllCache','route'=>'cancelAllCache','method'=>'POST'],
-        ['rule'=>'createAllCache','route'=>'createAllCache','method'=>'POST'],
-        ['rule'=>'renderCodeTemplate','route'=>'renderCodeTemplate','method'=>'POST'],
+        ['rule'=>'config','route'=>'getConfig'],
+        ['rule'=>'apiMenus','route'=>'getApiMenus'],
+        ['rule'=>'apiDetail','route'=>'getApiDetail'],
+        ['rule'=>'docMenus','route'=>'getMdMenus'],
+        ['rule'=>'docDetail','route'=>'getMdDetail'],
+        ['rule'=>'verifyAuth','route'=>'verifyAuth'],
+        ['rule'=>'generator','route'=>'createGenerator'],
+        ['rule'=>'cancelAllCache','route'=>'cancelAllCache'],
+        ['rule'=>'createAllCache','route'=>'createAllCache'],
+        ['rule'=>'renderCodeTemplate','route'=>'renderCodeTemplate'],
     ];
 
 
@@ -148,7 +148,6 @@ static public function registerApidocRoutes($routeFun=null){
                 'uri'=>$route_prefix.$item['rule'],
                 'callback'=>$controller_namespace.$item['route'],
                 'route'=>$item['route'],
-                'method'=>$item['method']
             ];
             if (!empty($routeFun)){
                 $routeFun($route);

src/providers/HyperfService.php

@@ -22,7 +22,7 @@ static function register(){
         ! defined('APIDOC_STORAGE_PATH') && define('APIDOC_STORAGE_PATH', HyperfMiddleware::getRuntimePath());
 
         CommonService::registerApidocRoutes(function ($item){
-            Router::addRoute($item['method'],$item['uri'],$item['callback'],['middleware' => [HyperfMiddleware::class]]);
+            Router::addRoute(['GET','POST'],$item['uri'],$item['callback'],['middleware' => [HyperfMiddleware::class]]);
         });
 
         // 自动注册路由

src/providers/LaravelService.php

@@ -67,7 +67,7 @@ static function getApidocConfig()
 
     static function registerRoute($route){
         $config = self::getApidocConfig();
-        $registerRoute =  Route::match([$route['method']],$route['uri'], $route['callback']);
+        $registerRoute =  Route::any($route['uri'], $route['callback']);
         $registerRoute->middleware([LaravelMiddleware::class]);
         if (!empty($config['allowCrossDomain'])) {
             $registerRoute->middleware([ApiCrossDomain::class]);

src/providers/ThinkPHP5Service.php

@@ -52,7 +52,7 @@ static function getApidocConfig()
 
     static function registerRoute($route){
         $config = self::getApidocConfig();
-        $registerRoute = Route::rule($route['uri'], $route['callback'],$route['method']);
+        $registerRoute = Route::rule($route['uri'], $route['callback'],"*");
         if (!empty($config['allowCrossDomain'])) {
             $registerRoute->allowCrossDomain();
         }

src/providers/ThinkPHPService.php

@@ -67,7 +67,7 @@ public function register()
     }
 
     static function registerRoute($route){
-        $registerRoute = Route::rule($route['uri'], $route['callback'],$route['method']);
+        $registerRoute = Route::any($route['uri'], $route['callback']);
     }
 
     static function databaseQuery($sql){