@@ -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 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | $uri = $this->getUri($route); |
80 | 80 | foreach ($bindings as $model => $id) { |
81 | - $uri = str_replace('{'.$model.'}', $id, $uri); |
|
81 | + $uri = str_replace('{' . $model . '}', $id, $uri); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | return $uri; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | foreach ($reflectionMethod->getParameters() as $parameter) { |
141 | 141 | $parameterType = $parameter->getClass(); |
142 | - if (! is_null($parameterType) && class_exists($parameterType->name)) { |
|
142 | + if (!is_null($parameterType) && class_exists($parameterType->name)) { |
|
143 | 143 | $className = $parameterType->name; |
144 | 144 | $parameterReflection = new $className; |
145 | 145 | if ($parameterReflection instanceof FormRequest) { |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | */ |
165 | 165 | protected function fancyImplode($arr, $first, $last) |
166 | 166 | { |
167 | - $arr = array_map(function ($value) { |
|
168 | - return '`'.$value.'`'; |
|
167 | + $arr = array_map(function($value) { |
|
168 | + return '`' . $value . '`'; |
|
169 | 169 | }, $arr); |
170 | 170 | array_push($arr, implode($last, array_splice($arr, -2))); |
171 | 171 | |
@@ -375,8 +375,8 @@ discard block |
||
375 | 375 | foreach ($headers as $name => $value) { |
376 | 376 | $name = strtr(strtoupper($name), '-', '_'); |
377 | 377 | |
378 | - if (! Str::startsWith($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
379 | - $name = $prefix.$name; |
|
378 | + if (!Str::startsWith($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
379 | + $name = $prefix . $name; |
|
380 | 380 | } |
381 | 381 | |
382 | 382 | $server[$name] = $value; |
@@ -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 | } |
@@ -15,11 +15,11 @@ 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'), |
|
22 | + __DIR__ . '/../../resources/lang' => $this->resource_path('lang/vendor/apidoc'), |
|
23 | 23 | ]); |
24 | 24 | } |
25 | 25 | |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function register() |
32 | 32 | { |
33 | - $this->app['apidoc.generate'] = $this->app->share(function () { |
|
33 | + $this->app['apidoc.generate'] = $this->app->share(function() { |
|
34 | 34 | return new GenerateDocumentation(); |
35 | 35 | }); |
36 | - $this->app['apidoc.update'] = $this->app->share(function () { |
|
36 | + $this->app['apidoc.update'] = $this->app->share(function() { |
|
37 | 37 | return new UpdateDocumentation(); |
38 | 38 | }); |
39 | 39 | |
@@ -52,6 +52,6 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function resource_path($path = '') |
54 | 54 | { |
55 | - return app()->basePath().'/resources'.($path ? '/'.$path : $path); |
|
55 | + return app()->basePath() . '/resources' . ($path ? '/' . $path : $path); |
|
56 | 56 | } |
57 | 57 | } |
@@ -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'] : '', |
@@ -29,7 +29,7 @@ |
||
29 | 29 | $routeDescription = $this->getRouteDescription($routeAction['uses']); |
30 | 30 | |
31 | 31 | return $this->getParameters([ |
32 | - 'id' => md5($route->uri().':'.implode($route->getMethods())), |
|
32 | + 'id' => md5($route->uri() . ':' . implode($route->getMethods())), |
|
33 | 33 | 'resource' => $routeGroup, |
34 | 34 | 'title' => $routeDescription['short'], |
35 | 35 | 'description' => $routeDescription['long'], |
@@ -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'], |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | $this->setUserToBeImpersonated($this->option('actAsUserId')); |
69 | 69 | |
70 | - if ($routePrefix === null && ! count($allowedRoutes)) { |
|
70 | + if ($routePrefix === null && !count($allowedRoutes)) { |
|
71 | 71 | $this->error('You must provide either a route prefix or a route to generate the documentation.'); |
72 | 72 | |
73 | 73 | return false; |
@@ -91,16 +91,16 @@ discard block |
||
91 | 91 | private function writeMarkdown($parsedRoutes) |
92 | 92 | { |
93 | 93 | $outputPath = $this->option('output'); |
94 | - $targetFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'index.md'; |
|
95 | - $compareFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'.compare.md'; |
|
94 | + $targetFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . 'index.md'; |
|
95 | + $compareFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . '.compare.md'; |
|
96 | 96 | |
97 | 97 | $infoText = view('apidoc::partials.info') |
98 | 98 | ->with('outputPath', $this->option('output')) |
99 | - ->with('showPostmanCollectionButton', ! $this->option('noPostmanCollection')); |
|
99 | + ->with('showPostmanCollectionButton', !$this->option('noPostmanCollection')); |
|
100 | 100 | |
101 | - $parsedRouteOutput = $parsedRoutes->map(function ($routeGroup) { |
|
102 | - return $routeGroup->map(function($route){ |
|
103 | - $route['output'] = (string)view('apidoc::partials.route')->with('parsedRoute', $route); |
|
101 | + $parsedRouteOutput = $parsedRoutes->map(function($routeGroup) { |
|
102 | + return $routeGroup->map(function($route) { |
|
103 | + $route['output'] = (string) view('apidoc::partials.route')->with('parsedRoute', $route); |
|
104 | 104 | return $route; |
105 | 105 | }); |
106 | 106 | }); |
@@ -115,23 +115,23 @@ discard block |
||
115 | 115 | $compareDocumentation = file_get_contents($compareFile); |
116 | 116 | |
117 | 117 | if (preg_match("/<!-- START_INFO -->(.*)<!-- END_INFO -->/is", $generatedDocumentation, $generatedInfoText)) { |
118 | - $infoText = trim($generatedInfoText[1],"\n"); |
|
118 | + $infoText = trim($generatedInfoText[1], "\n"); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | if (preg_match("/---(.*)---\\s<!-- START_INFO -->/is", $generatedDocumentation, $generatedFrontmatter)) { |
122 | - $frontmatter = trim($generatedFrontmatter[1],"\n"); |
|
122 | + $frontmatter = trim($generatedFrontmatter[1], "\n"); |
|
123 | 123 | } |
124 | 124 | |
125 | - $parsedRouteOutput->transform(function ($routeGroup) use($generatedDocumentation, $compareDocumentation) { |
|
125 | + $parsedRouteOutput->transform(function($routeGroup) use($generatedDocumentation, $compareDocumentation) { |
|
126 | 126 | return $routeGroup->transform(function($route) use($generatedDocumentation, $compareDocumentation) { |
127 | - if (preg_match("/<!-- START_".$route['id']." -->(.*)<!-- END_".$route['id']." -->/is", $generatedDocumentation, $routeMatch)) { |
|
128 | - $routeDocumentationChanged = (preg_match("/<!-- START_".$route['id']." -->(.*)<!-- END_".$route['id']." -->/is", $compareDocumentation, $compareMatch) && $compareMatch[1] !== $routeMatch[1]); |
|
129 | - if ($routeDocumentationChanged === false || $this->option('force')) { |
|
127 | + if (preg_match("/<!-- START_" . $route['id'] . " -->(.*)<!-- END_" . $route['id'] . " -->/is", $generatedDocumentation, $routeMatch)) { |
|
128 | + $routeDocumentationChanged = (preg_match("/<!-- START_" . $route['id'] . " -->(.*)<!-- END_" . $route['id'] . " -->/is", $compareDocumentation, $compareMatch) && $compareMatch[1] !== $routeMatch[1]); |
|
129 | + if ($routeDocumentationChanged === false || $this->option('force')) { |
|
130 | 130 | if ($routeDocumentationChanged) { |
131 | - $this->warn('Discarded manual changes for route ['.implode(',', $route['methods']).'] '.$route['uri']); |
|
131 | + $this->warn('Discarded manual changes for route [' . implode(',', $route['methods']) . '] ' . $route['uri']); |
|
132 | 132 | } |
133 | 133 | } else { |
134 | - $this->warn('Skipping modified route ['.implode(',', $route['methods']).'] '.$route['uri']); |
|
134 | + $this->warn('Skipping modified route [' . implode(',', $route['methods']) . '] ' . $route['uri']); |
|
135 | 135 | $route['modified_output'] = $routeMatch[0]; |
136 | 136 | } |
137 | 137 | } |
@@ -147,10 +147,10 @@ discard block |
||
147 | 147 | ->with('frontmatter', $frontmatter) |
148 | 148 | ->with('infoText', $infoText) |
149 | 149 | ->with('outputPath', $this->option('output')) |
150 | - ->with('showPostmanCollectionButton', ! $this->option('noPostmanCollection')) |
|
150 | + ->with('showPostmanCollectionButton', !$this->option('noPostmanCollection')) |
|
151 | 151 | ->with('parsedRoutes', $parsedRouteOutput); |
152 | 152 | |
153 | - if (! is_dir($outputPath)) { |
|
153 | + if (!is_dir($outputPath)) { |
|
154 | 154 | $documentarian->create($outputPath); |
155 | 155 | } |
156 | 156 | |
@@ -163,24 +163,24 @@ discard block |
||
163 | 163 | ->with('frontmatter', $frontmatter) |
164 | 164 | ->with('infoText', $infoText) |
165 | 165 | ->with('outputPath', $this->option('output')) |
166 | - ->with('showPostmanCollectionButton', ! $this->option('noPostmanCollection')) |
|
166 | + ->with('showPostmanCollectionButton', !$this->option('noPostmanCollection')) |
|
167 | 167 | ->with('parsedRoutes', $parsedRouteOutput); |
168 | 168 | |
169 | 169 | file_put_contents($compareFile, $compareMarkdown); |
170 | 170 | |
171 | - $this->info('Wrote index.md to: '.$outputPath); |
|
171 | + $this->info('Wrote index.md to: ' . $outputPath); |
|
172 | 172 | |
173 | 173 | $this->info('Generating API HTML code'); |
174 | 174 | |
175 | 175 | $documentarian->generate($outputPath); |
176 | 176 | |
177 | - $this->info('Wrote HTML documentation to: '.$outputPath.'/public/index.html'); |
|
177 | + $this->info('Wrote HTML documentation to: ' . $outputPath . '/public/index.html'); |
|
178 | 178 | |
179 | 179 | |
180 | 180 | if ($this->option('noPostmanCollection') !== true) { |
181 | 181 | $this->info('Generating Postman collection'); |
182 | 182 | |
183 | - file_put_contents($outputPath.DIRECTORY_SEPARATOR.'collection.json', $this->generatePostmanCollection($parsedRoutes)); |
|
183 | + file_put_contents($outputPath . DIRECTORY_SEPARATOR . 'collection.json', $this->generatePostmanCollection($parsedRoutes)); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | */ |
209 | 209 | private function setUserToBeImpersonated($actAs) |
210 | 210 | { |
211 | - if (! empty($actAs)) { |
|
211 | + if (!empty($actAs)) { |
|
212 | 212 | if (version_compare($this->laravel->version(), '5.2.0', '<')) { |
213 | 213 | $userModel = config('auth.model'); |
214 | 214 | $user = $userModel::find($actAs); |
@@ -250,9 +250,9 @@ discard block |
||
250 | 250 | if (in_array($route->getName(), $allowedRoutes) || str_is($routePrefix, $route->getUri())) { |
251 | 251 | if ($this->isValidRoute($route) && $this->isRouteVisibleForDocumentation($route->getAction()['uses'])) { |
252 | 252 | $parsedRoutes[] = $generator->processRoute($route, $bindings, $withResponse); |
253 | - $this->info('Processed route: '.$route->getUri()); |
|
253 | + $this->info('Processed route: ' . $route->getUri()); |
|
254 | 254 | } else { |
255 | - $this->warn('Skipping route: '.$route->getUri()); |
|
255 | + $this->warn('Skipping route: ' . $route->getUri()); |
|
256 | 256 | } |
257 | 257 | } |
258 | 258 | } |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | foreach ($routes as $route) { |
277 | 277 | if (empty($allowedRoutes) || in_array($route->getName(), $allowedRoutes) || str_is($routePrefix, $route->uri())) { |
278 | 278 | $parsedRoutes[] = $generator->processRoute($route, $bindings, $withResponse); |
279 | - $this->info('Processed route: '.$route->uri()); |
|
279 | + $this->info('Processed route: ' . $route->uri()); |
|
280 | 280 | } |
281 | 281 | } |
282 | 282 | |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | */ |
291 | 291 | private function isValidRoute($route) |
292 | 292 | { |
293 | - return ! is_callable($route->getAction()['uses']) && ! is_null($route->getAction()['uses']); |
|
293 | + return !is_callable($route->getAction()['uses']) && !is_null($route->getAction()['uses']); |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | /** |