Completed
Pull Request — master (#531)
by
unknown
01:35
created
src/Commands/GenerateDocumentation.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $generator = new Generator($this->docConfig);
74 74
         $parsedRoutes = $this->processRoutes($generator, $routes);
75 75
         $parsedRoutes = collect($parsedRoutes)->groupBy('group')
76
-            ->sortBy(static function ($group) {
76
+            ->sortBy(static function($group) {
77 77
                 /* @var $group Collection */
78 78
                 return $group->first()['group'];
79 79
             }, SORT_NATURAL);
@@ -89,19 +89,19 @@  discard block
 block discarded – undo
89 89
     private function writeMarkdown($parsedRoutes)
90 90
     {
91 91
         $outputPath = $this->docConfig->get('output');
92
-        $targetFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'index.md';
93
-        $compareFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'.compare.md';
94
-        $prependFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'prepend.md';
95
-        $appendFile = $outputPath.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR.'append.md';
92
+        $targetFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . 'index.md';
93
+        $compareFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . '.compare.md';
94
+        $prependFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . 'prepend.md';
95
+        $appendFile = $outputPath . DIRECTORY_SEPARATOR . 'source' . DIRECTORY_SEPARATOR . 'append.md';
96 96
 
97 97
         $infoText = view('apidoc::partials.info')
98 98
             ->with('outputPath', ltrim($outputPath, 'public/'))
99 99
             ->with('showPostmanCollectionButton', $this->shouldGeneratePostmanCollection());
100 100
 
101 101
         $settings = ['languages' => $this->docConfig->get('example_languages')];
102
-        $parsedRouteOutput = $parsedRoutes->map(function ($routeGroup) use ($settings) {
103
-            return $routeGroup->map(function ($route) use ($settings) {
104
-                if (count($route['cleanBodyParameters']) && ! isset($route['headers']['Content-Type'])) {
102
+        $parsedRouteOutput = $parsedRoutes->map(function($routeGroup) use ($settings) {
103
+            return $routeGroup->map(function($route) use ($settings) {
104
+                if (count($route['cleanBodyParameters']) && !isset($route['headers']['Content-Type'])) {
105 105
                     $route['headers']['Content-Type'] = 'application/json';
106 106
                 }
107 107
                 $route['output'] = (string) view('apidoc::partials.route')
@@ -128,16 +128,16 @@  discard block
 block discarded – undo
128 128
                 $frontmatter = trim($generatedFrontmatter[1], "\n");
129 129
             }
130 130
 
131
-            $parsedRouteOutput->transform(function ($routeGroup) use ($generatedDocumentation, $compareDocumentation) {
132
-                return $routeGroup->transform(function ($route) use ($generatedDocumentation, $compareDocumentation) {
133
-                    if (preg_match('/<!-- START_'.$route['id'].' -->(.*)<!-- END_'.$route['id'].' -->/is', $generatedDocumentation, $existingRouteDoc)) {
134
-                        $routeDocumentationChanged = (preg_match('/<!-- START_'.$route['id'].' -->(.*)<!-- END_'.$route['id'].' -->/is', $compareDocumentation, $lastDocWeGeneratedForThisRoute) && $lastDocWeGeneratedForThisRoute[1] !== $existingRouteDoc[1]);
131
+            $parsedRouteOutput->transform(function($routeGroup) use ($generatedDocumentation, $compareDocumentation) {
132
+                return $routeGroup->transform(function($route) use ($generatedDocumentation, $compareDocumentation) {
133
+                    if (preg_match('/<!-- START_' . $route['id'] . ' -->(.*)<!-- END_' . $route['id'] . ' -->/is', $generatedDocumentation, $existingRouteDoc)) {
134
+                        $routeDocumentationChanged = (preg_match('/<!-- START_' . $route['id'] . ' -->(.*)<!-- END_' . $route['id'] . ' -->/is', $compareDocumentation, $lastDocWeGeneratedForThisRoute) && $lastDocWeGeneratedForThisRoute[1] !== $existingRouteDoc[1]);
135 135
                         if ($routeDocumentationChanged === false || $this->option('force')) {
136 136
                             if ($routeDocumentationChanged) {
137
-                                $this->warn('Discarded manual changes for route ['.implode(',', $route['methods']).'] '.$route['uri']);
137
+                                $this->warn('Discarded manual changes for route [' . implode(',', $route['methods']) . '] ' . $route['uri']);
138 138
                             }
139 139
                         } else {
140
-                            $this->warn('Skipping modified route ['.implode(',', $route['methods']).'] '.$route['uri']);
140
+                            $this->warn('Skipping modified route [' . implode(',', $route['methods']) . '] ' . $route['uri']);
141 141
                             $route['modified_output'] = $existingRouteDoc[0];
142 142
                         }
143 143
                     }
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
         }
149 149
 
150 150
         $prependFileContents = file_exists($prependFile)
151
-            ? file_get_contents($prependFile)."\n" : '';
151
+            ? file_get_contents($prependFile) . "\n" : '';
152 152
         $appendFileContents = file_exists($appendFile)
153
-            ? "\n".file_get_contents($appendFile) : '';
153
+            ? "\n" . file_get_contents($appendFile) : '';
154 154
 
155 155
         $documentarian = new Documentarian();
156 156
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
             ->with('showPostmanCollectionButton', $this->shouldGeneratePostmanCollection())
165 165
             ->with('parsedRoutes', $parsedRouteOutput);
166 166
 
167
-        if (! is_dir($outputPath)) {
167
+        if (!is_dir($outputPath)) {
168 168
             $documentarian->create($outputPath);
169 169
         }
170 170
 
@@ -184,24 +184,24 @@  discard block
 block discarded – undo
184 184
 
185 185
         file_put_contents($compareFile, $compareMarkdown);
186 186
 
187
-        $this->info('Wrote index.md to: '.$outputPath);
187
+        $this->info('Wrote index.md to: ' . $outputPath);
188 188
 
189 189
         $this->info('Generating API HTML code');
190 190
 
191 191
         $documentarian->generate($outputPath);
192 192
 
193
-        $this->info('Wrote HTML documentation to: '.$outputPath.'/index.html');
193
+        $this->info('Wrote HTML documentation to: ' . $outputPath . '/index.html');
194 194
 
195 195
         if ($this->shouldGeneratePostmanCollection()) {
196 196
             $this->info('Generating Postman collection');
197 197
 
198
-            file_put_contents($outputPath.DIRECTORY_SEPARATOR.'collection.json', $this->generatePostmanCollection($parsedRoutes));
198
+            file_put_contents($outputPath . DIRECTORY_SEPARATOR . 'collection.json', $this->generatePostmanCollection($parsedRoutes));
199 199
         }
200 200
 
201 201
         if ($logo = $this->docConfig->get('logo')) {
202 202
             copy(
203 203
                 $logo,
204
-                $outputPath.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'logo.png'
204
+                $outputPath . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR . 'logo.png'
205 205
             );
206 206
         }
207 207
     }
@@ -220,9 +220,9 @@  discard block
 block discarded – undo
220 220
             /** @var Route $route */
221 221
             if ($this->isValidRoute($route) && $this->isRouteVisibleForDocumentation($route->getAction())) {
222 222
                 $parsedRoutes[] = $generator->processRoute($route, $routeItem['apply']);
223
-                $this->info('Processed route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($route));
223
+                $this->info('Processed route: [' . implode(',', $generator->getMethods($route)) . '] ' . $generator->getUri($route));
224 224
             } else {
225
-                $this->warn('Skipping route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($route));
225
+                $this->warn('Skipping route: [' . implode(',', $generator->getMethods($route)) . '] ' . $generator->getUri($route));
226 226
             }
227 227
         }
228 228
 
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
             $action = implode('@', $action);
242 242
         }
243 243
 
244
-        return ! is_callable($action) && ! is_null($action);
244
+        return !is_callable($action) && !is_null($action);
245 245
     }
246 246
 
247 247
     /**
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
         list($class, $method) = Utils::getRouteActionUses($action);
257 257
         $reflection = new ReflectionClass($class);
258 258
 
259
-        if (! $reflection->hasMethod($method)) {
259
+        if (!$reflection->hasMethod($method)) {
260 260
             return false;
261 261
         }
262 262
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
             $phpdoc = new DocBlock($comment);
267 267
 
268 268
             return collect($phpdoc->getTags())
269
-                ->filter(function ($tag) use ($action) {
269
+                ->filter(function($tag) use ($action) {
270 270
                     return $tag->getName() === 'hideFromAPIDocumentation';
271 271
                 })
272 272
                 ->isEmpty();
Please login to merge, or discard this patch.
src/Tools/Utils.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 
69 69
     public static function deleteDirectoryAndContents($dir)
70 70
     {
71
-        $adapter = new Local(realpath(__DIR__.'/../../'));
71
+        $adapter = new Local(realpath(__DIR__ . '/../../'));
72 72
         $fs = new Filesystem($adapter);
73 73
         $fs->deleteDir($dir);
74 74
     }
Please login to merge, or discard this patch.
src/Tools/Generator.php 2 patches
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     /**
29 29
      * @param Route $route
30 30
      *
31
-     * @return mixed
31
+     * @return string
32 32
      */
33 33
     public function getUri(Route $route)
34 34
     {
@@ -47,7 +47,6 @@  discard block
 block discarded – undo
47 47
 
48 48
     /**
49 49
      * @param  \Illuminate\Routing\Route $route
50
-     * @param array $apply Rules to apply when generating documentation for this route
51 50
      *
52 51
      * @return array
53 52
      */
@@ -95,7 +94,7 @@  discard block
 block discarded – undo
95 94
      * @param ReflectionMethod $method
96 95
      * @param array $tags
97 96
      *
98
-     * @return array
97
+     * @return Route
99 98
      */
100 99
     protected function getUriParameters(ReflectionMethod $method, array $tags)
101 100
     {
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
         ]);
70 70
 
71 71
         $parsedRoute = [
72
-            'id' => md5($this->getUri($route).':'.implode($this->getMethods($route))),
72
+            'id' => md5($this->getUri($route) . ':' . implode($this->getMethods($route))),
73 73
             'group' => $routeGroup,
74 74
             'title' => $docBlock['short'],
75 75
             'description' => $docBlock['long'],
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
             'cleanQueryParameters' => $this->cleanParams($queryParameters),
85 85
             'authenticated' => $this->getAuthStatusFromDocBlock($docBlock['tags']),
86 86
             'response' => $content,
87
-            'showresponse' => ! empty($content),
87
+            'showresponse' => !empty($content),
88 88
         ];
89 89
         $parsedRoute['headers'] = $rulesToApply['headers'] ?? [];
90 90
 
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
     protected function getUriParametersFromDocBlock(array $tags)
137 137
     {
138 138
         $parameters = collect($tags)
139
-            ->filter(function ($tag) {
139
+            ->filter(function($tag) {
140 140
                 return $tag instanceof Tag && $tag->getName() === 'uriParam';
141 141
             })
142
-            ->mapWithKeys(function ($tag) {
142
+            ->mapWithKeys(function($tag) {
143 143
                 preg_match('/(.+?)\s+(.+?)\s+?(.*)/', $tag->getContent(), $content);
144 144
                 if (empty($content)) {
145 145
                     // this means only name and type were supplied
@@ -200,10 +200,10 @@  discard block
 block discarded – undo
200 200
     protected function getBodyParametersFromDocBlock(array $tags)
201 201
     {
202 202
         $parameters = collect($tags)
203
-            ->filter(function ($tag) {
203
+            ->filter(function($tag) {
204 204
                 return $tag instanceof Tag && $tag->getName() === 'bodyParam';
205 205
             })
206
-            ->mapWithKeys(function ($tag) {
206
+            ->mapWithKeys(function($tag) {
207 207
                 preg_match('/(.+?)\s+(.+?)\s+(required\s+)?(.*)/', $tag->getContent(), $content);
208 208
                 if (empty($content)) {
209 209
                     // this means only name and type were supplied
@@ -275,10 +275,10 @@  discard block
 block discarded – undo
275 275
     protected function getQueryParametersFromDocBlock(array $tags)
276 276
     {
277 277
         $parameters = collect($tags)
278
-            ->filter(function ($tag) {
278
+            ->filter(function($tag) {
279 279
                 return $tag instanceof Tag && $tag->getName() === 'queryParam';
280 280
             })
281
-            ->mapWithKeys(function ($tag) {
281
+            ->mapWithKeys(function($tag) {
282 282
                 preg_match('/(.+?)\s+(required\s+)?(.*)/', $tag->getContent(), $content);
283 283
                 if (empty($content)) {
284 284
                     // this means only name was supplied
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
     protected function getAuthStatusFromDocBlock(array $tags)
317 317
     {
318 318
         $authTag = collect($tags)
319
-            ->first(function ($tag) {
319
+            ->first(function($tag) {
320 320
                 return $tag instanceof Tag && strtolower($tag->getName()) === 'authenticated';
321 321
             });
322 322
 
@@ -390,25 +390,25 @@  discard block
 block discarded – undo
390 390
             $faker->seed($this->config->get('faker_seed'));
391 391
         }
392 392
         $fakeFactories = [
393
-            'integer' => function () use ($faker) {
393
+            'integer' => function() use ($faker) {
394 394
                 return $faker->numberBetween(1, 20);
395 395
             },
396
-            'number' => function () use ($faker) {
396
+            'number' => function() use ($faker) {
397 397
                 return $faker->randomFloat();
398 398
             },
399
-            'float' => function () use ($faker) {
399
+            'float' => function() use ($faker) {
400 400
                 return $faker->randomFloat();
401 401
             },
402
-            'boolean' => function () use ($faker) {
402
+            'boolean' => function() use ($faker) {
403 403
                 return $faker->boolean();
404 404
             },
405
-            'string' => function () use ($faker) {
405
+            'string' => function() use ($faker) {
406 406
                 return $faker->word;
407 407
             },
408
-            'array' => function () {
408
+            'array' => function() {
409 409
                 return [];
410 410
             },
411
-            'object' => function () {
411
+            'object' => function() {
412 412
                 return new \stdClass;
413 413
             },
414 414
         ];
Please login to merge, or discard this patch.