From 0b88a75ec4d7a86b260fd5ca74e5fc8602e61a6e Mon Sep 17 00:00:00 2001
From: fogelito <fogelshmuel@gmail.com>
Date: Wed, 16 Aug 2023 11:57:30 +0300
Subject: [PATCH] Update "utopia-php/storage" tag 0.16.*

---
 composer.json                           |  2 +-
 composer.lock                           | 27 +++++++++----------------
 docker-compose.yml                      |  8 ++++----
 src/Appwrite/Platform/Tasks/Restore.php | 11 ----------
 4 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/composer.json b/composer.json
index 62976b4413..f3334f95f9 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
         "utopia-php/preloader": "0.2.*",
         "utopia-php/queue": "0.5.*",
         "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "dev-feat-transfer as 0.13.3",
+        "utopia-php/storage": "0.16.*",
         "utopia-php/swoole": "0.5.*",
         "utopia-php/websocket": "0.1.0",
         "resque/php-resque": "1.3.6",
diff --git a/composer.lock b/composer.lock
index 043927746c..8dfc8862d3 100644
--- a/composer.lock
+++ b/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": "ff72579b1906a3ee181ec1209198c13f",
+    "content-hash": "402b06af46e74314d6a3c33d74a923df",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2622,16 +2622,16 @@
         },
         {
             "name": "utopia-php/storage",
-            "version": "dev-feat-transfer",
+            "version": "0.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/storage.git",
-                "reference": "0c510a85509719a45cc6e7f9861d3bc1b4c0f1e0"
+                "reference": "c2d17614b8162d5c475b2194b849b2bf081cfed2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/0c510a85509719a45cc6e7f9861d3bc1b4c0f1e0",
-                "reference": "0c510a85509719a45cc6e7f9861d3bc1b4c0f1e0",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/c2d17614b8162d5c475b2194b849b2bf081cfed2",
+                "reference": "c2d17614b8162d5c475b2194b849b2bf081cfed2",
                 "shasum": ""
             },
             "require": {
@@ -2671,9 +2671,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/feat-transfer"
+                "source": "https://github.com/utopia-php/storage/tree/0.16.0"
             },
-            "time": "2023-08-12T10:18:42+00:00"
+            "time": "2023-08-15T16:32:52+00:00"
         },
         {
             "name": "utopia-php/swoole",
@@ -5522,18 +5522,9 @@
             "time": "2023-07-26T07:16:09+00:00"
         }
     ],
-    "aliases": [
-        {
-            "package": "utopia-php/storage",
-            "version": "dev-feat-transfer",
-            "alias": "0.13.3",
-            "alias_normalized": "0.13.3.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "utopia-php/storage": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e3fea90bd..984a572b54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -754,7 +754,7 @@ services:
     container_name: xtrabackup
     command: sleep infinity
     volumes:
-      - backup-data:/backups:rw
+      - ./backup-data:/backups:rw
       - appwrite-mariadb:/var/lib/mysql:r
     networks:
       - appwrite
@@ -773,7 +773,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      - backup-data:/backups:rw
+      - ./backup-data:/backups:rw
 
     depends_on:
       - redis
@@ -791,7 +791,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      - backup-data:/backups:rw
+      - ./backup-data:/backups:rw
       - appwrite-mariadb:/var/lib/mysql:rw
     depends_on:
       - redis
@@ -961,5 +961,5 @@ volumes:
   appwrite-config:
   appwrite-functions:
   appwrite-builds:
-  backup-data:
+  #backup-data:
   # appwrite-chronograf:
diff --git a/src/Appwrite/Platform/Tasks/Restore.php b/src/Appwrite/Platform/Tasks/Restore.php
index 8f1723ef8b..47371f3807 100644
--- a/src/Appwrite/Platform/Tasks/Restore.php
+++ b/src/Appwrite/Platform/Tasks/Restore.php
@@ -256,17 +256,6 @@ class Restore extends Action
         }
     }
 
-    public function getDsn(string $database): ?DSN
-    {
-        foreach (explode(',', App::getEnv('_APP_CONNECTIONS_DB_REPLICAS', '')) as $project) {
-            [$db, $dsn] = explode('=', $project);
-            if ($db === $database) {
-                return new DSN($dsn);
-            }
-        }
-        return null;
-    }
-
     public function setContainerId()
     {
         $stdout = '';