Point to root namespace if handling native functions #279

Webklex · Webklex · commit 5d796754eea3 · 2020-01-24T06:58:40.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,17 +6,21 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [UNRELEASED]
 ### Fixed
-- NaN
+- Point to root namespace if handling native functions #279
 
 ### Added
 - NaN
 
-### Affected Classes
-- NaN
-
 ### Breaking changes
 - NaN
 
+### Affected Classes
+- [Query::class](src/Query/WhereQuery.php)
+- [Attachment::class](src/Attachment.php)
+- [Client::class](src/Client.php)
+- [Folder::class](src/Folder.php)
+- [Message::class](src/Message.php)
+
 ## [1.4.5] - 2019-01-23
 ### Fixed
 - Convert encoding of personal data struct #272
diff --git a/src/IMAP/Attachment.php b/src/IMAP/Attachment.php
@@ -201,7 +201,7 @@ protected function findType() {
      */
     protected function fetch() {
 
-        $content = imap_fetchbody($this->oMessage->getClient()->getConnection(), $this->oMessage->getUid(), $this->part_number, $this->oMessage->getFetchOptions() | FT_UID);
+        $content = \imap_fetchbody($this->oMessage->getClient()->getConnection(), $this->oMessage->getUid(), $this->part_number, $this->oMessage->getFetchOptions() | FT_UID);
 
         $this->content_type = $this->type.'/'.strtolower($this->structure->subtype);
         $this->content = $this->oMessage->decodeString($content, $this->structure->encoding);
@@ -265,7 +265,7 @@ public function save($path = null, $filename = null) {
      */
     public function setName($name) {
         if($this->config['decoder']['message']['subject'] === 'utf-8') {
-            $this->name = imap_utf8($name);
+            $this->name = \imap_utf8($name);
         }else{
             $this->name = mb_decode_mimeheader($name);
         }
diff --git a/src/IMAP/Client.php b/src/IMAP/Client.php
@@ -283,7 +283,7 @@ public function connect($attempts = 3) {
         $this->disconnect();
 
         try {
-            $this->connection = imap_open(
+            $this->connection = \imap_open(
                 $this->getAddress(),
                 $this->username,
                 $this->password,
@@ -293,7 +293,7 @@ public function connect($attempts = 3) {
             );
             $this->connected = !!$this->connection;
         } catch (\ErrorException $e) {
-            $errors = imap_errors();
+            $errors = \imap_errors();
             $message = $e->getMessage().'. '.implode("; ", (is_array($errors) ? $errors : array()));
 
             throw new ConnectionFailedException($message);
@@ -309,8 +309,8 @@ public function connect($attempts = 3) {
      */
     public function disconnect() {
         if ($this->isConnected() && $this->connection !== false && is_integer($this->connection) === false) {
-            $this->errors = array_merge($this->errors, imap_errors() ?: []);
-            $this->connected = !imap_close($this->connection, IMAP::CL_EXPUNGE);
+            $this->errors = array_merge($this->errors, \imap_errors() ?: []);
+            $this->connected = !\imap_close($this->connection, IMAP::CL_EXPUNGE);
         }
 
         return $this;
@@ -360,7 +360,7 @@ public function getFolders($hierarchical = true, $parent_folder = null) {
 
         $pattern = $parent_folder.($hierarchical ? '%' : '*');
 
-        $items = imap_getmailboxes($this->connection, $this->getAddress(), $pattern);
+        $items = \imap_getmailboxes($this->connection, $this->getAddress(), $pattern);
         if(is_array($items)){
             foreach ($items as $item) {
                 $folder = new Folder($this, $item);
@@ -399,7 +399,7 @@ public function openFolder($folder_path, $attempts = 3) {
         if ($this->active_folder !== $folder_path) {
             $this->active_folder = $folder_path;
 
-            imap_reopen($this->getConnection(), $folder_path, $this->getOptions(), $attempts);
+            \imap_reopen($this->getConnection(), $folder_path, $this->getOptions(), $attempts);
         }
     }
 
@@ -413,7 +413,7 @@ public function openFolder($folder_path, $attempts = 3) {
      */
     public function createFolder($name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
+        $status = \imap_createmailbox($this->getConnection(), $this->getAddress() . \imap_utf7_encode($name));
         if($expunge) $this->expunge();
 
         return $status;
@@ -430,7 +430,7 @@ public function createFolder($name, $expunge = true) {
      */
     public function renameFolder($old_name, $new_name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name));
+        $status = \imap_renamemailbox($this->getConnection(), $this->getAddress() . \imap_utf7_encode($old_name), $this->getAddress() . \imap_utf7_encode($new_name));
         if($expunge) $this->expunge();
 
         return $status;
@@ -446,7 +446,7 @@ public function renameFolder($old_name, $new_name, $expunge = true) {
      */
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
+        $status = \imap_deletemailbox($this->getConnection(), $this->getAddress() . \imap_utf7_encode($name));
         if($expunge) $this->expunge();
 
         return $status;
@@ -522,7 +522,7 @@ public function searchMessages(array $where, Folder $folder, $fetch_options = nu
     }
 
     /**
-     * Get option for imap_open and imap_reopen.
+     * Get option for \imap_open and \imap_reopen.
      * It supports only isReadOnly feature.
      *
      * @return int
@@ -560,7 +560,7 @@ protected function getAddress() {
      */
     public function getQuota() {
         $this->checkConnection();
-        return imap_get_quota($this->getConnection(), 'user.'.$this->username);
+        return \imap_get_quota($this->getConnection(), 'user.'.$this->username);
     }
 
     /**
@@ -573,7 +573,7 @@ public function getQuota() {
      */
     public function getQuotaRoot($quota_root = 'INBOX') {
         $this->checkConnection();
-        return imap_get_quotaroot($this->getConnection(), $quota_root);
+        return \imap_get_quotaroot($this->getConnection(), $quota_root);
     }
 
     /**
@@ -584,7 +584,7 @@ public function getQuotaRoot($quota_root = 'INBOX') {
      */
     public function countMessages() {
         $this->checkConnection();
-        return imap_num_msg($this->connection);
+        return \imap_num_msg($this->connection);
     }
 
     /**
@@ -595,7 +595,7 @@ public function countMessages() {
      */
     public function countRecentMessages() {
         $this->checkConnection();
-        return imap_num_recent($this->connection);
+        return \imap_num_recent($this->connection);
     }
 
     /**
@@ -604,7 +604,7 @@ public function countRecentMessages() {
      * @return array
      */
     public function getAlerts() {
-        return imap_alerts();
+        return \imap_alerts();
     }
 
     /**
@@ -613,7 +613,7 @@ public function getAlerts() {
      * @return array
      */
     public function getErrors() {
-        $this->errors = array_merge($this->errors, imap_errors() ?: []);
+        $this->errors = array_merge($this->errors, \imap_errors() ?: []);
 
         return $this->errors;
     }
@@ -624,7 +624,7 @@ public function getErrors() {
      * @return string
      */
     public function getLastError() {
-        return imap_last_error();
+        return \imap_last_error();
     }
 
     /**
@@ -635,7 +635,7 @@ public function getLastError() {
      */
     public function expunge() {
         $this->checkConnection();
-        return imap_expunge($this->connection);
+        return \imap_expunge($this->connection);
     }
 
     /**
@@ -652,7 +652,7 @@ public function expunge() {
      */
     public function checkCurrentMailbox() {
         $this->checkConnection();
-        return imap_check($this->connection);
+        return \imap_check($this->connection);
     }
 
     /**
@@ -665,7 +665,7 @@ public function checkCurrentMailbox() {
      */
     public function setTimeout($type, $timeout) {
         if(0 <= $type && $type <= 4) {
-            return imap_timeout($type, $timeout);
+            return \imap_timeout($type, $timeout);
         }
 
         throw new InvalidImapTimeoutTypeException("Invalid imap timeout type provided.");
@@ -680,7 +680,7 @@ public function setTimeout($type, $timeout) {
      */
     public function getTimeout($type){
         if(0 <= $type && $type <= 4) {
-            return imap_timeout($type);
+            return \imap_timeout($type);
         }
 
         throw new InvalidImapTimeoutTypeException("Invalid imap timeout type provided.");
diff --git a/src/IMAP/Folder.php b/src/IMAP/Folder.php
@@ -193,7 +193,7 @@ public function setChildren($children = []) {
      */
     public function getMessage($uid, $msglist = null, $fetch_options = null, $fetch_body = false, $fetch_attachment = false, $fetch_flags = true) {
         $this->client->openFolder($this->path);
-        if (imap_msgno($this->getClient()->getConnection(), $uid) > 0) {
+        if (\imap_msgno($this->getClient()->getConnection(), $uid) > 0) {
             return new Message($uid, $msglist, $this->getClient(), $fetch_options, $fetch_body, $fetch_attachment, $fetch_flags);
         }
 
@@ -279,7 +279,7 @@ public function getUnseenMessages($criteria = 'UNSEEN', $fetch_options = null, $
      * @throws GetMessagesFailedException
      *
      * @doc http://php.net/manual/en/function.imap-search.php
-     *      imap_search() only supports IMAP2 search criterias, because the function mail_criteria() (from c-client lib)
+     *      \imap_search() only supports IMAP2 search criterias, because the function mail_criteria() (from c-client lib)
      *      is used in ext/imap/php_imap.c for parsing the search string.
      *      IMAP2 search criteria is defined in RFC 1176, section "tag SEARCH search_criteria".
      *
@@ -374,7 +374,7 @@ protected function parseAttributes($attributes) {
      * @throws Exceptions\ConnectionFailedException
      */
     public function delete($expunge = true) {
-        $status = imap_deletemailbox($this->client->getConnection(), $this->path);
+        $status = \imap_deletemailbox($this->client->getConnection(), $this->path);
         if($expunge) $this->client->expunge();
 
         return $status;
@@ -391,7 +391,7 @@ public function delete($expunge = true) {
      * @throws Exceptions\ConnectionFailedException
      */
     public function move($target_mailbox, $expunge = true) {
-        $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox);
+        $status = \imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox);
         if($expunge) $this->client->expunge();
 
         return $status;
@@ -412,7 +412,7 @@ public function move($target_mailbox, $expunge = true) {
      * @throws Exceptions\ConnectionFailedException
      */
     public function getStatus($options) {
-        return imap_status($this->client->getConnection(), $this->path, $options);
+        return \imap_status($this->client->getConnection(), $this->path, $options);
     }
 
     /**
@@ -436,10 +436,10 @@ public function appendMessage($message, $options = null, $internal_date = null)
             if ($internal_date instanceof \Carbon\Carbon){
                 $internal_date = $internal_date->format('d-M-Y H:i:s O');
             }
-            return imap_append($this->client->getConnection(), $this->path, $message, $options, $internal_date);
+            return \imap_append($this->client->getConnection(), $this->path, $message, $options, $internal_date);
         }
 
-        return imap_append($this->client->getConnection(), $this->path, $message, $options);
+        return \imap_append($this->client->getConnection(), $this->path, $message, $options);
     }
 
     /**
diff --git a/src/IMAP/Message.php b/src/IMAP/Message.php
diff --git a/src/IMAP/Query/Query.php b/src/IMAP/Query/Query.php
