Skip to content

Commit 06b3580

Browse files
Merge pull request #41045 from nextcloud/fix/openapi/provisioning_api/quota-fields
fix(provisioning_api): Fix quota fields in OpenAPI
2 parents 6114364 + d019392 commit 06b3580

File tree

2 files changed

+44
-12
lines changed

2 files changed

+44
-12
lines changed

apps/provisioning_api/lib/ResponseDefinitions.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
/**
2929
* @psalm-type ProvisioningApiUserDetailsQuota = array{
30-
* free?: float,
30+
* free?: float|int,
3131
* quota?: float|int|string,
32-
* relative?: float,
33-
* total?: float,
34-
* used?: float,
32+
* relative?: float|int,
33+
* total?: float|int,
34+
* used?: float|int,
3535
* }
3636
*
3737
* @psalm-type ProvisioningApiUserDetails = array{

apps/provisioning_api/openapi.json

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,16 @@
507507
"type": "object",
508508
"properties": {
509509
"free": {
510-
"type": "number",
511-
"format": "float"
510+
"oneOf": [
511+
{
512+
"type": "number",
513+
"format": "float"
514+
},
515+
{
516+
"type": "integer",
517+
"format": "int64"
518+
}
519+
]
512520
},
513521
"quota": {
514522
"oneOf": [
@@ -526,16 +534,40 @@
526534
]
527535
},
528536
"relative": {
529-
"type": "number",
530-
"format": "float"
537+
"oneOf": [
538+
{
539+
"type": "number",
540+
"format": "float"
541+
},
542+
{
543+
"type": "integer",
544+
"format": "int64"
545+
}
546+
]
531547
},
532548
"total": {
533-
"type": "number",
534-
"format": "float"
549+
"oneOf": [
550+
{
551+
"type": "number",
552+
"format": "float"
553+
},
554+
{
555+
"type": "integer",
556+
"format": "int64"
557+
}
558+
]
535559
},
536560
"used": {
537-
"type": "number",
538-
"format": "float"
561+
"oneOf": [
562+
{
563+
"type": "number",
564+
"format": "float"
565+
},
566+
{
567+
"type": "integer",
568+
"format": "int64"
569+
}
570+
]
539571
}
540572
}
541573
}

0 commit comments

Comments
 (0)