up: update some for array merge util

Author: inhere

src/Arr/ArrayHelper.php

@@ -41,7 +41,6 @@
 use function mb_strlen;
 use function method_exists;
 use function strlen;
-use function strpos;
 use function strtolower;
 use function trim;
 

src/Arr/Traits/ArrayMergeTrait.php

@@ -10,7 +10,6 @@
 namespace Toolkit\Stdlib\Arr\Traits;
 
 use RuntimeException;
-use function array_key_exists;
 use function array_merge;
 use function array_shift;
 use function is_array;
@@ -71,16 +70,18 @@ public static function quickMerge(array $append, array $base): array
     }
 
     /**
+     * Recursion merge new array to src array.
      * 递归合并两个多维数组,后面的值将会递归覆盖原来的值
      *
-     * @param array|null $src
-     * @param array      $new
+     * @param array $src
+     * @param array $new
+     * @param int $depth max merge depth
      *
      * @return array
      */
-    public static function merge($src, array $new): array
+    public static function merge(array $src, array $new, int $depth = 10): array
     {
-        if (!$src || !is_array($src)) {
+        if (!$src) {
             return $new;
         }
 
@@ -95,8 +96,8 @@ public static function merge($src, array $new): array
                 } else {
                     $src[$key] = $value;
                 }
-            } elseif (array_key_exists($key, $src) && is_array($value)) {
-                $src[$key] = self::merge($src[$key], $new[$key]);
+            } elseif ($depth > 0 && isset($src[$key]) && is_array($value)) {
+                $src[$key] = self::merge($src[$key], $value, --$depth);
             } else {
                 $src[$key] = $value;
             }

src/Arr/Traits/ArrayValueGetSetTrait.php

@@ -20,7 +20,6 @@
 use function is_int;
 use function is_object;
 use function is_string;
-use function strpos;
 use function trim;
 
 /**
@@ -203,7 +202,7 @@ public static function getByPath($data, string $path, $default = null, string $s
     }
 
     /**
-     * findValueByNodes
+     * find Value By Nodes
      *
      * @param array $data
      * @param array $nodes
@@ -237,7 +236,7 @@ public static function getValueByNodes(array $data, array $nodes, $default = nul
      */
     public static function setByPath(&$data, string $path, $value, string $separator = '.'): void
     {
-        if (false === strpos($path, $separator)) {
+        if (!str_contains($path, $separator)) {
             $data[$path] = $value;
             return;
         }
@@ -247,7 +246,6 @@ public static function setByPath(&$data, string $path, $value, string $separator
         }
 
         $dataTmp = &$data;
-
         foreach ($nodes as $node) {
             if (is_array($dataTmp)) {
                 if (empty($dataTmp[$node])) {

src/Helper/PhpHelper.php

@@ -174,7 +174,7 @@ public static function call($cb, ...$args)
     {
         if (is_string($cb)) {
             // function
-            if (strpos($cb, '::') === false) {
+            if (!str_contains($cb, '::')) {
                 return $cb(...$args);
             }
 

src/Std/Collection.php

@@ -354,13 +354,11 @@ public function offsetSet($key, $value)
     /**
      * Remove item from collection
      *
-     * @param string $key The data key
-     *
-     * @return mixed|null
+     * @param string $offset The data key
      */
-    public function offsetUnset($key): void
+    public function offsetUnset($offset): void
     {
-        $this->remove($key);
+        $this->remove($offset);
     }
 
     /********************************************************************************