From 5cbbacaae574d65ba3fed18b20a17264c2eb69d6 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Fri, 1 May 2026 13:56:35 +1200
Subject: [PATCH] refactor(notifications): move adapters under
 Appwrite\Utopia\Messaging

Mirror the upstream Utopia\Messaging package namespace under the
Appwrite\Utopia\Messaging prefix, matching the convention used by
Appwrite\Utopia\Database and Appwrite\Utopia\Response.
---
 src/Appwrite/Platform/Workers/Notifications.php           | 8 ++++----
 src/Appwrite/{ => Utopia}/Messaging/Adapter/Console.php   | 4 ++--
 src/Appwrite/{ => Utopia}/Messaging/Adapter/Webhook.php   | 4 ++--
 src/Appwrite/{ => Utopia}/Messaging/Messages/Console.php  | 2 +-
 src/Appwrite/{ => Utopia}/Messaging/Messages/Webhook.php  | 2 +-
 tests/unit/{ => Utopia}/Messaging/Adapter/ConsoleTest.php | 8 ++++----
 tests/unit/{ => Utopia}/Messaging/Adapter/WebhookTest.php | 8 ++++----
 7 files changed, 18 insertions(+), 18 deletions(-)
 rename src/Appwrite/{ => Utopia}/Messaging/Adapter/Console.php (96%)
 rename src/Appwrite/{ => Utopia}/Messaging/Adapter/Webhook.php (96%)
 rename src/Appwrite/{ => Utopia}/Messaging/Messages/Console.php (96%)
 rename src/Appwrite/{ => Utopia}/Messaging/Messages/Webhook.php (96%)
 rename tests/unit/{ => Utopia}/Messaging/Adapter/ConsoleTest.php (94%)
 rename tests/unit/{ => Utopia}/Messaging/Adapter/WebhookTest.php (95%)

diff --git a/src/Appwrite/Platform/Workers/Notifications.php b/src/Appwrite/Platform/Workers/Notifications.php
index c50e61a323..5e86a8b021 100644
--- a/src/Appwrite/Platform/Workers/Notifications.php
+++ b/src/Appwrite/Platform/Workers/Notifications.php
@@ -2,11 +2,11 @@
 
 namespace Appwrite\Platform\Workers;
 
-use Appwrite\Messaging\Adapter\Console as ConsoleAdapter;
-use Appwrite\Messaging\Adapter\Webhook as WebhookAdapter;
-use Appwrite\Messaging\Messages\Console as ConsoleMessage;
-use Appwrite\Messaging\Messages\Webhook as WebhookMessage;
 use Appwrite\Template\Template;
+use Appwrite\Utopia\Messaging\Adapter\Console as ConsoleAdapter;
+use Appwrite\Utopia\Messaging\Adapter\Webhook as WebhookAdapter;
+use Appwrite\Utopia\Messaging\Messages\Console as ConsoleMessage;
+use Appwrite\Utopia\Messaging\Messages\Webhook as WebhookMessage;
 use Exception;
 use Swoole\Runtime;
 use Throwable;
diff --git a/src/Appwrite/Messaging/Adapter/Console.php b/src/Appwrite/Utopia/Messaging/Adapter/Console.php
similarity index 96%
rename from src/Appwrite/Messaging/Adapter/Console.php
rename to src/Appwrite/Utopia/Messaging/Adapter/Console.php
index aa88f59472..121206abca 100644
--- a/src/Appwrite/Messaging/Adapter/Console.php
+++ b/src/Appwrite/Utopia/Messaging/Adapter/Console.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Messaging\Adapter;
+namespace Appwrite\Utopia\Messaging\Adapter;
 
-use Appwrite\Messaging\Messages\Console as ConsoleMessage;
+use Appwrite\Utopia\Messaging\Messages\Console as ConsoleMessage;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
diff --git a/src/Appwrite/Messaging/Adapter/Webhook.php b/src/Appwrite/Utopia/Messaging/Adapter/Webhook.php
similarity index 96%
rename from src/Appwrite/Messaging/Adapter/Webhook.php
rename to src/Appwrite/Utopia/Messaging/Adapter/Webhook.php
index e2cd3183d5..e9bf488ad8 100644
--- a/src/Appwrite/Messaging/Adapter/Webhook.php
+++ b/src/Appwrite/Utopia/Messaging/Adapter/Webhook.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Appwrite\Messaging\Adapter;
+namespace Appwrite\Utopia\Messaging\Adapter;
 
-use Appwrite\Messaging\Messages\Webhook as WebhookMessage;
+use Appwrite\Utopia\Messaging\Messages\Webhook as WebhookMessage;
 use Utopia\Messaging\Adapter;
 use Utopia\Messaging\Message;
 use Utopia\Messaging\Response;
diff --git a/src/Appwrite/Messaging/Messages/Console.php b/src/Appwrite/Utopia/Messaging/Messages/Console.php
similarity index 96%
rename from src/Appwrite/Messaging/Messages/Console.php
rename to src/Appwrite/Utopia/Messaging/Messages/Console.php
index 6d08c0f0e8..2226927b10 100644
--- a/src/Appwrite/Messaging/Messages/Console.php
+++ b/src/Appwrite/Utopia/Messaging/Messages/Console.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Messaging\Messages;
+namespace Appwrite\Utopia\Messaging\Messages;
 
 use Utopia\Messaging\Message;
 
diff --git a/src/Appwrite/Messaging/Messages/Webhook.php b/src/Appwrite/Utopia/Messaging/Messages/Webhook.php
similarity index 96%
rename from src/Appwrite/Messaging/Messages/Webhook.php
rename to src/Appwrite/Utopia/Messaging/Messages/Webhook.php
index 8572959b6c..2852dbeac3 100644
--- a/src/Appwrite/Messaging/Messages/Webhook.php
+++ b/src/Appwrite/Utopia/Messaging/Messages/Webhook.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Messaging\Messages;
+namespace Appwrite\Utopia\Messaging\Messages;
 
 use Utopia\Messaging\Message;
 
diff --git a/tests/unit/Messaging/Adapter/ConsoleTest.php b/tests/unit/Utopia/Messaging/Adapter/ConsoleTest.php
similarity index 94%
rename from tests/unit/Messaging/Adapter/ConsoleTest.php
rename to tests/unit/Utopia/Messaging/Adapter/ConsoleTest.php
index 1f5ed96ff4..283fd17819 100644
--- a/tests/unit/Messaging/Adapter/ConsoleTest.php
+++ b/tests/unit/Utopia/Messaging/Adapter/ConsoleTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Unit\Messaging\Adapter;
+namespace Tests\Unit\Utopia\Messaging\Adapter;
 
-use Appwrite\Messaging\Adapter\Console;
-use Appwrite\Messaging\Messages\Console as ConsoleMessage;
+use Appwrite\Utopia\Messaging\Adapter\Console;
+use Appwrite\Utopia\Messaging\Messages\Console as ConsoleMessage;
 use PHPUnit\Framework\TestCase;
 use Utopia\Cache\Adapter\None as NoCache;
 use Utopia\Cache\Cache;
@@ -120,6 +120,6 @@ class ConsoleTest extends TestCase
         $this->expectExceptionMessage('Invalid message type.');
 
         // ConsoleMessage extends nothing — pass an unrelated Message implementation
-        $adapter->send(new \Appwrite\Messaging\Messages\Webhook(urls: ['https://example.test'], payload: []));
+        $adapter->send(new \Appwrite\Utopia\Messaging\Messages\Webhook(urls: ['https://example.test'], payload: []));
     }
 }
diff --git a/tests/unit/Messaging/Adapter/WebhookTest.php b/tests/unit/Utopia/Messaging/Adapter/WebhookTest.php
similarity index 95%
rename from tests/unit/Messaging/Adapter/WebhookTest.php
rename to tests/unit/Utopia/Messaging/Adapter/WebhookTest.php
index 5ff7db987f..5ad1a8c348 100644
--- a/tests/unit/Messaging/Adapter/WebhookTest.php
+++ b/tests/unit/Utopia/Messaging/Adapter/WebhookTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Unit\Messaging\Adapter;
+namespace Tests\Unit\Utopia\Messaging\Adapter;
 
-use Appwrite\Messaging\Adapter\Webhook;
-use Appwrite\Messaging\Messages\Webhook as WebhookMessage;
+use Appwrite\Utopia\Messaging\Adapter\Webhook;
+use Appwrite\Utopia\Messaging\Messages\Webhook as WebhookMessage;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -190,6 +190,6 @@ class WebhookTest extends TestCase
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Invalid message type.');
 
-        $adapter->send(new \Appwrite\Messaging\Messages\Console(recipients: [['userId' => 'u']], title: 't', body: 'b'));
+        $adapter->send(new \Appwrite\Utopia\Messaging\Messages\Console(recipients: [['userId' => 'u']], title: 't', body: 'b'));
     }
 }