Merge remote-tracking branch 'origin/master' into fix-php

appwrite · Aug 7, 2024 · 22d4bac · 22d4bac
2 parents c74007f + b1cd382
commit 22d4bac
Show file tree

Hide file tree

Showing 25 changed files with 617 additions and 324 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/example.php b/example.php
@@ -69,7 +69,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -94,7 +94,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -118,7 +118,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -141,7 +141,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -186,7 +186,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -209,7 +209,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -232,7 +232,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -260,7 +260,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -287,7 +287,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -314,7 +314,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -339,7 +339,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -364,7 +364,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -388,7 +388,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 
@@ -412,7 +412,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.5.0',
+            'X-Appwrite-Response-Format' => '1.6.0',
         ])
     ;
 

diff --git a/src/SDK/Language/CLI.php b/src/SDK/Language/CLI.php
@@ -2,6 +2,7 @@
 
 namespace Appwrite\SDK\Language;
 
+use Twig\TwigFilter;
 use Twig\TwigFunction;
 
 class CLI extends Node
@@ -364,6 +365,14 @@ public function getParamExample(array $param): string
         return $output;
     }
 
+    public function getFilters(): array
+    {
+        return array_merge(parent::getFilters(), [
+            new TwigFilter('caseKebab', function ($value) {
+                return strtolower(preg_replace('/(?<!^)([A-Z][a-z]|(?<=[a-z])[^a-z]|(?<=[A-Z])[0-9_])/', '-$1', $value));
+            })
+        ]);
+    }
     /**
      * Language specific filters.
      * @return array

diff --git a/templates/cli/base/requests/api.twig b/templates/cli/base/requests/api.twig
@@ -24,11 +24,9 @@
             );
          } else {
             parse(response)
-            success()
         }
     {%~ else %}
         parse(response)
-        success()
     {%~ endif %}
     }
 

diff --git a/templates/cli/base/requests/file.twig b/templates/cli/base/requests/file.twig
@@ -107,7 +107,6 @@
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

diff --git a/templates/cli/index.js.twig b/templates/cli/index.js.twig
@@ -30,15 +30,16 @@ program
   .description(commandDescriptions['main'])
   .configureHelp({
     helpWidth: process.stdout.columns || 80,
-    sortSubcommands: true
+    sortSubcommands: true,
   })
-  .version(version, "-v, --version")
+  .helpOption('-h, --help', "Display help for command")
+  .version(version, "-v, --version", "Output the version number")
   .option("-V, --verbose", "Show complete error log")
   .option("-j, --json", "Output in JSON format")
   .hook('preAction', migrate)
   .option("-f,--force", "Flag to confirm all warnings")
   .option("-a,--all", "Flag to push all resources")
-  .option("--id [id...]", "Flag to pass list of ids for a giving action")
+  .option("--id [id...]", "Flag to pass a list of ids for a given action")
   .option("--report", "Enable reporting in case of CLI errors")
   .on("option:json", () => {
     cliConfig.json = true;