feat: switch from native sessions to leaf session

Author: mychidarko

src/Flash.php

@@ -2,25 +2,27 @@
 
 namespace Leaf;
 
+use Leaf\Http\Session;
+
 /**
  * Leaf Flash
  * -----
  * Simple flash messages for your leaf apps
- * 
+ *
  * @author Michael Darko <[email protected]>
  * @since 2.5.0
  */
 class Flash
 {
     private static $config = [
-        "key" => "leaf.flash",
-        "default" => "message",
-        "saved" => "leaf.flash.saved",
+        'key' => 'leaf.flash',
+        'default' => 'message',
+        'saved' => 'leaf.flashSaved',
     ];
 
     /**
      * Configure leaf flash
-     * 
+     *
      * @param array $config Configuration for leaf flash
      */
     public static function config(array $config)
@@ -30,61 +32,59 @@ public static function config(array $config)
 
     /**
      * Set a new flash message
-     * 
-     * @param string $message The flash message to set
+     *
+     * @param mixed $message The flash message to set
      * @param string $key The key to save message
      */
-    public static function set(string $message, string $key = "default")
+    public static function set($message, string $key = 'default')
     {
-        static::session();
-
-        if ($key === "default") {
-            $key = static::$config["default"];
+        if ($key === 'default') {
+            $key = static::$config['default'];
         }
 
-        $_SESSION[static::$config["key"]][$key] = $message;
+        Session::set(static::$config['key'], [$key => $message]);
     }
 
     /**
      * Remove a flash message
-     * 
+     *
      * @param string|null $key The key of message to remove
      */
     public static function unset(string $key = null)
     {
-        static::session();
+        $data = Session::get(static::$config['key'], null, false);
 
-        if (!$key) {
-            Http\Session::unset(static::$config["key"]);
-        } else {
-            if ($key === "default") {
-                $key = static::$config["default"];
-            }
+        if ($key === 'default') {
+            $key = static::$config['default'];
+        }
 
-            $_SESSION[static::$config["key"]][$key] = null;
+        if ($key) {
+            unset($data[$key]);
+        } else {
+            $data = [];
         }
+
+        Session::set(static::$config['key'], $data);
     }
 
     /**
      * Get the flash array
-     * 
+     *
      * @param string|null $key The key of message to get
      * @return string|array
      */
-    private static function get(string $key = null)
+    protected static function get(string $key = null)
     {
-        static::session();
-
         if (!$key) {
-            return Http\Session::get(static::$config["key"]);
+            return Session::get(static::$config['key']);
         }
 
-        if ($key === "default") {
-            $key = static::$config["default"];
+        if ($key === 'default') {
+            $key = static::$config['default'];
         }
 
         $item = null;
-        $items = Http\Session::get(static::$config["key"], false);
+        $items = Session::get(static::$config['key'], false);
 
         if (isset($items[$key])) {
             $item = $items[$key];
@@ -99,54 +99,39 @@ private static function get(string $key = null)
 
     /**
      * Display a flash message
-     * 
+     *
      * @param string $key The key of message to display
      * @return string
      */
-    public static function display(string $key = "default")
+    public static function display(string $key = 'default')
     {
-        static::session();
-
         return static::get($key);
     }
 
     /**
      * Save a flash message (won't delete after view).
      * You can save only one message at a time.
-     * 
+     *
      * @param string $message The flash message to save
      */
     public static function save(string $message)
     {
-        static::session();
-
-        Http\Session::set(static::$config["saved"], $message);
+        Session::set(static::$config['saved'], $message);
     }
 
     /**
      * Clear the saved flash message
      */
     public static function clearSaved()
     {
-        static::session();
-
-        Http\Session::set(static::$config["saved"], null);
+        Session::set(static::$config['saved'], null);
     }
 
     /**
      * Display the saved flash message
      */
     public static function displaySaved()
     {
-        static::session();
-
-        return Http\Session::get(static::$config["saved"]);
-    }
-
-    private static function session()
-    {
-        if (!session_id()) {
-            session_start();
-        }
+        return Session::get(static::$config['saved']);
     }
 }