Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6281693

Browse files
joelwurtzjoelwurtz
committed
Merge branch 'fix-null' into 1.22
2 parents 7cb079c + 9282f2c commit 6281693

29 files changed

+1087
-577
lines changed

‎docker-swagger.json

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@
151151
"type": "object",
152152
"properties": {
153153
"Binds": {
154-
"type": "array",
154+
"type": ["array", "null"],
155155
"items": {
156156
"type": "string"
157157
}
158158
},
159159
"Links": {
160-
"type": "array",
160+
"type": ["array", "null"],
161161
"items": {
162162
"type": "string"
163163
}
@@ -192,31 +192,31 @@
192192
"type": "integer"
193193
},
194194
"BlkioWeightDevice": {
195-
"type": "array",
195+
"type": ["array", "null"],
196196
"items": {
197197
"$ref": "#/definitions/DeviceWeight"
198198
}
199199
},
200200
"BlkioDeviceReadBps": {
201-
"type": "array",
201+
"type": ["array", "null"],
202202
"items": {
203203
"$ref": "#/definitions/DeviceRate"
204204
}
205205
},
206206
"BlkioDeviceReadIOps": {
207-
"type": "array",
207+
"type": ["array", "null"],
208208
"items": {
209209
"$ref": "#/definitions/DeviceRate"
210210
}
211211
},
212212
"BlkioDeviceWriteBps": {
213-
"type": "array",
213+
"type": ["array", "null"],
214214
"items": {
215215
"$ref": "#/definitions/DeviceRate"
216216
}
217217
},
218218
"BlkioDeviceWriteIOps": {
219-
"type": "array",
219+
"type": ["array", "null"],
220220
"items": {
221221
"$ref": "#/definitions/DeviceRate"
222222
}
@@ -243,37 +243,37 @@
243243
"type": "boolean"
244244
},
245245
"Dns": {
246-
"type": "array",
246+
"type": ["array", "null"],
247247
"items": {
248248
"type": "string"
249249
}
250250
},
251251
"DnsSearch": {
252-
"type": "array",
252+
"type": ["array", "null"],
253253
"items": {
254254
"type": "string"
255255
}
256256
},
257257
"ExtraHosts": {
258-
"type": "array",
258+
"type": ["array", "null"],
259259
"items": {
260260
"type": "string"
261261
}
262262
},
263263
"VolumesFrom": {
264-
"type": "array",
264+
"type": ["array", "null"],
265265
"items": {
266266
"type": "string"
267267
}
268268
},
269269
"CapAdd": {
270-
"type": "array",
270+
"type": ["array", "null"],
271271
"items": {
272272
"type": "string"
273273
}
274274
},
275275
"CapDrop": {
276-
"type": "array",
276+
"type": ["array", "null"],
277277
"items": {
278278
"type": "string"
279279
}
@@ -285,19 +285,19 @@
285285
"type": "string"
286286
},
287287
"Devices": {
288-
"type": "array",
288+
"type": ["array", "null"],
289289
"items": {
290290
"$ref": "#/definitions/Device"
291291
}
292292
},
293293
"Ulimits": {
294-
"type": "array",
294+
"type": ["array", "null"],
295295
"items": {
296296
"$ref": "#/definitions/Ulimit"
297297
}
298298
},
299299
"SecurityOpt": {
300-
"type": "array",
300+
"type": ["array", "null"],
301301
"items": {
302302
"type": "string"
303303
}
@@ -339,7 +339,7 @@
339339
"type": "string"
340340
},
341341
"Names": {
342-
"type": "array",
342+
"type": ["array", "null"],
343343
"items": {
344344
"type": "string"
345345
}
@@ -360,7 +360,7 @@
360360
"type": "string"
361361
},
362362
"Ports": {
363-
"type": "array",
363+
"type": ["array", "null"],
364364
"items": {
365365
"$ref": "#/definitions/port"
366366
}
@@ -411,7 +411,7 @@
411411
"default": false
412412
},
413413
"Env": {
414-
"type": "array",
414+
"type": ["array", "null"],
415415
"items": {
416416
"type": "string"
417417
}
@@ -429,7 +429,7 @@
429429
}
430430
},
431431
"Mounts": {
432-
"type": "array",
432+
"type": ["array", "null"],
433433
"items": {
434434
"$ref": "#/definitions/mount"
435435
}
@@ -568,7 +568,7 @@
568568
"type": "string"
569569
},
570570
"Args": {
571-
"type": "array",
571+
"type": ["array", "null"],
572572
"items": {
573573
"type": "string"
574574
}
@@ -631,7 +631,7 @@
631631
"$ref": "#/definitions/ContainerState"
632632
},
633633
"Mounts": {
634-
"type": "array",
634+
"type": ["array", "null"],
635635
"items": {
636636
"$ref": "#/definitions/mount"
637637
}
@@ -642,15 +642,15 @@
642642
"type": "object",
643643
"properties": {
644644
"Titles": {
645-
"type": "array",
645+
"type": ["array", "null"],
646646
"items": {
647647
"type": "string"
648648
}
649649
},
650650
"Processes": {
651-
"type": "array",
651+
"type": ["array", "null"],
652652
"items": {
653-
"type": "array",
653+
"type": ["array", "null"],
654654
"items": {
655655
"type": "string"
656656
}
@@ -692,7 +692,7 @@
692692
"type": "object",
693693
"properties": {
694694
"RepoTags": {
695-
"type": "array",
695+
"type": ["array", "null"],
696696
"items": {
697697
"type": "string"
698698
}
@@ -713,13 +713,13 @@
713713
"type": "integer"
714714
},
715715
"Labels": {
716-
"type": "object",
716+
"type": ["object", "null"],
717717
"additionalProperties": {
718718
"type": "string"
719719
}
720720
},
721721
"RepoDigests": {
722-
"type": "array",
722+
"type": ["array", "null"],
723723
"items": {
724724
"type": "string"
725725
}
@@ -769,13 +769,13 @@
769769
"$ref": "#/definitions/GraphDriver"
770770
},
771771
"RepoDigests": {
772-
"type": "array",
772+
"type": ["array", "null"],
773773
"items": {
774774
"type": "string"
775775
}
776776
},
777777
"RepoTags": {
778-
"type": "array",
778+
"type": ["array", "null"],
779779
"items": {
780780
"type": "string"
781781
}
@@ -798,7 +798,7 @@
798798
"type": "string"
799799
},
800800
"Tags": {
801-
"type": "array",
801+
"type": ["array", "null"],
802802
"items": {
803803
"type": "string"
804804
}
@@ -888,18 +888,18 @@
888888
"type": "string"
889889
},
890890
"DriverStatus": {
891-
"type": "array",
891+
"type": ["array", "null"],
892892
"items": {
893-
"type": "array",
893+
"type": ["array", "null"],
894894
"items": {
895895
"type": "string"
896896
}
897897
}
898898
},
899899
"SystemStatus": {
900-
"type": "array",
900+
"type": ["array", "null"],
901901
"items": {
902-
"type": "array",
902+
"type": ["array", "null"],
903903
"items": {
904904
"type": "string"
905905
}
@@ -939,7 +939,7 @@
939939
"type": "string"
940940
},
941941
"Labels": {
942-
"type": "array",
942+
"type": ["array", "null"],
943943
"items": {
944944
"type": "string"
945945
}
@@ -1001,7 +1001,7 @@
10011001
}
10021002
},
10031003
"InsecureRegistryCIDRs": {
1004-
"type": "array",
1004+
"type": ["array", "null"],
10051005
"items": {
10061006
"type": "string"
10071007
}
@@ -1012,7 +1012,7 @@
10121012
"type": "object",
10131013
"properties": {
10141014
"Mirrors": {
1015-
"type": "array",
1015+
"type": ["array", "null"],
10161016
"items": {
10171017
"type": "string"
10181018
}
@@ -1066,7 +1066,7 @@
10661066
"type": "boolean"
10671067
},
10681068
"Cmd": {
1069-
"type": "array",
1069+
"type": ["array", "null"],
10701070
"items": {
10711071
"type": "string"
10721072
}
@@ -1129,7 +1129,7 @@
11291129
"type": "string"
11301130
},
11311131
"arguments": {
1132-
"type": "array",
1132+
"type": ["array", "null"],
11331133
"items": {
11341134
"type": "string"
11351135
}
@@ -1140,7 +1140,7 @@
11401140
"type": "object",
11411141
"properties": {
11421142
"Volumes": {
1143-
"type": "array",
1143+
"type": ["array", "null"],
11441144
"items": {
11451145
"$ref": "#/definitions/Volume"
11461146
}
@@ -1217,7 +1217,7 @@
12171217
"type": "string"
12181218
},
12191219
"Config": {
1220-
"type": "array",
1220+
"type": ["array", "null"],
12211221
"items": {
12221222
"$ref": "#/definitions/IPAMConfig"
12231223
}

‎generated/Model/Container.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Container
99
*/
1010
protected $appArmorProfile;
1111
/**
12-
* @var string[]
12+
* @var string[]|null
1313
*/
1414
protected $args;
1515
/**
@@ -89,7 +89,7 @@ class Container
8989
*/
9090
protected $state;
9191
/**
92-
* @var Mount[]
92+
* @var Mount[]|null
9393
*/
9494
protected $mounts;
9595

@@ -114,19 +114,19 @@ public function setAppArmorProfile($appArmorProfile = null)
114114
}
115115

116116
/**
117-
* @return string[]
117+
* @return string[]|null
118118
*/
119119
public function getArgs()
120120
{
121121
return $this->args;
122122
}
123123

124124
/**
125-
* @param string[] $args
125+
* @param string[]|null $args
126126
*
127127
* @return self
128128
*/
129-
public function setArgs(array $args = null)
129+
public function setArgs($args = null)
130130
{
131131
$this->args = $args;
132132

@@ -514,19 +514,19 @@ public function setState(ContainerState $state = null)
514514
}
515515

516516
/**
517-
* @return Mount[]
517+
* @return Mount[]|null
518518
*/
519519
public function getMounts()
520520
{
521521
return $this->mounts;
522522
}
523523

524524
/**
525-
* @param Mount[] $mounts
525+
* @param Mount[]|null $mounts
526526
*
527527
* @return self
528528
*/
529-
public function setMounts(array $mounts = null)
529+
public function setMounts($mounts = null)
530530
{
531531
$this->mounts = $mounts;
532532

0 commit comments

Comments
 (0)