update

Author: tamedevelopers

Capsule/TimeHelper.php

@@ -115,7 +115,7 @@ static public function setPassedDate($date = null)
         }
 
         if (is_numeric($date)) {
-            $date = date('M d Y', (int) $date);
+            $date = date('M d Y h:ia', (int) $date);
         }
 
         // if instance of Carbon

Collections/Collection.php

@@ -345,6 +345,50 @@ public function merge($items)
         return new static(array_merge($this->items, $items));
     }
 
+    /**
+     * Needed key from items
+     * @param array|string|null  $keys of input
+     * 
+     * @return static
+     */
+    public function only(...$keys)
+    {
+        $keys = Str::flattenValue($keys);
+
+        $data = [];
+
+        foreach($keys as $key){
+            if(in_array($key, array_keys($this->items))){
+                $data[$key] = $this->items[$key];
+            }
+        }
+
+        return new static(
+            $data
+        );
+    }
+
+    /**
+     * Remove key from items
+     * @param array|string|null  $keys of input
+     * 
+     * @return static
+     */
+    public function except(...$keys)
+    {
+        $keys = Str::flattenValue($keys);
+
+        foreach($keys as $key){
+            if(in_array($key, array_keys($this->items))){
+                unset($this->items[$key]);
+            }
+        }
+
+        return new static(
+            $this->items
+        );
+    }
+
     /**
      * Chunk the collection into arrays with a specified size.
      *

NumberToWords.php

@@ -98,7 +98,7 @@ public function __cents($cents = false)
      */
     public function __iso($code = null)
     {
-        $this->currencyData = self::getCurrencyValue($code);
+        $this->currencyData = self::getCurrencyByIso3($code);
 
         return $this;
     }
@@ -362,8 +362,8 @@ static private function convertChunkToText($number)
      */
     static private function removeCurrencyNames($value)
     {
-        // Get all currency and cent names from the CurrencyNames() method
-        $currencyData = self::CurrencyNames();
+        // Get all currency and cent names from the allCurrency() method
+        $currencyData = self::allCurrency();
 
         // Loop through each currency and remove the corresponding names from the value string
         foreach ($currencyData as $currency) {

README.md

@@ -40,6 +40,7 @@ Support Package For PHP and Laravel
     * [shorten](#shorten)
     * [random](#random)
     * [formatString](#formatString)
+    * [formatOnlyString](#formatOnlyString)
     * [encrypt](#encrypt)
     * [decrypt](#decrypt)
     * [bindings](#bindings)
@@ -77,6 +78,7 @@ Support Package For PHP and Laravel
     * [date](#date)
     * [today](#today)
     * [yesterday](#yesterday)
+    * [createFromFormat](#createFromFormat)
     * [timestamp](#timestamp)
     * [toJsTimer](#toJsTimer)
     * [diff](#diff)
@@ -286,20 +288,20 @@ Tame()->unlink(base_path('path/to/directory/avatar.png'), 'default.png');
 | Params        | Description                                                                                   |
 |---------------|-----------------------------------------------------------------------------------------------|
 | `$str`        | The string to be masked.                                                                      |
-| `$length`     | The number of characters to mask (default is 4).                                              |
+| `$length`     | The number of visible characters. Default is 4.                                              |
 | `$position`   | The position to apply the mask: `'left'`, `'center'`, or `'right'` (default is `'right'`).    |
 | `$mask`       | The character used for masking (default is `*`).                                              |
 
 #### Example:
 ```
 Tame()->mask('[email protected]', 4, 'left');
-// Output: "****ple@email.com"
+// Output: "exam***@email.com"
 
 Tame()->mask('[email protected]', 4, 'right');
-// Output: "exa****@email.com"
+// Output: "e***mple@email.com"
 
 Tame()->mask('shortstring', 4, 'center');
-// Output: "sho****ing"
+// Output: "sh*******ng"
 ```
 
 ### imageToBase64
@@ -592,6 +594,15 @@ $time->today();
 $time->yesterday();
 ```
 
+### createFromFormat
+- Accepts two parameter [date, format]
+    - only [date] is mandatory and returns the Time(object)
+
+```
+$time->createFromFormat('24 Jan 2025 14:00:00', 'm/d/Y h:ia');
+// object(Tamedevelopers\Support\Time)
+```
+
 ### timestamp
 - Accepts two parameter [date, format]
     - only [date] is mandatory and returns formated timestamp

Str.php

@@ -286,12 +286,15 @@ static public function exceptArray(array $array, $keys)
      *
      * @param  string  $search   The substring to search for.
      * @param  string  $replace  The replacement substring.
-     * @param  string  $subject  The original string.
+     * @param  string|null  $subject  The original string.
      * @return string  
      * - The modified string.
      */
-    static public function replaceFirst(string $search, string $replace, string $subject)
+    static public function replaceFirst(string $search, string $replace, $subject = null)
     {
+        $subject = self::replaceSubject($subject);
+        $replace = self::replaceSubject($replace);
+
         // Find the position of the first occurrence of the search string
         $pos = strpos($subject, $search);
 
@@ -309,12 +312,15 @@ static public function replaceFirst(string $search, string $replace, string $sub
      *
      * @param  string  $search   The substring to search for.
      * @param  string  $replace  The replacement substring.
-     * @param  string  $subject  The original string.
+     * @param  string|null  $subject  The original string.
      * @return string  
      * - The modified string.
      */
-    static public function replaceLast(string $search, string $replace, string $subject)
+    static public function replaceLast(string $search, string $replace, $subject = null)
     {
+        $subject = self::replaceSubject($subject);
+        $replace = self::replaceSubject($replace);
+
         // Find the position of the first occurrence of the search string
         $pos = strrpos($subject, $search);
 
@@ -342,6 +348,25 @@ static public function formatString($string, $number = 4, $seperator = '-')
         return self::replace(' ', '', $string);
     }
 
+    /**
+     * Format String Once with Separator
+     *
+     * @param  string $string
+     * @param  int $number
+     * @param  string $separator
+     * @return string
+     */
+    static public function formatOnlyString($string, $number = 4, $separator = '-')
+    {
+        $string = self::trim($string);
+        
+        if (strlen($string) > $number) {
+            $string = substr_replace($string, $separator, $number, 0);
+        }
+        
+        return self::replace(' ', '', $string);
+    }
+
     /**
      * Clean phone string
      *
@@ -363,7 +388,7 @@ static public function phone($phone = null, ?bool $allow = true)
      * - The string to be masked.
      * 
      * @param int $length 
-     * - The desired length of the masked string. Default is 4.
+     * - The number of visible characters. Default is 4.
      * 
      * @param string $position 
      * - The position to apply the mask: 'left', 'middle' or 'center', 'right'. Default is 'right'.
@@ -702,14 +727,17 @@ static public function trim($string = null, string $characters = " \n\r\t\v\0")
 
     /**
      * Replace all occurrences of the search string with the replacement string
-     * @param string|string[] $search
-     * @param string|string[] $replace
-     * @param string|string[] $subject
+     * @param array|string $search
+     * @param array|string $replace
+     * @param string|null $subject
      * 
      * @return string
      */
-    static public function replace(array|string $search, array|string $replace, array|string $subject)
+    static public function replace($search, $replace, $subject = null)
     {
+        $subject = self::replaceSubject($subject);
+        $replace = self::replaceSubject($replace);
+
         return str_replace($search, $replace, $subject);
     }
 
@@ -950,6 +978,17 @@ static public function padString(string $value, int $length, string $padChar = '
     {
         return str_pad($value, $length, $padChar, $padType);
     }
+    
+    /**
+     * Replace Subject
+     *
+     * @param  mixed $subject
+     * @return void
+     */
+    static private function replaceSubject($subject = null)
+    {
+        return is_null($subject) ? (string) $subject : $subject;
+    }
 
     /**
      * Convert the case of a string based on the specified type.

Tame.php

@@ -1094,16 +1094,16 @@ static public function imageToBase64($path = null, $url = false)
     }
 
     /**
-     * Masks characters in a string.
+     * Masks characters in a string while keeping a specified number of visible characters.
      *
      * @param string|null $str 
      * - The string to be masked.
      * 
      * @param int $length 
-     * - The desired length of the masked string. Default is 4.
+     * - The number of visible characters. Default is 4.
      * 
      * @param string $position 
-     * - The position to apply the mask: 'left', 'center', 'right'. Default is 'right'.
+     * - The position to keep visible: 'left', 'center', 'right'. Default is 'right'.
      * 
      * @param string $mask 
      * - The character used for masking. Default is '*'.
@@ -1118,69 +1118,52 @@ static public function mask($str = null, ?int $length = 4, ?string $position = '
             return $str;
         }
 
-        // trim string
+        // Trim string and position input
         $str = Str::trim($str);
         $position = Str::trim($position);
 
         // Get the length of the string
         $strLength = mb_strlen($str, 'UTF-8');
 
+        // If length is greater than or equal to the string length, return the original string (nothing to mask)
+        if ($length >= $strLength) {
+            return $str;
+        }
+
+        // Calculate the number of masked characters
+        $maskedLength = max(0, $strLength - $length);
+
         // Check if it's an email by finding the last occurrence of "@"
         $atPosition = mb_strrpos($str, "@", 0, 'UTF-8');
-
-        // Check if it's an actual email
         $isEmail = self::emailValidator($str, false, false);
 
-        // Convert length to integer
-        $length = (int) $length;
-
-        // Ensure the mask length does not exceed the string length
-        $length = min($length, $strLength);
-
-        // is length and string length is same, then divide num into two
-        if($strLength === $length){
-            $length = (int) ceil($length / 2);
-        }
-
-        // Calculate number of unmasked characters
-        $unmaskedLength = $strLength - $length;
-
-        // if valid email address and position of email is found
+        // If it's a valid email, mask only the email part (excluding the domain)
         if ($isEmail && $atPosition !== false) {
-            // extract email without the tld (top-level domain)
             $email = mb_substr($str, 0, mb_strpos($str, "@"));
-
-            // extract only the tld, to be added at the end
             $tld = mb_substr($str, mb_strpos($str, "@"));
 
-            // now mask only the email using the middle position
-            $maskedString = self::mask($email, $length, $position);
-
-            return "{$maskedString}{$tld}";
+            // Mask only the email part, keeping visibility as per the $length
+            $maskedEmail = self::mask($email, $length, $position);
+            return "{$maskedEmail}{$tld}";
         }
 
-        // For left position
-        if ($position == 'left') {
-            // Mask the first 'length' characters and leave the rest visible
-            return str_repeat($mask, $length) . mb_substr($str, $length, null, 'UTF-8');
+        // Left masking: Show first 'length' characters, mask the rest
+        if ($position === 'left') {
+            return mb_substr($str, 0, $length, 'UTF-8') . str_repeat($mask, $maskedLength);
         } 
-        elseif ($position == 'right') {
-            // Mask the right part of the string
-            return mb_substr($str, 0, $unmaskedLength, 'UTF-8') . str_repeat($mask, $length);
+        // Right masking: Mask everything except the last 'length' characters
+        elseif ($position === 'right') {
+            return str_repeat($mask, $maskedLength) . mb_substr($str, -$length, null, 'UTF-8');
         } 
+        // Center masking: Keep equal parts visible on both sides
         else {
-            // Calculate how much to keep visible on both sides
-            $halfLength = (int) floor(($strLength - $length) / 2); // Evenly distribute the mask
-
-            // Ensure the remaining visible part accounts for the total length correctly
-            $start      = mb_substr($str, 0, $halfLength);
-            $end        = mb_substr($str, - $halfLength);
-
-            // Mask the middle portion
-            return $start . str_repeat($mask, $length) . $end;
+            $halfVisible = (int) floor($length / 2);
+            $start = mb_substr($str, 0, $halfVisible, 'UTF-8');
+            $end = mb_substr($str, -$halfVisible, null, 'UTF-8');
+            return $start . str_repeat($mask, $maskedLength) . $end;
         }
     }
-
+    
     /**
      * Validate an email address.
      *

Tests/numberToWords.php

@@ -21,7 +21,7 @@
         ->toNumber(),
 
 
-    NumberToWords()->getCurrencyValue('nga'),
-    // NumberToWords()->CurrencyNames(),
+    NumberToWords()->getCurrencyByIso3('nga'),
+    // NumberToWords()->allCurrency(),
     // NumberToWords::getUnits(),
 );

Time.php

@@ -233,6 +233,20 @@ public function subYears($value = 0)
     {
         return $this->buildTimeModifier('year', $value, true);
     }
+    
+    /**
+     * Create date from Format
+     *
+     * @param  int|string $datetime
+     * @param  string $format
+     * @return void
+     */
+    public function createFromFormat($datetime, $format = 'm/d/Y h:i:sa')
+    {
+        return $this->__setDate(
+            self::timestamp($datetime, $format)
+        );
+    }
 
     /**
      * Set custom time