Fixed encoding for rename method, improved test

ddeboer · Aug 4, 2022 · e3a4cba · e3a4cba
1 parent 14bfce7
commit e3a4cba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Mailbox.php b/src/Mailbox.php
@@ -47,8 +47,12 @@ public function renameTo(string $name = null): bool
         if (null === $name) {
             return false;
         }
+        $encodedName = \mb_convert_encoding($name, 'UTF7-IMAP', 'UTF-8');
         $oldFullName = $this->getFullEncodedName();
-        $newFullName = \str_replace($this->name, $name, $oldFullName);
+        $newFullName = \preg_replace('/' . \preg_quote(\mb_convert_encoding($this->name, 'UTF7-IMAP', 'UTF-8')) . '$/', $encodedName, $oldFullName);
+        if (null === $newFullName) {
+            return false;
+        }
 
         $return = \imap_renamemailbox($this->resource->getStream(), $oldFullName, $newFullName);
         if (false === $return) {

diff --git a/tests/MailboxTest.php b/tests/MailboxTest.php
@@ -41,9 +41,12 @@ public function testGetName(): void
 
     public function testRenameTo(): void
     {
-        $this->mailbox->renameTo($this->altName);
+        static::assertNotSame($this->mailboxName, $this->altName);
+
+        static::assertTrue($this->mailbox->renameTo($this->altName));
         static::assertSame($this->altName, $this->mailbox->getName());
-        $this->mailbox->renameTo($this->mailboxName);
+
+        static::assertTrue($this->mailbox->renameTo($this->mailboxName));
         static::assertSame($this->mailboxName, $this->mailbox->getName());
     }