replace helpers functions (#250)

Webklex · Sep 17, 2019 · 8acbbda · 8acbbda
1 parent d40033b
commit 8acbbda
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/IMAP/Attachment.php b/src/IMAP/Attachment.php
@@ -13,6 +13,7 @@
 namespace Webklex\IMAP;
 
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
 use Webklex\IMAP\Exceptions\MaskNotFoundException;
 use Webklex\IMAP\Exceptions\MethodNotFoundException;
@@ -111,15 +112,15 @@ public function __construct(Message $oMessage, $structure, $part_number = 1) {
      */
     public function __call($method, $arguments) {
         if(strtolower(substr($method, 0, 3)) === 'get') {
-            $name = snake_case(substr($method, 3));
+            $name = Str::snake(substr($method, 3));
 
             if(isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
             return null;
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
-            $name = snake_case(substr($method, 3));
+            $name = Str::snake(substr($method, 3));
 
             $this->attributes[$name] = array_pop($arguments);
 
@@ -336,4 +337,4 @@ public function mask($mask = null){
 
         throw new MaskNotFoundException("Unknown mask provided: ".$mask);
     }
-}
+}
diff --git a/src/IMAP/Message.php b/src/IMAP/Message.php
@@ -13,6 +13,7 @@
 namespace Webklex\IMAP;
 
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 use Webklex\IMAP\Exceptions\InvalidMessageDateException;
 use Webklex\IMAP\Exceptions\MaskNotFoundException;
 use Webklex\IMAP\Exceptions\MethodNotFoundException;
@@ -239,14 +240,14 @@ public function __construct($uid, $msglist, Client $client, $fetch_options = nul
      */
     public function __call($method, $arguments) {
         if(strtolower(substr($method, 0, 3)) === 'get') {
-            $name = snake_case(substr($method, 3));
+            $name = Str::snake(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
-            $name = snake_case(substr($method, 3));
+            $name = Str::snake(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
                 $this->attributes[$name] = array_pop($arguments);

diff --git a/src/IMAP/Query/WhereQuery.php b/src/IMAP/Query/WhereQuery.php
@@ -12,6 +12,7 @@
 
 namespace Webklex\IMAP\Query;
 
+use Illuminate\Support\Str;
 use Webklex\IMAP\Exceptions\InvalidWhereQueryCriteriaException;
 use Webklex\IMAP\Exceptions\MethodNotFoundException;
 use Webklex\IMAP\Exceptions\MessageSearchValidationException;
@@ -73,7 +74,7 @@ class WhereQuery extends Query {
     public function __call($name, $arguments) {
         $that = $this;
 
-        $name = camel_case($name);
+        $name = Str::camel($name);
 
         if(strtolower(substr($name, 0, 3)) === 'not') {
             $that = $that->whereNot();
@@ -425,4 +426,4 @@ public function whereIsXSpam(){
     public function whereLanguage($country_code){
         return $this->where("Content-Language $country_code");
     }
-}
+}
diff --git a/src/IMAP/Support/Masks/Mask.php b/src/IMAP/Support/Masks/Mask.php
@@ -12,6 +12,7 @@
 
 namespace Webklex\IMAP\Support\Masks;
 
+use Illuminate\Support\Str;
 use Webklex\IMAP\Exceptions\MethodNotFoundException;
 
 /**
@@ -60,14 +61,14 @@ protected function boot(){}
      */
     public function __call($method, $arguments) {
         if(strtolower(substr($method, 0, 3)) === 'get') {
-            $name = snake_case(substr($method, 3));
+            $name = Str::snake(substr($method, 3));
 
             if(isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
-            $name = snake_case(substr($method, 3));
+            $name = Str::snake(substr($method, 3));
 
             if(isset($this->attributes[$name])) {
                 $this->attributes[$name] = array_pop($arguments);
@@ -123,4 +124,4 @@ public function getAttributes(){
         return $this->attributes;
     }
 
-}
+}