Completed
Pull Request — master (#638)
by
unknown
12:52
created
src/Writing/Writer.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
      */
84 84
     public function writeMarkdownAndSourceFiles(Collection $parsedRoutes, string $sourceOutputPath)
85 85
     {
86
-        $targetFile = $sourceOutputPath.'/source/index.md';
87
-        $compareFile = $sourceOutputPath.'/source/.compare.md';
86
+        $targetFile = $sourceOutputPath . '/source/index.md';
87
+        $compareFile = $sourceOutputPath . '/source/.compare.md';
88 88
 
89 89
         $infoText = view('apidoc::partials.info')
90 90
             ->with('outputPath', 'docs')
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
             $generatedDocumentation = file_get_contents($targetFile);
107 107
             $compareDocumentation = file_get_contents($compareFile);
108 108
 
109
-            $parsedRouteOutput->transform(function (Collection $routeGroup) use ($generatedDocumentation, $compareDocumentation) {
110
-                return $routeGroup->transform(function (array $route) use ($generatedDocumentation, $compareDocumentation) {
111
-                    if (preg_match('/<!-- START_'.$route['id'].' -->(.*)<!-- END_'.$route['id'].' -->/is', $generatedDocumentation, $existingRouteDoc)) {
112
-                        $routeDocumentationChanged = (preg_match('/<!-- START_'.$route['id'].' -->(.*)<!-- END_'.$route['id'].' -->/is', $compareDocumentation, $lastDocWeGeneratedForThisRoute) && $lastDocWeGeneratedForThisRoute[1] !== $existingRouteDoc[1]);
109
+            $parsedRouteOutput->transform(function(Collection $routeGroup) use ($generatedDocumentation, $compareDocumentation) {
110
+                return $routeGroup->transform(function(array $route) use ($generatedDocumentation, $compareDocumentation) {
111
+                    if (preg_match('/<!-- START_' . $route['id'] . ' -->(.*)<!-- END_' . $route['id'] . ' -->/is', $generatedDocumentation, $existingRouteDoc)) {
112
+                        $routeDocumentationChanged = (preg_match('/<!-- START_' . $route['id'] . ' -->(.*)<!-- END_' . $route['id'] . ' -->/is', $compareDocumentation, $lastDocWeGeneratedForThisRoute) && $lastDocWeGeneratedForThisRoute[1] !== $existingRouteDoc[1]);
113 113
                         if ($routeDocumentationChanged === false || $this->forceIt) {
114 114
                             if ($routeDocumentationChanged) {
115
-                                $this->output->warn('Discarded manual changes for route ['.implode(',', $route['methods']).'] '.$route['uri']);
115
+                                $this->output->warn('Discarded manual changes for route [' . implode(',', $route['methods']) . '] ' . $route['uri']);
116 116
                             }
117 117
                         } else {
118
-                            $this->output->warn('Skipping modified route ['.implode(',', $route['methods']).'] '.$route['uri']);
118
+                            $this->output->warn('Skipping modified route [' . implode(',', $route['methods']) . '] ' . $route['uri']);
119 119
                             $route['modified_output'] = $existingRouteDoc[0];
120 120
                         }
121 121
                     }
@@ -138,9 +138,9 @@  discard block
 block discarded – undo
138 138
             ->with('showPostmanCollectionButton', $this->shouldGeneratePostmanCollection)
139 139
             ->with('parsedRoutes', $parsedRouteOutput);
140 140
 
141
-        $this->output->info('Writing index.md and source files to: '.$sourceOutputPath);
141
+        $this->output->info('Writing index.md and source files to: ' . $sourceOutputPath);
142 142
 
143
-        if (! is_dir($sourceOutputPath)) {
143
+        if (!is_dir($sourceOutputPath)) {
144 144
             $documentarian = new Documentarian();
145 145
             $documentarian->create($sourceOutputPath);
146 146
         }
@@ -161,19 +161,19 @@  discard block
 block discarded – undo
161 161
 
162 162
         file_put_contents($compareFile, $compareMarkdown);
163 163
 
164
-        $this->output->info('Wrote index.md and source files to: '.$sourceOutputPath);
164
+        $this->output->info('Wrote index.md and source files to: ' . $sourceOutputPath);
165 165
     }
166 166
 
167 167
     public function generateMarkdownOutputForEachRoute(Collection $parsedRoutes, array $settings): Collection
168 168
     {
169
-        $parsedRouteOutput = $parsedRoutes->map(function (Collection $routeGroup) use ($settings) {
170
-            return $routeGroup->map(function (array $route) use ($settings) {
171
-                if (count($route['cleanBodyParameters']) && ! isset($route['headers']['Content-Type'])) {
169
+        $parsedRouteOutput = $parsedRoutes->map(function(Collection $routeGroup) use ($settings) {
170
+            return $routeGroup->map(function(array $route) use ($settings) {
171
+                if (count($route['cleanBodyParameters']) && !isset($route['headers']['Content-Type'])) {
172 172
                     // Set content type if the user forgot to set it
173 173
                     $route['headers']['Content-Type'] = 'application/json';
174 174
                 }
175 175
 
176
-                $hasRequestOptions = ! empty($route['headers']) || ! empty($route['cleanQueryParameters']) || ! empty($route['cleanBodyParameters']);
176
+                $hasRequestOptions = !empty($route['headers']) || !empty($route['cleanQueryParameters']) || !empty($route['cleanBodyParameters']);
177 177
                 $route['output'] = (string) view('apidoc::partials.route')
178 178
                     ->with('hasRequestOptions', $hasRequestOptions)
179 179
                     ->with('route', $route)
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
      */
228 228
     protected function getMarkdownToPrepend(string $sourceOutputPath): string
229 229
     {
230
-        $prependFile = $sourceOutputPath.'/source/prepend.md';
230
+        $prependFile = $sourceOutputPath . '/source/prepend.md';
231 231
         $prependFileContents = file_exists($prependFile)
232
-            ? file_get_contents($prependFile)."\n" : '';
232
+            ? file_get_contents($prependFile) . "\n" : '';
233 233
 
234 234
         return $prependFileContents;
235 235
     }
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
      */
242 242
     protected function getMarkdownToAppend(string $sourceOutputPath): string
243 243
     {
244
-        $appendFile = $sourceOutputPath.'/source/append.md';
244
+        $appendFile = $sourceOutputPath . '/source/append.md';
245 245
         $appendFileContents = file_exists($appendFile)
246
-            ? "\n".file_get_contents($appendFile) : '';
246
+            ? "\n" . file_get_contents($appendFile) : '';
247 247
 
248 248
         return $appendFileContents;
249 249
     }
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
     protected function copyAssetsFromSourceFolderToPublicFolder(string $sourceOutputPath, bool $isStatic = true): void
252 252
     {
253 253
         $publicPath = 'public/docs';
254
-        if (! is_dir($publicPath)) {
254
+        if (!is_dir($publicPath)) {
255 255
             mkdir($publicPath, 0777, true);
256 256
             mkdir("{$publicPath}/css");
257 257
             mkdir("{$publicPath}/js");
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
             rename("{$sourceOutputPath}/index.html", "{$outputPath}/index.html");
275 275
         } else {
276 276
             // Move output to resources/views
277
-            if (! is_dir($outputPath)) {
277
+            if (!is_dir($outputPath)) {
278 278
                 mkdir($outputPath);
279 279
             }
280 280
             rename("{$sourceOutputPath}/index.html", "$outputPath/index.blade.php");
Please login to merge, or discard this patch.
src/Commands/GenerateDocumentation.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         $groupedRoutes = collect($parsedRoutes)
75 75
             ->groupBy('metadata.groupName')
76
-            ->sortBy(static function ($group) {
76
+            ->sortBy(static function($group) {
77 77
                 /* @var $group Collection */
78 78
                 return $group->first()['metadata']['groupName'];
79 79
             }, SORT_NATURAL);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             $routeMethods = implode(',', $generator->getMethods($route));
103 103
             $routePath = $generator->getUri($route);
104 104
 
105
-            if (! $this->isValidRoute($route) || ! $this->isRouteVisibleForDocumentation($route->getAction())) {
105
+            if (!$this->isValidRoute($route) || !$this->isRouteVisibleForDocumentation($route->getAction())) {
106 106
                 $this->warn(sprintf($messageFormat, 'Skipping', $routeMethods, $routePath));
107 107
                 continue;
108 108
             }
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
                 $parsedRoutes[] = $generator->processRoute($route, $routeItem['apply'] ?? []);
112 112
                 $this->info(sprintf($messageFormat, 'Processed', $routeMethods, $routePath));
113 113
             } catch (\Exception $exception) {
114
-                $this->warn(sprintf($messageFormat, 'Skipping', $routeMethods, $routePath).' - '.$exception->getMessage());
114
+                $this->warn(sprintf($messageFormat, 'Skipping', $routeMethods, $routePath) . ' - ' . $exception->getMessage());
115 115
             }
116 116
         }
117 117
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
             $action = implode('@', $action);
131 131
         }
132 132
 
133
-        return ! is_callable($action) && ! is_null($action);
133
+        return !is_callable($action) && !is_null($action);
134 134
     }
135 135
 
136 136
     /**
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         list($class, $method) = Utils::getRouteClassAndMethodNames($action);
146 146
         $reflection = new ReflectionClass($class);
147 147
 
148
-        if (! $reflection->hasMethod($method)) {
148
+        if (!$reflection->hasMethod($method)) {
149 149
             return false;
150 150
         }
151 151
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             $phpdoc = new DocBlock($comment);
156 156
 
157 157
             return collect($phpdoc->getTags())
158
-                ->filter(function ($tag) {
158
+                ->filter(function($tag) {
159 159
                     return $tag->getName() === 'hideFromAPIDocumentation';
160 160
                 })
161 161
                 ->isEmpty();
Please login to merge, or discard this patch.
src/Extracting/Strategies/Responses/UseResponseFileTag.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     {
45 45
         // Avoid "holes" in the keys of the filtered array, by using array_values on the filtered array
46 46
         $responseFileTags = array_values(
47
-            array_filter($tags, function ($tag) {
47
+            array_filter($tags, function($tag) {
48 48
                 return $tag instanceof Tag && strtolower($tag->getName()) === 'responsefile';
49 49
             })
50 50
         );
@@ -53,16 +53,16 @@  discard block
 block discarded – undo
53 53
             return null;
54 54
         }
55 55
 
56
-        $responses = array_map(function (Tag $responseFileTag) {
56
+        $responses = array_map(function(Tag $responseFileTag) {
57 57
             preg_match('/^(\d{3})?\s?([\S]*[\s]*?)(\{.*\})?$/', $responseFileTag->getContent(), $result);
58 58
             $relativeFilePath = trim($result[2]);
59 59
             $filePath = storage_path($relativeFilePath);
60
-            if (! file_exists($filePath)) {
61
-                throw new \Exception('@responseFile '.$relativeFilePath.' does not exist');
60
+            if (!file_exists($filePath)) {
61
+                throw new \Exception('@responseFile ' . $relativeFilePath . ' does not exist');
62 62
             }
63 63
             $status = $result[1] ?: 200;
64 64
             $content = $result[2] ? file_get_contents($filePath, true) : '{}';
65
-            $json = ! empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}';
65
+            $json = !empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}';
66 66
             $merged = array_merge(json_decode($content, true), json_decode($json, true));
67 67
 
68 68
             return ['content' => json_encode($merged), 'status' => (int) $status];
Please login to merge, or discard this patch.
src/Extracting/Generator.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         $method = $controller->getMethod($methodName);
57 57
 
58 58
         $parsedRoute = [
59
-            'id' => md5($this->getUri($route).':'.implode($this->getMethods($route))),
59
+            'id' => md5($this->getUri($route) . ':' . implode($this->getMethods($route))),
60 60
             'methods' => $this->getMethods($route),
61 61
             'uri' => $this->getUri($route),
62 62
         ];
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         $responses = $this->fetchResponses($controller, $method, $route, $routeRules, $parsedRoute);
83 83
         $parsedRoute['responses'] = $responses;
84
-        $parsedRoute['showresponse'] = ! empty($responses);
84
+        $parsedRoute['showresponse'] = !empty($responses);
85 85
 
86 86
         return $parsedRoute;
87 87
     }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
     {
119 119
         $responses = $this->iterateThroughStrategies('responses', $context, [$route, $controller, $method, $rulesToApply]);
120 120
         if (count($responses)) {
121
-            return array_filter($responses, function ($response) {
121
+            return array_filter($responses, function($response) {
122 122
                 return $response['content'] != null;
123 123
             });
124 124
         }
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
             $strategyArgs = $arguments;
169 169
             $strategyArgs[] = $context;
170 170
             $results = $strategy(...$strategyArgs);
171
-            if (! is_null($results)) {
171
+            if (!is_null($results)) {
172 172
                 foreach ($results as $index => $item) {
173 173
                     if ($stage == 'responses') {
174 174
                         // Responses are additive
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
                     // and also allows values to be overwritten
181 181
 
182 182
                     // Don't allow overwriting if an empty value is trying to replace a set one
183
-                    if (! in_array($context[$stage], [null, ''], true) && in_array($item, [null, ''], true)) {
183
+                    if (!in_array($context[$stage], [null, ''], true) && in_array($item, [null, ''], true)) {
184 184
                         continue;
185 185
                     } else {
186 186
                         $context[$stage][$index] = $item;
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
         $values = [];
206 206
 
207 207
         // Remove params which have no examples.
208
-        $params = array_filter($params, function ($details) {
209
-            return ! is_null($details['value']);
208
+        $params = array_filter($params, function($details) {
209
+            return !is_null($details['value']);
210 210
         });
211 211
 
212 212
         foreach ($params as $paramName => $details) {
Please login to merge, or discard this patch.