refactor: add new folder mappings for gmail labels

Author: ThorstenSuckow

src/Mail/Client/Imap/Util/DefaultFolderIdToTypeMapper.php

@@ -103,6 +103,7 @@ public function getFolderType(ListMailFolder $listMailFolder): string
 // | INBOX
 // +------------------
             case "[GOOGLE MAIL]/ALLE NACHRICHTEN":
+            case "[GMAIL]/ALLE NACHRICHTEN":
             case "INBOX":
                 $type = MailFolder::TYPE_INBOX;
                 break;
@@ -111,6 +112,7 @@ public function getFolderType(ListMailFolder $listMailFolder): string
 // | TRASH
 // +------------------
             case "[GOOGLE MAIL]/PAPIERKORB":
+            case "[GMAIL]/PAPIERKORB":
             case "TRASH":
             case "JUNK-E-MAIL":
             case "DELETED":
@@ -127,6 +129,7 @@ public function getFolderType(ListMailFolder $listMailFolder): string
 // | DRAFT
 // +------------------
             case "[GOOGLE MAIL]/ENTWÜRFE":
+            case "[GMAIL]/ENTWÜRFE":
             case "DRAFTS":
             case "DRAFT":
             case "ENTWÜRFE":
@@ -138,6 +141,7 @@ public function getFolderType(ListMailFolder $listMailFolder): string
 // | SENT
 // +------------------
             case "[GOOGLE MAIL]/GESENDET":
+            case "[GMAIL]/GESENDET":
             case "GESENDETE ELEMENTE":
             case "GESENDET":
             case "SENT":
@@ -152,6 +156,7 @@ public function getFolderType(ListMailFolder $listMailFolder): string
 // | JUNK
 // +------------------
             case "[GOOGLE MAIL]/SPAM":
+            case "[GMAIL]/SPAM":
             case "JUNK":
             case "SPAMVERDACHT":
             case "INBOX" . $delimiter . "JUNK":

tests/Mail/Client/Imap/Util/DefaultFolderIdToTypeMapperTest.php

@@ -195,6 +195,30 @@ public function testGetFolderType()
                 $this->createListMailFolder("Gesendet", ".")
             )
         );
+
+
+        foreach (["Google Mail", "Gmail"] as $label) {
+            $this->assertSame(
+                MailFolder::TYPE_SENT,
+                $mapper->getFolderType($this->createListMailFolder("[$label]/Gesendet", "."))
+            );
+            $this->assertSame(
+                MailFolder::TYPE_DRAFT,
+                $mapper->getFolderType($this->createListMailFolder("[$label]/Entwürfe", "."))
+            );
+            $this->assertSame(
+                MailFolder::TYPE_INBOX,
+                $mapper->getFolderType($this->createListMailFolder("[$label]/Alle Nachrichten", "."))
+            );
+            $this->assertSame(
+                MailFolder::TYPE_JUNK,
+                $mapper->getFolderType($this->createListMailFolder("[$label]/Spam", "."))
+            );
+            $this->assertSame(
+                MailFolder::TYPE_TRASH,
+                $mapper->getFolderType($this->createListMailFolder("[$label]/Papierkorb", "."))
+            );
+        }
     }