Merge branch 'master' into 97-add-custom-authentication-header-support

Author: Konstantin Lapkovsky

src/Http/Middleware/AutoDocMiddleware.php

@@ -16,7 +16,7 @@ public function handle($request, Closure $next)
     {
         $response = $next($request);
 
-        if ((config('app.env') == 'testing') && !self::$skipped && !empty($request->route())) {
+        if ((config('app.env') === 'testing') && !self::$skipped && !empty($request->route())) {
             app(SwaggerService::class)->addData($request, $response);
         }
 

src/Services/SwaggerService.php

@@ -275,6 +275,60 @@ protected function markAsDeprecated(array $annotations)
         $this->item['deprecated'] = Arr::get($annotations, 'deprecated', false);
     }
 
+    protected function saveResponseSchema(?array $content, string $definition): void
+    {
+        if (empty($content)) {
+            return;
+        }
+
+        $schemaProperties = [];
+        $schemaType = 'object';
+
+        if (array_is_list($content)) {
+            $this->saveListResponseDefinitions($content, $schemaProperties);
+
+            $schemaType = 'array';
+        } else {
+            $this->saveObjectResponseDefinitions($content, $schemaProperties, $definition);
+        }
+
+        $this->data['definitions'][$definition] = [
+            'type' => $schemaType,
+            'properties' => $schemaProperties
+        ];
+    }
+
+    protected function saveListResponseDefinitions(array $content, array &$schemaProperties): void
+    {
+        $types = [];
+
+        foreach ($content as $value) {
+            $type = gettype($value);
+
+            if (!in_array($type, $types)) {
+                $types[] = $type;
+                $schemaProperties['items']['allOf'][]['type'] = $type;
+            }
+        }
+    }
+
+    protected function saveObjectResponseDefinitions(array $content, array &$schemaProperties, string $definition): void
+    {
+        $properties = Arr::get($this->data['definitions'], $definition, []);
+
+        foreach ($content as $name => $value) {
+            $property = Arr::get($properties, $name, []);
+
+            if (is_null($value)) {
+                $property['nullable'] = true;
+            } else {
+                $property['type'] = gettype($value);
+            }
+
+            $schemaProperties[$name] = $property;
+        }
+    }
+
     protected function parseResponse($response)
     {
         $produceList = $this->data['paths'][$this->uri][$this->method]['produces'];
@@ -319,6 +373,15 @@ protected function parseResponse($response)
                 $produce
             );
         }
+
+        $action = Str::ucfirst($this->getActionName($this->uri));
+        $definition = "{$this->method}{$action}{$code}ResponseObject";
+
+        $this->saveResponseSchema($content, $definition);
+
+        if (is_array($this->item['responses'][$code])) {
+            $this->item['responses'][$code]['schema']['$ref'] = "#/definitions/{$definition}";
+        }
     }
 
     protected function saveExample($code, $content, $produce)
@@ -418,7 +481,7 @@ protected function saveGetRequestParameters($rules, array $attributes, array $an
             }
 
             $existedParameter = Arr::first($this->item['parameters'], function ($existedParameter) use ($parameter) {
-                return $existedParameter['name'] == $parameter;
+                return $existedParameter['name'] === $parameter;
             });
 
             if (empty($existedParameter)) {
@@ -536,7 +599,7 @@ protected function requestHasBody(): bool
         $parameters = $this->data['paths'][$this->uri][$this->method]['parameters'];
 
         $bodyParamExisted = Arr::where($parameters, function ($value) {
-            return $value['name'] == 'body';
+            return $value['name'] === 'body';
         });
 
         return empty($bodyParamExisted);
@@ -546,7 +609,7 @@ public function getConcreteRequest()
     {
         $controller = $this->request->route()->getActionName();
 
-        if ($controller == 'Closure') {
+        if ($controller === 'Closure') {
             return null;
         }
 
@@ -740,7 +803,7 @@ protected function camelCaseToUnderScore($input): string
         $ret = $matches[0];
 
         foreach ($ret as &$match) {
-            $match = $match == strtoupper($match) ? strtolower($match) : lcfirst($match);
+            $match = ($match === strtoupper($match)) ? strtolower($match) : lcfirst($match);
         }
 
         return implode('_', $ret);

tests/fixtures/AutoDocMiddlewareTest/tmp_data_search_roles_request.json

@@ -65,7 +65,8 @@
                     }
                   ]
                 }
-              ]
+              ],
+              "$ref": "#/definitions/getUsersroles200ResponseObject"
             }
           }
         },
@@ -76,7 +77,20 @@
       }
     }
   },
-  "definitions": {},
+  "definitions": {
+    "getUsersroles200ResponseObject": {
+      "type": "array",
+      "properties": {
+        "items": {
+          "allOf": [
+            {
+              "type": "array"
+            }
+          ]
+        }
+      }
+    }
+  },
   "info": {
     "description": "This is automatically collected documentation",
     "version": "0.0.0",

tests/fixtures/SwaggerServiceTest/tmp_data_create_user_request.json

@@ -30,6 +30,7 @@
             "description": "Forbidden",
             "schema":
             {
+              "$ref": "#/definitions/postApiusers403ResponseObject",
               "example":
               {
                 "message": "This action is unauthorized."
@@ -68,6 +69,14 @@
         "first_name": "andrey",
         "last_name": "voronin"
       }
+    },
+    "postApiusers403ResponseObject": {
+      "type": "object",
+      "properties": {
+        "message": {
+          "type": "string"
+        }
+      }
     }
   },
   "info":

tests/fixtures/SwaggerServiceTest/tmp_data_get_user_request.json

@@ -60,7 +60,8 @@
                                     "id": 2,
                                     "name": "client"
                                 }
-                            }
+                            },
+                            "$ref": "#/definitions/getUsers{id}assignRole{roleId}200ResponseObject"
                         }
                     }
                 },
@@ -71,7 +72,25 @@
             }
         }
     },
-    "definitions": {},
+    "definitions": {
+        "getUsers{id}assignRole{roleId}200ResponseObject": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "likes_count": {
+                    "type": "integer"
+                },
+                "role": {
+                    "type": "array"
+                }
+            }
+        }
+    },
     "info": {
         "description": "This is automatically collected documentation",
         "version": "0.0.0",

tests/fixtures/SwaggerServiceTest/tmp_data_post_user_request.json

@@ -55,7 +55,8 @@
                     }
                   ]
                 }
-              ]
+              ],
+              "$ref": "#/definitions/postUsers200ResponseObject"
             }
           }
         },
@@ -97,6 +98,18 @@
       "required": [
         "query"
       ]
+    },
+    "postUsers200ResponseObject": {
+      "type": "array",
+      "properties": {
+        "items": {
+          "allOf": [
+            {
+              "type": "array"
+            }
+          ]
+        }
+      }
     }
   },
   "info": {

tests/fixtures/SwaggerServiceTest/tmp_data_post_user_request_with_object_params.json

@@ -53,7 +53,8 @@
                     }
                   ]
                 }
-              ]
+              ],
+              "$ref": "#/definitions/postUsers200ResponseObject"
             }
           }
         },
@@ -93,6 +94,18 @@
         "notification_settings": "RonasIT\\Support\\Tests\\Support\\Mock\\TestNotificationSetting"
       },
       "required": ["query"]
+    },
+    "postUsers200ResponseObject": {
+      "type": "array",
+      "properties": {
+        "items": {
+          "allOf": [
+            {
+              "type": "array"
+            }
+          ]
+        }
+      }
     }
   },
   "info": {

tests/fixtures/SwaggerServiceTest/tmp_data_put_user_request_with_early_generated_doc.json

@@ -103,7 +103,8 @@
           "204": {
             "description": "Operation successfully done",
             "schema": {
-              "example": null
+              "example": null,
+              "$ref": "#/definitions/patchUsers{id}204ResponseObject"
             }
           }
         },

tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_closure_request.json

@@ -43,7 +43,8 @@
                                         }
                                     ]
                                 }
-                            ]
+                            ],
+                            "$ref": "#/definitions/getUsersroles200ResponseObject"
                         }
                     }
                 },
@@ -52,7 +53,20 @@
             }
         }
     },
-    "definitions": {},
+    "definitions": {
+        "getUsersroles200ResponseObject": {
+            "type": "array",
+            "properties": {
+                "items": {
+                    "allOf": [
+                        {
+                            "type": "array"
+                        }
+                    ]
+                }
+            }
+        }
+    },
     "info": {
         "description": "This is automatically collected documentation",
         "version": "0.0.0",

tests/fixtures/SwaggerServiceTest/tmp_data_search_roles_request.json

@@ -65,7 +65,8 @@
                                         }
                                     ]
                                 }
-                            ]
+                            ],
+                            "$ref": "#/definitions/getUsersroles200ResponseObject"
                         }
                     }
                 },
@@ -76,7 +77,20 @@
             }
         }
     },
-    "definitions": {},
+    "definitions": {
+        "getUsersroles200ResponseObject": {
+            "type": "array",
+            "properties": {
+                "items": {
+                    "allOf": [
+                        {
+                            "type": "array"
+                        }
+                    ]
+                }
+            }
+        }
+    },
     "info": {
         "description": "This is automatically collected documentation",
         "version": "0.0.0",