X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/3000/head:/app/Api/ApiDocsGenerator.php diff --git a/app/Api/ApiDocsGenerator.php b/app/Api/ApiDocsGenerator.php index 2953647bb..0ed7e6712 100644 --- a/app/Api/ApiDocsGenerator.php +++ b/app/Api/ApiDocsGenerator.php @@ -1,4 +1,6 @@ -generate(); Cache::put($cacheKey, $docs, 60 * 24); } + return $docs; } @@ -42,6 +44,7 @@ class ApiDocsGenerator $apiRoutes = $this->loadDetailsFromControllers($apiRoutes); $apiRoutes = $this->loadDetailsFromFiles($apiRoutes); $apiRoutes = $apiRoutes->groupBy('base_model'); + return $apiRoutes; } @@ -57,6 +60,7 @@ class ApiDocsGenerator $exampleContent = file_exists($exampleFile) ? file_get_contents($exampleFile) : null; $route["example_{$exampleType}"] = $exampleContent; } + return $route; }); } @@ -71,12 +75,14 @@ class ApiDocsGenerator $comment = $method->getDocComment(); $route['description'] = $comment ? $this->parseDescriptionFromMethodComment($comment) : null; $route['body_params'] = $this->getBodyParamsFromClass($route['controller'], $route['controller_method']); + return $route; }); } /** * Load body params and their rules by inspecting the given class and method name. + * * @throws BindingResolutionException */ protected function getBodyParamsFromClass(string $className, string $methodName): ?array @@ -92,6 +98,7 @@ class ApiDocsGenerator foreach ($rules as $param => $ruleString) { $rules[$param] = explode('|', $ruleString); } + return count($rules) > 0 ? $rules : null; } @@ -102,11 +109,13 @@ class ApiDocsGenerator { $matches = []; preg_match_all('/^\s*?\*\s((?![@\s]).*?)$/m', $comment, $matches); + return implode(' ', $matches[1] ?? []); } /** * Get a reflection method from the given class name and method name. + * * @throws ReflectionException */ protected function getReflectionMethod(string $className, string $methodName): ReflectionMethod @@ -131,16 +140,16 @@ class ApiDocsGenerator [$controller, $controllerMethod] = explode('@', $route->action['uses']); $baseModelName = explode('.', explode('/', $route->uri)[1])[0]; $shortName = $baseModelName . '-' . $controllerMethod; + return [ - 'name' => $shortName, - 'uri' => $route->uri, - 'method' => $route->methods[0], - 'controller' => $controller, - 'controller_method' => $controllerMethod, + 'name' => $shortName, + 'uri' => $route->uri, + 'method' => $route->methods[0], + 'controller' => $controller, + 'controller_method' => $controllerMethod, 'controller_method_kebab' => Str::kebab($controllerMethod), - 'base_model' => $baseModelName, + 'base_model' => $baseModelName, ]; }); } - -} \ No newline at end of file +}