@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | $documentarian = new Documentarian(); |
| 46 | 46 | |
| 47 | - if (! is_dir($outputPath)) { |
|
| 48 | - $this->error('There is no generated documentation available at '.$outputPath.'.'); |
|
| 47 | + if (!is_dir($outputPath)) { |
|
| 48 | + $this->error('There is no generated documentation available at ' . $outputPath . '.'); |
|
| 49 | 49 | |
| 50 | 50 | return false; |
| 51 | 51 | } |
@@ -53,6 +53,6 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $documentarian->generate($outputPath); |
| 55 | 55 | |
| 56 | - $this->info('Wrote HTML documentation to: '.$outputPath.'/public/index.html'); |
|
| 56 | + $this->info('Wrote HTML documentation to: ' . $outputPath . '/public/index.html'); |
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -34,8 +34,7 @@ discard block |
||
| 34 | 34 | public function with($parameters) |
| 35 | 35 | { |
| 36 | 36 | is_array($parameters) ? |
| 37 | - $this->parameters += $parameters : |
|
| 38 | - $this->parameters[] = $parameters; |
|
| 37 | + $this->parameters += $parameters : $this->parameters[] = $parameters; |
|
| 39 | 38 | |
| 40 | 39 | return $this; |
| 41 | 40 | } |
@@ -54,8 +53,7 @@ discard block |
||
| 54 | 53 | protected function makeDescription() |
| 55 | 54 | { |
| 56 | 55 | $description = trans()->hasForLocale($this->rule) ? |
| 57 | - trans()->get($this->rule) : |
|
| 58 | - trans()->get($this->rule, [], self::DEFAULT_LOCALE); |
|
| 56 | + trans()->get($this->rule) : trans()->get($this->rule, [], self::DEFAULT_LOCALE); |
|
| 59 | 57 | |
| 60 | 58 | return $this->replaceAttributes($description); |
| 61 | 59 | } |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | 'description' => '', |
| 32 | 32 | 'schema' => 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json' |
| 33 | 33 | ], |
| 34 | - 'item' => $this->routeGroups->map(function ($routes, $groupName) { |
|
| 34 | + 'item' => $this->routeGroups->map(function($routes, $groupName) { |
|
| 35 | 35 | return [ |
| 36 | 36 | 'name' => $groupName, |
| 37 | 37 | 'description' => '', |
| 38 | - 'item' => $routes->map(function ($route) { |
|
| 38 | + 'item' => $routes->map(function($route) { |
|
| 39 | 39 | return [ |
| 40 | 40 | 'name' => $route['title'] != '' ? $route['title'] : url($route['uri']), |
| 41 | 41 | 'request' => [ |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | 'method' => $route['methods'][0], |
| 44 | 44 | 'body' => [ |
| 45 | 45 | 'mode' => 'formdata', |
| 46 | - 'formdata' => collect($route['parameters'])->map(function ($parameter, $key) { |
|
| 46 | + 'formdata' => collect($route['parameters'])->map(function($parameter, $key) { |
|
| 47 | 47 | return [ |
| 48 | 48 | 'key' => $key, |
| 49 | 49 | 'value' => isset($parameter['value']) ? $parameter['value'] : '', |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | return $this->getParameters([ |
| 47 | - 'id' => md5($route->getUri().':'.implode($route->getMethods())), |
|
| 47 | + 'id' => md5($route->getUri() . ':' . implode($route->getMethods())), |
|
| 48 | 48 | 'resource' => $routeGroup, |
| 49 | 49 | 'title' => $routeDescription['short'], |
| 50 | 50 | 'description' => $routeDescription['long'], |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | public function boot() |
| 17 | 17 | { |
| 18 | - $this->loadViewsFrom(__DIR__.'/../../resources/views/', 'apidoc'); |
|
| 19 | - $this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'apidoc'); |
|
| 18 | + $this->loadViewsFrom(__DIR__ . '/../../resources/views/', 'apidoc'); |
|
| 19 | + $this->loadTranslationsFrom(__DIR__ . '/../../resources/lang', 'apidoc'); |
|
| 20 | 20 | |
| 21 | 21 | $this->publishes([ |
| 22 | - __DIR__.'/../../resources/lang' => $this->resource_path('lang/vendor/apidoc'), |
|
| 23 | - __DIR__.'/../../resources/views' => $this->resource_path('views/vendor/apidoc'), |
|
| 22 | + __DIR__ . '/../../resources/lang' => $this->resource_path('lang/vendor/apidoc'), |
|
| 23 | + __DIR__ . '/../../resources/views' => $this->resource_path('views/vendor/apidoc'), |
|
| 24 | 24 | ]); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function register() |
| 33 | 33 | { |
| 34 | - $this->app['apidoc.generate'] = $this->app->share(function () { |
|
| 34 | + $this->app['apidoc.generate'] = $this->app->share(function() { |
|
| 35 | 35 | return new GenerateDocumentation(); |
| 36 | 36 | }); |
| 37 | - $this->app['apidoc.update'] = $this->app->share(function () { |
|
| 37 | + $this->app['apidoc.update'] = $this->app->share(function() { |
|
| 38 | 38 | return new UpdateDocumentation(); |
| 39 | 39 | }); |
| 40 | 40 | |
@@ -53,6 +53,6 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function resource_path($path = '') |
| 55 | 55 | { |
| 56 | - return app()->basePath().'/resources'.($path ? '/'.$path : $path); |
|
| 56 | + return app()->basePath() . '/resources' . ($path ? '/' . $path : $path); |
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | $routeDescription = $this->getRouteDescription($routeAction['uses']); |
| 31 | 31 | |
| 32 | 32 | return $this->getParameters([ |
| 33 | - 'id' => md5($route->uri().':'.implode($route->getMethods())), |
|
| 33 | + 'id' => md5($route->uri() . ':' . implode($route->getMethods())), |
|
| 34 | 34 | 'resource' => $routeGroup, |
| 35 | 35 | 'title' => $routeDescription['short'], |
| 36 | 36 | 'description' => $routeDescription['long'], |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | { |
| 49 | 49 | $dispatcher = app('Dingo\Api\Dispatcher')->raw(); |
| 50 | 50 | |
| 51 | - collect($server)->map(function ($key, $value) use ($dispatcher) { |
|
| 51 | + collect($server)->map(function($key, $value) use ($dispatcher) { |
|
| 52 | 52 | $dispatcher->header($key, $value); |
| 53 | 53 | }); |
| 54 | 54 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $methods = $route->getMethods(); |
| 71 | 71 | |
| 72 | 72 | // Split headers into key - value pairs |
| 73 | - $headers = collect($headers)->map(function ($value) { |
|
| 73 | + $headers = collect($headers)->map(function($value) { |
|
| 74 | 74 | $split = explode(':', $value); |
| 75 | 75 | |
| 76 | 76 | return [trim($split[0]) => trim($split[1])]; |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | { |
| 90 | 90 | $uri = $this->getUri($route); |
| 91 | 91 | foreach ($bindings as $model => $id) { |
| 92 | - $uri = str_replace('{'.$model.'}', $id, $uri); |
|
| 92 | + $uri = str_replace('{' . $model . '}', $id, $uri); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | return $uri; |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | foreach ($reflectionMethod->getParameters() as $parameter) { |
| 153 | 153 | $parameterType = $parameter->getClass(); |
| 154 | - if (! is_null($parameterType) && class_exists($parameterType->name)) { |
|
| 154 | + if (!is_null($parameterType) && class_exists($parameterType->name)) { |
|
| 155 | 155 | $className = $parameterType->name; |
| 156 | 156 | |
| 157 | 157 | if (is_subclass_of($className, FormRequest::class)) { |
@@ -181,8 +181,8 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | protected function fancyImplode($arr, $first, $last) |
| 183 | 183 | { |
| 184 | - $arr = array_map(function ($value) { |
|
| 185 | - return '`'.$value.'`'; |
|
| 184 | + $arr = array_map(function($value) { |
|
| 185 | + return '`' . $value . '`'; |
|
| 186 | 186 | }, $arr); |
| 187 | 187 | array_push($arr, implode($last, array_splice($arr, -2))); |
| 188 | 188 | |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | protected function splitValuePairs($parameters, $first = 'is ', $last = 'or ') |
| 193 | 193 | { |
| 194 | 194 | $attribute = ''; |
| 195 | - collect($parameters)->map(function ($item, $key) use (&$attribute, $first, $last) { |
|
| 196 | - $attribute .= '`'.$item.'` '; |
|
| 195 | + collect($parameters)->map(function($item, $key) use (&$attribute, $first, $last) { |
|
| 196 | + $attribute .= '`' . $item . '` '; |
|
| 197 | 197 | if (($key + 1) % 2 === 0) { |
| 198 | 198 | $attribute .= $last; |
| 199 | 199 | } else { |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | } |
| 268 | 268 | break; |
| 269 | 269 | case 'between': |
| 270 | - if (! isset($attributeData['type'])) { |
|
| 270 | + if (!isset($attributeData['type'])) { |
|
| 271 | 271 | $attributeData['type'] = 'numeric'; |
| 272 | 272 | } |
| 273 | 273 | $attributeData['description'][] = Description::parse($rule)->with($parameters)->getDescription(); |
@@ -429,8 +429,8 @@ discard block |
||
| 429 | 429 | foreach ($headers as $name => $value) { |
| 430 | 430 | $name = strtr(strtoupper($name), '-', '_'); |
| 431 | 431 | |
| 432 | - if (! Str::startsWith($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
| 433 | - $name = $prefix.$name; |
|
| 432 | + if (!Str::startsWith($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
| 433 | + $name = $prefix . $name; |
|
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | $server[$name] = $value; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $this->setUserToBeImpersonated($this->option('actAsUserId')); |
| 72 | 72 | |
| 73 | - if ($routePrefix === null && ! count($allowedRoutes) && $middleware === null) { |
|
| 73 | + if ($routePrefix === null && !count($allowedRoutes) && $middleware === null) { |
|
| 74 | 74 | $this->error('You must provide either a route prefix or a route or a middleware to generate the documentation.'); |
| 75 | 75 | |
| 76 | 76 | return false; |
@@ -94,15 +94,15 @@ discard block |
||
| 94 | 94 | private function writeMarkdown($parsedRoutes) |
| 95 | 95 | { |
| 96 | 96 | $outputPath = $this->option('output'); |
| 97 | - $targetFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'index.md'; |
|
| 98 | - $compareFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'.compare.md'; |
|
| 97 | + $targetFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . 'index.md'; |
|
| 98 | + $compareFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . '.compare.md'; |
|
| 99 | 99 | |
| 100 | 100 | $infoText = view('apidoc::partials.info') |
| 101 | 101 | ->with('outputPath', ltrim($outputPath, 'public/')) |
| 102 | - ->with('showPostmanCollectionButton', ! $this->option('noPostmanCollection')); |
|
| 102 | + ->with('showPostmanCollectionButton', !$this->option('noPostmanCollection')); |
|
| 103 | 103 | |
| 104 | - $parsedRouteOutput = $parsedRoutes->map(function ($routeGroup) { |
|
| 105 | - return $routeGroup->map(function ($route) { |
|
| 104 | + $parsedRouteOutput = $parsedRoutes->map(function($routeGroup) { |
|
| 105 | + return $routeGroup->map(function($route) { |
|
| 106 | 106 | $route['output'] = (string) view('apidoc::partials.route')->with('parsedRoute', $route); |
| 107 | 107 | |
| 108 | 108 | return $route; |
@@ -126,16 +126,16 @@ discard block |
||
| 126 | 126 | $frontmatter = trim($generatedFrontmatter[1], "\n"); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - $parsedRouteOutput->transform(function ($routeGroup) use ($generatedDocumentation, $compareDocumentation) { |
|
| 130 | - return $routeGroup->transform(function ($route) use ($generatedDocumentation, $compareDocumentation) { |
|
| 131 | - if (preg_match('/<!-- START_'.$route['id'].' -->(.*)<!-- END_'.$route['id'].' -->/is', $generatedDocumentation, $routeMatch)) { |
|
| 132 | - $routeDocumentationChanged = (preg_match('/<!-- START_'.$route['id'].' -->(.*)<!-- END_'.$route['id'].' -->/is', $compareDocumentation, $compareMatch) && $compareMatch[1] !== $routeMatch[1]); |
|
| 129 | + $parsedRouteOutput->transform(function($routeGroup) use ($generatedDocumentation, $compareDocumentation) { |
|
| 130 | + return $routeGroup->transform(function($route) use ($generatedDocumentation, $compareDocumentation) { |
|
| 131 | + if (preg_match('/<!-- START_' . $route['id'] . ' -->(.*)<!-- END_' . $route['id'] . ' -->/is', $generatedDocumentation, $routeMatch)) { |
|
| 132 | + $routeDocumentationChanged = (preg_match('/<!-- START_' . $route['id'] . ' -->(.*)<!-- END_' . $route['id'] . ' -->/is', $compareDocumentation, $compareMatch) && $compareMatch[1] !== $routeMatch[1]); |
|
| 133 | 133 | if ($routeDocumentationChanged === false || $this->option('force')) { |
| 134 | 134 | if ($routeDocumentationChanged) { |
| 135 | - $this->warn('Discarded manual changes for route ['.implode(',', $route['methods']).'] '.$route['uri']); |
|
| 135 | + $this->warn('Discarded manual changes for route [' . implode(',', $route['methods']) . '] ' . $route['uri']); |
|
| 136 | 136 | } |
| 137 | 137 | } else { |
| 138 | - $this->warn('Skipping modified route ['.implode(',', $route['methods']).'] '.$route['uri']); |
|
| 138 | + $this->warn('Skipping modified route [' . implode(',', $route['methods']) . '] ' . $route['uri']); |
|
| 139 | 139 | $route['modified_output'] = $routeMatch[0]; |
| 140 | 140 | } |
| 141 | 141 | } |
@@ -152,10 +152,10 @@ discard block |
||
| 152 | 152 | ->with('frontmatter', $frontmatter) |
| 153 | 153 | ->with('infoText', $infoText) |
| 154 | 154 | ->with('outputPath', $this->option('output')) |
| 155 | - ->with('showPostmanCollectionButton', ! $this->option('noPostmanCollection')) |
|
| 155 | + ->with('showPostmanCollectionButton', !$this->option('noPostmanCollection')) |
|
| 156 | 156 | ->with('parsedRoutes', $parsedRouteOutput); |
| 157 | 157 | |
| 158 | - if (! is_dir($outputPath)) { |
|
| 158 | + if (!is_dir($outputPath)) { |
|
| 159 | 159 | $documentarian->create($outputPath); |
| 160 | 160 | } |
| 161 | 161 | |
@@ -168,24 +168,24 @@ discard block |
||
| 168 | 168 | ->with('frontmatter', $frontmatter) |
| 169 | 169 | ->with('infoText', $infoText) |
| 170 | 170 | ->with('outputPath', $this->option('output')) |
| 171 | - ->with('showPostmanCollectionButton', ! $this->option('noPostmanCollection')) |
|
| 171 | + ->with('showPostmanCollectionButton', !$this->option('noPostmanCollection')) |
|
| 172 | 172 | ->with('parsedRoutes', $parsedRouteOutput); |
| 173 | 173 | |
| 174 | 174 | file_put_contents($compareFile, $compareMarkdown); |
| 175 | 175 | |
| 176 | - $this->info('Wrote index.md to: '.$outputPath); |
|
| 176 | + $this->info('Wrote index.md to: ' . $outputPath); |
|
| 177 | 177 | |
| 178 | 178 | $this->info('Generating API HTML code'); |
| 179 | 179 | |
| 180 | 180 | $documentarian->generate($outputPath); |
| 181 | 181 | |
| 182 | - $this->info('Wrote HTML documentation to: '.$outputPath.'/public/index.html'); |
|
| 182 | + $this->info('Wrote HTML documentation to: ' . $outputPath . '/public/index.html'); |
|
| 183 | 183 | |
| 184 | 184 | |
| 185 | 185 | if ($this->option('noPostmanCollection') !== true) { |
| 186 | 186 | $this->info('Generating Postman collection'); |
| 187 | 187 | |
| 188 | - file_put_contents($outputPath.DIRECTORY_SEPARATOR.'collection.json', $this->generatePostmanCollection($parsedRoutes)); |
|
| 188 | + file_put_contents($outputPath . DIRECTORY_SEPARATOR . 'collection.json', $this->generatePostmanCollection($parsedRoutes)); |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | */ |
| 214 | 214 | private function setUserToBeImpersonated($actAs) |
| 215 | 215 | { |
| 216 | - if (! empty($actAs)) { |
|
| 216 | + if (!empty($actAs)) { |
|
| 217 | 217 | if (version_compare($this->laravel->version(), '5.2.0', '<')) { |
| 218 | 218 | $userModel = config('auth.model'); |
| 219 | 219 | $user = $userModel::find((int) $actAs); |
@@ -255,9 +255,9 @@ discard block |
||
| 255 | 255 | if (in_array($route->getName(), $allowedRoutes) || str_is($routePrefix, $route->getUri()) || in_array($middleware, $route->middleware())) { |
| 256 | 256 | if ($this->isValidRoute($route) && $this->isRouteVisibleForDocumentation($route->getAction()['uses'])) { |
| 257 | 257 | $parsedRoutes[] = $generator->processRoute($route, $bindings, $this->option('header'), $withResponse); |
| 258 | - $this->info('Processed route: ['.implode(',', $route->getMethods()).'] '.$route->getUri()); |
|
| 258 | + $this->info('Processed route: [' . implode(',', $route->getMethods()) . '] ' . $route->getUri()); |
|
| 259 | 259 | } else { |
| 260 | - $this->warn('Skipping route: ['.implode(',', $route->getMethods()).'] '.$route->getUri()); |
|
| 260 | + $this->warn('Skipping route: [' . implode(',', $route->getMethods()) . '] ' . $route->getUri()); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -282,9 +282,9 @@ discard block |
||
| 282 | 282 | if (empty($allowedRoutes) || in_array($route->getName(), $allowedRoutes) || str_is($routePrefix, $route->uri()) || in_array($middleware, $route->middleware())) { |
| 283 | 283 | if ($this->isValidRoute($route) && $this->isRouteVisibleForDocumentation($route->getAction()['uses'])) { |
| 284 | 284 | $parsedRoutes[] = $generator->processRoute($route, $bindings, $this->option('header'), $withResponse); |
| 285 | - $this->info('Processed route: ['.implode(',', $route->getMethods()).'] '.$route->uri()); |
|
| 285 | + $this->info('Processed route: [' . implode(',', $route->getMethods()) . '] ' . $route->uri()); |
|
| 286 | 286 | } else { |
| 287 | - $this->warn('Skipping route: ['.implode(',', $route->getMethods()).'] '.$route->uri()); |
|
| 287 | + $this->warn('Skipping route: [' . implode(',', $route->getMethods()) . '] ' . $route->uri()); |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | } |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | */ |
| 300 | 300 | private function isValidRoute($route) |
| 301 | 301 | { |
| 302 | - return ! is_callable($route->getAction()['uses']) && ! is_null($route->getAction()['uses']); |
|
| 302 | + return !is_callable($route->getAction()['uses']) && !is_null($route->getAction()['uses']); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | /** |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $phpdoc = new DocBlock($comment); |
| 317 | 317 | |
| 318 | 318 | return collect($phpdoc->getTags()) |
| 319 | - ->filter(function ($tag) use ($route) { |
|
| 319 | + ->filter(function($tag) use ($route) { |
|
| 320 | 320 | return $tag->getName() === 'hideFromAPIDocumentation'; |
| 321 | 321 | }) |
| 322 | 322 | ->isEmpty(); |