From 68ec4ba97e5eb78ecb67ae7119986296b1f17817 Mon Sep 17 00:00:00 2001
From: Chaim <gc@dtapp.net>
Date: Wed, 6 May 2020 17:13:48 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0=E9=97=A8=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/facade/Strings.php |  1 +
 src/helper/Files.php   | 14 ++++----------
 src/helper/Strings.php | 27 +++++++++++++++++++--------
 src/helper/UnIqIds.php |  4 +---
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/facade/Strings.php b/src/facade/Strings.php
index d8128cc..433b319 100644
--- a/src/facade/Strings.php
+++ b/src/facade/Strings.php
@@ -32,6 +32,7 @@ use think\facade;
  * @method helper filter(string $str) string 过滤字符串
  * @method helper exitContain(string $str, $nee = 3, $del = ',') bool 判断字符串是否包含某个字符
  * @method helper len(string $str) int 统计字符串长度
+ * @method helper trimAll(string $str) string 删除空格
  */
 class Strings extends Facade
 {
diff --git a/src/helper/Files.php b/src/helper/Files.php
index 08e96f6..85fcc05 100644
--- a/src/helper/Files.php
+++ b/src/helper/Files.php
@@ -55,20 +55,14 @@ class Files
         while ($file = readdir($dh)) {
             if ($file != "." && $file != "..") {
                 $fullpath = $name . "/" . $file;
-                if (!is_dir($fullpath)) {
-                    unlink($fullpath);
-                } else {
-                    $this->deletes($fullpath);
-                }
+                if (!is_dir($fullpath)) unlink($fullpath);
+                else $this->deletes($fullpath);
             }
         }
         closedir($dh);
         //删除当前文件夹：
-        if (rmdir($name)) {
-            return true;
-        } else {
-            return false;
-        }
+        if (rmdir($name)) return true;
+        else return false;
     }
 
     /**
diff --git a/src/helper/Strings.php b/src/helper/Strings.php
index 1e5f20a..5f9e298 100644
--- a/src/helper/Strings.php
+++ b/src/helper/Strings.php
@@ -13,6 +13,7 @@
 // | github 仓库地址 ：https://github.com/GC0202/ThinkLibrary
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
+declare (strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 
@@ -31,7 +32,7 @@ class Strings
      * @param int $end_num 多少个
      * @return bool|false|string
      */
-    public function extractBefore(string $str, int $start_num, int $end_num)
+    public function extractBefore(string $str, int $start_num, int $end_num): string
     {
         if (strlen($str) < $start_num + $end_num) return $str;
         return substr($str, $start_num, $end_num);
@@ -43,7 +44,7 @@ class Strings
      * @param int $num 多少个
      * @return false|string
      */
-    public function extractRear(string $str, int $num)
+    public function extractRear(string $str, int $num): string
     {
         if (strlen($str) <= $num) return $str;
         return substr($str, -$num);
@@ -54,7 +55,7 @@ class Strings
      * @param string $str
      * @return string
      */
-    public function filter(string $str)
+    public function filter(string $str): string
     {
         $str = str_replace('`', '', $str);
         $str = str_replace('·', '', $str);
@@ -132,13 +133,11 @@ class Strings
      * @param string $del
      * @return bool
      */
-    public function exitContain(string $str, $nee = 3, $del = ',')
+    public function exitContain(string $str, $nee = 3, $del = ','): bool
     {
         if (strpos($str, $del) !== false) {
             $var = explode($del, $str);
-            foreach ($var as $v) {
-                if ($v == $nee) return true;
-            }
+            foreach ($var as $v) if ($v == $nee) return true;
             return false;
         } else {
             if ($str == $nee) return true;
@@ -151,8 +150,20 @@ class Strings
      * @param string $str 字符串
      * @return int
      */
-    public function len(string $str)
+    public function len(string $str): int
     {
         return strlen($str);
     }
+
+    /**
+     * 删除空格
+     * @param $str
+     * @return string|string[]
+     */
+    private function trimAll($str): string
+    {
+        $oldchar = array(" ", "　", "\t", "\n", "\r");
+        $newchar = array("", "", "", "", "");
+        return str_replace($oldchar, $newchar, $str);
+    }
 }
diff --git a/src/helper/UnIqIds.php b/src/helper/UnIqIds.php
index 25625d5..5a3a5fb 100644
--- a/src/helper/UnIqIds.php
+++ b/src/helper/UnIqIds.php
@@ -40,9 +40,7 @@ class UnIqIds
         if (intval($type) === 2) $chars = "{$chars}";
         if (intval($type) === 3) $chars = "{$numbs}{$chars}";
         $string = $prefix . $chars[rand(1, strlen($chars) - 1)];
-        if (isset($chars)) while (strlen($string) < $size) {
-            $string .= $chars[rand(0, strlen($chars) - 1)];
-        }
+        if (isset($chars)) while (strlen($string) < $size) $string .= $chars[rand(0, strlen($chars) - 1)];
         return $string;
     }