From 66675bc4035af39af42c3f5ebfa854f5c2447667 Mon Sep 17 00:00:00 2001
From: Kator James <kator95@gmail.com>
Date: Sat, 5 May 2018 06:26:39 +0100
Subject: [PATCH 1/3] Use .env before falling back to .env.[environment]

Allow for environment specific .env file if .env file not found
---
 system/dotenv/Dotenv.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/dotenv/Dotenv.php b/system/dotenv/Dotenv.php
index d4fa193..7578d58 100644
--- a/system/dotenv/Dotenv.php
+++ b/system/dotenv/Dotenv.php
@@ -25,7 +25,7 @@ class Dotenv
 
     public function __construct($path, $file = '.env')
     {
-        if ($file == '.env') {
+        if ($file != '.env') {
             $file = '.env.' . strtolower(ENVIRONMENT);
         }
         $this->filePath = $this->getFilePath($path, $file);

From db98a0eb0311330e63767edcb886b38fca57ecf7 Mon Sep 17 00:00:00 2001
From: Kator James <kator95@gmail.com>
Date: Sat, 5 May 2018 06:41:26 +0100
Subject: [PATCH 2/3] Update Loader.php

---
 system/dotenv/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/dotenv/Loader.php b/system/dotenv/Loader.php
index 2173bff..fc96fd5 100644
--- a/system/dotenv/Loader.php
+++ b/system/dotenv/Loader.php
@@ -75,7 +75,7 @@ protected function ensureFileIsReadable()
     {
         $filePath = $this->filePath;
         if (!is_readable($filePath) || !is_file($filePath)) {
-            echo "Related \".env\" not found, please configure \"". basename($filePath) ."\" it before running codeigniter application"; exit;
+            echo "\".env\" not found, please configure \"". basename($filePath) ."\" it before running codeigniter application"; exit;
             // throw new InvalidArgumentException(sprintf(
             //     'Dotenv: Environment file .env not found or not readable. '.
             //     'Create file with your environment settings at %s',

From 21d39f56c5866ee87da4b8acbe6d8b64806e17ba Mon Sep 17 00:00:00 2001
From: Kator James <kator95@gmail.com>
Date: Tue, 8 May 2018 05:50:58 +0100
Subject: [PATCH 3/3] New env function

New `env` function to return default value if the not set
---
 system/dotenv/autoloader.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/system/dotenv/autoloader.php b/system/dotenv/autoloader.php
index a5e4c94..9bc4264 100644
--- a/system/dotenv/autoloader.php
+++ b/system/dotenv/autoloader.php
@@ -1,4 +1,28 @@
 <?php
+
 require_once 'Dotenv.php';
 require_once 'Loader.php';
 require_once 'Validator.php';
+
+
+if (!function_exists('env')) {
+    // Define function `env` if it doesn't already exists
+    
+    /**
+     * Gets the environment varaible if set or returns the second argument
+     * 
+     * @param string    $varname
+     * The variable. null will return all environment varaibles
+     * 
+     * @param mixed     $default_value
+     * The value to return if $varname is not set
+     * 
+     * @return array|mixed
+     */
+    function env($varname = null, $default_value = "") {
+        if (is_null($varname)) {
+            return getenv();
+        }
+        return getenv($varname) ? getenv($varname) : $default_value;
+    }
+}