Merge pull request #4 from myENA/feature/EC-3371_update_swagger

Feature/ec 3371 update swagger

Author: dcarbone

composer.json

@@ -11,6 +11,8 @@
   ],
   "require": {
     "php": ">=7.1",
+    "ext-json": "*",
+    "ext-curl": "*",
     "guzzlehttp/guzzle": "6.3.*",
     "psr/log": "1.*"
   },

src/Models/MetadataBucketInstanceResponse.php

@@ -6,12 +6,16 @@
  * @OA\Schema(
  *     schema="RGWMetadataBucketInstanceResponse",
  *     type="object",
- *     ref="$/definitions/RGWMetadataResponse",
- *     @OA\Property(
- *          property="data",
- *          type="object",
- *          ref="#/components/schemas/RGWMetadataBucketInstanceResponseData"
- *     )
+ *     allOf={
+ *          @OA\Schema(ref="#/components/schemas/RGWMetadataResponse"),
+ *          @OA\Schema(
+ *              @OA\Property(
+ *                  property="data",
+ *                  type="object",
+ *                  ref="#/components/schemas/RGWMetadataBucketInstanceResponseData"
+ *              )
+ *          )
+ *      }
  * )
  */
 

src/Models/MetadataBucketResponse.php

@@ -6,12 +6,16 @@
  * @OA\Schema(
  *     schema="RGWMetadataBucketResponse",
  *     type="object",
- *     ref="$/definitions/RGWMetadataResponse",
- *     @OA\Property(
- *          property="data",
- *          type="object",
- *          ref="#/components/schemas/RGWMetadataBucketResponseData"
- *     )
+ *     allOf={
+ *          @OA\Schema(ref="#/components/schemas/RGWMetadataResponse"),
+ *          @OA\Schema(
+ *              @OA\Property(
+ *                  property="data",
+ *                  type="object",
+ *                  ref="#/components/schemas/RGWMetadataBucketResponseData"
+ *              )
+ *          )
+ *     }
  * )
  */
 

src/Models/MetadataUserInfo.php

@@ -6,48 +6,52 @@
  * @OA\Schema(
  *     schema="RGWMetadataUserInfo",
  *     type="object",
- *     ref="$/definitions/RGWUserInfo",
- *     @OA\Property(
- *          property="auid",
- *          type="integer"
- *     ),
- *     @OA\Property(
- *          property="op_mask",
- *          type="string"
- *     ),
- *     @OA\Property(
- *          property="default_placement",
- *          type="string"
- *     ),
- *     @OA\Property(
- *          property="placement_tags",
- *          type="array",
- *          @OA\Items(type="string"),
- *     ),
- *     @OA\Property(
- *          property="bucket_quota",
- *          type="object",
- *          ref="#/components/schemas/RGWQuotaMeta"
- *     ),
- *     @OA\Property(
- *          property="user_quota",
- *          type="object",
- *          ref="#/components/schemas/RGWQuotaMeta"
- *     ),
- *     @OA\Property(
- *          property="temp_url_keys",
- *          type="array",
- *          @OA\Items(type="string"),
- *     ),
- *     @OA\Property(
- *          property="type",
- *          type="string"
- *     ),
- *     @OA\Property(
- *          property="attrs",
- *          type="array",
- *          @OA\Items(ref="#/components/schemas/RGWMetadataAttribute")
- *     )
+ *     allOf={
+ *          @OA\Schema(ref="#/components/schemas/RGWUserInfo"),
+ *          @OA\Schema(
+ *              @OA\Property(
+ *                  property="auid",
+ *                  type="integer"
+ *              ),
+ *              @OA\Property(
+ *                  property="op_mask",
+ *                  type="string"
+ *               ),
+ *              @OA\Property(
+ *                  property="default_placement",
+ *                  type="string"
+ *              ),
+ *              @OA\Property(
+ *                  property="placement_tags",
+ *                  type="array",
+ *                  @OA\Items(type="string"),
+ *              ),
+ *              @OA\Property(
+ *                  property="bucket_quota",
+ *                  type="object",
+ *                  ref="#/components/schemas/RGWQuotaMeta"
+ *              ),
+ *              @OA\Property(
+ *                  property="user_quota",
+ *                  type="object",
+ *                  ref="#/components/schemas/RGWQuotaMeta"
+ *              ),
+ *              @OA\Property(
+ *                  property="temp_url_keys",
+ *                  type="array",
+ *                  @OA\Items(type="string"),
+ *              ),
+ *              @OA\Property(
+ *                  property="type",
+ *                  type="string"
+ *              ),
+ *              @OA\Property(
+ *                  property="attrs",
+ *                  type="array",
+ *                  @OA\Items(ref="#/components/schemas/RGWMetadataAttribute")
+ *              )
+ *          )
+ *     }
  * )
  */
 

src/Models/MetadataUserResponse.php

@@ -6,12 +6,16 @@
  * @OA\Schema(
  *     schema="RGWMetadataUserResponse",
  *     type="object",
- *     ref="$/definitions/RGWMetadataResponse",
- *     @OA\Property(
- *          property="data",
- *          type="object",
- *          ref="#/components/schemas/RGWMetadataUserInfo"
- *     )
+ *     allOf={
+ *          @OA\Schema(ref="#/components/schemas/RGWMetadataResponse"),
+ *          @OA\Schema(
+ *              @OA\Property(
+ *                  property="data",
+ *                  type="object",
+ *                  ref="#/components/schemas/RGWMetadataUserInfo"
+ *              )
+ *          )
+ *      }
  * )
  */
 

src/Validator/InstanceOfValidator.php

@@ -46,6 +46,6 @@ public function test($value): bool
      */
     public function expectedStatement(): string
     {
-        return 'object that is an instance of '.$this->class;
+        return 'object that is an instance of ' . $this->class;
     }
 }

tests/OpenApiTest.php

@@ -30,8 +30,7 @@ public function testAnnotation()
  *      title="php-rgw-api",
  *      description="php-rgw-api",
  *      @OA\Contact(
- *          email="[email protected]",
-*           email="[email protected]"
+ *          email="[email protected]"
  *      ),
  *      @OA\License(
  *         name="Mozilla Public License 2.0",