Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa

src/Appwrite/Auth/Phrase.php

@@ -2,7 +2,7 @@
 
 namespace Appwrite\Auth;
 
-class SecurityPhrase
+class Phrase
 {
     public static function generate(): string
     {

src/Appwrite/Messaging/Status.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Enum;
+namespace Appwrite\Messaging;
 
-class MessageStatus
+class Status
 {
     /**
      * Message that is not ready to be sent

src/Appwrite/Platform/Workers/Messaging.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Workers;
 
-use Appwrite\Enum\MessageStatus;
 use Appwrite\Extend\Exception;
+use Appwrite\Messaging\Status as MessageStatus;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Database\Helpers\ID;

src/Appwrite/Platform/Workers/Webhooks.php

@@ -16,7 +16,6 @@ use Utopia\Queue\Message;
 class Webhooks extends Action
 {
     private array $errors = [];
-    private const MAX_FAILED_ATTEMPTS = 10;
     private const MAX_FILE_SIZE = 5242880; // 5 MB
 
     public static function getName(): string
@@ -157,7 +156,7 @@ class Webhooks extends Action
 
             $webhook->setAttribute('logs', $logs);
 
-            if ($attempts >= self::MAX_FAILED_ATTEMPTS) {
+            if ($attempts >= \intval(App::getEnv('_APP_WEBHOOK_MAX_FAILED_ATTEMPTS', '10'))) {
                 $webhook->setAttribute('enabled', false);
                 $this->sendEmailAlert($attempts, $statusCode, $webhook, $project, $dbForConsole, $queueForMails);
             }

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

@@ -40,7 +40,7 @@ class Token extends Model
                 'default' => '',
                 'example' => self::TYPE_DATETIME_EXAMPLE,
             ])
-            ->addRule('securityPhrase', [
+            ->addRule('phrase', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Security phrase of a token. Empty if security phrase was not requested when creating a token. It includes randomly generated phrase which is also sent in the external resource such as email.',
                 'default' => '',