@@ -77,7 +77,7 @@ |
||
77 | 77 | * |
78 | 78 | * @param string $type |
79 | 79 | * |
80 | - * @return mixed|string |
|
80 | + * @return string |
|
81 | 81 | */ |
82 | 82 | protected function normalizeParameterType(string $type) |
83 | 83 | { |
@@ -13,25 +13,25 @@ |
||
13 | 13 | $faker->seed($this->config->get('faker_seed')); |
14 | 14 | } |
15 | 15 | $fakeFactories = [ |
16 | - 'integer' => function () use ($faker) { |
|
16 | + 'integer' => function() use ($faker) { |
|
17 | 17 | return $faker->numberBetween(1, 20); |
18 | 18 | }, |
19 | - 'number' => function () use ($faker) { |
|
19 | + 'number' => function() use ($faker) { |
|
20 | 20 | return $faker->randomFloat(); |
21 | 21 | }, |
22 | - 'float' => function () use ($faker) { |
|
22 | + 'float' => function() use ($faker) { |
|
23 | 23 | return $faker->randomFloat(); |
24 | 24 | }, |
25 | - 'boolean' => function () use ($faker) { |
|
25 | + 'boolean' => function() use ($faker) { |
|
26 | 26 | return $faker->boolean(); |
27 | 27 | }, |
28 | - 'string' => function () use ($faker) { |
|
28 | + 'string' => function() use ($faker) { |
|
29 | 29 | return $faker->word; |
30 | 30 | }, |
31 | - 'array' => function () { |
|
31 | + 'array' => function() { |
|
32 | 32 | return []; |
33 | 33 | }, |
34 | - 'object' => function () { |
|
34 | + 'object' => function() { |
|
35 | 35 | return new \stdClass; |
36 | 36 | }, |
37 | 37 | ]; |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | |
65 | 65 | private function getAllRoutes(bool $usingDingoRouter) |
66 | 66 | { |
67 | - if (! $usingDingoRouter) { |
|
67 | + if (!$usingDingoRouter) { |
|
68 | 68 | return RouteFacade::getRoutes(); |
69 | 69 | } |
70 | 70 | |
71 | 71 | $allRouteCollections = app(\Dingo\Api\Routing\Router::class)->getRoutes(); |
72 | 72 | |
73 | 73 | return collect($allRouteCollections) |
74 | - ->flatMap(function (RouteCollection $collection) { |
|
74 | + ->flatMap(function(RouteCollection $collection) { |
|
75 | 75 | return $collection->getRoutes(); |
76 | 76 | })->toArray(); |
77 | 77 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | private function shouldIncludeRoute(Route $route, array $routeRule, array $mustIncludes, bool $usingDingoRouter) |
80 | 80 | { |
81 | 81 | $matchesVersion = $usingDingoRouter |
82 | - ? ! empty(array_intersect($route->versions(), $routeRule['match']['versions'] ?? [])) |
|
82 | + ? !empty(array_intersect($route->versions(), $routeRule['match']['versions'] ?? [])) |
|
83 | 83 | : true; |
84 | 84 | |
85 | 85 | return Str::is($mustIncludes, $route->getName()) |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | $class = new ReflectionClass($className); |
22 | 22 | |
23 | - if (! $class->hasMethod($methodName)) { |
|
23 | + if (!$class->hasMethod($methodName)) { |
|
24 | 24 | throw new \Exception("Error while fetching docblock for route: Class $className does not contain method $methodName"); |
25 | 25 | } |
26 | 26 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | $fractal = new Manager(); |
65 | 65 | |
66 | - if (! is_null(config('apidoc.fractal.serializer'))) { |
|
66 | + if (!is_null(config('apidoc.fractal.serializer'))) { |
|
67 | 67 | $fractal->setSerializer(app(config('apidoc.fractal.serializer'))); |
68 | 68 | } |
69 | 69 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | ], |
83 | 83 | ]; |
84 | 84 | } catch (\Exception $e) { |
85 | - echo 'Exception thrown when fetching transformer response for ['.implode(',', $route->methods)."] {$route->uri}.\n"; |
|
85 | + echo 'Exception thrown when fetching transformer response for [' . implode(',', $route->methods) . "] {$route->uri}.\n"; |
|
86 | 86 | if (Flags::$shouldBeVerbose) { |
87 | 87 | Utils::dumpException($e); |
88 | 88 | } else { |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | private function getClassToBeTransformed(array $tags, ReflectionMethod $transformerMethod): string |
118 | 118 | { |
119 | - $modelTag = Arr::first(array_filter($tags, function ($tag) { |
|
119 | + $modelTag = Arr::first(array_filter($tags, function($tag) { |
|
120 | 120 | return ($tag instanceof Tag) && strtolower($tag->getName()) == 'transformermodel'; |
121 | 121 | })); |
122 | 122 | |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $type = $modelTag->getContent(); |
126 | 126 | } else { |
127 | 127 | $parameter = Arr::first($transformerMethod->getParameters()); |
128 | - if ($parameter->hasType() && ! $parameter->getType()->isBuiltin() && class_exists((string) $parameter->getType())) { |
|
128 | + if ($parameter->hasType() && !$parameter->getType()->isBuiltin() && class_exists((string) $parameter->getType())) { |
|
129 | 129 | // Ladies and gentlemen, we have a type! |
130 | 130 | $type = (string) $parameter->getType(); |
131 | 131 | } |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | private function getTransformerTag(array $tags) |
187 | 187 | { |
188 | 188 | $transformerTags = array_values( |
189 | - array_filter($tags, function ($tag) { |
|
189 | + array_filter($tags, function($tag) { |
|
190 | 190 | return ($tag instanceof Tag) && in_array(strtolower($tag->getName()), ['transformer', 'transformercollection']); |
191 | 191 | }) |
192 | 192 | ); |
@@ -141,7 +141,7 @@ |
||
141 | 141 | /** |
142 | 142 | * @param string $type |
143 | 143 | * |
144 | - * @return Model|object |
|
144 | + * @return string |
|
145 | 145 | */ |
146 | 146 | protected function instantiateTransformerModel(string $type) |
147 | 147 | { |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | protected function getDocBlockResponses(array $tags) |
44 | 44 | { |
45 | 45 | $responseTags = array_values( |
46 | - array_filter($tags, function ($tag) { |
|
46 | + array_filter($tags, function($tag) { |
|
47 | 47 | return $tag instanceof Tag && strtolower($tag->getName()) === 'response'; |
48 | 48 | }) |
49 | 49 | ); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | return null; |
53 | 53 | } |
54 | 54 | |
55 | - $responses = array_map(function (Tag $responseTag) { |
|
55 | + $responses = array_map(function(Tag $responseTag) { |
|
56 | 56 | preg_match('/^(\d{3})?\s?([\s\S]*)$/', $responseTag->getContent(), $result); |
57 | 57 | |
58 | 58 | $status = $result[1] ?: 200; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | public function __invoke(Route $route, \ReflectionClass $controller, \ReflectionMethod $method, array $routeRules, array $context = []) |
32 | 32 | { |
33 | 33 | $rulesToApply = $routeRules['response_calls'] ?? []; |
34 | - if (! $this->shouldMakeApiCall($route, $rulesToApply, $context)) { |
|
34 | + if (!$this->shouldMakeApiCall($route, $rulesToApply, $context)) { |
|
35 | 35 | return null; |
36 | 36 | } |
37 | 37 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | ], |
53 | 53 | ]; |
54 | 54 | } catch (\Exception $e) { |
55 | - echo 'Exception thrown during response call for ['.implode(',', $route->methods)."] {$route->uri}.\n"; |
|
55 | + echo 'Exception thrown during response call for [' . implode(',', $route->methods) . "] {$route->uri}.\n"; |
|
56 | 56 | if (Flags::$shouldBeVerbose) { |
57 | 57 | Utils::dumpException($e); |
58 | 58 | } else { |
@@ -186,14 +186,14 @@ discard block |
||
186 | 186 | // set URL and query parameters |
187 | 187 | $uri = $request->getRequestUri(); |
188 | 188 | $query = $request->getQueryString(); |
189 | - if (! empty($query)) { |
|
189 | + if (!empty($query)) { |
|
190 | 190 | $uri .= "?$query"; |
191 | 191 | } |
192 | 192 | $response = call_user_func_array([$dispatcher, strtolower($request->method())], [$uri]); |
193 | 193 | |
194 | 194 | // the response from the Dingo dispatcher is the 'raw' response from the controller, |
195 | 195 | // so we have to ensure it's JSON first |
196 | - if (! $response instanceof Response) { |
|
196 | + if (!$response instanceof Response) { |
|
197 | 197 | $response = response()->json($response); |
198 | 198 | } |
199 | 199 | |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | } |
322 | 322 | |
323 | 323 | // Don't attempt a response call if there are already successful responses |
324 | - $successResponses = collect($context['responses'])->filter(function ($response) { |
|
324 | + $successResponses = collect($context['responses'])->filter(function($response) { |
|
325 | 325 | return ((string) $response['status'])[0] == '2'; |
326 | 326 | })->count(); |
327 | 327 | if ($successResponses) { |
@@ -357,8 +357,8 @@ discard block |
||
357 | 357 | $prefix = 'HTTP_'; |
358 | 358 | foreach ($headers as $name => $value) { |
359 | 359 | $name = strtr(strtoupper($name), '-', '_'); |
360 | - if (! Str::startsWith($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
361 | - $name = $prefix.$name; |
|
360 | + if (!Str::startsWith($name, $prefix) && $name !== 'CONTENT_TYPE') { |
|
361 | + $name = $prefix . $name; |
|
362 | 362 | } |
363 | 363 | $server[$name] = $value; |
364 | 364 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | ], |
93 | 93 | ]; |
94 | 94 | } catch (\Exception $e) { |
95 | - echo 'Exception thrown when fetching Eloquent API resource response for ['.implode(',', $route->methods)."] {$route->uri}.\n"; |
|
95 | + echo 'Exception thrown when fetching Eloquent API resource response for [' . implode(',', $route->methods) . "] {$route->uri}.\n"; |
|
96 | 96 | if (Flags::$shouldBeVerbose) { |
97 | 97 | Utils::dumpException($e); |
98 | 98 | } else { |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | */ |
126 | 126 | private function getClassToBeTransformed(array $tags): string |
127 | 127 | { |
128 | - $modelTag = Arr::first(array_filter($tags, function ($tag) { |
|
128 | + $modelTag = Arr::first(array_filter($tags, function($tag) { |
|
129 | 129 | return ($tag instanceof Tag) && strtolower($tag->getName()) == 'apiresourcemodel'; |
130 | 130 | })); |
131 | 131 | |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | private function getApiResourceTag(array $tags) |
187 | 187 | { |
188 | 188 | $apiResourceTags = array_values( |
189 | - array_filter($tags, function ($tag) { |
|
189 | + array_filter($tags, function($tag) { |
|
190 | 190 | return ($tag instanceof Tag) && in_array(strtolower($tag->getName()), ['apiresource', 'apiresourcecollection']); |
191 | 191 | }) |
192 | 192 | ); |
@@ -10,7 +10,6 @@ |
||
10 | 10 | use Illuminate\Http\Response; |
11 | 11 | use Illuminate\Routing\Route; |
12 | 12 | use Illuminate\Support\Arr; |
13 | -use League\Fractal\Resource\Collection; |
|
14 | 13 | use Mpociot\ApiDoc\Extracting\RouteDocBlocker; |
15 | 14 | use Mpociot\ApiDoc\Extracting\Strategies\Strategy; |
16 | 15 | use Mpociot\ApiDoc\Tools\Flags; |
@@ -141,7 +141,7 @@ |
||
141 | 141 | /** |
142 | 142 | * @param string $type |
143 | 143 | * |
144 | - * @return Model|object |
|
144 | + * @return string |
|
145 | 145 | */ |
146 | 146 | protected function instantiateApiResourceModel(string $type) |
147 | 147 | { |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | private function getUrlParametersFromDocBlock($tags) |
56 | 56 | { |
57 | 57 | $parameters = collect($tags) |
58 | - ->filter(function ($tag) { |
|
58 | + ->filter(function($tag) { |
|
59 | 59 | return $tag instanceof Tag && $tag->getName() === 'urlParam'; |
60 | 60 | }) |
61 | - ->mapWithKeys(function (Tag $tag) { |
|
61 | + ->mapWithKeys(function(Tag $tag) { |
|
62 | 62 | // Format: |
63 | 63 | // @urlParam <name> <"required" (optional)> <description> |
64 | 64 | // Examples: |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | list($description, $value) = $this->parseParamDescription($description, 'string'); |
85 | - if (is_null($value) && ! $this->shouldExcludeExample($tag->getContent())) { |
|
85 | + if (is_null($value) && !$this->shouldExcludeExample($tag->getContent())) { |
|
86 | 86 | $value = Str::contains($description, ['number', 'count', 'page']) |
87 | 87 | ? $this->generateDummyValue('integer') |
88 | 88 | : $this->generateDummyValue('string'); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | protected function getAuthStatusFromDocBlock(array $tags) |
38 | 38 | { |
39 | 39 | $authTag = collect($tags) |
40 | - ->first(function ($tag) { |
|
40 | + ->first(function($tag) { |
|
41 | 41 | return $tag instanceof Tag && strtolower($tag->getName()) === 'authenticated'; |
42 | 42 | }); |
43 | 43 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | protected function getRouteGroupDescriptionAndTitle(DocBlock $methodDocBlock, DocBlock $controllerDocBlock) |
54 | 54 | { |
55 | 55 | // @group tag on the method overrides that on the controller |
56 | - if (! empty($methodDocBlock->getTags())) { |
|
56 | + if (!empty($methodDocBlock->getTags())) { |
|
57 | 57 | foreach ($methodDocBlock->getTags() as $tag) { |
58 | 58 | if ($tag->getName() === 'group') { |
59 | 59 | $routeGroupParts = explode("\n", trim($tag->getContent())); |