Merge branch '1.6.x' of github.com:appwrite/appwrite into update-rules-fetching

app/config/errors.php

@@ -686,7 +686,7 @@ return [
     ],
     Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
         'name' => Exception::ATTRIBUTE_LIMIT_EXCEEDED,
-        'description' => 'The maximum number or size of attributes for this collection has been reached.',
+        'description' => 'The maximum number of attributes has been reached.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_VALUE_INVALID => [

app/controllers/api/databases.php

@@ -153,7 +153,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
     } catch (DuplicateException) {
         throw new Exception(Exception::ATTRIBUTE_ALREADY_EXISTS);
     } catch (LimitException) {
-        throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
+        throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED, 'Attribute limit exceeded');
     } catch (\Throwable $e) {
         $dbForProject->purgeCachedDocument('database_' . $db->getInternalId(), $collectionId);
         $dbForProject->purgeCachedCollection('database_' . $db->getInternalId() . '_collection_' . $collection->getInternalId());
@@ -197,7 +197,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
             throw new Exception(Exception::ATTRIBUTE_ALREADY_EXISTS);
         } catch (LimitException) {
             $dbForProject->deleteDocument('attributes', $attribute->getId());
-            throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
+            throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED, 'Attribute limit exceeded');
         } catch (\Throwable $e) {
             $dbForProject->purgeCachedDocument('database_' . $db->getInternalId(), $relatedCollection->getId());
             $dbForProject->purgeCachedCollection('database_' . $db->getInternalId() . '_collection_' . $relatedCollection->getInternalId());
@@ -393,8 +393,6 @@ function updateAttribute(
             throw new Exception(Exception::ATTRIBUTE_INVALID_RESIZE);
         } catch (NotFoundException) {
             throw new Exception(Exception::ATTRIBUTE_NOT_FOUND);
-        } catch (LimitException) {
-            throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
         }
     }
 

composer.lock

@@ -6923,16 +6923,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.14.2",
+            "version": "v3.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a"
+                "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
-                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/f405356d20fb43603bcadc8b09bfb676cb04a379",
+                "reference": "f405356d20fb43603bcadc8b09bfb676cb04a379",
                 "shasum": ""
             },
             "require": {
@@ -6986,7 +6986,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.14.2"
+                "source": "https://github.com/twigphp/Twig/tree/v3.14.1"
             },
             "funding": [
                 {
@@ -6998,7 +6998,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-07T12:36:22+00:00"
+            "time": "2024-11-06T18:17:38+00:00"
         },
         {
             "name": "webmozart/glob",

src/Appwrite/Event/Audit.php

@@ -121,6 +121,10 @@ class Audit extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Build.php

@@ -112,6 +112,10 @@ class Build extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Certificate.php

@@ -74,6 +74,10 @@ class Certificate extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Database.php

@@ -108,6 +108,10 @@ class Database extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         try {
             $dsn = new DSN($this->getProject()->getAttribute('database'));
         } catch (\InvalidArgumentException) {

src/Appwrite/Event/Delete.php

@@ -140,6 +140,10 @@ class Delete extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Event.php

@@ -65,6 +65,24 @@ class Event
     {
     }
 
+    /**
+     * Set paused state for this event.
+     */
+    public function setPaused(bool $paused): self
+    {
+        $this->paused = $paused;
+
+        return $this;
+    }
+
+    /**
+     * Get paused state for this event.
+     */
+    public function getPaused(): bool
+    {
+        return $this->paused;
+    }
+
     /**
      * Set queue used for this event.
      *
@@ -302,6 +320,10 @@ class Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Func.php

@@ -213,6 +213,10 @@ class Func extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         $events = $this->getEvent() ? Event::generateEvents($this->getEvent(), $this->getParams()) : null;

src/Appwrite/Event/Mail.php

@@ -404,6 +404,10 @@ class Mail extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Messaging.php

@@ -182,6 +182,10 @@ class Messaging extends Event
      */
     public function trigger(): string | bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

src/Appwrite/Event/Migration.php

@@ -75,6 +75,9 @@ class Migration extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
 
         $client = new Client($this->queue, $this->connection);
 

src/Appwrite/Event/Realtime.php

@@ -32,7 +32,7 @@ class Realtime extends Event
      */
     public function trigger(): string|bool
     {
-        if (empty($this->event)) {
+        if ($this->paused || empty($this->event)) {
             return false;
         }
 

src/Appwrite/Event/Usage.php

@@ -57,6 +57,10 @@ class Usage extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
         return $client->enqueue([
             'project' => $this->getProject(),

src/Appwrite/Event/UsageDump.php

@@ -38,6 +38,10 @@ class UsageDump extends Event
      */
     public function trigger(): string|bool
     {
+        if ($this->paused) {
+            return false;
+        }
+
         $client = new Client($this->queue, $this->connection);
 
         return $client->enqueue([

tests/e2e/Services/Databases/DatabasesCustomServerTest.php

@@ -1362,7 +1362,7 @@ class DatabasesCustomServerTest extends Scope
         ]);
 
         $this->assertEquals(400, $tooWide['headers']['status-code']);
-        $this->assertEquals('attribute_limit_exceeded', $tooWide['body']['type']);
+        $this->assertEquals('Attribute limit exceeded', $tooWide['body']['message']);
     }
 
     public function testIndexLimitException()