diff --git a/CHANGELOG.md b/CHANGELOG.md index afa7671..ffe7099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v6.0.105 / 2020-08-08 +- 修复数组门面增加数组删除空格函数问题 + ## v6.0.104 / 2020-08-05 - 修复数组门面增加数组删除空格函数问题 diff --git a/src/common.php b/src/common.php index da0e9c0..9cc18f4 100644 --- a/src/common.php +++ b/src/common.php @@ -26,7 +26,7 @@ use think\db\exception\DbException; /** * 定义当前版本 */ -const VERSION = '6.0.104'; +const VERSION = '6.0.105'; if (!function_exists('get_ip_info')) { /** diff --git a/src/helper/Arrays.php b/src/helper/Arrays.php index 8f607ba..f0fd9f2 100644 --- a/src/helper/Arrays.php +++ b/src/helper/Arrays.php @@ -134,9 +134,21 @@ class Arrays if (is_array($value)) { $arr[$key] = $this->TrimArray($value); } else { - $arr[$key] = (new Strings)->trimAll(trim($value)); + $arr[$key] = $this->trimAll(trim($value)); } } return $arr; } + + /** + * 字符串删除空格 + * @param $str + * @return string|string[] + */ + private function trimAll($str) + { + $oldchar = array(" ", " ", "\t", "\n", "\r"); + $newchar = array("", "", "", "", ""); + return str_replace($oldchar, $newchar, $str); + } }