Unify arguments with idle and properly support query callback and frequency as callable

Author: stevebauman

src/Folder.php

@@ -140,27 +140,22 @@ function (int $msgn) use ($callback, $fetch) {
     /**
      * {@inheritDoc}
      */
-    public function poll(int $frequency, callable $callback, ?callable $query = null): void
+    public function poll(callable $callback, ?callable $query = null, callable|int $frequency = 60): void
     {
-        // The message query to use when fetching messages.
-        $query ??= fn (MessageQuery $query) => $query;
-
         (new Poll(clone $this->mailbox, $this->path, $frequency))->start(
-            function (MessageInterface $message) use ($callback, $query) {
+            function (MessageInterface $message) use ($callback) {
                 if (! $this->mailbox->connected()) {
                     $this->mailbox->connect();
                 }
 
                 try {
-                    // Apply the query to the message if needed.
-                    $query($this->messages());
-
                     $callback($message);
                 } catch (Exception) {
                     // Something happened. We will attempt reconnecting.
                     $this->mailbox->reconnect();
                 }
-            }
+            },
+            $query ?? fn (MessageQuery $query) => $query
         );
     }
 

src/FolderInterface.php

@@ -47,9 +47,9 @@ public function messages(): MessageQueryInterface;
     public function idle(callable $callback, ?callable $query = null, callable|int $timeout = 300): void;
 
     /**
-     * Poll for new messages at a given frequency.
+     * Begin polling for new messages at a given frequency.
      */
-    public function poll(int $frequency, callable $callback, ?callable $query = null): void;
+    public function poll(callable $callback, ?callable $query = null, callable|int $frequency = 60): void;
 
     /**
      * Move or rename the current folder.

src/Poll.php

@@ -33,13 +33,13 @@ public function __destruct()
     /**
      * Poll for new messages at a given frequency.
      */
-    public function start(callable $callback): void
+    public function start(callable $callback, callable $query): void
     {
         $this->connect();
 
         while ($frequency = $this->getNextFrequency()) {
             try {
-                $this->check($callback);
+                $this->check($callback, $query);
             } catch (ImapConnectionClosedException) {
                 $this->reconnect();
             }
@@ -51,24 +51,25 @@ public function start(callable $callback): void
     /**
      * Check for new messages since the last seen UID.
      */
-    protected function check(callable $callback): void
+    protected function check(callable $callback, callable $query): void
     {
         $folder = $this->folder();
 
-        $query = $folder->messages();
+        if (! $this->lastSeenUid) {
+            $this->lastSeenUid = $folder->messages()
+                ->first()
+                ?->uid() ?? 0;
 
-        // If we have a last seen UID, search for messages after it.
-        if ($this->lastSeenUid !== null) {
-            $query->uid($this->lastSeenUid + 1, INF);
+            return;
         }
 
-        $messages = $query->get();
+        $query($folder->messages())
+            ->uid($this->lastSeenUid + 1, INF)
+            ->each(function (MessageInterface $message) use ($callback) {
+                $callback($message);
 
-        foreach ($messages as $message) {
-            $callback($message);
-
-            $this->lastSeenUid = $message->uid();
-        }
+                $this->lastSeenUid = $message->uid();
+            });
     }
 
     /**

src/Testing/FakeFolder.php

@@ -99,7 +99,7 @@ public function idle(callable $callback, ?callable $query = null, callable|int $
     /**
      * {@inheritDoc}
      */
-    public function poll(int $frequency, callable $callback, ?callable $query = null): void
+    public function poll(callable $callback, ?callable $query = null, callable|int $frequency = 60): void
     {
         foreach ($this->messages as $message) {
             $callback($message);