Try to fix sqlite detection

VitexSoftware · Nov 8, 2023 · e5d5e64 · e5d5e64
1 parent bed8d9b
commit e5d5e64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/Ease/Logger/ToEventlog.php b/src/Ease/Logger/ToEventlog.php
@@ -15,7 +15,7 @@
  * Log to EventLog.
  *
  * @author    Vitex <vitex@hippy.cz>
- * @copyright 2009-2021 Vitex@hippy.cz (G)
+ * @copyright 2009-2023 Vitex@hippy.cz (G)
  */
 class ToEventlog extends ToSyslog implements Loggingable
 {
@@ -50,7 +50,6 @@ public function finalizeMessage($messageRaw)
      */
     public static function singleton()
     {
-        return is_object(self::$instance) ? self::$instance :
-                new self(\Ease\Shared::appName() ? \Ease\Shared::appName() : 'EaseFramework');
+        return is_object(self::$instance) ? self::$instance : new self(\Ease\Shared::appName());
     }
 }
diff --git a/src/Ease/Shared.php b/src/Ease/Shared.php
@@ -72,7 +72,7 @@ public static function init($configKeys = [], $envFile = '')
             }
         }
         $configured = true;
-        if (array_key_exists('DB_CONNECTION', $configKeys) && strstr(self::cfg('DB_CONNECTION'), 'sqlite')) {
+        if (array_key_exists('DB_CONNECTION', $configKeys) && (substr(self::cfg('DB_CONNECTION', ''), 0, 6) === 'sqlite')) {
             unset($configKeys['DB_PASSWORD']);
             unset($configKeys['DB_USERNAME']);
             unset($configKeys['DB_HOST']);
@@ -97,7 +97,7 @@ public static function init($configKeys = [], $envFile = '')
      *
      * @return string|int|boolean|null
      */
-    public static function cfg(/*string*/ $constant, $cfg = null)
+    public static function cfg(/* string */ $constant, $cfg = null)
     {
         if (!empty($constant) && defined($constant)) {
             $cfg = constant($constant);
@@ -279,8 +279,8 @@ public static function &user(Person $user = null, string $candidat = 'User', str
         } else {
             if (!empty($candidat)) {
                 $_SESSION[$efprefix][self::$userSessionName] = method_exists($candidat, 'singleton') ?
-                    $candidat::singleton() :
-                    new $candidat();
+                        $candidat::singleton() :
+                        new $candidat();
             }
         }
         return $_SESSION[$efprefix][self::$userSessionName];