Completed
Pull Request — master (#566)
by Marcel
02:27 queued 01:11
created
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/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/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.
src/Commands/RebuildDocumentation.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,15 +42,15 @@
 block discarded – undo
42 42
 
43 43
         $documentarian = new Documentarian();
44 44
 
45
-        if (! is_dir($outputPath)) {
46
-            $this->error('There is no existing documentation available at '.$outputPath.'.');
45
+        if (!is_dir($outputPath)) {
46
+            $this->error('There is no existing documentation available at ' . $outputPath . '.');
47 47
 
48 48
             return false;
49 49
         }
50
-        $this->info('Rebuilding API HTML code from '.$outputPath.'/source/index.md');
50
+        $this->info('Rebuilding API HTML code from ' . $outputPath . '/source/index.md');
51 51
 
52 52
         $documentarian->generate($outputPath);
53 53
 
54
-        $this->info('Wrote HTML documentation to: '.$outputPath.'/index.html');
54
+        $this->info('Wrote HTML documentation to: ' . $outputPath . '/index.html');
55 55
     }
56 56
 }
Please login to merge, or discard this patch.
src/Tools/Utils.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 
69 69
     public static function deleteDirectoryAndContents($dir)
70 70
     {
71
-        $adapter = new Local(realpath(__DIR__.'/../../'));
71
+        $adapter = new Local(realpath(__DIR__ . '/../../'));
72 72
         $fs = new Filesystem($adapter);
73 73
         $fs->deleteDir($dir);
74 74
     }
Please login to merge, or discard this patch.
src/Postman/CollectionWriter.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -41,32 +41,32 @@  discard block
 block discarded – undo
41 41
         $collection = [
42 42
             'variables' => [],
43 43
             'info' => [
44
-                'name' => config('apidoc.postman.name') ?: config('app.name').' API',
44
+                'name' => config('apidoc.postman.name') ?: config('app.name') . ' API',
45 45
                 '_postman_id' => Uuid::uuid4()->toString(),
46 46
                 'description' => config('apidoc.postman.description') ?: '',
47 47
                 'schema' => 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json',
48 48
             ],
49
-            'item' => $this->routeGroups->map(function ($routes, $groupName) {
49
+            'item' => $this->routeGroups->map(function($routes, $groupName) {
50 50
                 return [
51 51
                     'name' => $groupName,
52 52
                     'description' => '',
53
-                    'item' => $routes->map(function ($route) {
53
+                    'item' => $routes->map(function($route) {
54 54
                         $mode = $route['methods'][0] === 'PUT' ? 'urlencoded' : 'formdata';
55 55
 
56 56
                         return [
57 57
                             'name' => $route['title'] != '' ? $route['title'] : url($route['uri']),
58 58
                             'request' => [
59
-                                'url' => url($route['uri']).(collect($route['queryParameters'])->isEmpty()
59
+                                'url' => url($route['uri']) . (collect($route['queryParameters'])->isEmpty()
60 60
                                     ? ''
61
-                                    : ('?'.implode('&', collect($route['queryParameters'])->map(function ($parameter, $key) {
62
-                                        return urlencode($key).'='.urlencode($parameter['value'] ?? '');
61
+                                    : ('?' . implode('&', collect($route['queryParameters'])->map(function($parameter, $key) {
62
+                                        return urlencode($key) . '=' . urlencode($parameter['value'] ?? '');
63 63
                                     })->all()))),
64 64
                                 'method' => $route['methods'][0],
65 65
                                 'header' => collect($route['headers'])
66 66
                                     ->union([
67 67
                                         'Accept' => 'application/json',
68 68
                                     ])
69
-                                    ->map(function ($value, $header) {
69
+                                    ->map(function($value, $header) {
70 70
                                         return [
71 71
                                             'key' => $header,
72 72
                                             'value' => $value,
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
                                     ->values()->all(),
76 76
                                 'body' => [
77 77
                                     'mode' => $mode,
78
-                                    $mode => collect($route['bodyParameters'])->map(function ($parameter, $key) {
78
+                                    $mode => collect($route['bodyParameters'])->map(function($parameter, $key) {
79 79
                                         return [
80 80
                                             'key' => $key,
81 81
                                             'value' => $parameter['value'] ?? '',
Please login to merge, or discard this patch.
src/Tools/ResponseStrategies/ResponseCallStrategy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     public function __invoke(Route $route, array $tags, array $routeProps)
28 28
     {
29 29
         $rulesToApply = $routeProps['rules']['response_calls'] ?? [];
30
-        if (! $this->shouldMakeApiCall($route, $rulesToApply)) {
30
+        if (!$this->shouldMakeApiCall($route, $rulesToApply)) {
31 31
             return null;
32 32
         }
33 33
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         try {
38 38
             $response = [$this->makeApiCall($request)];
39 39
         } catch (\Exception $e) {
40
-            echo 'Exception thrown during response call for ['.implode(',', $route->methods)."] {$route->uri}.\n";
40
+            echo 'Exception thrown during response call for [' . implode(',', $route->methods) . "] {$route->uri}.\n";
41 41
             if (Flags::$shouldBeVerbose) {
42 42
                 Utils::dumpException($e);
43 43
             } else {
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
174 174
         // set URL and query parameters
175 175
         $uri = $request->getRequestUri();
176 176
         $query = $request->getQueryString();
177
-        if (! empty($query)) {
177
+        if (!empty($query)) {
178 178
             $uri .= "?$query";
179 179
         }
180 180
         $response = call_user_func_array([$dispatcher, strtolower($request->method())], [$uri]);
181 181
 
182 182
         // the response from the Dingo dispatcher is the 'raw' response from the controller,
183 183
         // so we have to ensure it's JSON first
184
-        if (! $response instanceof Response) {
184
+        if (!$response instanceof Response) {
185 185
             $response = response()->json($response);
186 186
         }
187 187
 
@@ -330,8 +330,8 @@  discard block
 block discarded – undo
330 330
         $prefix = 'HTTP_';
331 331
         foreach ($headers as $name => $value) {
332 332
             $name = strtr(strtoupper($name), '-', '_');
333
-            if (! starts_with($name, $prefix) && $name !== 'CONTENT_TYPE') {
334
-                $name = $prefix.$name;
333
+            if (!starts_with($name, $prefix) && $name !== 'CONTENT_TYPE') {
334
+                $name = $prefix . $name;
335 335
             }
336 336
             $server[$name] = $value;
337 337
         }
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 null;
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 null;
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.