update for dot env class

Author: inhere

src/Utils/PhpDotEnv.php

@@ -11,29 +11,29 @@
 /**
  * Class PhpDotEnv - local env read
  * @package Inhere\Library\Utils
- * in local config file(must is 'ini' format):
+ * in local config file `.env` (must is 'ini' format):
  * ```ini
- * env=dev
- * debug=true
+ * ENV=dev
+ * DEBUG=true
  * ... ...
  * ```
  * IN CODE:
  * ```php
- * new PhpDotEnv(__DIE__, '.env');
- * env('debug', false);
- * env('env_name', 'pdt');
+ * PhpDotEnv::load(__DIE__);
+ * env('DEBUG', false);
+ * env('ENV', 'pdt');
  * ```
  */
-class PhpDotEnv
+final class PhpDotEnv
 {
     /**
      * @param string $fileDir
      * @param string $fileName
      * @return static
      */
-    public static function init(string $fileDir, string $fileName = '.env')
+    public static function load(string $fileDir, string $fileName = '.env')
     {
-        return new static($fileDir, $fileName);
+        return new self($fileDir, $fileName);
     }
 
     /**
@@ -46,17 +46,17 @@ public function __construct(string $fileDir, string $fileName = '.env')
         $file = $fileDir . DIRECTORY_SEPARATOR . ($fileName ?: '.env');
 
         if (is_file($file) && is_readable($file)) {
-            $this->load(parse_ini_file($file));
+            $this->settingEnv(parse_ini_file($file));
         }
     }
 
     /**
-     * load env data
+     * setting env data
      */
-    protected function load($data)
+    protected function settingEnv($data)
     {
         foreach ($data as $name => $value) {
-            if (!is_string($value)) {
+            if (is_int($name) || !is_string($value)) {
                 continue;
             }
 

src/functions.php

@@ -43,17 +43,21 @@ function class_basename($class)
     function retry($times, callable $callback, $sleep = 0)
     {
         $times--;
+
         beginning:
         try {
             return $callback();
         } catch (Exception $e) {
             if (!$times) {
                 throw $e;
             }
+
             $times--;
+
             if ($sleep) {
                 usleep($sleep * 1000);
             }
+
             goto beginning;
         }
     }
@@ -62,9 +66,24 @@ function retry($times, callable $callback, $sleep = 0)
 if (!function_exists('env')) {
     function env(string $name, $default = null)
     {
-        $value = getenv(strtoupper($name));
+        $value = getenv($name);
 
-        return false !== $value ? $value : $default;
+        if ($value === false) {
+            return value($default);
+        }
+
+        switch (strtolower($value)) {
+            case 'true':
+                return true;
+            case 'false':
+                return false;
+            case 'empty':
+                return '';
+            case 'null':
+                return null;
+        }
+
+        return $value;
     }
 }