From 9462e1c75bd47640cf88f158a838364ee694a179 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sun, 21 Jun 2020 16:31:51 +0300
Subject: [PATCH] Updated structures

---
 CHANGES.md                                          | 13 ++++---------
 Dockerfile                                          |  2 +-
 src/Appwrite/Response/Response.php                  |  2 +-
 src/Appwrite/Response/{Results => Result}/File.php  |  2 +-
 src/Appwrite/Response/{Results => Result}/Files.php |  2 +-
 .../Response/{Results => Result}/Health.php         |  2 +-
 src/Appwrite/Response/{Results => Result}/Logs.php  |  2 +-
 src/Appwrite/Response/{Results => Result}/Prefs.php |  2 +-
 .../Response/{Results => Result}/Session.php        |  2 +-
 .../Response/{Results => Result}/Sessions.php       |  2 +-
 src/Appwrite/Response/{Results => Result}/Token.php |  2 +-
 src/Appwrite/Response/{Results => Result}/User.php  |  2 +-
 12 files changed, 15 insertions(+), 20 deletions(-)
 rename src/Appwrite/Response/{Results => Result}/File.php (96%)
 rename src/Appwrite/Response/{Results => Result}/Files.php (96%)
 rename src/Appwrite/Response/{Results => Result}/Health.php (96%)
 rename src/Appwrite/Response/{Results => Result}/Logs.php (94%)
 rename src/Appwrite/Response/{Results => Result}/Prefs.php (96%)
 rename src/Appwrite/Response/{Results => Result}/Session.php (94%)
 rename src/Appwrite/Response/{Results => Result}/Sessions.php (94%)
 rename src/Appwrite/Response/{Results => Result}/Token.php (94%)
 rename src/Appwrite/Response/{Results => Result}/User.php (96%)

diff --git a/CHANGES.md b/CHANGES.md
index 4d255f717e..fb1355bf69 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,14 +2,6 @@
 
 ## Features
 
-<<<<<<< HEAD
-- New route in Locale API to fetch a list of languages
-- New and consistent response format for all API object + new response examples in the docs
-  - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
-  - Removed type attribute from session object response (used only internally)
-  - ** - might be changed before merging to master
-  
-=======
 - New route in Locale API to fetch a list of languages (@TorstenDittmann)
 - Added Google Fonts to Appwrite for offline availability
 - Added a new route in the Avatars API to get user initials avatar
@@ -26,7 +18,10 @@
 - Upgraded Redis Resque queue library to version 1.3.6
 - Added container names to docker-compose.yml (@drandell)
 - Upgraded ClamAV container image to version 1.0.9
->>>>>>> 0abfa5e5fc2ff2d43a43426fbdaf90b62315c8e9
+- - New and consistent response format for all API object + new response examples in the docs
+  - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
+  - Removed type attribute from session object response (used only internally)
+  - ** - might be changed before merging to master
 
 ## Bug Fixes
 
diff --git a/Dockerfile b/Dockerfile
index c4e7e72c82..03b1d5eea4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,7 +94,7 @@ RUN \
   add-apt-repository ppa:certbot/certbot && \
   apt-get update && \
   apt-get install -y --no-install-recommends --no-install-suggests php$PHP_VERSION php$PHP_VERSION-fpm \
-  php$PHP_VERSION-mysqlnd php$PHP_VERSION-curl php$PHP_VERSION-imagick php$PHP_VERSION-mbstring php$PHP_VERSION-dom webp certbot && \
+  php$PHP_VERSION-mysqlnd php$PHP_VERSION-curl php$PHP_VERSION-imagick php$PHP_VERSION-mbstring php$PHP_VERSION-dom php$PHP_VERSION-yaml webp certbot && \
   # Nginx
   wget http://nginx.org/download/nginx-1.19.0.tar.gz && \
   tar -xzvf nginx-1.19.0.tar.gz && rm nginx-1.19.0.tar.gz && \
diff --git a/src/Appwrite/Response/Response.php b/src/Appwrite/Response/Response.php
index 5dbdc537be..4abb0c36c0 100644
--- a/src/Appwrite/Response/Response.php
+++ b/src/Appwrite/Response/Response.php
@@ -4,7 +4,7 @@ namespace Appwrite\Response;
 
 use Exception;
 use Appwrite\Database\Document;
-use Appwrite\Response\Results\User;
+use Appwrite\Response\Result\User;
 use Utopia\Response as UtopiaResponse;
 
 class Response extends UtopiaResponse
diff --git a/src/Appwrite/Response/Results/File.php b/src/Appwrite/Response/Result/File.php
similarity index 96%
rename from src/Appwrite/Response/Results/File.php
rename to src/Appwrite/Response/Result/File.php
index 246fcdb9c1..229b824799 100644
--- a/src/Appwrite/Response/Results/File.php
+++ b/src/Appwrite/Response/Result/File.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Files.php b/src/Appwrite/Response/Result/Files.php
similarity index 96%
rename from src/Appwrite/Response/Results/Files.php
rename to src/Appwrite/Response/Result/Files.php
index 11454c070a..e7a007c205 100644
--- a/src/Appwrite/Response/Results/Files.php
+++ b/src/Appwrite/Response/Result/Files.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Health.php b/src/Appwrite/Response/Result/Health.php
similarity index 96%
rename from src/Appwrite/Response/Results/Health.php
rename to src/Appwrite/Response/Result/Health.php
index 0b5b1c981c..2043e38b0c 100644
--- a/src/Appwrite/Response/Results/Health.php
+++ b/src/Appwrite/Response/Result/Health.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Logs.php b/src/Appwrite/Response/Result/Logs.php
similarity index 94%
rename from src/Appwrite/Response/Results/Logs.php
rename to src/Appwrite/Response/Result/Logs.php
index 45599a787f..980534c193 100644
--- a/src/Appwrite/Response/Results/Logs.php
+++ b/src/Appwrite/Response/Result/Logs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Prefs.php b/src/Appwrite/Response/Result/Prefs.php
similarity index 96%
rename from src/Appwrite/Response/Results/Prefs.php
rename to src/Appwrite/Response/Result/Prefs.php
index 2cf28bdd7c..24914577da 100644
--- a/src/Appwrite/Response/Results/Prefs.php
+++ b/src/Appwrite/Response/Result/Prefs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Session.php b/src/Appwrite/Response/Result/Session.php
similarity index 94%
rename from src/Appwrite/Response/Results/Session.php
rename to src/Appwrite/Response/Result/Session.php
index 8cd2577d87..c6bcf6bb26 100644
--- a/src/Appwrite/Response/Results/Session.php
+++ b/src/Appwrite/Response/Result/Session.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Sessions.php b/src/Appwrite/Response/Result/Sessions.php
similarity index 94%
rename from src/Appwrite/Response/Results/Sessions.php
rename to src/Appwrite/Response/Result/Sessions.php
index 944aee2f8b..b778655a2d 100644
--- a/src/Appwrite/Response/Results/Sessions.php
+++ b/src/Appwrite/Response/Result/Sessions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/Token.php b/src/Appwrite/Response/Result/Token.php
similarity index 94%
rename from src/Appwrite/Response/Results/Token.php
rename to src/Appwrite/Response/Result/Token.php
index 2b2dd9fc07..432813debb 100644
--- a/src/Appwrite/Response/Results/Token.php
+++ b/src/Appwrite/Response/Result/Token.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;
diff --git a/src/Appwrite/Response/Results/User.php b/src/Appwrite/Response/Result/User.php
similarity index 96%
rename from src/Appwrite/Response/Results/User.php
rename to src/Appwrite/Response/Result/User.php
index 8620a18f63..21f2341f51 100644
--- a/src/Appwrite/Response/Results/User.php
+++ b/src/Appwrite/Response/Result/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Response\Results;
+namespace Appwrite\Response\Result;
 
 use Appwrite\Database\Database;
 use Appwrite\Response\Result;