From ae0b9e78aa19424f76667101c4fec168da653d34 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:01:41 +0000
Subject: [PATCH] refactor namespace and naming

---
 composer.lock                                 |  2 +-
 src/Appwrite/CLI/Tasks.php                    | 13 ----------
 src/Appwrite/Platform/Appwrite.php            | 13 ++++++++++
 .../TasksService.php => Platform/Tasks.php}   | 26 +++++++++----------
 .../{CLI => Platform}/Tasks/Doctor.php        |  2 +-
 .../{CLI => Platform}/Tasks/Install.php       |  2 +-
 .../{CLI => Platform}/Tasks/Maintenance.php   |  2 +-
 .../{CLI => Platform}/Tasks/Migrate.php       |  2 +-
 src/Appwrite/{CLI => Platform}/Tasks/SDKs.php |  2 +-
 src/Appwrite/{CLI => Platform}/Tasks/SSL.php  |  2 +-
 .../{CLI => Platform}/Tasks/Specs.php         |  2 +-
 .../{CLI => Platform}/Tasks/Usage.php         |  2 +-
 src/Appwrite/{CLI => Platform}/Tasks/Vars.php |  2 +-
 .../{CLI => Platform}/Tasks/Version.php       |  2 +-
 .../{CLI => Platform}/Tasks/VolumeSync.php    |  2 +-
 15 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 src/Appwrite/CLI/Tasks.php
 create mode 100644 src/Appwrite/Platform/Appwrite.php
 rename src/Appwrite/{CLI/TasksService.php => Platform/Tasks.php} (62%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Doctor.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Install.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Maintenance.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Migrate.php (98%)
 rename src/Appwrite/{CLI => Platform}/Tasks/SDKs.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/SSL.php (96%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Specs.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Usage.php (98%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Vars.php (95%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Version.php (92%)
 rename src/Appwrite/{CLI => Platform}/Tasks/VolumeSync.php (98%)

diff --git a/composer.lock b/composer.lock
index a66a959b7c..fbc8d019d7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5245,5 +5245,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/src/Appwrite/CLI/Tasks.php b/src/Appwrite/CLI/Tasks.php
deleted file mode 100644
index 7f07b8137a..0000000000
--- a/src/Appwrite/CLI/Tasks.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Appwrite\CLI;
-
-use Utopia\Platform\Platform;
-
-class Tasks extends Platform
-{
-    public function __construct()
-    {
-        $this->addService('cliTasks', new TasksService());
-    }
-}
diff --git a/src/Appwrite/Platform/Appwrite.php b/src/Appwrite/Platform/Appwrite.php
new file mode 100644
index 0000000000..187cabdeea
--- /dev/null
+++ b/src/Appwrite/Platform/Appwrite.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Appwrite\Platform;
+
+use Utopia\Platform\Platform;
+
+class Appwrite extends Platform
+{
+    public function __construct()
+    {
+        $this->addService('tasks', new Tasks());
+    }
+}
diff --git a/src/Appwrite/CLI/TasksService.php b/src/Appwrite/Platform/Tasks.php
similarity index 62%
rename from src/Appwrite/CLI/TasksService.php
rename to src/Appwrite/Platform/Tasks.php
index 12617ec33f..2ca169a201 100644
--- a/src/Appwrite/CLI/TasksService.php
+++ b/src/Appwrite/Platform/Tasks.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Appwrite\CLI;
+namespace Appwrite\Platform;
 
 use Utopia\Platform\Service;
-use Appwrite\CLI\Tasks\Doctor;
-use Appwrite\CLI\Tasks\Install;
-use Appwrite\CLI\Tasks\Maintenance;
-use Appwrite\CLI\Tasks\Migrate;
-use Appwrite\CLI\Tasks\SDKs;
-use Appwrite\CLI\Tasks\Specs;
-use Appwrite\CLI\Tasks\SSL;
-use Appwrite\CLI\Tasks\Usage;
-use Appwrite\CLI\Tasks\Vars;
-use Appwrite\CLI\Tasks\Version;
-use VolumeSync;
+use Appwrite\Platform\Tasks\Doctor;
+use Appwrite\Platform\Tasks\Install;
+use Appwrite\Platform\Tasks\Maintenance;
+use Appwrite\Platform\Tasks\Migrate;
+use Appwrite\Platform\Tasks\SDKs;
+use Appwrite\Platform\Tasks\Specs;
+use Appwrite\Platform\Tasks\SSL;
+use Appwrite\Platform\Tasks\Usage;
+use Appwrite\Platform\Tasks\Vars;
+use Appwrite\Platform\Tasks\Version;
+use Appwrite\Platform\Tasks\VolumeSync;
 
-class TasksService extends Service
+class Tasks extends Service
 {
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Doctor.php
rename to src/Appwrite/Platform/Tasks/Doctor.php
index fbbc5e0230..38af7c7376 100644
--- a/src/Appwrite/CLI/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\App;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/CLI/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Install.php
rename to src/Appwrite/Platform/Tasks/Install.php
index b1e980b7f4..219a03129d 100644
--- a/src/Appwrite/CLI/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Docker\Compose;
diff --git a/src/Appwrite/CLI/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Maintenance.php
rename to src/Appwrite/Platform/Tasks/Maintenance.php
index 01b950dad8..fe659c8746 100644
--- a/src/Appwrite/CLI/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
diff --git a/src/Appwrite/CLI/Tasks/Migrate.php b/src/Appwrite/Platform/Tasks/Migrate.php
similarity index 98%
rename from src/Appwrite/CLI/Tasks/Migrate.php
rename to src/Appwrite/Platform/Tasks/Migrate.php
index 49878bc6f5..d7f591ac1a 100644
--- a/src/Appwrite/CLI/Tasks/Migrate.php
+++ b/src/Appwrite/Platform/Tasks/Migrate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/CLI/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/SDKs.php
rename to src/Appwrite/Platform/Tasks/SDKs.php
index e3d34b56f4..fe312f8ef2 100644
--- a/src/Appwrite/CLI/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\Config\Config;
diff --git a/src/Appwrite/CLI/Tasks/SSL.php b/src/Appwrite/Platform/Tasks/SSL.php
similarity index 96%
rename from src/Appwrite/CLI/Tasks/SSL.php
rename to src/Appwrite/Platform/Tasks/SSL.php
index 6379253789..43026b0753 100644
--- a/src/Appwrite/CLI/Tasks/SSL.php
+++ b/src/Appwrite/Platform/Tasks/SSL.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Appwrite\Event\Certificate;
diff --git a/src/Appwrite/CLI/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Specs.php
rename to src/Appwrite/Platform/Tasks/Specs.php
index 7c2d242786..10f322f196 100644
--- a/src/Appwrite/CLI/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\Validator\Text;
diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/Platform/Tasks/Usage.php
similarity index 98%
rename from src/Appwrite/CLI/Tasks/Usage.php
rename to src/Appwrite/Platform/Tasks/Usage.php
index 9231c90f66..89859c883b 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/Platform/Tasks/Usage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Platform\Task;
 use Appwrite\Usage\Calculators\Aggregator;
diff --git a/src/Appwrite/CLI/Tasks/Vars.php b/src/Appwrite/Platform/Tasks/Vars.php
similarity index 95%
rename from src/Appwrite/CLI/Tasks/Vars.php
rename to src/Appwrite/Platform/Tasks/Vars.php
index 7286cc5382..c97f77a9da 100644
--- a/src/Appwrite/CLI/Tasks/Vars.php
+++ b/src/Appwrite/Platform/Tasks/Vars.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\App;
 use Utopia\Config\Config;
diff --git a/src/Appwrite/CLI/Tasks/Version.php b/src/Appwrite/Platform/Tasks/Version.php
similarity index 92%
rename from src/Appwrite/CLI/Tasks/Version.php
rename to src/Appwrite/Platform/Tasks/Version.php
index 164b8b0766..4a9cbf9dcf 100644
--- a/src/Appwrite/CLI/Tasks/Version.php
+++ b/src/Appwrite/Platform/Tasks/Version.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\App;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/CLI/Tasks/VolumeSync.php b/src/Appwrite/Platform/Tasks/VolumeSync.php
similarity index 98%
rename from src/Appwrite/CLI/Tasks/VolumeSync.php
rename to src/Appwrite/Platform/Tasks/VolumeSync.php
index 3fd84c7d22..6197b20fbd 100644
--- a/src/Appwrite/CLI/Tasks/VolumeSync.php
+++ b/src/Appwrite/Platform/Tasks/VolumeSync.php
@@ -1,6 +1,6 @@
 <?php
 
-global $cli;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\CLI\Console;
 use Utopia\Database\DateTime;