Merge branch 'master' into patch-1

Author: Webklex

CHANGELOG.md

@@ -5,12 +5,14 @@ All notable changes to `webklex/laravel-imap` will be documented in this file.
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
 ## [UNRELEASED]
-
 ### Fixed
 - Fix implode error in Client.php, beacause imap_errors() can return FALSE instand of array
 
+### Added
+-FT_UID changed to $this->options which references to `imap.options.fetch`
+
 ### Affected Classes
--NaN-
+\Webklex\IMAP\Message
 
 ## [1.0.3.1] - 2017-09-05
 ### Added

src/IMAP/Message.php

@@ -97,8 +97,6 @@ class Message {
      * @const integer   ENC_BASE64
      * @const integer   ENC_QUOTED_PRINTABLE
      * @const integer   ENC_OTHER
-     *
-     * @const integer   FT_UID
      */
     const TYPE_TEXT = 0;
     const TYPE_MULTIPART = 1;
@@ -117,8 +115,6 @@ class Message {
     const ENC_QUOTED_PRINTABLE = 4;
     const ENC_OTHER = 5;
 
-    const FT_UID = 1;
-
     /**
      * Message constructor.
      *
@@ -222,7 +218,7 @@ public function getHTMLBody($replaceImages = false) {
      * @return void
      */
     private function parseHeader() {
-        $header = imap_fetchheader($this->client->connection, $this->uid, FT_UID);
+        $header = imap_fetchheader($this->client->connection, $this->uid, $this->fetch_options);
         if ($header) {
             $header = imap_rfc822_parse_headers($header);
         }
@@ -302,7 +298,7 @@ private function parseAddresses($list) {
      * @return void
      */
     private function parseBody() {
-        $structure = imap_fetchstructure($this->client->connection, $this->uid, FT_UID);
+        $structure = imap_fetchstructure($this->client->connection, $this->uid, $this->fetch_options);
 
         $this->fetchStructure($structure);
     }
@@ -546,7 +542,7 @@ public function moveToFolder($mailbox = 'INBOX'){
      * @return bool
      */
     public function delete(){
-        $status = imap_delete($this->client->connection, $this->uid, self::FT_UID);
+        $status = imap_delete($this->client->connection, $this->uid, $this->fetch_options);
         $this->client->expunge();
 
         return $status;