fix: swoft-cloud/swoft#1083 uniqid is not work on cygwin

swoft-cloud · Nov 5, 2019 · c7f688f · c7f688f
1 parent c466f6a
commit c7f688f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/rpc-client/src/Proxy.php b/src/rpc-client/src/Proxy.php
@@ -1,15 +1,18 @@
 <?php declare(strict_types=1);
 
-
 namespace Swoft\Rpc\Client;
 
-
 use Swoft\Proxy\Exception\ProxyException;
 use Swoft\Proxy\Proxy as BaseProxy;
 use Swoft\Rpc\Client\Exception\RpcClientException;
 use Swoft\Rpc\Client\Proxy\Ast\ProxyVisitor;
 use Swoft\Stdlib\Helper\Str;
 
+/**
+ * Class Proxy
+ *
+ * @since 2.0
+ */
 class Proxy
 {
     /**
@@ -32,4 +35,4 @@ public static function newClassName(string $className): string
         $className = BaseProxy::newClassName($className, $visitor);
         return $className;
     }
-}
+}
diff --git a/src/stdlib/src/Concern/RandomStringTrait.php b/src/stdlib/src/Concern/RandomStringTrait.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace Swoft\Stdlib\Concern;
+
+/**
+ * Trait RandomStringTrait
+ *
+ * @since 2.0.7
+ */
+trait RandomStringTrait
+{
+
+}
diff --git a/src/stdlib/src/Helper/StringHelper.php b/src/stdlib/src/Helper/StringHelper.php
@@ -780,11 +780,17 @@ public static function rmPharPrefix(string $path): string
      *
      * @return string
      */
-    public static function getUniqid(string $prefix = "", bool $moreEntropy = false): string
+    public static function getUniqid(string $prefix = '', bool $moreEntropy = false): string
     {
-        $uniqid = uniqid($prefix, $moreEntropy);
-        $uniqid = str_replace('.', '', $uniqid);
-        return $uniqid;
+        // If on Cygwin, $moreEntropy must be TRUE.
+        if (EnvHelper::isCygwin()) {
+            $moreEntropy = true;
+        }
+
+        $uniqId = uniqid($prefix, $moreEntropy);
+        $uniqId = str_replace('.', '', $uniqId);
+
+        return $uniqId;
     }
 
     /**