From da17d0bfbb260fe9fb5f2b3481b0e7f62a971141 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Tue, 20 Oct 2020 16:24:29 +0300
Subject: [PATCH 1/3] Fixed quotes

---
 app/config/locale/translations/bg.countries.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/locale/translations/bg.countries.php b/app/config/locale/translations/bg.countries.php
index 5ba9b7a13..f6ae739ca 100644
--- a/app/config/locale/translations/bg.countries.php
+++ b/app/config/locale/translations/bg.countries.php
@@ -34,7 +34,7 @@ return [
     'CH' => 'Швейцария',
     'CL' => 'Чили',
     'CN' => 'Китай',
-    'CI' => `Кот д'Ивоар`,
+    'CI' => 'Кот д\'Ивоар',
     'CM' => 'Камерун',
     'CD' => 'ДР Конго',
     'CG' => 'Република Конго',

From e89a87152822d240df04fe6d315608ab75e0b0db Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Wed, 21 Oct 2020 21:52:52 +0300
Subject: [PATCH 2/3] Fix for redis persistent connection

---
 app/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/init.php b/app/init.php
index 9637c4381..d44039ec2 100644
--- a/app/init.php
+++ b/app/init.php
@@ -166,8 +166,8 @@ $register->set('statsd', function () { // Register DB connection
 });
 $register->set('cache', function () { // Register cache connection
     $redis = new Redis();
-    $redis->pconnect(App::getEnv('_APP_REDIS_HOST', '', 2.5),
-        App::getEnv('_APP_REDIS_PORT', ''));
+    $redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''));
+    $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
 
     return $redis;
 });

From 8ee187c3c9dd68dc966a4bc2a5dbde05e2dd74df Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Thu, 22 Oct 2020 15:34:13 +0300
Subject: [PATCH 3/3] Fix for broken dev paths

---
 app/preload.php | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/preload.php b/app/preload.php
index a61e84248..6cf308f8c 100644
--- a/app/preload.php
+++ b/app/preload.php
@@ -20,17 +20,30 @@ use Utopia\Preloader\Preloader;
 
 include __DIR__.'/controllers/general.php';
 
-(new Preloader())
+$preloader = new Preloader();
+
+foreach ([
+    realpath(__DIR__ . '/../app/config'),
+    realpath(__DIR__ . '/../app/controllers'),
+    realpath(__DIR__ . '/../src'),
+    realpath(__DIR__ . '/../vendor/twig/twig'),
+    realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'),
+    realpath(__DIR__ . '/../vendor/domnikl'),
+    realpath(__DIR__ . '/../vendor/geoip2'),
+    realpath(__DIR__ . '/../vendor/domnikl'),
+    realpath(__DIR__ . '/../vendor/maxmind'),
+    realpath(__DIR__ . '/../vendor/maxmind-db'),
+    realpath(__DIR__ . '/../vendor/psr/log'),
+    realpath(__DIR__ . '/../vendor/piwik'),
+    realpath(__DIR__ . '/../vendor/symfony'),
+] as $key => $value) {
+    if($value !== false) {
+        $preloader->ignore($value);
+    }
+}
+
+$preloader
     ->paths(realpath(__DIR__ . '/../app/config'))
     ->paths(realpath(__DIR__ . '/../app/controllers'))
     ->paths(realpath(__DIR__ . '/../src'))
-    ->ignore(realpath(__DIR__ . '/../vendor/twig/twig'))
-    ->ignore(realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'))
-    ->ignore(realpath(__DIR__ . '/../vendor/geoip2'))
-    ->ignore(realpath(__DIR__ . '/../vendor/domnikl'))
-    ->ignore(realpath(__DIR__ . '/../vendor/maxmind'))
-    ->ignore(realpath(__DIR__ . '/../vendor/maxmind-db'))
-    ->ignore(realpath(__DIR__ . '/../vendor/psr/log'))
-    ->ignore(realpath(__DIR__ . '/../vendor/piwik'))
-    ->ignore(realpath(__DIR__ . '/../vendor/symfony'))
     ->load();
\ No newline at end of file