feat: add support for eien

leafsphp · Oct 15, 2022 · 4308c18 · 4308c18
1 parent 18132c4
commit 4308c18
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/Cookie.php b/src/Cookie.php
@@ -40,7 +40,8 @@ class Cookie
 	public static function setDefaults(array $defaults)
 	{
 		static::$options = array_merge(
-			static::$options, $defaults
+			static::$options,
+			$defaults
 		);
 	}
 
@@ -56,7 +57,7 @@ public static function set($key, $value = '', array $options = [])
 		if (class_exists('Leaf\Eien\Server') && PHP_SAPI === 'cli') {
 			\Leaf\Config::set('response.cookies', array_merge(
 				\Leaf\Config::get('response.cookies'),
-				[$key,  $value, $options['expires'] ?? (time() + (60 * 60 * 24 * 7))],
+				[$key,  $value, $options['expires'] ?? (time() + 604800)],
 			));
 
 			return;
@@ -90,21 +91,21 @@ public static function simpleCookie(string $name, string $value, string $expires
 		if (class_exists('Leaf\Eien\Server') && PHP_SAPI === 'cli') {
 			\Leaf\Config::set('response.cookies', array_merge(
 				\Leaf\Config::get('response.cookies'),
-				[$name,  $value, $expires ?? (time() + (60 * 60 * 24 * 7))],
+				[$name,  $value, $expires ?? (time() + 604800)],
 			));
 
 			return;
 		}
 
-		self::set($name, $value, ['expires' => $expires  ?? (time() + (60 * 60 * 24 * 7))]);
+		self::set($name, $value, ['expires' => $expires  ?? (time() + 604800)]);
 	}
 
 	/**
 	 * Get all set cookies
 	 */
 	public static function all(): array
-    {
-		return $_COOKIE;
+	{
+		return $_COOKIE ?? [];
 	}
 
 	/**
@@ -122,6 +123,13 @@ public static function unset($key)
 	{
 		if (is_array($key)) {
 			foreach ($key as $name) {
+				if (class_exists('Leaf\Eien\Server') && PHP_SAPI === 'cli') {
+					\Leaf\Config::set('response.cookies', array_merge(
+						\Leaf\Config::get('response.cookies'),
+						[$key, '', time() - 604800],
+					));
+				}
+
 				self::unset($name);
 			}
 		} else {