@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * @param Route $route |
16 | 16 | * |
17 | - * @return mixed |
|
17 | + * @return string |
|
18 | 18 | */ |
19 | 19 | public function getUri(Route $route) |
20 | 20 | { |
@@ -33,7 +33,6 @@ discard block |
||
33 | 33 | |
34 | 34 | /** |
35 | 35 | * @param \Illuminate\Routing\Route $route |
36 | - * @param array $apply Rules to apply when generating documentation for this route |
|
37 | 36 | * |
38 | 37 | * @return array |
39 | 38 | */ |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | ]); |
69 | 69 | |
70 | 70 | $parsedRoute = [ |
71 | - 'id' => md5($this->getUri($route).':'.implode($this->getMethods($route))), |
|
71 | + 'id' => md5($this->getUri($route) . ':' . implode($this->getMethods($route))), |
|
72 | 72 | 'group' => $routeGroup, |
73 | 73 | 'title' => $docBlock['short'], |
74 | 74 | 'description' => $docBlock['long'], |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | 'cleanQueryParameters' => $this->cleanParams($queryParameters), |
82 | 82 | 'authenticated' => $this->getAuthStatusFromDocBlock($docBlock['tags']), |
83 | 83 | 'response' => $content, |
84 | - 'showresponse' => ! empty($content), |
|
84 | + 'showresponse' => !empty($content), |
|
85 | 85 | ]; |
86 | 86 | $parsedRoute['headers'] = $rulesToApply['headers'] ?? []; |
87 | 87 | |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | protected function getBodyParametersFromDocBlock(array $tags) |
128 | 128 | { |
129 | 129 | $parameters = collect($tags) |
130 | - ->filter(function ($tag) { |
|
130 | + ->filter(function($tag) { |
|
131 | 131 | return $tag instanceof Tag && $tag->getName() === 'bodyParam'; |
132 | 132 | }) |
133 | - ->mapWithKeys(function ($tag) { |
|
133 | + ->mapWithKeys(function($tag) { |
|
134 | 134 | preg_match('/(.+?)\s+(.+?)\s+(required\s+)?(.*)/', $tag->getContent(), $content); |
135 | 135 | if (empty($content)) { |
136 | 136 | // this means only name and type were supplied |
@@ -202,10 +202,10 @@ discard block |
||
202 | 202 | protected function getQueryParametersFromDocBlock(array $tags) |
203 | 203 | { |
204 | 204 | $parameters = collect($tags) |
205 | - ->filter(function ($tag) { |
|
205 | + ->filter(function($tag) { |
|
206 | 206 | return $tag instanceof Tag && $tag->getName() === 'queryParam'; |
207 | 207 | }) |
208 | - ->mapWithKeys(function ($tag) { |
|
208 | + ->mapWithKeys(function($tag) { |
|
209 | 209 | preg_match('/(.+?)\s+(required\s+)?(.*)/', $tag->getContent(), $content); |
210 | 210 | if (empty($content)) { |
211 | 211 | // this means only name was supplied |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | protected function getAuthStatusFromDocBlock(array $tags) |
244 | 244 | { |
245 | 245 | $authTag = collect($tags) |
246 | - ->first(function ($tag) { |
|
246 | + ->first(function($tag) { |
|
247 | 247 | return $tag instanceof Tag && strtolower($tag->getName()) === 'authenticated'; |
248 | 248 | }); |
249 | 249 | |
@@ -317,25 +317,25 @@ discard block |
||
317 | 317 | $faker->seed($this->config->get('faker_seed')); |
318 | 318 | } |
319 | 319 | $fakeFactories = [ |
320 | - 'integer' => function () use ($faker) { |
|
320 | + 'integer' => function() use ($faker) { |
|
321 | 321 | return $faker->numberBetween(1, 20); |
322 | 322 | }, |
323 | - 'number' => function () use ($faker) { |
|
323 | + 'number' => function() use ($faker) { |
|
324 | 324 | return $faker->randomFloat(); |
325 | 325 | }, |
326 | - 'float' => function () use ($faker) { |
|
326 | + 'float' => function() use ($faker) { |
|
327 | 327 | return $faker->randomFloat(); |
328 | 328 | }, |
329 | - 'boolean' => function () use ($faker) { |
|
329 | + 'boolean' => function() use ($faker) { |
|
330 | 330 | return $faker->boolean(); |
331 | 331 | }, |
332 | - 'string' => function () use ($faker) { |
|
332 | + 'string' => function() use ($faker) { |
|
333 | 333 | return $faker->word; |
334 | 334 | }, |
335 | - 'array' => function () { |
|
335 | + 'array' => function() { |
|
336 | 336 | return []; |
337 | 337 | }, |
338 | - 'object' => function () { |
|
338 | + 'object' => function() { |
|
339 | 339 | return new \stdClass; |
340 | 340 | }, |
341 | 341 | ]; |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | |
51 | 51 | private function getAllRoutes(bool $usingDingoRouter, array $versions = []) |
52 | 52 | { |
53 | - if (! $usingDingoRouter) { |
|
53 | + if (!$usingDingoRouter) { |
|
54 | 54 | return RouteFacade::getRoutes(); |
55 | 55 | } |
56 | 56 | |
57 | 57 | $allRouteCollections = app(\Dingo\Api\Routing\Router::class)->getRoutes(); |
58 | 58 | |
59 | 59 | return collect($allRouteCollections) |
60 | - ->flatMap(function (RouteCollection $collection) { |
|
60 | + ->flatMap(function(RouteCollection $collection) { |
|
61 | 61 | return $collection->getRoutes(); |
62 | 62 | })->toArray(); |
63 | 63 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | private function shouldIncludeRoute(Route $route, array $routeRule, array $mustIncludes, bool $usingDingoRouter) |
66 | 66 | { |
67 | 67 | $matchesVersion = $usingDingoRouter |
68 | - ? ! empty(array_intersect($route->versions(), $routeRule['match']['versions'] ?? [])) |
|
68 | + ? !empty(array_intersect($route->versions(), $routeRule['match']['versions'] ?? [])) |
|
69 | 69 | : true; |
70 | 70 | |
71 | 71 | return str_is($mustIncludes, $route->getName()) |
@@ -48,8 +48,8 @@ |
||
48 | 48 | /** @var Response[]|null $response */ |
49 | 49 | $responses = $strategy($this->route, $tags, $routeProps); |
50 | 50 | |
51 | - if (! is_null($responses)) { |
|
52 | - return array_map(function (Response $response) { |
|
51 | + if (!is_null($responses)) { |
|
52 | + return array_map(function(Response $response) { |
|
53 | 53 | return ['status' => $response->getStatusCode(), 'content' => $this->getResponseContent($response)]; |
54 | 54 | }, $responses); |
55 | 55 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | protected function getDocBlockResponses(array $tags) |
34 | 34 | { |
35 | 35 | $responseTags = array_values( |
36 | - array_filter($tags, function ($tag) { |
|
36 | + array_filter($tags, function($tag) { |
|
37 | 37 | return $tag instanceof Tag && strtolower($tag->getName()) === 'response'; |
38 | 38 | }) |
39 | 39 | ); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | return; |
43 | 43 | } |
44 | 44 | |
45 | - return array_map(function (Tag $responseTag) { |
|
45 | + return array_map(function(Tag $responseTag) { |
|
46 | 46 | preg_match('/^(\d{3})?\s?([\s\S]*)$/', $responseTag->getContent(), $result); |
47 | 47 | |
48 | 48 | $status = $result[1] ?: 200; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | // avoid "holes" in the keys of the filtered array, by using array_values on the filtered array |
36 | 36 | $responseFileTags = array_values( |
37 | - array_filter($tags, function ($tag) { |
|
37 | + array_filter($tags, function($tag) { |
|
38 | 38 | return $tag instanceof Tag && strtolower($tag->getName()) === 'responsefile'; |
39 | 39 | }) |
40 | 40 | ); |
@@ -43,11 +43,11 @@ discard block |
||
43 | 43 | return; |
44 | 44 | } |
45 | 45 | |
46 | - return array_map(function (Tag $responseFileTag) { |
|
46 | + return array_map(function(Tag $responseFileTag) { |
|
47 | 47 | preg_match('/^(\d{3})?\s?([\S]*[\s]*?)(\{.*\})?$/', $responseFileTag->getContent(), $result); |
48 | 48 | $status = $result[1] ?: 200; |
49 | 49 | $content = $result[2] ? file_get_contents(storage_path(trim($result[2])), true) : '{}'; |
50 | - $json = ! empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}'; |
|
50 | + $json = !empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}'; |
|
51 | 51 | $merged = array_merge(json_decode($content, true), json_decode($json, true)); |
52 | 52 | |
53 | 53 | return new JsonResponse($merged, (int) $status); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | $fractal = new Manager(); |
49 | 49 | |
50 | - if (! is_null(config('apidoc.fractal.serializer'))) { |
|
50 | + if (!is_null(config('apidoc.fractal.serializer'))) { |
|
51 | 51 | $fractal->setSerializer(app(config('apidoc.fractal.serializer'))); |
52 | 52 | } |
53 | 53 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | */ |
80 | 80 | private function getClassToBeTransformed(array $tags, ReflectionMethod $transformerMethod) |
81 | 81 | { |
82 | - $modelTag = array_first(array_filter($tags, function ($tag) { |
|
82 | + $modelTag = array_first(array_filter($tags, function($tag) { |
|
83 | 83 | return ($tag instanceof Tag) && strtolower($tag->getName()) == 'transformermodel'; |
84 | 84 | })); |
85 | 85 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $type = $modelTag->getContent(); |
89 | 89 | } else { |
90 | 90 | $parameter = array_first($transformerMethod->getParameters()); |
91 | - if ($parameter->hasType() && ! $parameter->getType()->isBuiltin() && class_exists((string) $parameter->getType())) { |
|
91 | + if ($parameter->hasType() && !$parameter->getType()->isBuiltin() && class_exists((string) $parameter->getType())) { |
|
92 | 92 | // ladies and gentlemen, we have a type! |
93 | 93 | $type = (string) $parameter->getType(); |
94 | 94 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | private function getTransformerTag(array $tags) |
134 | 134 | { |
135 | 135 | $transFormerTags = array_values( |
136 | - array_filter($tags, function ($tag) { |
|
136 | + array_filter($tags, function($tag) { |
|
137 | 137 | return ($tag instanceof Tag) && in_array(strtolower($tag->getName()), ['transformer', 'transformercollection']); |
138 | 138 | }) |
139 | 139 | ); |
@@ -27,16 +27,16 @@ discard block |
||
27 | 27 | $collection = [ |
28 | 28 | 'variables' => [], |
29 | 29 | 'info' => [ |
30 | - 'name' => config('apidoc.postman.name') ?: config('app.name').' API', |
|
30 | + 'name' => config('apidoc.postman.name') ?: config('app.name') . ' API', |
|
31 | 31 | '_postman_id' => Uuid::uuid4()->toString(), |
32 | 32 | 'description' => config('apidoc.postman.description') ?: '', |
33 | 33 | 'schema' => 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json', |
34 | 34 | ], |
35 | - 'item' => $this->routeGroups->map(function ($routes, $groupName) { |
|
35 | + 'item' => $this->routeGroups->map(function($routes, $groupName) { |
|
36 | 36 | return [ |
37 | 37 | 'name' => $groupName, |
38 | 38 | 'description' => '', |
39 | - 'item' => $routes->map(function ($route) { |
|
39 | + 'item' => $routes->map(function($route) { |
|
40 | 40 | $mode = $route['methods'][0] === 'PUT' ? 'urlencoded' : 'formdata'; |
41 | 41 | |
42 | 42 | return [ |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | 'method' => $route['methods'][0], |
47 | 47 | 'body' => [ |
48 | 48 | 'mode' => $mode, |
49 | - $mode => collect($route['bodyParameters'])->map(function ($parameter, $key) { |
|
49 | + $mode => collect($route['bodyParameters'])->map(function($parameter, $key) { |
|
50 | 50 | return [ |
51 | 51 | 'key' => $key, |
52 | 52 | 'value' => isset($parameter['value']) ? $parameter['value'] : '', |
@@ -15,17 +15,17 @@ |
||
15 | 15 | */ |
16 | 16 | public function boot() |
17 | 17 | { |
18 | - $this->loadViewsFrom(__DIR__.'/../resources/views/', 'apidoc'); |
|
18 | + $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'apidoc'); |
|
19 | 19 | |
20 | 20 | $this->publishes([ |
21 | - __DIR__.'/../resources/views' => app()->basePath().'/resources/views/vendor/apidoc', |
|
21 | + __DIR__ . '/../resources/views' => app()->basePath() . '/resources/views/vendor/apidoc', |
|
22 | 22 | ], 'apidoc-views'); |
23 | 23 | |
24 | 24 | $this->publishes([ |
25 | - __DIR__.'/../config/apidoc.php' => app()->basePath().'/config/apidoc.php', |
|
25 | + __DIR__ . '/../config/apidoc.php' => app()->basePath() . '/config/apidoc.php', |
|
26 | 26 | ], 'apidoc-config'); |
27 | 27 | |
28 | - $this->mergeConfigFrom(__DIR__.'/../config/apidoc.php', 'apidoc'); |
|
28 | + $this->mergeConfigFrom(__DIR__ . '/../config/apidoc.php', 'apidoc'); |
|
29 | 29 | |
30 | 30 | if ($this->app->runningInConsole()) { |
31 | 31 | $this->commands([ |
@@ -84,7 +84,6 @@ |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
87 | - * @param array $config |
|
88 | 87 | * |
89 | 88 | * @return void |
90 | 89 | * |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | public function __invoke(Route $route, array $tags, array $routeProps) |
30 | 30 | { |
31 | 31 | $rulesToApply = $routeProps['rules']['response_calls'] ?? []; |
32 | - if (! $this->shouldMakeApiCall($route, $rulesToApply)) { |
|
32 | + if (!$this->shouldMakeApiCall($route, $rulesToApply)) { |
|
33 | 33 | return; |
34 | 34 | } |
35 | 35 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | try { |
40 | 40 | $response = [$this->makeApiCall($request)]; |
41 | 41 | } catch (\Exception $e) { |
42 | - echo 'Exception thrown during response call for ['.implode(',', $route->methods)."] {$route->uri}.\n"; |
|
42 | + echo 'Exception thrown during response call for [' . implode(',', $route->methods) . "] {$route->uri}.\n"; |
|
43 | 43 | if (Flags::$shouldBeVerbose) { |
44 | 44 | $handler = new Handler; |
45 | 45 | $handler->setInspector(new Inspector($e)); |
@@ -179,14 +179,14 @@ discard block |
||
179 | 179 | // set URL and query parameters |
180 | 180 | $uri = $request->getRequestUri(); |
181 | 181 | $query = $request->getQueryString(); |
182 | - if (! empty($query)) { |
|
182 | + if (!empty($query)) { |
|
183 | 183 | $uri .= "?$query"; |
184 | 184 | } |
185 | 185 | $response = call_user_func_array([$dispatcher, strtolower($request->method())], [$uri]); |
186 | 186 | |
187 | 187 | // the response from the Dingo dispatcher is the 'raw' response from the controller, |
188 | 188 | // so we have to ensure it's JSON first |
189 | - if (! $response instanceof Response) { |
|
189 | + if (!$response instanceof Response) { |
|
190 | 190 | $response = response()->json($response); |
191 | 191 | } |
192 | 192 | |
@@ -335,8 +335,8 @@ discard block |
||
335 | 335 | $prefix = 'HTTP_'; |
336 | 336 | foreach ($headers as $name => $value) { |
337 | 337 | $name = strtr(strtoupper($name), '-', '_'); |
338 | - if (! starts_with($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
339 | - $name = $prefix.$name; |
|
338 | + if (!starts_with($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
339 | + $name = $prefix . $name; |
|
340 | 340 | } |
341 | 341 | $server[$name] = $value; |
342 | 342 | } |