@@ -14,73 +14,73 @@  | 
                                                    ||
| 14 | 14 | |
| 15 | 15 |  class DatabaseConnection extends \PDO { | 
                                                        
| 16 | 16 | |
| 17 | - private $databaseName;  | 
                                                        |
| 18 | - private $databaseHost;  | 
                                                        |
| 19 | - private $databaseDriver;  | 
                                                        |
| 20 | - private $databaseUsername;  | 
                                                        |
| 21 | - private $databasePassword;  | 
                                                        |
| 17 | + private $databaseName;  | 
                                                        |
| 18 | + private $databaseHost;  | 
                                                        |
| 19 | + private $databaseDriver;  | 
                                                        |
| 20 | + private $databaseUsername;  | 
                                                        |
| 21 | + private $databasePassword;  | 
                                                        |
| 22 | 22 | |
| 23 | - public function __construct()  | 
                                                        |
| 24 | -    { | 
                                                        |
| 25 | - $this->loadEnv(); // load the environment variables  | 
                                                        |
| 26 | -    	$this->databaseName     =  getenv('databaseName'); | 
                                                        |
| 27 | -    	$this->databaseHost     =  getenv('databaseHost'); | 
                                                        |
| 28 | -    	$this->databaseDriver   =  getenv('databaseDriver'); | 
                                                        |
| 29 | -    	$this->databaseUsername =  getenv('databaseUsername'); | 
                                                        |
| 30 | -    	$this->databasePassword =  getenv('databasePassword'); | 
                                                        |
| 23 | + public function __construct()  | 
                                                        |
| 24 | +	{ | 
                                                        |
| 25 | + $this->loadEnv(); // load the environment variables  | 
                                                        |
| 26 | +		$this->databaseName     =  getenv('databaseName'); | 
                                                        |
| 27 | +		$this->databaseHost     =  getenv('databaseHost'); | 
                                                        |
| 28 | +		$this->databaseDriver   =  getenv('databaseDriver'); | 
                                                        |
| 29 | +		$this->databaseUsername =  getenv('databaseUsername'); | 
                                                        |
| 30 | +		$this->databasePassword =  getenv('databasePassword'); | 
                                                        |
| 31 | 31 | |
| 32 | -    	try { | 
                                                        |
| 33 | - $options = [  | 
                                                        |
| 34 | - PDO::ATTR_PERSISTENT => true,  | 
                                                        |
| 35 | - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION  | 
                                                        |
| 36 | - ];  | 
                                                        |
| 37 | - parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);  | 
                                                        |
| 32 | +		try { | 
                                                        |
| 33 | + $options = [  | 
                                                        |
| 34 | + PDO::ATTR_PERSISTENT => true,  | 
                                                        |
| 35 | + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION  | 
                                                        |
| 36 | + ];  | 
                                                        |
| 37 | + parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);  | 
                                                        |
| 38 | 38 | |
| 39 | -    	} catch(PDOException $e) { | 
                                                        |
| 40 | - return $e->getMessage();  | 
                                                        |
| 41 | - }  | 
                                                        |
| 39 | +		} catch(PDOException $e) { | 
                                                        |
| 40 | + return $e->getMessage();  | 
                                                        |
| 41 | + }  | 
                                                        |
| 42 | 42 | |
| 43 | - }  | 
                                                        |
| 43 | + }  | 
                                                        |
| 44 | 44 | |
| 45 | - /**  | 
                                                        |
| 46 | - * This method determines the driver to be used for appropriate database server  | 
                                                        |
| 47 | - * @params void  | 
                                                        |
| 48 | - * @return string dsn  | 
                                                        |
| 49 | - */  | 
                                                        |
| 50 | - public function getDatabaseDriver()  | 
                                                        |
| 51 | -     { | 
                                                        |
| 52 | - $dsn = "";  | 
                                                        |
| 45 | + /**  | 
                                                        |
| 46 | + * This method determines the driver to be used for appropriate database server  | 
                                                        |
| 47 | + * @params void  | 
                                                        |
| 48 | + * @return string dsn  | 
                                                        |
| 49 | + */  | 
                                                        |
| 50 | + public function getDatabaseDriver()  | 
                                                        |
| 51 | +	 { | 
                                                        |
| 52 | + $dsn = "";  | 
                                                        |
| 53 | 53 | |
| 54 | - switch ($this->databaseDriver)  | 
                                                        |
| 55 | -     	{ | 
                                                        |
| 56 | - case 'mysql':  | 
                                                        |
| 57 | - // Set DSN  | 
                                                        |
| 58 | - $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 59 | - break;  | 
                                                        |
| 60 | - case 'sqlite':  | 
                                                        |
| 61 | - // Set DSN  | 
                                                        |
| 62 | - $dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 63 | - break;  | 
                                                        |
| 64 | - case 'pgsql':  | 
                                                        |
| 65 | - // Set DSN  | 
                                                        |
| 66 | - $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 67 | - break;  | 
                                                        |
| 68 | - default:  | 
                                                        |
| 69 | - // Set DSN  | 
                                                        |
| 70 | - $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 71 | - }  | 
                                                        |
| 72 | - return $dsn;  | 
                                                        |
| 73 | - }  | 
                                                        |
| 54 | + switch ($this->databaseDriver)  | 
                                                        |
| 55 | +	 	{ | 
                                                        |
| 56 | + case 'mysql':  | 
                                                        |
| 57 | + // Set DSN  | 
                                                        |
| 58 | + $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 59 | + break;  | 
                                                        |
| 60 | + case 'sqlite':  | 
                                                        |
| 61 | + // Set DSN  | 
                                                        |
| 62 | + $dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 63 | + break;  | 
                                                        |
| 64 | + case 'pgsql':  | 
                                                        |
| 65 | + // Set DSN  | 
                                                        |
| 66 | + $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 67 | + break;  | 
                                                        |
| 68 | + default:  | 
                                                        |
| 69 | + // Set DSN  | 
                                                        |
| 70 | + $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 71 | + }  | 
                                                        |
| 72 | + return $dsn;  | 
                                                        |
| 73 | + }  | 
                                                        |
| 74 | 74 | |
| 75 | - /**  | 
                                                        |
| 76 | - * Load Dotenv to grant getenv() access to environment variables in .env file  | 
                                                        |
| 77 | - */  | 
                                                        |
| 78 | - public function loadEnv()  | 
                                                        |
| 79 | -     { | 
                                                        |
| 80 | -     	if (!getenv("APP_ENV")) { | 
                                                        |
| 81 | - $dotenv = new Dotenv(__DIR__.'/../../');  | 
                                                        |
| 82 | - $dotenv->load();  | 
                                                        |
| 83 | - }  | 
                                                        |
| 84 | - }  | 
                                                        |
| 75 | + /**  | 
                                                        |
| 76 | + * Load Dotenv to grant getenv() access to environment variables in .env file  | 
                                                        |
| 77 | + */  | 
                                                        |
| 78 | + public function loadEnv()  | 
                                                        |
| 79 | +	 { | 
                                                        |
| 80 | +	 	if (!getenv("APP_ENV")) { | 
                                                        |
| 81 | + $dotenv = new Dotenv(__DIR__.'/../../');  | 
                                                        |
| 82 | + $dotenv->load();  | 
                                                        |
| 83 | + }  | 
                                                        |
| 84 | + }  | 
                                                        |
| 85 | 85 | |
| 86 | 86 | }  | 
                                                        
@@ -23,11 +23,11 @@ discard block  | 
                                                    ||
| 23 | 23 | public function __construct()  | 
                                                        
| 24 | 24 |      { | 
                                                        
| 25 | 25 | $this->loadEnv(); // load the environment variables  | 
                                                        
| 26 | -    	$this->databaseName     =  getenv('databaseName'); | 
                                                        |
| 27 | -    	$this->databaseHost     =  getenv('databaseHost'); | 
                                                        |
| 28 | -    	$this->databaseDriver   =  getenv('databaseDriver'); | 
                                                        |
| 29 | -    	$this->databaseUsername =  getenv('databaseUsername'); | 
                                                        |
| 30 | -    	$this->databasePassword =  getenv('databasePassword'); | 
                                                        |
| 26 | +    	$this->databaseName     = getenv('databaseName'); | 
                                                        |
| 27 | +    	$this->databaseHost     = getenv('databaseHost'); | 
                                                        |
| 28 | +    	$this->databaseDriver   = getenv('databaseDriver'); | 
                                                        |
| 29 | +    	$this->databaseUsername = getenv('databaseUsername'); | 
                                                        |
| 30 | +    	$this->databasePassword = getenv('databasePassword'); | 
                                                        |
| 31 | 31 | |
| 32 | 32 |      	try { | 
                                                        
| 33 | 33 | $options = [  | 
                                                        
@@ -36,7 +36,7 @@ discard block  | 
                                                    ||
| 36 | 36 | ];  | 
                                                        
| 37 | 37 | parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);  | 
                                                        
| 38 | 38 | |
| 39 | -    	} catch(PDOException $e) { | 
                                                        |
| 39 | +    	} catch (PDOException $e) { | 
                                                        |
| 40 | 40 | return $e->getMessage();  | 
                                                        
| 41 | 41 | }  | 
                                                        
| 42 | 42 | |
@@ -55,19 +55,19 @@ discard block  | 
                                                    ||
| 55 | 55 |       	{ | 
                                                        
| 56 | 56 | case 'mysql':  | 
                                                        
| 57 | 57 | // Set DSN  | 
                                                        
| 58 | - $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 58 | + $dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName;  | 
                                                        |
| 59 | 59 | break;  | 
                                                        
| 60 | 60 | case 'sqlite':  | 
                                                        
| 61 | 61 | // Set DSN  | 
                                                        
| 62 | - $dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 62 | + $dsn = 'sqlite:host='.$this->databaseHost.';dbname='.$this->databaseName;  | 
                                                        |
| 63 | 63 | break;  | 
                                                        
| 64 | 64 | case 'pgsql':  | 
                                                        
| 65 | 65 | // Set DSN  | 
                                                        
| 66 | - $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 66 | + $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='.$this->databaseName;  | 
                                                        |
| 67 | 67 | break;  | 
                                                        
| 68 | 68 | default:  | 
                                                        
| 69 | 69 | // Set DSN  | 
                                                        
| 70 | - $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;  | 
                                                        |
| 70 | + $dsn = 'mysql:host='.$this->databaseHost.';dbname='.$this->databaseName;  | 
                                                        |
| 71 | 71 | }  | 
                                                        
| 72 | 72 | return $dsn;  | 
                                                        
| 73 | 73 | }  |