Merge pull request #1 from Webklex/master

Changes from original repo

Author: ZelmaLab-Paulius

CHANGELOG.md

@@ -17,6 +17,29 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 ### Breaking changes
 - NaN
 
+## [2.4.2] - 2021-01-09
+### Fixed
+- Attachment::save() return error 'A facade root has not been set' #87
+- Unused dependencies removed
+- Fix PHP 8 error that changes null back in to an empty string. #88 (thanks @mennovanhout)
+- Fix regex to be case insensitive #88 (thanks @mennovanhout)
+
+### Affected Classes
+- [Attachment::class](src/Attachment.php)
+- [Address::class](src/Address.php)
+- [Attribute::class](src/Attribute.php)
+- [Structure::class](src/Structure.php)
+
+## [2.4.1] - 2021-01-06
+### Fixed
+- Debug line position fixed
+- Handle incomplete address to string conversion #83
+- Configured message key gets overwritten by the first fetched message #84
+
+### Affected Classes
+- [Address::class](src/Address.php)
+- [Query::class](src/Query/Query.php)
+
 ## [2.4.0] - 2021-01-03
 ### Fixed
 - Get partial overview when `IMAP::ST_UID` is set #74

README.md

@@ -3,7 +3,7 @@
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]][link-license]
-[![Build Status][ico-build]][link-scrutinizer] 
+[![Build Status][ico-travis]][link-scrutinizer] 
 [![Total Downloads][ico-downloads]][link-downloads]
 [![Hits][ico-hits]][link-hits]
 

src/Address.php

@@ -12,12 +12,6 @@
 
 namespace Webklex\PHPIMAP;
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\File;
-use Webklex\PHPIMAP\Exceptions\MaskNotFoundException;
-use Webklex\PHPIMAP\Exceptions\MethodNotFoundException;
-use Webklex\PHPIMAP\Support\Masks\AttachmentMask;
-
 /**
  * Class Address
  *

src/Attachment.php

@@ -13,7 +13,6 @@
 namespace Webklex\PHPIMAP;
 
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\File;
 use Webklex\PHPIMAP\Exceptions\MaskNotFoundException;
 use Webklex\PHPIMAP\Exceptions\MethodNotFoundException;
 use Webklex\PHPIMAP\Support\Masks\AttachmentMask;
@@ -246,7 +245,7 @@ protected function fetch() {
     public function save($path, $filename = null) {
         $filename = $filename ?: $this->getName();
 
-        return File::put($path.$filename, $this->getContent()) !== false;
+        return file_put_contents($path.$filename, $this->getContent()) !== false;
     }
 
     /**

src/Attribute.php

@@ -12,12 +12,6 @@
 
 namespace Webklex\PHPIMAP;
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\File;
-use Webklex\PHPIMAP\Exceptions\MaskNotFoundException;
-use Webklex\PHPIMAP\Exceptions\MethodNotFoundException;
-use Webklex\PHPIMAP\Support\Masks\AttachmentMask;
-
 /**
  * Class Attribute
  *

src/Connection/Protocols/ImapProtocol.php

@@ -233,6 +233,7 @@ public function readLine(&$tokens = [], $wantedTag = '*', $dontParse = false) {
         } else {
             $tokens = $line;
         }
+        if ($this->debug) echo "<< ".$line."\n";
 
         // if tag is wanted tag we might be at the end of a multiline response
         return $tag == $wantedTag;
@@ -257,11 +258,6 @@ public function readResponse($tag, $dontParse = false) {
             // First two chars are still needed for the response code
             $tokens = [substr($tokens, 0, 2)];
         }
-        if (is_array($lines)){
-            if ($this->debug) echo "<< ".json_encode($lines)."\n";
-        }else{
-            if ($this->debug) echo "<< ".$lines."\n";
-        }
 
         // last line has response code
         if ($tokens[0] == 'OK') {

src/Query/Query.php

@@ -242,20 +242,20 @@ public function get() {
                     $message = Message::make($uid, $msglist, $this->getClient(), $raw_header, $raw_content, $raw_flag, $this->getFetchOptions(), $this->sequence);
                     switch ($message_key){
                         case 'number':
-                            $message_key = $message->getMessageNo();
+                            $key = $message->getMessageNo();
                             break;
                         case 'list':
-                            $message_key = $msglist;
+                            $key = $msglist;
                             break;
                         case 'uid':
-                            $message_key = $message->getUid();
+                            $key = $message->getUid();
                             break;
                         default:
-                            $message_key = $message->getMessageId();
+                            $key = $message->getMessageId();
                             break;
 
                     }
-                    $messages->put("$message_key", $message);
+                    $messages->put("$key", $message);
                     $msglist++;
                 }
             }

src/Structure.php

@@ -98,9 +98,16 @@ public function findContentType(){
 
     /**
      * Determine the message content type
+     *
+     * @return string|null
      */
     public function getBoundary(){
-        $boundary = $this->header->find("/boundary=\"?([^\"]*)[\";\s]/");
+        $boundary = $this->header->find("/boundary=\"?([^\"]*)[\";\s]/i");
+
+        if ($boundary === null) {
+            return null;
+        }
+
         return str_replace('"', '', $boundary);
     }