Completed
Pull Request — master (#530)
by Marcel
07:46 queued 06:17
created
src/Tools/DocumentationConfig.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -11,6 +11,10 @@
 block discarded – undo
11 11
         $this->data = $config;
12 12
     }
13 13
 
14
+    /**
15
+     * @param string $key
16
+     * @param boolean $default
17
+     */
14 18
     public function get($key, $default = null)
15 19
     {
16 20
         return data_get($this->data, $key, $default);
Please login to merge, or discard this patch.
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.