Skip to content

Commit b0d9a63

Browse files
abnegateabnegate
committed
Fix array type checks
1 parent df4c5d6 commit b0d9a63

File tree

9 files changed

+16
-24
lines changed

9 files changed

+16
-24
lines changed

‎src/SDK/Language/Dart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function getTypeName(array $parameter): string
143143
case self::TYPE_BOOLEAN:
144144
return 'bool';
145145
case self::TYPE_ARRAY:
146-
if (!empty($parameter['array']['type'])) {
146+
if (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type'])) {
147147
return 'List<' . $this->getTypeName($parameter['array']) . '>';
148148
}
149149
return 'List';

‎src/SDK/Language/Deno.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function getTypeName(array $parameter): string
118118
self::TYPE_STRING => 'string',
119119
self::TYPE_FILE => 'InputFile',
120120
self::TYPE_BOOLEAN => 'boolean',
121-
self::TYPE_ARRAY => $parameter['array']['type']
121+
self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
122122
? $this->getTypeName($parameter['array']) . '[]'
123123
: 'string[]',
124124
self::TYPE_OBJECT => 'object',

‎src/SDK/Language/DotNet.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function getTypeName(array $parameter): string
163163
self::TYPE_STRING => 'string',
164164
self::TYPE_BOOLEAN => 'bool',
165165
self::TYPE_FILE => 'InputFile',
166-
self::TYPE_ARRAY => $parameter['array']['type']
166+
self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
167167
? 'List<' . $this->getTypeName($parameter['array']) . '>'
168168
: 'List<object>',
169169
self::TYPE_OBJECT => 'object',
@@ -401,7 +401,7 @@ public function getFiles(): array
401401
[
402402
'scope' => 'enum',
403403
'destination' => '/src/{{ spec.title | caseUcfirst }}/Enums/{{ enum.name | caseUcfirst | overrideIdentifier }}.cs',
404-
'template' => 'dotnet/src/Appwrite/Enums/Enums.cs.twig',
404+
'template' => 'dotnet/src/Appwrite/Enums/Enum.cs.twig',
405405
]
406406
];
407407
}

‎src/SDK/Language/GraphQL.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function getTypeName(array $parameter): string
3434
$type = 'Bool';
3535
break;
3636
case self::TYPE_ARRAY:
37-
if (!empty($parameter['array']['type'])) {
37+
if (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type'])) {
3838
$type = '[' . $this->getTypeName($parameter['array']) . ']';
3939
break;
4040
}

‎src/SDK/Language/JS.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function getTypeName(array $parameter): string
136136
case self::TYPE_NUMBER:
137137
return 'number';
138138
case self::TYPE_ARRAY:
139-
if (!empty($parameter['array']['type'])) {
139+
if (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type'])) {
140140
return $this->getTypeName($parameter['array']) . '[]';
141141
}
142142
return 'string[]';

‎src/SDK/Language/Kotlin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function getTypeName(array $parameter): string
117117
self::TYPE_STRING => 'String',
118118
self::TYPE_FILE => 'InputFile',
119119
self::TYPE_BOOLEAN => 'Boolean',
120-
self::TYPE_ARRAY => $parameter['array']['type']
120+
self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
121121
? 'List<' . $this->getTypeName($parameter['array']) . '>'
122122
: 'List<Any>',
123123
self::TYPE_OBJECT => 'Any',

‎src/SDK/Language/Node.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,11 @@ public function getTypeName(array $parameter): string
3232
self::TYPE_FILE => 'InputFile',
3333
self::TYPE_BOOLEAN => 'boolean',
3434
self::TYPE_OBJECT => 'object',
35-
self::TYPE_ARRAY => $parameter['array']['type']
35+
self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
3636
? $this->getTypeName($parameter['array']) . '[]'
3737
: 'string[]',
3838
default => $parameter['type'],
3939
};
40-
switch ($parameter['type']) {
41-
case self::TYPE_INTEGER:
42-
case self::TYPE_NUMBER:
43-
return 'number';
44-
case self::TYPE_ARRAY:
45-
if (!empty($parameter['array']['type'])) {
46-
return $this->getTypeName($parameter['array']) . '[]';
47-
}
48-
return 'string[]';
49-
case self::TYPE_FILE:
50-
return 'InputFile';
51-
default:
52-
return $parameter['type'];
53-
}
5440
}
5541

5642
/**

‎src/SDK/Language/Swift.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public function getTypeName(array $parameter): string
312312
self::TYPE_STRING => 'String',
313313
self::TYPE_FILE => 'InputFile',
314314
self::TYPE_BOOLEAN => 'Bool',
315-
self::TYPE_ARRAY => $parameter['array']['type']
315+
self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
316316
? '[' . $this->getTypeName($parameter['array']) . ']'
317317
: '[Any]',
318318
self::TYPE_OBJECT => 'Any',
@@ -460,6 +460,12 @@ public function getFilters(): array
460460
new TwigFilter('hasGenericType', function (string $model, array $spec) {
461461
return $this->hasGenericType($model, $spec);
462462
}),
463+
new TwigFilter('escapeSwiftKeyword', function ($value) {
464+
if (in_array($value, $this->getKeywords())) {
465+
return "`{$value}`";
466+
}
467+
return $value;
468+
}),
463469
];
464470
}
465471

‎src/SDK/Language/Web.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public function getTypeName(array $parameter, array $method = []): string
190190
case self::TYPE_NUMBER:
191191
return 'number';
192192
case self::TYPE_ARRAY:
193-
if (!empty($parameter['array']['type'])) {
193+
if (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type'])) {
194194
return $this->getTypeName($parameter['array']) . '[]';
195195
}
196196
return 'string[]';

0 commit comments

Comments
 (0)