Updated structures

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
 

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 && \

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

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;

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;

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;

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;

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;

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;

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;

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;

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;