Find general .env file before falling back to .env.[environment]

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);

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',

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;
+    }
+}