内核更新

2016-12-28 10:41:09 +08:00
parent c89254e12a
commit ffab826db0
65 changed files with 1194 additions and 610 deletions
--- a/core/library/think/process/Builder.php
+++ b/core/library/think/process/Builder.php
@@ -15,10 +15,9 @@ use think\Process;

 class Builder
 {
-
    private $arguments;
    private $cwd;
-    private $env            = null;
+    private $env = null;
    private $input;
    private $timeout        = 60;
    private $options        = [];
@@ -155,7 +154,7 @@ class Builder
            return $this;
        }

-        $timeout = (float)$timeout;
+        $timeout = (float) $timeout;

        if ($timeout < 0) {
            throw new \InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
@@ -231,4 +230,4 @@ class Builder

        return $process;
    }
-}
+}