From c3149a4db0bd12962c66c5f01cd318086740835e Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Fri, 30 Oct 2020 00:07:01 +0200
Subject: [PATCH 1/3] Cleanup

---
 app/controllers/general.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 389e179e6d..6693c97948 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -361,10 +361,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
         ->addHeader('Pragma', 'no-cache')
         ->setStatusCode($code)
     ;
-
-    $route = $utopia->match($request);
-    $template = ($route) ? $route->getLabel('error', null) : null;
-
+    
     if ($template) {
         $comp = new View($template);
 

From 9565f8c0211c00ce5fbaadd29fe03abca83e92ef Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Fri, 30 Oct 2020 00:19:47 +0200
Subject: [PATCH 2/3] Updated stack

---
 docker-compose.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 62574c7192..66aca10bcf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -287,7 +287,7 @@ services:
       - _APP_REDIS_PORT
 
   mariadb:
-    image: appwrite/mariadb:1.0.3 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: appwrite/mariadb:1.1.0 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
@@ -301,10 +301,10 @@ services:
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
       - MYSQL_USER=${_APP_DB_USER}
       - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: 'mysqld --innodb-flush-method=fsync'
+    command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests
     # command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
 
-  maildev:
+  maildev: # used mainly for dev tests
     image: djfarrelly/maildev
     container_name: appwrite-maildev
     restart: unless-stopped
@@ -313,6 +313,15 @@ services:
     networks:
       - appwrite
 
+  request-catcher: # used mainly for dev tests
+    image: smarterdm/http-request-catcher
+    container_name: appwrite-request-catcher
+    restart: unless-stopped
+    ports:
+      - '5000:5000'
+    networks:
+      - appwrite
+
   # smtp:
   #   image: appwrite/smtp:1.2.0
   #   container_name: appwrite-smtp

From ec5d928213f00126cf70c5c66c0de3c83333868a Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Fri, 30 Oct 2020 00:20:32 +0200
Subject: [PATCH 3/3] Updated event test

---
 tests/unit/Event/EventTest.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/unit/Event/EventTest.php b/tests/unit/Event/EventTest.php
index 180a2af782..7d14cf18fc 100644
--- a/tests/unit/Event/EventTest.php
+++ b/tests/unit/Event/EventTest.php
@@ -35,32 +35,32 @@ class EventTest extends TestCase
     public function testParams()
     {
         $this->object
-            ->setParam('key1', 'value1')
-            ->setParam('key2', 'value2')
+            ->setParam('eventKey1', 'eventValue1')
+            ->setParam('eventKey2', 'eventValue2')
         ;
 
         $this->object->trigger();
 
-        $this->assertEquals(null, $this->object->getParam('key1'));
-        $this->assertEquals(null, $this->object->getParam('key2'));
-        $this->assertEquals(null, $this->object->getParam('key3'));
+        $this->assertEquals(null, $this->object->getParam('eventKey1'));
+        $this->assertEquals(null, $this->object->getParam('eventKey2'));
+        $this->assertEquals(null, $this->object->getParam('eventKey3'));
         $this->assertEquals(\Resque::size($this->queue), 1);
     }
 
     public function testReset()
     {
         $this->object
-            ->setParam('key1', 'value1')
-            ->setParam('key2', 'value2')
+            ->setParam('eventKey1', 'eventValue1')
+            ->setParam('eventKey2', 'eventValue2')
         ;
 
-        $this->assertEquals('value1', $this->object->getParam('key1'));
-        $this->assertEquals('value2', $this->object->getParam('key2'));
+        $this->assertEquals('eventValue1', $this->object->getParam('eventKey1'));
+        $this->assertEquals('eventValue2', $this->object->getParam('eventKey2'));
 
         $this->object->reset();
 
-        $this->assertEquals(null, $this->object->getParam('key1'));
-        $this->assertEquals(null, $this->object->getParam('key2'));
-        $this->assertEquals(null, $this->object->getParam('key3'));
+        $this->assertEquals(null, $this->object->getParam('eventKey1'));
+        $this->assertEquals(null, $this->object->getParam('eventKey2'));
+        $this->assertEquals(null, $this->object->getParam('eventKey3'));
     }
 }