WIP

Author: stevebauman

src/Connection/Connection.php

@@ -69,8 +69,8 @@ public function __construct(StreamInterface $stream = new ImapStream)
      */
     public function __destruct()
     {
-        //        $this->logout();
-        //        $this->close();
+        $this->logout();
+        $this->close();
     }
 
     /**

src/Folder.php

@@ -95,7 +95,7 @@ public function idle(callable $callback, int $timeout = 300): void
         }
 
         $fetch = function (int $msgn) {
-            return $this->messages()->find($msgn, Imap::SEQUENCE_TYPE_MSG_NUMBER);
+            return $this->messages()->withBody()->find($msgn, Imap::SEQUENCE_TYPE_MSG_NUMBER);
         };
 
         (new Idle(clone $this->mailbox, $this->path, $timeout))->await(

src/MessageQuery.php

@@ -147,29 +147,35 @@ public function setPage(int $page): static
     }
 
     /**
-     * Set the fetch option flag.
+     * Determine if the body of messages is being fetched.
      */
-    public function setFetchOptions(int $fetchOptions): static
+    public function isFetchingBody(): bool
     {
-        $this->fetchOptions = $fetchOptions;
+        return $this->fetchBody;
+    }
 
-        return $this;
+    /**
+     * Determine if the flags of messages is being fetched.
+     */
+    public function isFetchingFlags(): bool
+    {
+        return $this->fetchFlags;
     }
 
     /**
-     * Get the fetch option flag.
+     * Determine if the headers of messages is being fetched.
      */
-    public function getFetchOptions(): ?int
+    public function isFetchingHeaders(): bool
     {
-        return $this->fetchOptions;
+        return $this->fetchHeaders;
     }
 
     /**
-     * Determine if the body of messages is being fetched.
+     * Fetch the body of messages.
      */
-    public function isFetchingBody(): bool
+    public function withFlags(): static
     {
-        return $this->fetchBody;
+        return $this->setFetchFlags(true);
     }
 
     /**
@@ -180,6 +186,14 @@ public function withBody(): static
         return $this->setFetchBody(true);
     }
 
+    /**
+     * Fetch the body of messages.
+     */
+    public function withHeaders(): static
+    {
+        return $this->setFetchHeaders(true);
+    }
+
     /**
      * Don't fetch the body of messages.
      */
@@ -189,27 +203,45 @@ public function withoutBody(): static
     }
 
     /**
-     * Set the fetch body flag.
+     * Don't fetch the body of messages.
      */
-    public function setFetchBody(bool $fetchBody): static
+    public function withoutHeaders(): static
     {
-        $this->fetchBody = $fetchBody;
+        return $this->setFetchHeaders(false);
+    }
+
+    /**
+     * Don't fetch the body of messages.
+     */
+    public function withoutFlags(): static
+    {
+        return $this->setFetchFlags(false);
+    }
+
+    /**
+     * Set whether to fetch the flags.
+     */
+    protected function setFetchFlags(bool $fetchFlags): static
+    {
+        $this->fetchFlags = $fetchFlags;
 
         return $this;
     }
 
     /**
-     * Get the fetch body flag.
+     * Set the fetch body flag.
      */
-    public function getFetchFlags(): bool
+    protected function setFetchBody(bool $fetchBody): static
     {
-        return $this->fetchFlags;
+        $this->fetchBody = $fetchBody;
+
+        return $this;
     }
 
     /**
-     * Set the fetch flag.
+     * Set whether to fetch the headers.
      */
-    public function setFetchFlags(bool $fetchFlags): static
+    protected function setFetchHeaders(bool $fetchFlags): static
     {
         $this->fetchFlags = $fetchFlags;
 
@@ -259,14 +291,16 @@ public function setFetchOrderDesc(): static
      */
     public function where(mixed $criteria, mixed $value = null): static
     {
-        if (is_array($criteria)) {
-            foreach ($criteria as $key => $value) {
-                is_numeric($key)
-                    ? $this->where($value)
-                    : $this->where($key, $value);
-            }
-        } else {
-            $this->addCondition($criteria, $this->prepareWhereValue($value));
+        if (! is_array($criteria)) {
+            $this->addCondition(
+                $criteria, $this->prepareWhereValue($value)
+            );
+
+            return $this;
+        }
+
+        foreach ($criteria as $key => $value) {
+            $this->where($key, $value);
         }
 
         return $this;