Skip to content

Commit 49bce99

Browse files
RidRid
committed
Built using latest janephp with fixes
Signed-off-by: Grant Millar <rid@cylo.io>
1 parent 0983de5 commit 49bce99

File tree

95 files changed

+302
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+302
-306
lines changed

‎composer.json‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"sort-packages": true,
99
"preferred-install": "dist",
1010
"allow-plugins": {
11-
"php-http/discovery": true
11+
"php-http/discovery": false
1212
}
1313
},
1414
"minimum-stability": "dev",
@@ -22,29 +22,31 @@
2222
{
2323
"type": "github",
2424
"url": "https://github.com/flavioheleno"
25-
},
26-
{
27-
"type": "patreon",
28-
"url": "https://www.patreon.com/flavioheleno"
2925
}
3026
],
3127
"require": {
3228
"php": ">=8.1",
33-
"ext-json": "*",
3429
"ext-mbstring": "*",
35-
"jane-php/open-api-runtime": "^7.4",
36-
"nyholm/psr7": "^1.8",
30+
"jane-php/json-schema-runtime": "^7.5",
31+
"jane-php/open-api-runtime": "^7.5",
32+
"php-http/client-common": "^2.7",
33+
"php-http/discovery": "^1.19",
34+
"php-http/multipart-stream-builder": "^1.3",
3735
"psr/http-client": "^1.0",
3836
"psr/http-factory": "^1.0",
39-
"psr/http-message": "^1.0 || ^2.0"
37+
"psr/http-message": "^2.0",
38+
"psr/http-client-implementation": "*",
39+
"psr/http-factory-implementation": "*",
40+
"psr/http-message-implementation": "*",
41+
"symfony/deprecation-contracts": "^3.3",
42+
"symfony/options-resolver": "^6.3",
43+
"symfony/serializer": "^6.3",
44+
"symfony/validator": "^6.3"
4045
},
4146
"require-dev": {
4247
"friendsofphp/php-cs-fixer": "^3.8",
43-
"jane-php/json-schema": "^7.4",
44-
"jane-php/open-api-3": "^7.4"
45-
},
46-
"suggest": {
47-
"php-http/socket-client": "Socket-based HTTP Client to use the API"
48+
"jane-php/open-api-3": "^7.4",
49+
"roave/security-advisories": "dev-latest"
4850
},
4951
"conflict": {
5052
"docker-php/docker-php-api": "*"
@@ -59,9 +61,11 @@
5961
},
6062
"extra": {
6163
"branch-alias": {
62-
"dev-main": "7.1.41.x-dev",
64+
"dev-main": "7.1.43.x-dev",
65+
"7.1.42": "7.1.42.x-dev",
66+
"7.1.41": "7.1.41.x-dev",
6367
"6.1.41": "6.1.41.x-dev",
6468
"6.1.36": "6.1.36.x-dev"
6569
}
6670
}
67-
}
71+
}

‎src/Normalizer/BuildInfoNormalizer.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function normalize($object, $format = null, array $context = [])
116116
$data['error'] = $object->getError();
117117
}
118118
if ($object->isInitialized('errorDetail') && null !== $object->getErrorDetail()) {
119-
$data['errorDetail'] = $this->normalizer->normalize($object->getErrorDetail(), 'json', $context);
119+
$data['errorDetail'] = null === $object->getErrorDetail() ? null : new \ArrayObject($this->normalizer->normalize($object->getErrorDetail(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
120120
}
121121
if ($object->isInitialized('status') && null !== $object->getStatus()) {
122122
$data['status'] = $object->getStatus();
@@ -125,10 +125,10 @@ public function normalize($object, $format = null, array $context = [])
125125
$data['progress'] = $object->getProgress();
126126
}
127127
if ($object->isInitialized('progressDetail') && null !== $object->getProgressDetail()) {
128-
$data['progressDetail'] = $this->normalizer->normalize($object->getProgressDetail(), 'json', $context);
128+
$data['progressDetail'] = null === $object->getProgressDetail() ? null : new \ArrayObject($this->normalizer->normalize($object->getProgressDetail(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
129129
}
130130
if ($object->isInitialized('aux') && null !== $object->getAux()) {
131-
$data['aux'] = $this->normalizer->normalize($object->getAux(), 'json', $context);
131+
$data['aux'] = null === $object->getAux() ? null : new \ArrayObject($this->normalizer->normalize($object->getAux(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
132132
}
133133
foreach ($object as $key => $value) {
134134
if (preg_match('/.*/', (string) $key)) {

‎src/Normalizer/ClusterInfoNormalizer.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function normalize($object, $format = null, array $context = [])
126126
$data['ID'] = $object->getID();
127127
}
128128
if ($object->isInitialized('version') && null !== $object->getVersion()) {
129-
$data['Version'] = $this->normalizer->normalize($object->getVersion(), 'json', $context);
129+
$data['Version'] = null === $object->getVersion() ? null : new \ArrayObject($this->normalizer->normalize($object->getVersion(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
130130
}
131131
if ($object->isInitialized('createdAt') && null !== $object->getCreatedAt()) {
132132
$data['CreatedAt'] = $object->getCreatedAt();
@@ -135,10 +135,10 @@ public function normalize($object, $format = null, array $context = [])
135135
$data['UpdatedAt'] = $object->getUpdatedAt();
136136
}
137137
if ($object->isInitialized('spec') && null !== $object->getSpec()) {
138-
$data['Spec'] = $this->normalizer->normalize($object->getSpec(), 'json', $context);
138+
$data['Spec'] = null === $object->getSpec() ? null : new \ArrayObject($this->normalizer->normalize($object->getSpec(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
139139
}
140140
if ($object->isInitialized('tLSInfo') && null !== $object->getTLSInfo()) {
141-
$data['TLSInfo'] = $this->normalizer->normalize($object->getTLSInfo(), 'json', $context);
141+
$data['TLSInfo'] = null === $object->getTLSInfo() ? null : new \ArrayObject($this->normalizer->normalize($object->getTLSInfo(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
142142
}
143143
if ($object->isInitialized('rootRotationInProgress') && null !== $object->getRootRotationInProgress()) {
144144
$data['RootRotationInProgress'] = $object->getRootRotationInProgress();

‎src/Normalizer/ConfigNormalizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function normalize($object, $format = null, array $context = [])
9292
$data['ID'] = $object->getID();
9393
}
9494
if ($object->isInitialized('version') && null !== $object->getVersion()) {
95-
$data['Version'] = $this->normalizer->normalize($object->getVersion(), 'json', $context);
95+
$data['Version'] = null === $object->getVersion() ? null : new \ArrayObject($this->normalizer->normalize($object->getVersion(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
9696
}
9797
if ($object->isInitialized('createdAt') && null !== $object->getCreatedAt()) {
9898
$data['CreatedAt'] = $object->getCreatedAt();
@@ -101,7 +101,7 @@ public function normalize($object, $format = null, array $context = [])
101101
$data['UpdatedAt'] = $object->getUpdatedAt();
102102
}
103103
if ($object->isInitialized('spec') && null !== $object->getSpec()) {
104-
$data['Spec'] = $this->normalizer->normalize($object->getSpec(), 'json', $context);
104+
$data['Spec'] = null === $object->getSpec() ? null : new \ArrayObject($this->normalizer->normalize($object->getSpec(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
105105
}
106106
foreach ($object as $key => $value) {
107107
if (preg_match('/.*/', (string) $key)) {

‎src/Normalizer/ConfigSpecNormalizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function normalize($object, $format = null, array $context = [])
9090
$data['Name'] = $object->getName();
9191
}
9292
if ($object->isInitialized('labels') && null !== $object->getLabels()) {
93-
$values = [];
93+
$values = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
9494
foreach ($object->getLabels() as $key => $value) {
9595
$values[$key] = $value;
9696
}
@@ -100,7 +100,7 @@ public function normalize($object, $format = null, array $context = [])
100100
$data['Data'] = $object->getData();
101101
}
102102
if ($object->isInitialized('templating') && null !== $object->getTemplating()) {
103-
$data['Templating'] = $this->normalizer->normalize($object->getTemplating(), 'json', $context);
103+
$data['Templating'] = null === $object->getTemplating() ? null : new \ArrayObject($this->normalizer->normalize($object->getTemplating(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
104104
}
105105
foreach ($object as $key_1 => $value_1) {
106106
if (preg_match('/.*/', (string) $key_1)) {

‎src/Normalizer/ConfigsCreatePostBodyNormalizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function normalize($object, $format = null, array $context = [])
9090
$data['Name'] = $object->getName();
9191
}
9292
if ($object->isInitialized('labels') && null !== $object->getLabels()) {
93-
$values = [];
93+
$values = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
9494
foreach ($object->getLabels() as $key => $value) {
9595
$values[$key] = $value;
9696
}
@@ -100,7 +100,7 @@ public function normalize($object, $format = null, array $context = [])
100100
$data['Data'] = $object->getData();
101101
}
102102
if ($object->isInitialized('templating') && null !== $object->getTemplating()) {
103-
$data['Templating'] = $this->normalizer->normalize($object->getTemplating(), 'json', $context);
103+
$data['Templating'] = null === $object->getTemplating() ? null : new \ArrayObject($this->normalizer->normalize($object->getTemplating(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
104104
}
105105
foreach ($object as $key_1 => $value_1) {
106106
if (preg_match('/.*/', (string) $key_1)) {

‎src/Normalizer/ContainerConfigNormalizer.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ public function normalize($object, $format = null, array $context = [])
259259
$data['AttachStderr'] = $object->getAttachStderr();
260260
}
261261
if ($object->isInitialized('exposedPorts') && null !== $object->getExposedPorts()) {
262-
$values = [];
262+
$values = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
263263
foreach ($object->getExposedPorts() as $key => $value) {
264-
$values[$key] = $this->normalizer->normalize($value, 'json', $context);
264+
$values[$key] = null === $value ? null : new \ArrayObject($this->normalizer->normalize($value, 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
265265
}
266266
$data['ExposedPorts'] = $values;
267267
}
@@ -289,7 +289,7 @@ public function normalize($object, $format = null, array $context = [])
289289
$data['Cmd'] = $values_2;
290290
}
291291
if ($object->isInitialized('healthcheck') && null !== $object->getHealthcheck()) {
292-
$data['Healthcheck'] = $this->normalizer->normalize($object->getHealthcheck(), 'json', $context);
292+
$data['Healthcheck'] = null === $object->getHealthcheck() ? null : new \ArrayObject($this->normalizer->normalize($object->getHealthcheck(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
293293
}
294294
if ($object->isInitialized('argsEscaped') && null !== $object->getArgsEscaped()) {
295295
$data['ArgsEscaped'] = $object->getArgsEscaped();
@@ -298,9 +298,9 @@ public function normalize($object, $format = null, array $context = [])
298298
$data['Image'] = $object->getImage();
299299
}
300300
if ($object->isInitialized('volumes') && null !== $object->getVolumes()) {
301-
$values_3 = [];
301+
$values_3 = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
302302
foreach ($object->getVolumes() as $key_1 => $value_3) {
303-
$values_3[$key_1] = $this->normalizer->normalize($value_3, 'json', $context);
303+
$values_3[$key_1] = null === $value_3 ? null : new \ArrayObject($this->normalizer->normalize($value_3, 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
304304
}
305305
$data['Volumes'] = $values_3;
306306
}
@@ -328,7 +328,7 @@ public function normalize($object, $format = null, array $context = [])
328328
$data['OnBuild'] = $values_5;
329329
}
330330
if ($object->isInitialized('labels') && null !== $object->getLabels()) {
331-
$values_6 = [];
331+
$values_6 = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
332332
foreach ($object->getLabels() as $key_2 => $value_6) {
333333
$values_6[$key_2] = $value_6;
334334
}

‎src/Normalizer/ContainerStateNormalizer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public function normalize($object, $format = null, array $context = [])
164164
$data['FinishedAt'] = $object->getFinishedAt();
165165
}
166166
if ($object->isInitialized('health') && null !== $object->getHealth()) {
167-
$data['Health'] = $this->normalizer->normalize($object->getHealth(), 'json', $context);
167+
$data['Health'] = null === $object->getHealth() ? null : new \ArrayObject($this->normalizer->normalize($object->getHealth(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
168168
}
169169
foreach ($object as $key => $value) {
170170
if (preg_match('/.*/', (string) $key)) {

‎src/Normalizer/ContainerSummaryItemNetworkSettingsNormalizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public function normalize($object, $format = null, array $context = [])
6969
{
7070
$data = [];
7171
if ($object->isInitialized('networks') && null !== $object->getNetworks()) {
72-
$values = [];
72+
$values = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
7373
foreach ($object->getNetworks() as $key => $value) {
74-
$values[$key] = $this->normalizer->normalize($value, 'json', $context);
74+
$values[$key] = null === $value ? null : new \ArrayObject($this->normalizer->normalize($value, 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
7575
}
7676
$data['Networks'] = $values;
7777
}

‎src/Normalizer/ContainerSummaryItemNormalizer.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function normalize($object, $format = null, array $context = [])
189189
if ($object->isInitialized('ports') && null !== $object->getPorts()) {
190190
$values_1 = [];
191191
foreach ($object->getPorts() as $value_1) {
192-
$values_1[] = $this->normalizer->normalize($value_1, 'json', $context);
192+
$values_1[] = null === $value_1 ? null : new \ArrayObject($this->normalizer->normalize($value_1, 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
193193
}
194194
$data['Ports'] = $values_1;
195195
}
@@ -200,7 +200,7 @@ public function normalize($object, $format = null, array $context = [])
200200
$data['SizeRootFs'] = $object->getSizeRootFs();
201201
}
202202
if ($object->isInitialized('labels') && null !== $object->getLabels()) {
203-
$values_2 = [];
203+
$values_2 = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
204204
foreach ($object->getLabels() as $key => $value_2) {
205205
$values_2[$key] = $value_2;
206206
}
@@ -213,15 +213,15 @@ public function normalize($object, $format = null, array $context = [])
213213
$data['Status'] = $object->getStatus();
214214
}
215215
if ($object->isInitialized('hostConfig') && null !== $object->getHostConfig()) {
216-
$data['HostConfig'] = $this->normalizer->normalize($object->getHostConfig(), 'json', $context);
216+
$data['HostConfig'] = null === $object->getHostConfig() ? null : new \ArrayObject($this->normalizer->normalize($object->getHostConfig(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
217217
}
218218
if ($object->isInitialized('networkSettings') && null !== $object->getNetworkSettings()) {
219-
$data['NetworkSettings'] = $this->normalizer->normalize($object->getNetworkSettings(), 'json', $context);
219+
$data['NetworkSettings'] = null === $object->getNetworkSettings() ? null : new \ArrayObject($this->normalizer->normalize($object->getNetworkSettings(), 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
220220
}
221221
if ($object->isInitialized('mounts') && null !== $object->getMounts()) {
222222
$values_3 = [];
223223
foreach ($object->getMounts() as $value_3) {
224-
$values_3[] = $this->normalizer->normalize($value_3, 'json', $context);
224+
$values_3[] = null === $value_3 ? null : new \ArrayObject($this->normalizer->normalize($value_3, 'json', $context), \ArrayObject::ARRAY_AS_PROPS);
225225
}
226226
$data['Mounts'] = $values_3;
227227
}

0 commit comments

Comments
 (0)