Merge remote-tracking branch 'origin/master' into refactor-kt-android-test-names

Author: abnegate

.travis.yml

@@ -12,7 +12,7 @@ os: linux
 language: php
 
 php:
-  - 8.0
+  - 8.1
 
 env:
   - SDK=Android11Java8

composer.lock

@@ -74,4 +74,13 @@ public function getParams()
     {
         return $this->params;
     }
+
+    /**
+     * Language specific filters.
+     * @return array 
+     */
+    public function getFilters(): array
+    {
+        return [];
+    }
 }

specs/swagger-appwrite-0.12.0.json

@@ -131,6 +131,11 @@ public function getFiles()
                 'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/json/PreciseNumberAdapter.kt',
                 'template'      => '/android/library/src/main/java/io/appwrite/json/PreciseNumberAdapter.kt.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/models/InputFile.kt',
+                'template'      => '/android/library/src/main/java/io/appwrite/models/InputFile.kt.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/models/RealtimeModels.kt',

specs/swagger-appwrite.0.12.0.json

@@ -158,6 +158,12 @@ public function getFiles()
                 'template'      => 'cli/lib/client.js.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/utils.js',
+                'template'      => 'cli/lib/utils.js.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/commands/init.js',

specs/swagger2-latest-console.json

@@ -3,6 +3,7 @@
 namespace Appwrite\SDK\Language;
 
 use Appwrite\SDK\Language;
+use Twig\TwigFilter;
 
 class Dart extends Language {
 
@@ -111,7 +112,7 @@ public function getKeywords()
      */
     public function getIdentifierOverrides()
     {
-        return ['Function' => 'Func'];
+        return ['Function' => 'Func', 'default' => 'xdefault', 'required' => 'xrequired', 'async' => 'xasync'];
     }
 
     /**
@@ -420,18 +421,19 @@ public function getFiles()
                 'template'      => 'dart/lib/src/input_file.dart.twig',
                 'minify'        => false,
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'lib/src/chunked_upload_io.dart',
-                'template'      => 'dart/lib/src/chunked_upload_io.dart.twig',
-                'minify'        => false,
-            ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'lib/src/chunked_upload_stub.dart',
-                'template'      => 'dart/lib/src/chunked_upload_stub.dart.twig',
-                'minify'        => false,
-            ],
+        ];
+    }
+
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('dartComment', function ($value) {
+                $value = explode("\n", $value);
+                foreach ($value as $key => $line) {
+                    $value[$key] = "     /// " . wordwrap($value[$key], 75, "\n     /// ");
+                }
+                return implode("\n", $value);
+            }, ['is_safe' => ['html']]),
         ];
     }
 }

src/SDK/Language.php

@@ -36,6 +36,12 @@ public function getFiles()
                 'template'      => 'deno/src/query.ts.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'src/inputFile.ts',
+                'template'      => 'deno/src/inputFile.ts.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/src/service.ts',
@@ -101,7 +107,7 @@ public function getTypeName($type)
                 return 'string';
             break;
             case self::TYPE_FILE:
-                return 'string';
+                return 'InputFile';
             break;
             case self::TYPE_BOOLEAN:
                 return 'boolean';
@@ -145,7 +151,7 @@ public function getParamExample(array $param)
                     $output .= '{}';
                     break;
                 case self::TYPE_FILE:
-                    $output .= "new File([fileBlob], 'file.png')";
+                    $output .= "'file.png'";
                     break;
             }
         }
@@ -164,7 +170,7 @@ public function getParamExample(array $param)
                     $output .= "'{$example}'";
                     break;
                 case self::TYPE_FILE:
-                    $output .= "new File([fileBlob], 'file.png')";
+                    $output .= "'file.png'";
                     break;
             }
         }