Skip to content

Commit 22d4bac

Browse files
abnegateabnegate
committed
Merge remote-tracking branch 'origin/master' into fix-php
2 parents c74007f + b1cd382 commit 22d4bac

File tree

25 files changed

+617
-324
lines changed

25 files changed

+617
-324
lines changed

‎composer.lock

Lines changed: 43 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function getSSLPage($url) {
6969
->setTwitter('appwrite_io')
7070
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
7171
->setDefaultHeaders([
72-
'X-Appwrite-Response-Format' => '1.5.0',
72+
'X-Appwrite-Response-Format' => '1.6.0',
7373
])
7474
;
7575

@@ -94,7 +94,7 @@ function getSSLPage($url) {
9494
->setTwitter('appwrite_io')
9595
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
9696
->setDefaultHeaders([
97-
'X-Appwrite-Response-Format' => '1.5.0',
97+
'X-Appwrite-Response-Format' => '1.6.0',
9898
])
9999
;
100100

@@ -118,7 +118,7 @@ function getSSLPage($url) {
118118
->setTwitter('appwrite_io')
119119
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
120120
->setDefaultHeaders([
121-
'X-Appwrite-Response-Format' => '1.5.0',
121+
'X-Appwrite-Response-Format' => '1.6.0',
122122
])
123123
;
124124

@@ -141,7 +141,7 @@ function getSSLPage($url) {
141141
->setTwitter('appwrite_io')
142142
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
143143
->setDefaultHeaders([
144-
'X-Appwrite-Response-Format' => '1.5.0',
144+
'X-Appwrite-Response-Format' => '1.6.0',
145145
])
146146
;
147147

@@ -186,7 +186,7 @@ function getSSLPage($url) {
186186
->setTwitter('appwrite_io')
187187
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
188188
->setDefaultHeaders([
189-
'X-Appwrite-Response-Format' => '1.5.0',
189+
'X-Appwrite-Response-Format' => '1.6.0',
190190
])
191191
;
192192

@@ -209,7 +209,7 @@ function getSSLPage($url) {
209209
->setTwitter('appwrite_io')
210210
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
211211
->setDefaultHeaders([
212-
'X-Appwrite-Response-Format' => '1.5.0',
212+
'X-Appwrite-Response-Format' => '1.6.0',
213213
])
214214
;
215215

@@ -232,7 +232,7 @@ function getSSLPage($url) {
232232
->setTwitter('appwrite_io')
233233
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
234234
->setDefaultHeaders([
235-
'X-Appwrite-Response-Format' => '1.5.0',
235+
'X-Appwrite-Response-Format' => '1.6.0',
236236
])
237237
;
238238

@@ -260,7 +260,7 @@ function getSSLPage($url) {
260260
->setTwitter('appwrite_io')
261261
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
262262
->setDefaultHeaders([
263-
'X-Appwrite-Response-Format' => '1.5.0',
263+
'X-Appwrite-Response-Format' => '1.6.0',
264264
])
265265
;
266266

@@ -287,7 +287,7 @@ function getSSLPage($url) {
287287
->setTwitter('appwrite_io')
288288
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
289289
->setDefaultHeaders([
290-
'X-Appwrite-Response-Format' => '1.5.0',
290+
'X-Appwrite-Response-Format' => '1.6.0',
291291
])
292292
;
293293

@@ -314,7 +314,7 @@ function getSSLPage($url) {
314314
->setTwitter('appwrite_io')
315315
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
316316
->setDefaultHeaders([
317-
'X-Appwrite-Response-Format' => '1.5.0',
317+
'X-Appwrite-Response-Format' => '1.6.0',
318318
])
319319
;
320320

@@ -339,7 +339,7 @@ function getSSLPage($url) {
339339
->setTwitter('appwrite_io')
340340
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
341341
->setDefaultHeaders([
342-
'X-Appwrite-Response-Format' => '1.5.0',
342+
'X-Appwrite-Response-Format' => '1.6.0',
343343
])
344344
;
345345

@@ -364,7 +364,7 @@ function getSSLPage($url) {
364364
->setTwitter('appwrite_io')
365365
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
366366
->setDefaultHeaders([
367-
'X-Appwrite-Response-Format' => '1.5.0',
367+
'X-Appwrite-Response-Format' => '1.6.0',
368368
])
369369
;
370370

@@ -388,7 +388,7 @@ function getSSLPage($url) {
388388
->setTwitter('appwrite_io')
389389
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
390390
->setDefaultHeaders([
391-
'X-Appwrite-Response-Format' => '1.5.0',
391+
'X-Appwrite-Response-Format' => '1.6.0',
392392
])
393393
;
394394

@@ -412,7 +412,7 @@ function getSSLPage($url) {
412412
->setTwitter('appwrite_io')
413413
->setDiscord('564160730845151244', 'https://appwrite.io/discord')
414414
->setDefaultHeaders([
415-
'X-Appwrite-Response-Format' => '1.5.0',
415+
'X-Appwrite-Response-Format' => '1.6.0',
416416
])
417417
;
418418

‎src/SDK/Language/CLI.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Appwrite\SDK\Language;
44

5+
use Twig\TwigFilter;
56
use Twig\TwigFunction;
67

78
class CLI extends Node
@@ -364,6 +365,14 @@ public function getParamExample(array $param): string
364365
return $output;
365366
}
366367

368+
public function getFilters(): array
369+
{
370+
return array_merge(parent::getFilters(), [
371+
new TwigFilter('caseKebab', function ($value) {
372+
return strtolower(preg_replace('/(?<!^)([A-Z][a-z]|(?<=[a-z])[^a-z]|(?<=[A-Z])[0-9_])/', '-$1', $value));
373+
})
374+
]);
375+
}
367376
/**
368377
* Language specific filters.
369378
* @return array

‎templates/cli/base/requests/api.twig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@
2424
);
2525
} else {
2626
parse(response)
27-
success()
2827
}
2928
{%~ else %}
3029
parse(response)
31-
success()
3230
{%~ endif %}
3331
}
3432

‎templates/cli/base/requests/file.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107

108108
if (parseOutput) {
109109
parse(response)
110-
success()
111110
}
112111

113112
return response;

‎templates/cli/index.js.twig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ program
3030
.description(commandDescriptions['main'])
3131
.configureHelp({
3232
helpWidth: process.stdout.columns || 80,
33-
sortSubcommands: true
33+
sortSubcommands: true,
3434
})
35-
.version(version, "-v, --version")
35+
.helpOption('-h, --help', "Display help for command")
36+
.version(version, "-v, --version", "Output the version number")
3637
.option("-V, --verbose", "Show complete error log")
3738
.option("-j, --json", "Output in JSON format")
3839
.hook('preAction', migrate)
3940
.option("-f,--force", "Flag to confirm all warnings")
4041
.option("-a,--all", "Flag to push all resources")
41-
.option("--id [id...]", "Flag to pass list of ids for a giving action")
42+
.option("--id [id...]", "Flag to pass a list of ids for a given action")
4243
.option("--report", "Enable reporting in case of CLI errors")
4344
.on("option:json", () => {
4445
cliConfig.json = true;

0 commit comments

Comments
 (0)