From 71a546c9083a455ad62b5d0eaf1c8c7721c91bf1 Mon Sep 17 00:00:00 2001
From: Matej Baco <matejbacocom@gmail.com>
Date: Fri, 31 Dec 2021 15:19:29 +0100
Subject: [PATCH] Post-merge fixes

---
 app/init.php  |  1 -
 composer.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/app/init.php b/app/init.php
index 0a363a4ab..89f2361d2 100644
--- a/app/init.php
+++ b/app/init.php
@@ -31,7 +31,6 @@ use Appwrite\Stats\Stats;
 use Appwrite\Utopia\View;
 use Utopia\App;
 use Utopia\Logger\Logger;
-use Utopia\View;
 use Utopia\Config\Config;
 use Utopia\Locale\Locale;
 use Utopia\Registry\Registry;
diff --git a/composer.lock b/composer.lock
index 590d207c9..7fb2cd49a 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": "2b1ed15e618832ee86b69cff2dcdd6ac",
+    "content-hash": "e0243d2a276d074c4af4ac21f521c953",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2405,6 +2405,72 @@
             },
             "time": "2021-07-24T11:35:55+00:00"
         },
+        {
+            "name": "utopia-php/logger",
+            "version": "0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/utopia-php/logger.git",
+                "reference": "a7d626e349e8736e46d4d75f5ba686b40e73c097"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/utopia-php/logger/zipball/a7d626e349e8736e46d4d75f5ba686b40e73c097",
+                "reference": "a7d626e349e8736e46d4d75f5ba686b40e73c097",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "vimeo/psalm": "4.0.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Utopia\\Logger\\": "src/Logger"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eldad Fux",
+                    "email": "eldad@appwrite.io"
+                },
+                {
+                    "name": "Matej Bačo",
+                    "email": "matej@appwrite.io"
+                },
+                {
+                    "name": "Christy Jacob",
+                    "email": "christy@appwrite.io"
+                }
+            ],
+            "description": "Utopia Logger library is simple and lite library for logging information, such as errors or warnings. This library is aiming to be as simple and easy to learn and use.",
+            "keywords": [
+                "appsignal",
+                "errors",
+                "framework",
+                "logger",
+                "logging",
+                "logs",
+                "php",
+                "raygun",
+                "sentry",
+                "upf",
+                "utopia",
+                "warnings"
+            ],
+            "support": {
+                "issues": "https://github.com/utopia-php/logger/issues",
+                "source": "https://github.com/utopia-php/logger/tree/0.1.0"
+            },
+            "time": "2021-12-20T06:57:26+00:00"
+        },
         {
             "name": "utopia-php/orchestration",
             "version": "0.2.1",
@@ -2730,16 +2796,16 @@
         },
         {
             "name": "utopia-php/websocket",
-            "version": "0.0.1",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/websocket.git",
-                "reference": "808317ef4ea0683c2c82dee5d543b1c8378e2e1b"
+                "reference": "51fcb86171400d8aa40d76c54593481fd273dab5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/websocket/zipball/808317ef4ea0683c2c82dee5d543b1c8378e2e1b",
-                "reference": "808317ef4ea0683c2c82dee5d543b1c8378e2e1b",
+                "url": "https://api.github.com/repos/utopia-php/websocket/zipball/51fcb86171400d8aa40d76c54593481fd273dab5",
+                "reference": "51fcb86171400d8aa40d76c54593481fd273dab5",
                 "shasum": ""
             },
             "require": {
@@ -2782,9 +2848,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/websocket/issues",
-                "source": "https://github.com/utopia-php/websocket/tree/0.0.1"
+                "source": "https://github.com/utopia-php/websocket/tree/0.1.0"
             },
-            "time": "2021-07-11T13:09:44+00:00"
+            "time": "2021-12-20T10:50:09+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6520,5 +6586,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }