From 3be5e2292790f2c77276f48484d438e12d857ba5 Mon Sep 17 00:00:00 2001
From: Alexander Pankratov <s.pankratoff@gmail.com>
Date: Sat, 3 Oct 2020 02:50:56 +0300
Subject: [PATCH] Support all db providers from madeline

---
 .env.docker.example           | 16 ++++++++--------
 .env.example                  | 16 ++++++++--------
 bootstrap.php                 |  3 +++
 composer.json                 |  2 +-
 composer.lock                 | 12 ++++++------
 config.php                    | 18 +++++++++---------
 src/Migrations/EnvUpgrade.php | 16 ++++++++++++++++
 7 files changed, 51 insertions(+), 32 deletions(-)
 create mode 100644 src/Migrations/EnvUpgrade.php

diff --git a/.env.docker.example b/.env.docker.example
index 37a4a1d..1c22de5 100644
--- a/.env.docker.example
+++ b/.env.docker.example
@@ -39,12 +39,12 @@ TELEGRAM_PROXY_PASSWORD=
 #   Change this type to convert session:
 DB_TYPE=mysql
 #   MYSQL Settings. Required, when DB_TYPE=mysql
-MYSQL_HOST=mysql
-MYSQL_PORT=3306
-MYSQL_USER=root
-MYSQL_PASSWORD=
-MYSQL_DATABASE=MadelineProto
-MYSQL_MAX_CONNECTIONS=10
-MYSQL_IDLE_TIMEOUT=60
+DB_HOST=mysql
+DB_PORT=3306
+DB_USER=root
+DB_PASSWORD=
+DB_DATABASE=MadelineProto
+DB_MAX_CONNECTIONS=10
+DB_IDLE_TIMEOUT=60
 #   Recent data will be stored in memory this amount of time:
-MYSQL_CACHE_TTL="+5 minutes"
\ No newline at end of file
+DB_CACHE_TTL="+5 minutes"
\ No newline at end of file
diff --git a/.env.example b/.env.example
index b2d9ae3..1a1a1b2 100644
--- a/.env.example
+++ b/.env.example
@@ -39,12 +39,12 @@ TELEGRAM_PROXY_PASSWORD=
 #   Change this type to convert session:
 DB_TYPE=memory
 #   MYSQL Settings. Required, when DB_TYPE=mysql
-MYSQL_HOST=127.0.0.1
-MYSQL_PORT=3306
-MYSQL_USER=root
-MYSQL_PASSWORD=
-MYSQL_DATABASE=MadelineProto
-MYSQL_MAX_CONNECTIONS=10
-MYSQL_IDLE_TIMEOUT=60
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_USER=root
+DB_PASSWORD=
+DB_DATABASE=MadelineProto
+DB_MAX_CONNECTIONS=10
+DB_IDLE_TIMEOUT=60
 #   Recent data will be stored in memory this amount of time:
-MYSQL_CACHE_TTL="+5 minutes"
\ No newline at end of file
+DB_CACHE_TTL="+5 minutes"
\ No newline at end of file
diff --git a/bootstrap.php b/bootstrap.php
index 136b96b..ced925d 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,6 +1,7 @@
 <?php
 
 use TelegramApiServer\Logger;
+use TelegramApiServer\Migrations\EnvUpgrade;
 
 $root = __DIR__;
 const ENV_VERSION='1';
@@ -23,6 +24,8 @@
 //Config init
 {
     if (!getenv('SERVER_ADDRESS')) {
+        EnvUpgrade::mysqlToDbPrefix();
+
         $envFile = $options['env'];
         if (empty($envFile)) {
             throw new InvalidArgumentException('Env file not defined');
diff --git a/composer.json b/composer.json
index 842d91f..032f745 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "amphp/websocket-server": "dev-master",
     "amphp/websocket-client": "dev-master",
     "vlucas/phpdotenv": "^4",
-    "danog/madelineproto":"dev-banned_session_handler_fix",
+    "danog/madelineproto":"dev-master",
     "danog/tgseclib": "^3",
     "amphp/http-server-form-parser": "^1.1"
   },
diff --git a/composer.lock b/composer.lock
index 24edeb9..a4c6834 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": "b970e8526530b3a7dbf8444415275d9f",
+    "content-hash": "5c7f2c233c20d70ced8e832eb6f64623",
     "packages": [
         {
             "name": "amphp/amp",
@@ -2134,16 +2134,16 @@
         },
         {
             "name": "danog/madelineproto",
-            "version": "dev-banned_session_handler_fix",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/danog/MadelineProto.git",
-                "reference": "d5b5dc49e89a59ea153ad28fbdc5579bc7e9ae0c"
+                "reference": "463e807dbec457bf61ac99dd47800cd97d5e71b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/danog/MadelineProto/zipball/d5b5dc49e89a59ea153ad28fbdc5579bc7e9ae0c",
-                "reference": "d5b5dc49e89a59ea153ad28fbdc5579bc7e9ae0c",
+                "url": "https://api.github.com/repos/danog/MadelineProto/zipball/463e807dbec457bf61ac99dd47800cd97d5e71b6",
+                "reference": "463e807dbec457bf61ac99dd47800cd97d5e71b6",
                 "shasum": ""
             },
             "require": {
@@ -2249,7 +2249,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-02T23:20:06+00:00"
+            "time": "2020-10-02T23:49:46+00:00"
         },
         {
             "name": "danog/magicalserializer",
diff --git a/config.php b/config.php
index 6cf0ca5..f17fab5 100644
--- a/config.php
+++ b/config.php
@@ -37,15 +37,15 @@
         ],
         'db' => [
             'type' => getenv('DB_TYPE'),
-            'mysql' => [
-                'host' => getenv('MYSQL_HOST'),
-                'port' => (int) getenv('MYSQL_PORT'),
-                'user' => getenv('MYSQL_USER'),
-                'password' => getenv('MYSQL_PASSWORD'),
-                'database' => getenv('MYSQL_DATABASE'),
-                'max_connections' => (int) getenv('MYSQL_MAX_CONNECTIONS'),
-                'idle_timeout' => (int) getenv('MYSQL_IDLE_TIMEOUT'),
-                'cache_ttl' => getenv('MYSQL_CACHE_TTL'),
+            getenv('DB_TYPE') => [
+                'host' => getenv('DB_HOST'),
+                'port' => (int) getenv('DB_PORT'),
+                'user' => getenv('DB_USER'),
+                'password' => getenv('DB_PASSWORD'),
+                'database' => getenv('DB_DATABASE'),
+                'max_connections' => (int) getenv('DB_MAX_CONNECTIONS'),
+                'idle_timeout' => (int) getenv('DB_IDLE_TIMEOUT'),
+                'cache_ttl' => getenv('DB_CACHE_TTL'),
             ]
         ],
         'download'=>[
diff --git a/src/Migrations/EnvUpgrade.php b/src/Migrations/EnvUpgrade.php
new file mode 100644
index 0000000..e4c6e76
--- /dev/null
+++ b/src/Migrations/EnvUpgrade.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace TelegramApiServer\Migrations;
+
+class EnvUpgrade
+{
+    public static function mysqlToDbPrefix() {
+        foreach (glob(ROOT_DIR . '/.env*') as $envFile) {
+            $text = file_get_contents($envFile);
+            $text = preg_replace('/^MYSQL_/m', 'DB_', $text);
+            file_put_contents($envFile, $text);
+        }
+
+    }
+
+}
\ No newline at end of file