add new method for array repleace

Author: inhere

src/Arr/ArrayHelper.php

@@ -102,7 +102,7 @@ public static function toIterator($array): Traversable
      *
      * @return mixed
      */
-    public static function toObject($array, $class = stdClass::class)
+    public static function toObject($array, string $class = stdClass::class)
     {
         $object = new $class;
 
@@ -387,7 +387,7 @@ public static function crossJoin(...$arrays): array
      *
      * @return array
      */
-    public static function divide($array): array
+    public static function divide(array $array): array
     {
         return [array_keys($array), array_values($array)];
     }
@@ -456,7 +456,7 @@ public static function exists(array $array, $key): bool
      *
      * @return array
      */
-    public static function flatten($array, int $depth = INF): array
+    public static function flatten(array $array, int $depth = INF): array
     {
         return array_reduce($array, static function ($result, $item) use ($depth) {
             if (is_object($item) && method_exists($item, 'toArray')) {
@@ -571,7 +571,7 @@ public static function has($array, $keys): bool
      *
      * @return array
      */
-    public static function prepend($array, $value, $key = null): array
+    public static function prepend(array $array, $value, $key = null): array
     {
         if (null === $key) {
             array_unshift($array, $value);
@@ -585,13 +585,13 @@ public static function prepend($array, $value, $key = null): array
     /**
      * remove the $key of the $arr, and return value.
      *
-     * @param string $key
+     * @param string|int $key
      * @param array  $arr
      * @param mixed  $default
      *
      * @return mixed
      */
-    public static function remove(&$arr, $key, $default = null)
+    public static function remove(array &$arr, $key, $default = null)
     {
         if (isset($arr[$key])) {
             $value = $arr[$key];
@@ -629,7 +629,7 @@ public static function pull(&$array, $key, $default = null)
      *
      * @return array
      */
-    public static function only($array, $keys): array
+    public static function only(array $array, $keys): array
     {
         return array_intersect_key($array, array_flip((array)$keys));
     }
@@ -641,7 +641,7 @@ public static function only($array, $keys): array
      *
      * @return array
      */
-    public static function shuffle($array): array
+    public static function shuffle(array $array): array
     {
         shuffle($array);
 
@@ -656,7 +656,7 @@ public static function shuffle($array): array
      *
      * @return array
      */
-    public static function where($array, callable $callback): array
+    public static function where(array $array, callable $callback): array
     {
         return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH);
     }
@@ -680,9 +680,9 @@ public static function wrap($value): array
     /**
      * array 递归 转换成 字符串
      *
-     * @param array     $array  [大于1200字符 strlen($string)>1200
+     * @param array     $array
      * @param int       $length
-     * @param array|int $cycles [至多循环六次 $num >= 6
+     * @param int       $cycles 至多循环六次 $num >= 6
      * @param bool      $showKey
      * @param bool      $addMark
      * @param string    $separator
@@ -692,12 +692,12 @@ public static function wrap($value): array
      */
     public static function toString(
         $array,
-        $length = 800,
-        $cycles = 6,
-        $showKey = true,
-        $addMark = false,
-        $separator = ', ',
-        $string = ''
+        int $length = 800,
+        int $cycles = 6,
+        bool $showKey = true,
+        bool $addMark = false,
+        string $separator = ', ',
+        string $string = ''
     ): string {
         if (!is_array($array) || empty($array)) {
             return '';
@@ -754,9 +754,9 @@ public static function toStringNoKey(
      * @param array $array
      * @param int   $length
      *
-     * @return mixed|null|string|string[]
+     * @return string
      */
-    public static function toFormatString($array, $length = 400)
+    public static function toFormatString($array, int $length = 400): string
     {
         $string = var_export($array, true);
 

src/Arr/Traits/ArrayMergeTrait.php

@@ -23,6 +23,26 @@
  */
 trait ArrayMergeTrait
 {
+    /**
+     * 替换值合并数组
+     * - 只会将同时存在于两个数组的key，使用第二个数组对应的值替换
+     *
+     * @param array $base
+     * @param array $replacements
+     *
+     * @return array
+     */
+    public static function replace(array $base, array $replacements): array
+    {
+        foreach ($base as $key => $value) {
+            if (isset($replacements[$key])) {
+                $base[$key] = $replacements[$key];
+            }
+        }
+
+        return $base;
+    }
+
     /**
      * quick merge `append` array to `base` array.
      * - Process at most secondary arrays

src/Arr/Traits/ArrayValueGetSetTrait.php

@@ -130,7 +130,7 @@ public static function set(array &$array, $key, $value): array
      *
      * @return array
      */
-    public static function gets(array &$data, array $needKeys = [], $unsetKey = false): array
+    public static function gets(array &$data, array $needKeys = [], bool $unsetKey = false): array
     {
         $needed = [];