From aa0ea36c9e10fb4de7feefd529dcf1b048addc58 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 27 Mar 2019 16:11:43 +0530
Subject: [PATCH 1/3] issue #745

---
 public/installer/index.php   | 29 +++++++++++++++++++----------
 public/installer/install.php | 33 ++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/public/installer/index.php b/public/installer/index.php
index d4ca4af94..12771da1f 100755
--- a/public/installer/index.php
+++ b/public/installer/index.php
@@ -63,19 +63,28 @@
                     }
                 }
 
-                $databaseData['DB_HOST'] = $databaseData['DB_USERNAME'] = $databaseData['DB_PASSWORD'] =  $databaseData['DB_DATABASE'] = $databaseData['DB_CONNECTION'] = $databaseData['DB_PORT'] = '';
-
                 $databaseData = array_combine($key, $value);
 
-                // getting database info
-                $servername = $databaseData['DB_HOST'];
-                $username   = $databaseData['DB_USERNAME'];
-                $password   = $databaseData['DB_PASSWORD'];
-                $dbname     = $databaseData['DB_DATABASE'];
-                $connection = $databaseData['DB_CONNECTION'];
-                $port       = $databaseData['DB_PORT'];
+                if (isset($databaseData['DB_HOST'])) {
+                    $servername = $databaseData['DB_HOST'];
+                }
+                if (isset($databaseData['DB_USERNAME'])) {
+                    $username   = $databaseData['DB_USERNAME'];
+                }
+                if (isset($databaseData['DB_PASSWORD'])) {
+                    $password = $databaseData['DB_PASSWORD'];
+                }
+                if (isset($databaseData['DB_DATABASE'])) {
+                    $dbname = $databaseData['DB_DATABASE'];
+                }
+                if (isset($databaseData['DB_CONNECTION'])) {
+                    $connection = $databaseData['DB_CONNECTION'];
+                }
+                if (isset($databaseData['DB_PORT'])) {
+                    $port = $databaseData['DB_PORT'];
+                }
 
-                if ($connection == 'mysql') {
+                if (isset($connection) && $connection == 'mysql') {
                     @$conn = new mysqli($servername, $username, $password, $dbname, $port);
 
                     if (!$conn->connect_error) {
diff --git a/public/installer/install.php b/public/installer/install.php
index f7894c870..8cce33164 100755
--- a/public/installer/install.php
+++ b/public/installer/install.php
@@ -1,4 +1,6 @@
-<?php
+<?php declare(strict_types=1);
+
+   ini_set('display_errors', "1");
     // getting env file
     $location = str_replace('\\', '/', getcwd());
     $currentLocation = explode("/", $location);
@@ -29,19 +31,28 @@
             }
         }
 
-        $databaseData['DB_HOST'] = $databaseData['DB_USERNAME'] = $databaseData['DB_PASSWORD'] =  $databaseData['DB_DATABASE'] = $databaseData['DB_CONNECTION'] = $databaseData['DB_PORT'] = '';
-
         $databaseData = array_combine($key, $value);
 
-        // getting database info
-        $servername = $databaseData['DB_HOST'];
-        $username   = $databaseData['DB_USERNAME'];
-        $password   = $databaseData['DB_PASSWORD'];
-        $dbname     = $databaseData['DB_DATABASE'];
-        $connection = $databaseData['DB_CONNECTION'];
-        $port       = $databaseData['DB_PORT'];
+        if (isset($databaseData['DB_HOST'])) {
+            $servername = $databaseData['DB_HOST'];
+        }
+        if (isset($databaseData['DB_USERNAME'])) {
+            $username   = $databaseData['DB_USERNAME'];
+        }
+        if (isset($databaseData['DB_PASSWORD'])) {
+            $password = $databaseData['DB_PASSWORD'];
+        }
+        if (isset($databaseData['DB_DATABASE'])) {
+            $dbname = $databaseData['DB_DATABASE'];
+        }
+        if (isset($databaseData['DB_CONNECTION'])) {
+            $connection = $databaseData['DB_CONNECTION'];
+        }
+        if (isset($databaseData['DB_PORT'])) {
+            $port = $databaseData['DB_PORT'];
+        }
 
-        if ($connection == 'mysql') {
+        if (isset($connection) && $connection == 'mysql') {
             @$conn = new mysqli($servername, $username, $password, $dbname, $port);
 
             if (!$conn->connect_error) {

From 5766fa97b50aae57db95760506bd778336febea5 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 27 Mar 2019 16:14:35 +0530
Subject: [PATCH 2/3] removing strict mode

---
 public/installer/install.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/installer/install.php b/public/installer/install.php
index 8cce33164..a4e3e93ba 100755
--- a/public/installer/install.php
+++ b/public/installer/install.php
@@ -1,6 +1,4 @@
-<?php declare(strict_types=1);
-
-   ini_set('display_errors', "1");
+<?php
     // getting env file
     $location = str_replace('\\', '/', getcwd());
     $currentLocation = explode("/", $location);

From ce9390ea83422c54612589cf0b5c8145f6b597ea Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 27 Mar 2019 16:19:07 +0530
Subject: [PATCH 3/3] datatype change for port

---
 public/installer/index.php   | 2 +-
 public/installer/install.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/installer/index.php b/public/installer/index.php
index 12771da1f..7edc6a201 100755
--- a/public/installer/index.php
+++ b/public/installer/index.php
@@ -85,7 +85,7 @@
                 }
 
                 if (isset($connection) && $connection == 'mysql') {
-                    @$conn = new mysqli($servername, $username, $password, $dbname, $port);
+                    @$conn = new mysqli($servername, $username, $password, $dbname, (int)$port);
 
                     if (!$conn->connect_error) {
                         // retrieving admin entry
diff --git a/public/installer/install.php b/public/installer/install.php
index a4e3e93ba..4378aacef 100755
--- a/public/installer/install.php
+++ b/public/installer/install.php
@@ -51,7 +51,7 @@
         }
 
         if (isset($connection) && $connection == 'mysql') {
-            @$conn = new mysqli($servername, $username, $password, $dbname, $port);
+            @$conn = new mysqli($servername, $username, $password, $dbname, (int)$port);
 
             if (!$conn->connect_error) {
                 // retrieving admin entry