Merge pull request #327 from barbushin/develop

Fixed PHPUnit tests, setConnectionArgs() and string encoding
barbushin · May 18, 2019 · b23e99b · b23e99b
2 parents 72ead4e + 3f3e3ee
commit b23e99b
Show file tree

Hide file tree

Showing 3 changed files with 432 additions and 440 deletions.
diff --git a/src/PhpImap/DataPartInfo.php b/src/PhpImap/DataPartInfo.php
@@ -61,7 +61,7 @@ function fetch() {
 		}
 
 		if(isset($this->charset) AND !empty($this->charset)) {
-			$this->data = $this->mail->decodeMimeStr($this->data, $this->charset);
+			$this->data = $this->mail->convertStringEncoding($this->data, $this->charset, $this->mail->getServerEncoding());
 		}
 
 		return $this->data;

diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php
@@ -198,7 +198,7 @@ public function setConnectionArgs($options = 0, $retriesNum = 0, $params = NULL)
 		if($options != 0) {
 			$supported_options = array(OP_READONLY, OP_ANONYMOUS, OP_HALFOPEN, CL_EXPUNGE, OP_DEBUG, OP_SHORTCACHE, OP_SILENT, OP_PROTOTYPE, OP_SECURE);
 			if(!in_array($options, $supported_options)) {
-				throw new InvalidParameterException('Please check your options for setConnectionArgs()! You have provided an unsupported option. Available options: https://www.php.net/manual/de/function.imap-open.php');
+				throw new InvalidParameterException('Please check your option for setConnectionArgs()! Unsupported option "'.$options.'". Available options: https://www.php.net/manual/de/function.imap-open.php');
 			}
 			$this->imapOptions = $options;
 		}
@@ -210,14 +210,14 @@ public function setConnectionArgs($options = 0, $retriesNum = 0, $params = NULL)
 			$this->imapRetriesNum = $retriesNum;
 		}
 
-		if($params != NULL AND !empty(is_array($params))) {
+		if($params != NULL AND !empty($params)) {
 			$supported_params = array('DISABLE_AUTHENTICATOR');
 			if(!is_array($params)) {
 				throw new InvalidParameterException('setConnectionArgs() requires $params to be an array!');
 			}
 
 			foreach($params as $key => $value) {
-				if(!array_key_exists($key, $supported_params)) {
+				if(!in_array($key, $supported_params)) {
 					throw new InvalidParameterException('Invalid array key of params provided for setConnectionArgs()! Only DISABLE_AUTHENTICATOR is currently valid.');
 				}
 			}