remove toolkit construct

ares333 · Dec 6, 2018 · f31bb91 · f31bb91
1 parent 1a57c27
commit f31bb91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/HttpClone.php b/src/HttpClone.php
@@ -51,7 +51,6 @@ class HttpClone extends Toolkit
      */
     function __construct($dir)
     {
-        parent::__construct();
         if (! is_dir($dir) || ! is_writable($dir)) {
             user_error('dir(' . $dir . ') is invalid', E_USER_ERROR);
         }

diff --git a/src/Toolkit.php b/src/Toolkit.php
@@ -10,7 +10,7 @@ class Toolkit
     // Curl instance
     protected $_curl;
 
-    function __construct(Curl $curl = null)
+    function setCurl(Curl $curl = null)
     {
         $this->_curl = $curl;
         if (! isset($this->_curl)) {
@@ -49,8 +49,7 @@ function __construct(Curl $curl = null)
      */
     function onFail($error, $args)
     {
-        $msg = "Curl error ($error[errorCode]). $error[errorMsg], url=" .
-            $error['info']['url'];
+        $msg = "Curl error ($error[errorCode]). $error[errorMsg], url=" . $error['info']['url'];
         if ($this->_curl->onInfo == array(
             $this,
             'onInfo'
@@ -123,8 +122,7 @@ function onInfo($info, $curl = null, $isLast = null)
         }
         $all = $info['all'];
         $all['downloadSpeed'] = round($all['downloadSpeed'] / 1024) . 'KB';
-        $all['downloadSize'] = round(
-            ($all['headerSize'] + $all['bodySize']) / 1024 / 1024) . "MB";
+        $all['downloadSize'] = round(($all['headerSize'] + $all['bodySize']) / 1024 / 1024) . "MB";
         // clean
         foreach (array_keys($meta) as $v) {
             if (! array_key_exists($v, $all)) {
@@ -348,9 +346,8 @@ function buildUrl(array $parse)
             $parse['query'] .= '#';
         }
         $parse['path'] = preg_replace('/\/+/', '/', $parse['path']);
-        return $parse['scheme'] . $parse['user'] . $parse['pass'] .
-            $parse['host'] . $parse['port'] . $parse['path'] . $parse['query'] .
-            $parse['fragment'];
+        return $parse['scheme'] . $parse['user'] . $parse['pass'] . $parse['host'] . $parse['port'] . $parse['path'] .
+            $parse['query'] . $parse['fragment'];
     }
 
     /**