@@ -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()) |
@@ -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 | { |
@@ -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'); |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | private function getQueryParametersFromDocBlock($tags) |
| 56 | 56 | { |
| 57 | 57 | $parameters = collect($tags) |
| 58 | - ->filter(function ($tag) { |
|
| 58 | + ->filter(function($tag) { |
|
| 59 | 59 | return $tag instanceof Tag && $tag->getName() === 'queryParam'; |
| 60 | 60 | }) |
| 61 | - ->mapWithKeys(function (Tag $tag) { |
|
| 61 | + ->mapWithKeys(function(Tag $tag) { |
|
| 62 | 62 | // Format: |
| 63 | 63 | // @queryParam <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'); |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | private function getBodyParametersFromDocBlock($tags) |
| 55 | 55 | { |
| 56 | 56 | $parameters = collect($tags) |
| 57 | - ->filter(function ($tag) { |
|
| 57 | + ->filter(function($tag) { |
|
| 58 | 58 | return $tag instanceof Tag && $tag->getName() === 'bodyParam'; |
| 59 | 59 | }) |
| 60 | - ->mapWithKeys(function (Tag $tag) { |
|
| 60 | + ->mapWithKeys(function(Tag $tag) { |
|
| 61 | 61 | // Format: |
| 62 | 62 | // @bodyParam <name> <type> <"required" (optional)> <description> |
| 63 | 63 | // Examples: |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | $type = $this->normalizeParameterType($type); |
| 84 | 84 | list($description, $example) = $this->parseParamDescription($description, $type); |
| 85 | - $value = is_null($example) && ! $this->shouldExcludeExample($tag->getContent()) |
|
| 85 | + $value = is_null($example) && !$this->shouldExcludeExample($tag->getContent()) |
|
| 86 | 86 | ? $this->generateDummyValue($type) |
| 87 | 87 | : $example; |
| 88 | 88 | |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | { |
| 10 | 10 | public static function routes($path = '/doc') |
| 11 | 11 | { |
| 12 | - return Route::get("$path{format?}", function (?string $format = null) { |
|
| 12 | + return Route::get("$path{format?}", function(?string $format = null) { |
|
| 13 | 13 | if ($format == '.json') { |
| 14 | 14 | return response( |
| 15 | 15 | Storage::disk('local')->get('apidoc/collection.json'), |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | public static function replaceUrlParameterPlaceholdersWithValues(string $uri, array $urlParameters) |
| 54 | 54 | { |
| 55 | 55 | $matches = preg_match_all('/{.+?}/i', $uri, $parameterPaths); |
| 56 | - if (! $matches) { |
|
| 56 | + if (!$matches) { |
|
| 57 | 57 | return $uri; |
| 58 | 58 | } |
| 59 | 59 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | public static function deleteDirectoryAndContents($dir) |
| 90 | 90 | { |
| 91 | - $adapter = new Local(realpath(__DIR__.'/../../')); |
|
| 91 | + $adapter = new Local(realpath(__DIR__ . '/../../')); |
|
| 92 | 92 | $fs = new Filesystem($adapter); |
| 93 | 93 | $fs->deleteDir($dir); |
| 94 | 94 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $result = ''; |
| 102 | 102 | $padWith = str_repeat(' ', $indentationLevel); |
| 103 | 103 | foreach ($split as $index => $line) { |
| 104 | - $result .= ($index == 0 ? '' : "\n$padWith").$line; |
|
| 104 | + $result .= ($index == 0 ? '' : "\n$padWith") . $line; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | return $result; |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | * @param string $uri |
| 50 | 50 | * @param array $urlParameters Dictionary of url params and example values |
| 51 | 51 | * |
| 52 | - * @return mixed |
|
| 52 | + * @return string |
|
| 53 | 53 | */ |
| 54 | 54 | public static function replaceUrlParameterPlaceholdersWithValues(string $uri, array $urlParameters) |
| 55 | 55 | { |