Merge pull request #3 from jijihohococo/refactor

Refactor ENV and helpers: streamline error handling and improve readability

Author: jijihohococo

src/ENV.php

@@ -12,12 +12,11 @@ class ENV
 
     public static function set(string $filePath)
     {
-        if (is_readable($filePath)) {
-            self::$comma = rand();
-            self::$env = implode(self::$comma, file($filePath));
-        } else {
+        if (!is_readable($filePath)) {
             throw new Exception($filePath . ' is not exist', 1);
         }
+        self::$comma = rand();
+        self::$env = implode(self::$comma, file($filePath));
     }
 
     public static function get()

src/helpers.php

@@ -23,16 +23,15 @@ function gete(string $data)
         $dataset = ENV::getDataset();
         if (isset($dataset[$data])) {
             return  preg_replace('/\s+/', '', $dataset[$data]);
-        } else {
-            $data = $data . '=';
-            $env = ENV::get();
-            $comma = ENV::getComma();
-            if ($env == null) {
-                throw new \Exception("Please set the file path firstly", 1);
-            }
-            $getData = strpos($env, $data) !== false ? getStringBetween($env, $data, $comma) : null;
-            ENV::setDataset($previousData, $getData);
-            return  preg_replace('/\s+/', '', $getData);
         }
+        $data = $data . '=';
+        $env = ENV::get();
+        $comma = ENV::getComma();
+        if ($env == null) {
+            throw new \Exception("Please set the file path firstly", 1);
+        }
+        $getData = strpos($env, $data) !== false ? getStringBetween($env, $data, $comma) : null;
+        ENV::setDataset($previousData, $getData);
+        return  preg_replace('/\s+/', '', $getData);
     }
 }