fix: fix str util unit tests error

Author: inhere

src/Str/StringHelper.php

@@ -341,7 +341,7 @@ public static function wrapList(array $list, string $wrapChar): array
     {
         $new = [];
         foreach ($list as $val) {
-            $new = self::wrap($val, $wrapChar);
+            $new[] = self::wrap($val, $wrapChar);
         }
 
         return $new;

src/Str/Traits/StringConvertTrait.php

@@ -10,6 +10,7 @@
 namespace Toolkit\Stdlib\Str\Traits;
 
 use Toolkit\Stdlib\Helper\DataHelper;
+use function array_filter;
 use function array_map;
 use function array_values;
 use function count;
@@ -85,43 +86,24 @@ public static function str2ints(string $str, string $delimiter = ',', int $limit
     }
 
     /**
-     * like explode, split string to no empty array
-     *
-     * - Difference toNoEmptyArray() and splitTrimFiltered().
-     *
-     * Please see {@see StringHelperTest::testDiff_splitTrimFiltered_toNoEmptyArray()}
-     * So, recommend use toNoEmptyArray() instead splitTrimFiltered()
+     * Like explode, but will trim each item and filter empty item.
+     * - alias of toNoEmptyArray()
      *
      * @param string $str
-     * @param string $sep
-     * @param int $limit
-     *
-     * @return array
-     */
-    public static function toNoEmptyArray(string $str, string $sep = ',', int $limit = -1): array
-    {
-        $str = trim($str, "$sep ");
-        if (!$str) {
-            return [];
-        }
-
-        $pattern = $sep === ' ' ? '/\s+/' : "/\s*$sep\s*/";
-        return preg_split($pattern, $str, $limit, PREG_SPLIT_NO_EMPTY);
-    }
-
-    /**
-     * @param string $str
-     * @param string $sep
+     * @param string $separator
      * @param int    $limit
      *
      * @return array
      */
-    public static function splitNoEmptyArray(string $str, string $sep = ',', int $limit = 0): array
+    public static function explode(string $str, string $separator = '.', int $limit = 0): array
     {
-        return self::toNoEmptyArray($str, $sep, $limit);;
+        return self::toNoEmptyArray($str, $separator, $limit);
+        // return self::splitTrimFiltered($str, $separator, $limit);
     }
 
     /**
+     * alias of toNoEmptyArray()
+     *
      * @param string $str
      * @param string $sep
      * @param int    $limit
@@ -134,7 +116,7 @@ public static function toArray(string $str, string $sep = ',', int $limit = 0):
     }
 
     /**
-     * split to array.
+     * alias of toNoEmptyArray()
      *
      * @param string $str
      * @param string $sep
@@ -148,56 +130,54 @@ public static function str2array(string $str, string $sep = ',', int $limit = 0)
     }
 
     /**
-     * Like explode, but will trim each item and filter empty item.
+     * alias of toNoEmptyArray()
      *
      * @param string $str
-     * @param string $separator
+     * @param string $delimiter
      * @param int    $limit
      *
      * @return array
      */
-    public static function explode(string $str, string $separator = '.', int $limit = 0): array
+    public static function split2Array(string $str, string $delimiter = ',', int $limit = 0): array
     {
-        return self::toNoEmptyArray($str, $separator, $limit);
-        // return self::splitTrimFiltered($str, $separator, $limit);
+        return self::toNoEmptyArray($str, $delimiter, $limit);
     }
 
     /**
-     * Like explode, but will trim each item and filter empty item.
+     * like explode, split string to no empty array
+     *
+     * - Difference toNoEmptyArray() and splitTrimFiltered().
+     *
+     * Please see {@see StringHelperTest::testDiff_splitTrimFiltered_toNoEmptyArray()}
+     * So, recommend use toNoEmptyArray() instead splitTrimFiltered()
      *
      * @param string $str
-     * @param string $delimiter
-     * @param int    $limit
+     * @param string $sep
+     * @param int $limit
      *
      * @return array
      */
-    public static function split2Array(string $str, string $delimiter = ',', int $limit = 0): array
+    public static function toNoEmptyArray(string $str, string $sep = ',', int $limit = -1): array
     {
-        return self::toNoEmptyArray($str, $delimiter, $limit);
+        $str = trim($str, "$sep ");
+        if (!$str) {
+            return [];
+        }
+
+        $pattern = $sep === ' ' ? '/\s+/' : "/\s*$sep\s*/";
+        return preg_split($pattern, $str, $limit, PREG_SPLIT_NO_EMPTY);
     }
 
     /**
-     * Like explode, but will trim each item and filter empty item.
-     *
      * @param string $str
-     * @param string $delimiter
+     * @param string $sep
      * @param int    $limit
      *
      * @return array
      */
-    public static function splitTrimFiltered(string $str, string $delimiter = ',', int $limit = 0): array
+    public static function splitNoEmptyArray(string $str, string $sep = ',', int $limit = 0): array
     {
-        if (!$str = trim($str)) {
-            return [];
-        }
-
-        if (!strpos($str, $delimiter)) {
-            return [$str];
-        }
-
-        $list = $limit < 1 ? explode($delimiter, $str) : explode($delimiter, $str, $limit);
-
-        return array_values(array_filter(array_map('trim', $list), 'strlen'));
+        return self::toNoEmptyArray($str, $sep, $limit);;
     }
 
     /**
@@ -279,6 +259,31 @@ public static function splitTypedList(string $str, string $delimiter = ','): arr
 
         return $arr;
     }
+
+    /**
+     * Like explode, but will trim each item and filter empty item.
+     *
+     * @param string $str
+     * @param string $delimiter
+     * @param int    $limit
+     *
+     * @return array
+     */
+    public static function splitTrimFiltered(string $str, string $delimiter = ',', int $limit = 0): array
+    {
+        if (!$str = trim($str)) {
+            return [];
+        }
+
+        if (!strpos($str, $delimiter)) {
+            return [$str];
+        }
+
+        $list = $limit < 1 ? explode($delimiter, $str) : explode($delimiter, $str, $limit);
+
+        return array_values(array_filter(array_map('trim', $list), 'strlen'));
+    }
+
     /**
      * @param string $string
      * @param int    $width