Merge pull request #11 from CPS-IT/feature/file-iterator

[!!!][FEATURE] Resolve dependency between iterator and transport

Classes/Mail/Iterator/FileIterator.php → Classes/Iterator/LimitedFileIterator.php

@@ -21,30 +21,44 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace CPSIT\Typo3Mailqueue\Mail\Iterator;
+namespace CPSIT\Typo3Mailqueue\Iterator;
 
-use CPSIT\Typo3Mailqueue\Mail;
 use FilterIterator;
+use Iterator;
 use SplFileInfo;
 use Traversable;
 
 /**
- * FileIterator
+ * LimitedFileIterator
  *
  * @author Elias Häußler <[email protected]>
  * @license GPL-2.0-or-later
  *
- * @template-extends FilterIterator<int, SplFileInfo, Traversable<SplFileInfo>>
+ * @extends FilterIterator<int, SplFileInfo, Traversable<SplFileInfo>>
  */
-final class FileIterator extends FilterIterator
+final class LimitedFileIterator extends FilterIterator
 {
+    /**
+     * @param list<string> $acceptedSuffixes
+     */
+    public function __construct(
+        Iterator $iterator,
+        private readonly array $acceptedSuffixes,
+    ) {
+        parent::__construct($iterator);
+    }
+
     public function accept(): bool
     {
         $file = $this->getInnerIterator()->current();
         $path = $file->getRealPath();
 
-        return str_ends_with($path, Mail\Transport\QueueableFileTransport::FILE_SUFFIX_QUEUED)
-            || str_ends_with($path, Mail\Transport\QueueableFileTransport::FILE_SUFFIX_SENDING)
-        ;
+        foreach ($this->acceptedSuffixes as $suffix) {
+            if (str_ends_with($path, $suffix)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }

Classes/Mail/Transport/QueueableFileTransport.php

@@ -25,6 +25,7 @@
 
 use CPSIT\Typo3Mailqueue\Enums;
 use CPSIT\Typo3Mailqueue\Exception;
+use CPSIT\Typo3Mailqueue\Iterator;
 use CPSIT\Typo3Mailqueue\Mail;
 use DateTimeImmutable;
 use DirectoryIterator;
@@ -44,9 +45,9 @@
  */
 final class QueueableFileTransport extends Core\Mail\FileSpool implements RecoverableTransport
 {
-    public const FILE_SUFFIX_QUEUED = '.message';
-    public const FILE_SUFFIX_SENDING = '.message.sending';
-    public const FILE_SUFFIX_FAILURE_DATA = '.message.failure';
+    private const FILE_SUFFIX_QUEUED = '.message';
+    private const FILE_SUFFIX_SENDING = '.message.sending';
+    private const FILE_SUFFIX_FAILURE_DATA = '.message.failure';
 
     private readonly Core\Context\Context $context;
 
@@ -185,7 +186,13 @@ private function flagFailedTransport(string $file, Mailer\Exception\TransportExc
      */
     private function initializeQueueFromFilePath(): Generator
     {
-        $iterator = new Mail\Iterator\FileIterator(new DirectoryIterator($this->path));
+        $iterator = new Iterator\LimitedFileIterator(
+            new DirectoryIterator($this->path),
+            [
+                self::FILE_SUFFIX_QUEUED,
+                self::FILE_SUFFIX_SENDING,
+            ],
+        );
 
         foreach ($iterator as $file) {
             yield $this->restoreItem($file);