#624: Provide PHP 8.1 compatibility

Author: MaSpeng

composer.json

@@ -23,7 +23,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.2 || ^8.0 <8.1",
+        "php": "^7.2 || ^8.0",
         "ext-fileinfo": "*",
         "ext-iconv": "*",
         "ext-imap": "*",

src/PhpImap/Mailbox.php

@@ -453,13 +453,7 @@ public function hasImapStream(): bool
      */
     public function encodeStringToUtf7Imap(string $str): string
     {
-        $out = \mb_convert_encoding($str, 'UTF7-IMAP', \mb_detect_encoding($str, 'UTF-8, ISO-8859-1, ISO-8859-15', true));
-
-        if (!\is_string($out)) {
-            throw new UnexpectedValueException('mb_convert_encoding($str, \'UTF-8\', {detected}) could not convert $str');
-        }
-
-        return $out;
+        return imap_utf7_encode($str);
     }
 
     /**
@@ -469,7 +463,7 @@ public function encodeStringToUtf7Imap(string $str): string
      */
     public function decodeStringFromUtf7ImapToUtf8(string $str): string
     {
-        $out = \mb_convert_encoding($str, 'UTF-8', 'UTF7-IMAP');
+        $out = imap_utf7_decode($str);
 
         if (!\is_string($out)) {
             throw new UnexpectedValueException('mb_convert_encoding($str, \'UTF-8\', \'UTF7-IMAP\') could not convert $str');