Skip to content

Commit 08ef9ed

Browse files
dcarbonedcarbone
authored
Merge pull request #2 from alupuleasa/master
Bugfix
2 parents 3a959ca + 65a72ea commit 08ef9ed

38 files changed

+189
-533
lines changed

‎src/Models/AbstractMetadataResponse.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,15 @@
1010
* type="object",
1111
* @OA\Property(
1212
* property="key",
13-
* @OA\Schema(
14-
* type="string"
15-
* )
13+
* type="string"
1614
* ),
1715
* @OA\Property(
1816
* property="mtime",
19-
* @OA\Schema(
20-
* type="string"
21-
* )
17+
* type="string"
2218
* ),
2319
* @OA\Property(
2420
* property="ver",
25-
* @OA\Schema(
26-
* type="object"
27-
* ),
21+
* type="object",
2822
* ref="#/components/schemas/RGWMetadataVersion"
2923
* )
3024
* )

‎src/Models/BucketIndex.php

+4-10
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,15 @@
1010
/**
1111
* @OA\Schema(
1212
* schema="RGWBucketIndex",
13-
* @OA\Schema(
14-
* type="object"
15-
* ),
13+
* type="object",
1614
* @OA\Property(
1715
* property="new_objects",
18-
* @OA\Schema(
19-
* type="array",
20-
* @OA\Items(type="string")
21-
* )
16+
* type="array",
17+
* @OA\Items(type="string"),
2218
* ),
2319
* @OA\Property(
2420
* property="headers",
25-
* @OA\Schema(
26-
* type="object"
27-
* ),
21+
* type="object",
2822
* ref="#/components/schemas/RGWBucketIndexHeaders"
2923
* )
3024
* )

‎src/Models/BucketIndexHeaders.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,15 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketIndexHeaders",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="existing_header",
15-
* @OA\Schema(
16-
* type="object"
17-
* ),
13+
* type="object",
1814
* ref="#/components/schemas/RGWBucketIndexUsage"
1915
* ),
2016
* @OA\Property(
2117
* property="calculated_header",
22-
* @OA\Schema(
23-
* type="object"
24-
* ),
18+
* type="object",
2519
* ref="#/components/schemas/RGWBucketIndexUsage"
2620
* )
2721
* )

‎src/Models/BucketIndexUsage.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketIndexUsage",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="usage",
15-
* @OA\Schema(
16-
* type="object"
17-
* ),
13+
* type="object",
1814
* ref="#/components/schemas/RGWBucketUsage"
1915
* )
2016
* )

‎src/Models/BucketInfo.php

+17-51
Original file line numberDiff line numberDiff line change
@@ -7,107 +7,73 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketInfo",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="bucket",
15-
* @OA\Schema(
16-
* type="string"
17-
* )
13+
* type="string"
1814
* ),
1915
* @OA\Property(
2016
* property="pool",
21-
* @OA\Schema(
22-
* type="string"
23-
* )
17+
* type="string"
2418
* ),
2519
* @OA\Property(
2620
* property="index_pool",
27-
* @OA\Schema(
28-
* type="string"
29-
* )
21+
* type="string"
3022
* ),
3123
* @OA\Property(
3224
* property="id",
33-
* @OA\Schema(
34-
* type="string"
35-
* )
25+
* type="string"
3626
* ),
3727
* @OA\Property(
3828
* property="marker",
39-
* @OA\Schema(
40-
* type="string"
41-
* )
29+
* type="string"
4230
* ),
4331
* @OA\Property(
4432
* property="owner",
45-
* @OA\Schema(
46-
* type="string"
47-
* )
33+
* type="string"
4834
* ),
4935
* @OA\Property(
5036
* property="ver",
51-
* @OA\Schema(
52-
* type="string"
53-
* )
37+
* type="string"
5438
* ),
5539
* @OA\Property(
5640
* property="master_ver",
57-
* @OA\Schema(
58-
* type="string"
59-
* )
41+
* type="string"
6042
* ),
6143
* @OA\Property(
6244
* property="mtime",
63-
* @OA\Schema(
64-
* type="string"
65-
* )
45+
* type="string"
6646
* ),
6747
* @OA\Property(
6848
* property="max_marker",
69-
* @OA\Schema(
70-
* type="string"
71-
* )
49+
* type="string"
7250
* ),
7351
* @OA\Property(
7452
* property="usage",
75-
* @OA\Schema(
76-
* type="object"
77-
* ),
53+
* type="object",
7854
* ref="#/components/schemas/RGWBucketUsage"
7955
* ),
8056
* @OA\Property(
8157
* property="bucket_quota",
82-
* @OA\Schema(
83-
* type="object"
84-
* ),
58+
* type="object",
8559
* ref="#/components/schemas/RGWQuotaMeta"
8660
* ),
8761
* @OA\Property(
8862
* property="zonegroup",
89-
* @OA\Schema(
90-
* type="string"
91-
* )
63+
* type="string"
9264
* ),
9365
* @OA\Property(
9466
* property="placement_rule",
95-
* @OA\Schema(
96-
* type="string"
97-
* )
67+
* type="string"
9868
* ),
9969
* @OA\Property(
10070
* property="explicit_placement",
101-
* @OA\Schema(
102-
* type="object"
103-
* ),
71+
* type="object",
10472
* ref="#/components/schemas/RGWBucketPlacement"
10573
* ),
10674
* @OA\Property(
10775
* property="index_type",
108-
* @OA\Schema(
109-
* type="string"
110-
* )
76+
* type="string"
11177
* )
11278
* )
11379
*/

‎src/Models/BucketInfoCollection.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketInfoCollection",
10-
* @OA\Schema(
11-
* type="array",
12-
* @OA\Items(ref="#/components/schemas/RGWBucketInfo")
13-
* )
10+
* type="array",
11+
* @OA\Items(ref="#/components/schemas/RGWBucketInfo")
1412
* )
1513
*/
1614

‎src/Models/BucketPlacement.php

+4-12
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,18 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketPlacement",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="data_pool",
15-
* @OA\Schema(
16-
* type="integer"
17-
* )
13+
* type="integer"
1814
* ),
1915
* @OA\Property(
2016
* property="data_extra_pool",
21-
* @OA\Schema(
22-
* type="integer"
23-
* )
17+
* type="integer"
2418
* ),
2519
* @OA\Property(
2620
* property="index_pool",
27-
* @OA\Schema(
28-
* type="integer"
29-
* )
21+
* type="integer"
3022
* )
3123
* )
3224
*/

‎src/Models/BucketPolicy.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,15 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketPolicy",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="owner",
15-
* @OA\Schema(
16-
* type="object"
17-
* ),
13+
* type="object",
1814
* ref="#/components/schemas/RGWBucketPolicyOwner"
1915
* ),
2016
* @OA\Property(
2117
* property="acl",
22-
* @OA\Schema(
23-
* type="object"
24-
* ),
18+
* type="object",
2519
* ref="#/components/schemas/RGWBucketPolicyACL"
2620
* )
2721
* )

‎src/Models/BucketPolicyACL.php

+7-15
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,21 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketPolicyACL",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="acl_group_map",
15-
* @OA\Schema(
16-
* type="array",
17-
* @OA\Items(ref="#/components/schemas/RGWBucketPolicyACLGroupMap")
18-
* )
13+
* type="array",
14+
* @OA\Items(ref="#/components/schemas/RGWBucketPolicyACLGroupMap")
1915
* ),
2016
* @OA\Property(
2117
* property="acl_user_map",
22-
* @OA\Schema(
23-
* type="array",
24-
* @OA\Items(ref="#/components/schemas/RGWBucketPolicyACLUserMap")
25-
* )
18+
* type="array",
19+
* @OA\Items(ref="#/components/schemas/RGWBucketPolicyACLUserMap")
2620
* ),
2721
* @OA\Property(
2822
* property="grant_map",
29-
* @OA\Schema(
30-
* type="array",
31-
* @OA\Items(ref="#/components/schemas/RGWBucketPolicyACLGrantMap")
32-
* )
23+
* type="array",
24+
* @OA\Items(ref="#/components/schemas/RGWBucketPolicyACLGrantMap")
3325
* )
3426
* )
3527
*/

‎src/Models/BucketPolicyACLGrantMap.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
/**
88
* @OA\Schema(
99
* schema="RGWBucketPolicyACLGrantMap",
10-
* @OA\Schema(
11-
* type="object"
12-
* ),
10+
* type="object",
1311
* @OA\Property(
1412
* property="id",
15-
* @OA\Schema(
16-
* type="string"
17-
* )
13+
* type="string"
1814
* ),
1915
* @OA\Property(
2016
* property="grant",

0 commit comments

Comments
 (0)