Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-database-indexing' into feat-quest-filters

Browse Source
This commit is contained in:
Matej Baco
2022-01-03 10:52:35 +01:00
parent 35a665b2d7 a071cae7f0
commit df97b67c6d
53 changed files with 747 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Specification/Format/OpenAPI3.php
+8 -1
View File
@@ -396,7 +396,14 @@ class OpenAPI3 extends Format
foreach ($this->models as $model) {
foreach ($model->getRules() as $rule) {
if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
$usedModels[] = $rule['type'];
if(\is_array($rule['type'])) {
foreach ($rule['type'] as $value) {
$usedModels[] = $value;
}
}
else {
$usedModels[] = $rule['type'];
}
}
}
}
src/Appwrite/Specification/Format/Swagger2.php
+12 -5
View File
@@ -198,7 +198,7 @@ class Swagger2 extends Format
$temp['responses'][(string)$route->getLabel('sdk.response.code', '500')] = [
'description' => $modelDescription,
'schema' => [
'oneOf' => \array_map(function($m) {
'x-oneOf' => \array_map(function($m) {
return ['$ref' => '#/definitions/'.$m->getType()];
}, $model)
],
@@ -393,7 +393,14 @@ class Swagger2 extends Format
foreach ($this->models as $model) {
foreach ($model->getRules() as $rule) {
if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
$usedModels[] = $rule['type'];
if(\is_array($rule['type'])) {
foreach ($rule['type'] as $value) {
$usedModels[] = $value;
}
}
else {
$usedModels[] = $rule['type'];
}
}
}
}
@@ -460,13 +467,13 @@ class Swagger2 extends Format
if(\is_array($rule['type'])) {
if($rule['array']) {
$items = [
'anyOf' => \array_map(function($type) {
'x-anyOf' => \array_map(function($type) {
return ['$ref' => '#/definitions/'.$type];
}, $rule['type'])
];
} else {
$items = [
'oneOf' => \array_map(function($type) {
'x-oneOf' => \array_map(function($type) {
return ['$ref' => '#/definitions/'.$type];
}, $rule['type'])
];
@@ -514,7 +521,7 @@ class Swagger2 extends Format
}
}
if (!in_array($name, $required)) {
$output['definitions'][$model->getType()]['properties'][$name]['nullable'] = true;
$output['definitions'][$model->getType()]['properties'][$name]['x-nullable'] = true;
}
}
}