Fix some critical errors

bootstrap.php

@@ -1613,3 +1613,14 @@ function imap2_utf8(string $string)
         return imap_utf8($string);
     }
 }
+
+/* For testing
+// A side-effectless version (functions only) of Roundcube's bootstrap.php
+require __DIR__ . '/rcube_bootstrap.php';
+require __DIR__ . '/roundcubemail/program/lib/Roundcube/rcube.php';
+require __DIR__ . '/roundcubemail/program/lib/Roundcube/rcube_mime_decode.php';
+require __DIR__ . '/roundcubemail/program/lib/Roundcube/rcube_charset.php';
+require __DIR__ . '/roundcubemail/program/lib/Roundcube/rcube_string_replacer.php';
+require __DIR__ . '/roundcubemail/program/lib/Roundcube/rcube_imap_generic.php';
+require __DIR__ . '/roundcubemail/program/lib/Roundcube/rcube_result_index.php';
+*/

composer.json

@@ -25,7 +25,9 @@
     "zbateson/mail-mime-parser": "^2.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.5"
+    "phpunit/phpunit": "^6.5",
+    "phpstan/phpstan": "^1.10",
+    "pear/auth_sasl": "^1.1"
   },
   "suggest": {
     "ext-mbstring": "For best support/performance",

src/Mailbox.php

@@ -35,7 +35,7 @@ public static function check($imap)
             return imap_check($imap);
         }
 
-        trigger_error(Errors::invalidImapConnection(debug_backtrace(), 1), E_USER_WARNING);
+        trigger_error(Errors::invalidImapConnection(debug_backtrace(), 1, false), E_USER_WARNING);
 
         return false;
     }
@@ -245,13 +245,13 @@ public static function createMailbox($imap, $mailbox)
 
     public static function renameMailbox($imap, $from, $to)
     {
-        if (is_a($imap, Connection::class)) {
-            $client = $imap->getClient();
-
-            return $client->createFolder($mailbox);
+        if (!is_a($imap, Connection::class)) {
+            return Errors::invalidImapConnection(debug_backtrace(), 1, false);
         }
 
-        return imap_createmailbox($imap, $mailbox);
+        $client = $imap->getClient();
+
+        return $client->renameFolder($from, $to);
     }
 
     public static function deleteMailbox($imap, $mailbox)

src/Polyfill.php

@@ -87,7 +87,7 @@ public static function rfc822WriteHeaders($string)
 
     public static function utf7Decode($string)
     {
-        return mb_convert_decoding($string, "UTF7-IMAP", "UTF-8");
+        return mb_convert_encoding($string, "UTF7-IMAP", "UTF-8");
     }
 
     public static function utf7Encode($string)

src/Roundcube/Charset.php

@@ -23,8 +23,8 @@
 
 namespace Javanile\Imap2\Roundcube;
 
-use Javanile\Imap2\ErrorException;
-use Javanile\Imap2\rcube;
+use ErrorException;
+use rcube;
 
 /**
  * Character sets conversion functionality

src/Roundcube/ImapClient.php

@@ -26,10 +26,10 @@
 
 namespace Javanile\Imap2\Roundcube;
 
-use Javanile\Imap2\Auth_SASL;
-use Javanile\Imap2\Exception;
-use Javanile\Imap2\GSSAPIContext;
-use Javanile\Imap2\KRB5CCache;
+use Auth_SASL;
+use Exception;
+use GSSAPIContext;
+use KRB5CCache;
 use Javanile\Imap2\rcube_message_header;
 use Javanile\Imap2\rcube_result_index;
 use Javanile\Imap2\rcube_result_thread;

src/Roundcube/Mime.php

@@ -21,8 +21,8 @@
 
 namespace Javanile\Imap2\Roundcube;
 
-use Javanile\Imap2\rcube;
-use Javanile\Imap2\rcube_mime_decode;
+use rcube;
+use rcube_mime_decode;
 
 /**
  * Class for parsing MIME messages

src/Roundcube/ResultIndex.php

@@ -22,7 +22,7 @@
 namespace Javanile\Imap2\Roundcube;
 
 use Javanile\Imap2\Offset;
-use Javanile\Imap2\rcube_imap_generic;
+use rcube_imap_generic;
 
 /**
  * Class for accessing IMAP's SORT/SEARCH/ESEARCH result

src/Roundcube/ResultThread.php

@@ -22,8 +22,8 @@
 namespace Javanile\Imap2\Roundcube;
 
 use Javanile\Imap2\Offset;
-use Javanile\Imap2\rcube_imap_generic;
-use Javanile\Imap2\rcube_result_index;
+use rcube_imap_generic;
+use rcube_result_index;
 
 /**
  * Class for accessing IMAP's THREAD result
@@ -427,7 +427,7 @@ public function get_parameters($param=null)
      */
     public function sort($index)
     {
-        $this->sort_order = $index->get_parameters('ORDER');
+        $this->order = $index->get_parameters('ORDER');
 
         if (empty($this->raw_data)) {
             return;

src/Roundcube/Utils.php

@@ -21,12 +21,12 @@
 
 namespace Javanile\Imap2\Roundcube;
 
-use Javanile\Imap2\DateTime;
-use Javanile\Imap2\DateTimeZone;
-use Javanile\Imap2\Exception;
-use Javanile\Imap2\rcube;
-use Javanile\Imap2\rcube_charset;
-use Javanile\Imap2\rcube_string_replacer;
+use DateTime;
+use DateTimeZone;
+use Exception;
+use rcube;
+use rcube_charset;
+use rcube_string_replacer;
 
 /**
  * Utility class providing common functions