Init now can only return false when failed

VitexSoftware · Nov 8, 2023 · 0e02dc2 · 0e02dc2
1 parent 64db731
commit 0e02dc2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Ease/Shared.php b/src/Ease/Shared.php
@@ -61,8 +61,11 @@ class Shared extends Atom
      *
      * @param array  $configKeys
      * @param string $envFile
+     * @param boolean $exit do exit(1) when unsuccessful ?
+     *
+     * @return boolean Configuration success
      */
-    public static function init($configKeys = [], $envFile = '')
+    public static function init($configKeys = [], $envFile = '', $exit = true)
     {
         if (empty($envFile) === false) {
             if (file_exists($envFile)) {
@@ -72,7 +75,7 @@ public static function init($configKeys = [], $envFile = '')
             }
         }
         $configured = true;
-        if (array_key_exists('DB_CONNECTION', $configKeys) && preg_match('/^sqlite/', self::cfg('DB_CONNECTION', ''))) {
+        if ((array_search('DB_CONNECTION', $configKeys) !== false) && preg_match('/^sqlite/', self::cfg('DB_CONNECTION', ''))) {
             unset($configKeys['DB_PASSWORD']);
             unset($configKeys['DB_USERNAME']);
             unset($configKeys['DB_HOST']);
@@ -84,9 +87,10 @@ public static function init($configKeys = [], $envFile = '')
                 $configured = false;
             }
         }
-        if ($configured === false) {
+        if ($exit && ($configured === false)) {
             exit(1);
         }
+        return $configured;
     }
 
     /**

diff --git a/tests/src/Ease/SharedTest.php b/tests/src/Ease/SharedTest.php
@@ -126,6 +126,15 @@ public function testLoadConfig()
         $this->object->loadConfig('tests/Bootstrap.php', true);
     }
 
+    /**
+     * @covers Ease\Shared::init
+     */
+    public function testInit()
+    {
+        putenv('DB_CONNECTION=sqlite3');
+        $this->assertTrue(\Ease\Shared::init(['DB_CONNECTION'], null, false));
+    }
+
     /**
      * @covers Ease\Shared::saveStatusMessages
      */