Merge branch '0.15.x' of https://github.com/appwrite/appwrite into feat-migration-0-15-x

Dockerfile

@@ -31,7 +31,7 @@ ENV DEBUG=$DEBUG
 
 ENV PHP_REDIS_VERSION=5.3.7 \
     PHP_MONGODB_VERSION=1.13.0 \
-    PHP_SWOOLE_VERSION=v4.8.9 \
+    PHP_SWOOLE_VERSION=v4.8.10 \
     PHP_IMAGICK_VERSION=3.7.0 \
     PHP_YAML_VERSION=2.2.2 \
     PHP_MAXMINDDB_VERSION=v1.11.0

app/config/services.php

@@ -65,6 +65,9 @@ return [
         'tests' => false,
         'optional' => true,
         'icon' => '/images/services/databases.png',
+        'globalAttributes' => [
+            'databaseId'
+        ]
     ],
     'locale' => [
         'key' => 'locale',

app/init.php

@@ -557,7 +557,7 @@ $register->set('smtp', function () {
     return $mail;
 });
 $register->set('geodb', function () {
-    return new Reader(__DIR__ . '/db/DBIP/dbip-country-lite-2022-03.mmdb');
+    return new Reader(__DIR__ . '/db/DBIP/dbip-country-lite-2022-06.mmdb');
 });
 $register->set('db', function () {
  // This is usually for our workers or CLI commands scope

app/tasks/specs.php

@@ -197,6 +197,7 @@ $cli
                     $services[] = [
                         'name' => $service['key'] ?? '',
                         'description' => $service['subtitle'] ?? '',
+                        'x-globalAttributes' => $service['globalAttributes'] ?? [],
                     ];
                 }
 

src/Appwrite/Specification/Format/OpenAPI3.php

@@ -263,6 +263,12 @@ class OpenAPI3 extends Format
                     'required' => !$param['optional'],
                 ];
 
+                foreach ($this->services as $service) {
+                    if ($route->getLabel('sdk.namespace', 'default') === $service['name'] && in_array($name, $service['x-globalAttributes'] ?? [])) {
+                        $node['x-global'] = true;
+                    }
+                }
+
                 switch ((!empty($validator)) ? \get_class($validator) : '') {
                     case 'Utopia\Validator\Text':
                         $node['schema']['type'] = $validator->getType();
@@ -390,6 +396,10 @@ class OpenAPI3 extends Format
                     if (\array_key_exists('items', $node['schema'])) {
                         $body['content'][$consumes[0]]['schema']['properties'][$name]['items'] = $node['schema']['items'];
                     }
+
+                    if ($node['x-global'] ?? false) {
+                        $body['content'][$consumes[0]]['schema']['properties'][$name]['x-global'] = true;
+                    }
                 }
 
                 $url = \str_replace(':' . $name, '{' . $name . '}', $url);

src/Appwrite/Specification/Format/Swagger2.php

@@ -252,6 +252,12 @@ class Swagger2 extends Format
                     'required' => !$param['optional'],
                 ];
 
+                foreach ($this->services as $service) {
+                    if ($route->getLabel('sdk.namespace', 'default') === $service['name'] && in_array($name, $service['x-globalAttributes'] ?? [])) {
+                        $node['x-global'] = true;
+                    }
+                }
+
                 switch ((!empty($validator)) ? \get_class($validator) : '') {
                     case 'Utopia\Validator\Text':
                         $node['type'] = $validator->getType();
@@ -378,6 +384,10 @@ class Swagger2 extends Format
                         'x-example' => $node['x-example'] ?? null,
                     ];
 
+                    if ($node['x-global'] ?? false) {
+                        $body['schema']['properties'][$name]['x-global'] = true;
+                    }
+
                     if (\array_key_exists('items', $node)) {
                         $body['schema']['properties'][$name]['items'] = $node['items'];
                     }