Merge pull request #8356 from appwrite/chore-16x-specs

Chores: Update specs

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = 4.3.5
+	branch = 1.6.x

app/console

@@ -1 +1 @@
-Subproject commit f483d9631d6f21e94aedb20b5c37c56fea06c23e
+Subproject commit f978cecfafe55e85fcd20fe90fc020e78a7c7952

app/init.php

@@ -62,6 +62,10 @@ use Utopia\Database\Validator\Structure;
 use Utopia\Domains\Validator\PublicDomain;
 use Utopia\DSN\DSN;
 use Utopia\Locale\Locale;
+use Utopia\Logger\Adapter\AppSignal;
+use Utopia\Logger\Adapter\LogOwl;
+use Utopia\Logger\Adapter\Raygun;
+use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Pools\Group;
@@ -763,18 +767,14 @@ $register->set('logger', function () {
         throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
     }
 
-    // Old Sentry Format conversion. Fallback until the old syntax is completely deprecated.
-    if (str_contains($providerConfig, ';') && strtolower($providerName) == 'sentry') {
-        $configChunks = \explode(";", $providerConfig);
+    $adapter = match ($providerName) {
+        'sentry' => new Sentry($providerConfig['projectId'], $providerConfig['key'], $providerConfig['host']),
+        'logowl' => new LogOwl($providerConfig['ticket'], $providerConfig['host']),
+        'raygun' => new Raygun($providerConfig['key']),
+        'appsignal' => new AppSignal($providerConfig['key']),
+        default => throw new Exception('Provider "' . $providerName . '" not supported.')
+    };
 
-        $sentryKey = $configChunks[0];
-        $projectId = $configChunks[1];
-
-        $providerConfig = 'https://' . $sentryKey . '@sentry.io/' . $projectId;
-    }
-
-    $classname = '\\Utopia\\Logger\\Adapter\\' . \ucfirst($providerName);
-    $adapter = new $classname($providerConfig);
     return new Logger($adapter);
 });
 

composer.json

@@ -42,7 +42,7 @@
         "ext-openssl": "*",
         "ext-zlib": "*",
         "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.13.*",
+        "appwrite/php-runtimes": "0.14.*",
         "appwrite/php-clamav": "2.0.*",
         "utopia-php/abuse": "0.37.*",
         "utopia-php/analytics": "0.10.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "90c87617f6a2639e3c6c3a1920e7d7de",
+    "content-hash": "06f391b62842a79736fe3fe77ec82adf",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -156,16 +156,16 @@
         },
         {
             "name": "appwrite/php-runtimes",
-            "version": "0.13.5",
+            "version": "0.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/runtimes.git",
-                "reference": "ba24c3a163f1a1da6cd355db92def508d05e59f7"
+                "reference": "9bae5bebe7c7cb3e4bf3a05a1d36c9d6ce3a2d3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/ba24c3a163f1a1da6cd355db92def508d05e59f7",
-                "reference": "ba24c3a163f1a1da6cd355db92def508d05e59f7",
+                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/9bae5bebe7c7cb3e4bf3a05a1d36c9d6ce3a2d3e",
+                "reference": "9bae5bebe7c7cb3e4bf3a05a1d36c9d6ce3a2d3e",
                 "shasum": ""
             },
             "require": {
@@ -173,8 +173,9 @@
                 "utopia-php/system": "0.8.*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "vimeo/psalm": "4.0.1"
+                "laravel/pint": "^1.15",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "autoload": {
@@ -204,9 +205,9 @@
             ],
             "support": {
                 "issues": "https://github.com/appwrite/runtimes/issues",
-                "source": "https://github.com/appwrite/runtimes/tree/0.13.5"
+                "source": "https://github.com/appwrite/runtimes/tree/0.14.0"
             },
-            "time": "2024-04-01T10:35:02+00:00"
+            "time": "2024-07-03T10:18:32+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -5615,5 +5616,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

docker-compose.yml

@@ -851,7 +851,7 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.6.0
+    image: openruntimes/executor:0.6.1
     restart: unless-stopped
     networks:
       - appwrite

src/Appwrite/Auth/Validator/MockNumber.php

@@ -76,6 +76,6 @@ class MockNumber extends Validator
      */
     public function getType(): string
     {
-        return self::TYPE_STRING;
+        return self::TYPE_OBJECT;
     }
 }

src/Appwrite/Platform/Tasks/Doctor.php

@@ -7,6 +7,7 @@ use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Domains\Domain;
+use Utopia\DSN\DSN;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Action;
 use Utopia\Registry\Registry;

src/Appwrite/Utopia/Response.php

@@ -271,7 +271,6 @@ class Response extends SwooleResponse
     public const MODEL_KEY = 'key';
     public const MODEL_KEY_LIST = 'keyList';
     public const MODEL_MOCK_NUMBER = 'mockNumber';
-    public const MODEL_MOCK_NUMBER_LIST = 'mockNumberList';
     public const MODEL_AUTH_PROVIDER = 'authProvider';
     public const MODEL_AUTH_PROVIDER_LIST = 'authProviderList';
     public const MODEL_PLATFORM = 'platform';
@@ -351,7 +350,6 @@ class Response extends SwooleResponse
             ->setModel(new BaseList('Projects List', self::MODEL_PROJECT_LIST, 'projects', self::MODEL_PROJECT, true, false))
             ->setModel(new BaseList('Webhooks List', self::MODEL_WEBHOOK_LIST, 'webhooks', self::MODEL_WEBHOOK, true, false))
             ->setModel(new BaseList('API Keys List', self::MODEL_KEY_LIST, 'keys', self::MODEL_KEY, true, false))
-            ->setModel(new BaseList('Mock Numbers List', self::MODEL_MOCK_NUMBER_LIST, 'numbers', self::MODEL_MOCK_NUMBER, true, false))
             ->setModel(new BaseList('Auth Providers List', self::MODEL_AUTH_PROVIDER_LIST, 'platforms', self::MODEL_AUTH_PROVIDER, true, false))
             ->setModel(new BaseList('Platforms List', self::MODEL_PLATFORM_LIST, 'platforms', self::MODEL_PLATFORM, true, false))
             ->setModel(new BaseList('Countries List', self::MODEL_COUNTRY_LIST, 'countries', self::MODEL_COUNTRY))

src/Appwrite/Utopia/Response/Model/Project.php

@@ -139,10 +139,11 @@ class Project extends Model
                 'example' => true,
             ])
             ->addRule('authMockNumbers', [
-                'type' => Response::MODEL_MOCK_NUMBER_LIST,
+                'type' => Response::MODEL_MOCK_NUMBER,
                 'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
                 'default' => [],
-                'example' => true,
+                'array' => true,
+                'example' => [new \stdClass()],
             ])
             ->addRule('authSessionAlerts', [
                 'type' => self::TYPE_BOOLEAN,