unqueueing cookies; access to cookie jar through cookie()

pyxol · Nov 27, 2023 · 0b1d0dd · 0b1d0dd
1 parent ea92f74
commit 0b1d0dd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Magnetar/Http/CookieJar/CookieJar.php b/src/Magnetar/Http/CookieJar/CookieJar.php
@@ -172,6 +172,29 @@ public function setCookie(Cookie $cookie): self {
 		 * @return self
 		 */
 		public function remove(string $name): self {
+			if(isset($this->cookie_queue[ $name ])) {
+				return $this->unequeue($name);
+			}
+
+			$this->cookie_queue[ $name ] = new Cookie(
+				$name,
+				'',
+				-604800,
+				$this->default_path,
+				$this->default_domain,
+				$this->default_secure,
+				$this->default_httponly
+			);
+
+			return $this;
+		}
+
+		/**
+		 * Unqueue a cookie
+		 * @param string $name The cookie name
+		 * @return self
+		 */
+		public function unequeue(string $name): self {
 			unset($this->cookie_queue[ $name ]);
 
 			return $this;

diff --git a/src/Magnetar/_autoload.php b/src/Magnetar/_autoload.php
@@ -126,7 +126,7 @@ function config_path(string $rel_path=''): string {
 	if(!function_exists('cookie')) {
 		/**
 		 * Get or set a cookie. If $value is null, the cookie value from the request is returned. If $value is false, the cookie will be deleted
-		 * @param string $name Cookie name
+		 * @param ?string $name Cookie name. If null, the cookie jar will be returned. Defaults to null
 		 * @param mixed $value Optional. Cookie value. If null, the cookie value will be returned. If false, the cookie will be deleted. Defaults to null
 		 * @param int|null $expires_seconds Optional. Number of seconds until the cookie expires. If null, the default expiration time from config will be used. Defaults to null
 		 * @param ?string $path Optional. Cookie path. If null, the default path from config will be used. Defaults to null
@@ -135,18 +135,23 @@ function config_path(string $rel_path=''): string {
 		 * @param ?bool $httponly Optional. Whether the cookie should only be accessible over HTTP. If null, the default httponly setting from config will be used. Defaults to null
 		 * @return mixed
 		 * 
+		 * @see \Magnetar\Http\CookieJar\CookieJar
 		 * @see \Magnetar\Http\CookieJar\CookieJar::get
+		 * @see \Magnetar\Http\CookieJar\CookieJar::set
 		 */
 		function cookie(
-			string $name,
+			?string $name=null,
 			mixed $value=null,
 			?int $expires_seconds=null,
 			?string $path=null,
 			?string $domain=null,
 			?bool $secure=null,
 			?bool $httponly=null
 		): mixed {
-			if(null === $value) {
+			if(null === $name) {
+				// get the cookie jar
+				return app('cookie');
+			} elseif(null === $value) {
 				// get the cookie value
 				return app('cookie')->get($name);
 			} elseif(false === $value) {