Completed
Pull Request — master (#506)
by Faton
03:04
created
src/Tools/ResponseStrategies/ResponseCallStrategy.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
     public function __invoke(Route $route, array $tags, array $routeProps)
16 16
     {
17 17
         $rulesToApply = $routeProps['rules']['response_calls'] ?? [];
18
-        if (! $this->shouldMakeApiCall($route, $rulesToApply)) {
18
+        if (!$this->shouldMakeApiCall($route, $rulesToApply)) {
19 19
             return;
20 20
         }
21 21
 
@@ -124,14 +124,14 @@  discard block
 block discarded – undo
124 124
         // set URL and query parameters
125 125
         $uri = $request->getRequestUri();
126 126
         $query = $request->getQueryString();
127
-        if (! empty($query)) {
127
+        if (!empty($query)) {
128 128
             $uri .= "?$query";
129 129
         }
130 130
         $response = call_user_func_array([$dispatcher, strtolower($request->method())], [$uri]);
131 131
 
132 132
         // the response from the Dingo dispatcher is the 'raw' response from the controller,
133 133
         // so we have to ensure it's JSON first
134
-        if (! $response instanceof Response) {
134
+        if (!$response instanceof Response) {
135 135
             $response = response()->json($response);
136 136
         }
137 137
 
@@ -238,8 +238,8 @@  discard block
 block discarded – undo
238 238
         $prefix = 'HTTP_';
239 239
         foreach ($headers as $name => $value) {
240 240
             $name = strtr(strtoupper($name), '-', '_');
241
-            if (! starts_with($name, $prefix) && $name !== 'CONTENT_TYPE') {
242
-                $name = $prefix.$name;
241
+            if (!starts_with($name, $prefix) && $name !== 'CONTENT_TYPE') {
242
+                $name = $prefix . $name;
243 243
             }
244 244
             $server[$name] = $value;
245 245
         }
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,6 @@
 block discarded – undo
84 84
     }
85 85
 
86 86
     /**
87
-     * @param array $config
88 87
      *
89 88
      * @return void
90 89
      *
Please login to merge, or discard this patch.
src/Tools/Generator.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
      */
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
         ]);
70 70
 
71 71
         $parsedRoute = [
72
-            'id' => md5($this->getUri($route).':'.implode($this->getMethods($route))),
72
+            'id' => md5($this->getUri($route) . ':' . implode($this->getMethods($route))),
73 73
             'group' => $routeGroup,
74 74
             'title' => $docBlock['short'],
75 75
             'description' => $docBlock['long'],
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             'cleanBodyParameters' => $this->cleanParams($bodyParameters),
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
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
                 continue;
107 107
             }
108 108
 
109
-            if ( class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) {
109
+            if (class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) {
110 110
                 $formRequestDocBlock = new DocBlock($parameterClass->getDocComment());
111 111
                 $bodyParametersFromDocBlock = $this->getBodyParametersFromDocBlock($formRequestDocBlock->getTags());
112 112
 
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
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
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
                 continue;
182 182
             }
183 183
 
184
-            if ( class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) {
184
+            if (class_exists('\Illuminate\Foundation\Http\FormRequest') && $parameterClass->isSubclassOf(\Illuminate\Foundation\Http\FormRequest::class) || class_exists('\Dingo\Api\Http\FormRequest') && $parameterClass->isSubclassOf(\Dingo\Api\Http\FormRequest::class)) {
185 185
                 $formRequestDocBlock = new DocBlock($parameterClass->getDocComment());
186 186
                 $queryParametersFromDocBlock = $this->getQueryParametersFromDocBlock($formRequestDocBlock->getTags());
187 187
 
@@ -202,10 +202,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
@@ -318,25 +318,25 @@  discard block
 block discarded – undo
318 318
             $faker->seed($this->fakerSeed);
319 319
         }
320 320
         $fakeFactories = [
321
-            'integer' => function () use ($faker) {
321
+            'integer' => function() use ($faker) {
322 322
                 return $faker->numberBetween(1, 20);
323 323
             },
324
-            'number' => function () use ($faker) {
324
+            'number' => function() use ($faker) {
325 325
                 return $faker->randomFloat();
326 326
             },
327
-            'float' => function () use ($faker) {
327
+            'float' => function() use ($faker) {
328 328
                 return $faker->randomFloat();
329 329
             },
330
-            'boolean' => function () use ($faker) {
330
+            'boolean' => function() use ($faker) {
331 331
                 return $faker->boolean();
332 332
             },
333
-            'string' => function () use ($faker) {
333
+            'string' => function() use ($faker) {
334 334
                 return $faker->word;
335 335
             },
336
-            'array' => function () {
336
+            'array' => function() {
337 337
                 return [];
338 338
             },
339
-            'object' => function () {
339
+            'object' => function() {
340 340
                 return new \stdClass;
341 341
             },
342 342
         ];
Please login to merge, or discard this patch.
src/Tools/RouteMatcher.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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())
Please login to merge, or discard this patch.
src/Tools/ResponseResolver.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,8 +48,8 @@
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
src/Tools/ResponseStrategies/ResponseTagStrategy.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
src/Tools/ResponseStrategies/ResponseFileStrategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/Tools/ResponseStrategies/TransformerTagsStrategy.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         );
Please login to merge, or discard this patch.
src/Postman/CollectionWriter.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,16 +27,16 @@  discard block
 block discarded – undo
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
 block discarded – undo
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'] : '',
Please login to merge, or discard this patch.
src/ApiDocGeneratorServiceProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,17 +15,17 @@
 block discarded – undo
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([
Please login to merge, or discard this patch.