fix some error

Author: inhere

src/Arr/ArrayHelper.php

@@ -12,7 +12,7 @@
 use ArrayAccess;
 use ArrayObject;
 use stdClass;
-use Toolkit\Collection\CollectionInterface;
+use Toolkit\Stdlib\Php;
 use Traversable;
 use function array_change_key_case;
 use function array_diff;
@@ -39,6 +39,7 @@
 use function is_scalar;
 use function is_string;
 use function mb_strlen;
+use function method_exists;
 use function strlen;
 use function strpos;
 use function strtolower;
@@ -250,7 +251,7 @@ public static function valueTrim(array $data)
             return trim($data);
         }
 
-        array_walk_recursive($data, function (&$value): void {
+        array_walk_recursive($data, static function (&$value): void {
             $value = trim($value);
         });
 
@@ -330,7 +331,7 @@ public static function valueExistsAll($check, array $sampleArr): bool
         // 以逗号分隔的会被拆开，组成数组
         if (is_string($check)) {
             $check = trim($check, ', ');
-            $check = strpos($check, ',') !== false ? explode(',', $check) : [$check];
+            $check = strpos($check, ',') !== false ? (array)explode(',', $check) : [$check];
         }
 
         return !array_diff((array)$check, $sampleArr);
@@ -350,7 +351,7 @@ public static function valueExistsOne($check, array $sampleArr): bool
         // 以逗号分隔的会被拆开，组成数组
         if (is_string($check)) {
             $check = trim($check, ', ');
-            $check = strpos($check, ',') !== false ? explode(',', $check) : [$check];
+            $check = strpos($check, ',') !== false ? (array)explode(',', $check) : [$check];
         }
 
         return (bool)array_intersect((array)$check, $sampleArr);
@@ -569,8 +570,8 @@ public static function collapse(array $array): array
         $results = [];
 
         foreach ($array as $values) {
-            if ($values instanceof CollectionInterface) {
-                $values = $values->all();
+            if (is_object($values) && method_exists($values, 'toArray')) {
+                $values = $values->toArray();
             } elseif (!is_array($values)) {
                 continue;
             }
@@ -591,9 +592,9 @@ public static function collapse(array $array): array
      */
     public static function crossJoin(...$arrays): array
     {
-        return array_reduce($arrays, function ($results, $array) {
-            return static::collapse(array_map(function ($parent) use ($array) {
-                return array_map(function ($item) use ($parent) {
+        return array_reduce($arrays, static function ($results, $array) {
+            return static::collapse(array_map(static function ($parent) use ($array) {
+                return array_map(static function ($item) use ($parent) {
                     return array_merge($parent, [$item]);
                 }, $array);
             }, $results));
@@ -698,7 +699,7 @@ public static function add(array $array, $key, $value): array
     public static function get($array, $key, $default = null)
     {
         if (!static::accessible($array)) {
-            return value($default);
+            return Php::value($default);
         }
 
         if (null === $key) {
@@ -713,7 +714,7 @@ public static function get($array, $key, $default = null)
             if (static::accessible($array) && static::exists($array, $segment)) {
                 $array = $array[$segment];
             } else {
-                return value($default);
+                return Php::value($default);
             }
         }
 
@@ -763,10 +764,12 @@ public static function set(array &$array, $key, $value): array
      *
      * @return array
      */
-    public static function flatten($array, $depth = INF): array
+    public static function flatten($array, int $depth = INF): array
     {
-        return array_reduce($array, function ($result, $item) use ($depth) {
-            $item = $item instanceof CollectionInterface ? $item->all() : $item;
+        return array_reduce($array, static function ($result, $item) use ($depth) {
+            if (is_object($item) && method_exists($item, 'toArray')) {
+                $item = $item->toArray();
+            }
 
             if (!is_array($item)) {
                 return array_merge($result, [$item]);
@@ -1078,6 +1081,11 @@ public static function toFormatString($array, $length = 400)
         return $string;
     }
 
+    /**
+     * @param $array
+     *
+     * @return array
+     */
     public static function toLimitOut($array): array
     {
         if (!is_array($array)) {

src/Helper/PhpHelper.php

@@ -13,6 +13,7 @@
 use function array_sum;
 use function explode;
 use function is_array;
+use function is_callable;
 use function is_object;
 use function is_string;
 use function memory_get_peak_usage;
@@ -35,6 +36,20 @@
  */
 class PhpHelper
 {
+    /**
+     * @param $value
+     *
+     * @return mixed
+     */
+    public static function value($value)
+    {
+        if (is_callable($value)) {
+            return $value();
+        }
+
+        return $value;
+    }
+
     /**
      * get $_SERVER value
      *

src/Str/StringHelper.php

@@ -410,7 +410,7 @@ public static function substr(string $str, int $start, int $length = null, strin
     public static function utf8SubStr(string $str, int $start = 0, int $end = null): string
     {
         if (empty($str)) {
-            return false;
+            return '';
         }
 
         if (function_exists('mb_substr')) {