@@ -46,7 +46,7 @@ |
||
| 46 | 46 | * @param bool $auth |
| 47 | 47 | * @return resource<curl> |
| 48 | 48 | */ |
| 49 | - public static function getConnection($origin, $auth=false) |
|
| 49 | + public static function getConnection($origin, $auth = false) |
|
| 50 | 50 | { |
| 51 | 51 | $instance = self::getInstance(); |
| 52 | 52 | if ($auth) { |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | public function importURL($url) |
| 64 | 64 | { |
| 65 | 65 | $struct = parse_url($url); |
| 66 | - if (! $struct) { |
|
| 66 | + if (!$struct) { |
|
| 67 | 67 | throw new \InvalidArgumentException("$url is not valid URL"); |
| 68 | 68 | } |
| 69 | 69 | |
@@ -74,13 +74,13 @@ discard block |
||
| 74 | 74 | $this->username = self::setOr($struct, 'user', null); |
| 75 | 75 | $this->password = self::setOr($struct, 'pass', null); |
| 76 | 76 | |
| 77 | - if (! empty($struct['query'])) { |
|
| 77 | + if (!empty($struct['query'])) { |
|
| 78 | 78 | parse_str($struct['query'], $this->query); |
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // utility for __construct |
| 83 | - private static function setOr(array $struct, $key, $default=null) |
|
| 83 | + private static function setOr(array $struct, $key, $default = null) |
|
| 84 | 84 | { |
| 85 | 85 | if (!empty($struct[$key])) { |
| 86 | 86 | return $struct[$key]; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | CURLOPT_USERAGENT => $this->genUA(), |
| 101 | 101 | ); |
| 102 | 102 | |
| 103 | - $curlOpts[CURLOPT_VERBOSE] = (bool) $this->verbose; |
|
| 103 | + $curlOpts[CURLOPT_VERBOSE] = (bool)$this->verbose; |
|
| 104 | 104 | |
| 105 | 105 | if ($this->username && $this->password) { |
| 106 | 106 | $curlOpts[CURLOPT_USERPWD] = "$this->username:$this->password"; |
@@ -116,46 +116,46 @@ |
||
| 116 | 116 | // wait for any event |
| 117 | 117 | do { |
| 118 | 118 | switch (curl_multi_select($mh, 5)) { |
| 119 | - case -1: |
|
| 120 | - usleep(10); |
|
| 121 | - do { |
|
| 122 | - $stat = curl_multi_exec($mh, $running); |
|
| 123 | - } while ($stat === CURLM_CALL_MULTI_PERFORM); |
|
| 124 | - continue 2; |
|
| 125 | - case 0: |
|
| 126 | - continue 2; |
|
| 127 | - default: |
|
| 128 | - do { |
|
| 129 | - $stat = curl_multi_exec($mh, $running); |
|
| 130 | - } while ($stat === CURLM_CALL_MULTI_PERFORM); |
|
| 131 | - |
|
| 132 | - do { |
|
| 133 | - if ($raised = curl_multi_info_read($mh, $remains)) { |
|
| 134 | - $ch = $raised['handle']; |
|
| 135 | - $errno = curl_errno($ch); |
|
| 136 | - $info = curl_getinfo($ch); |
|
| 137 | - curl_setopt($ch, CURLOPT_FILE, STDOUT); |
|
| 138 | - $index = (int)$ch; |
|
| 139 | - $fileinfo = $chFpMap[$index]; |
|
| 140 | - unset($chFpMap[$index]); |
|
| 141 | - $fp = $fileinfo['fp']; |
|
| 142 | - $filepath = $fileinfo['filepath']; |
|
| 143 | - fclose($fp); |
|
| 144 | - if (CURLE_OK === $errno && 200 === $info['http_code']) { |
|
| 145 | - ++$this->successCnt; |
|
| 146 | - } else { |
|
| 147 | - ++$this->failureCnt; |
|
| 148 | - unlink($filepath); |
|
| 119 | + case -1: |
|
| 120 | + usleep(10); |
|
| 121 | + do { |
|
| 122 | + $stat = curl_multi_exec($mh, $running); |
|
| 123 | + } while ($stat === CURLM_CALL_MULTI_PERFORM); |
|
| 124 | + continue 2; |
|
| 125 | + case 0: |
|
| 126 | + continue 2; |
|
| 127 | + default: |
|
| 128 | + do { |
|
| 129 | + $stat = curl_multi_exec($mh, $running); |
|
| 130 | + } while ($stat === CURLM_CALL_MULTI_PERFORM); |
|
| 131 | + |
|
| 132 | + do { |
|
| 133 | + if ($raised = curl_multi_info_read($mh, $remains)) { |
|
| 134 | + $ch = $raised['handle']; |
|
| 135 | + $errno = curl_errno($ch); |
|
| 136 | + $info = curl_getinfo($ch); |
|
| 137 | + curl_setopt($ch, CURLOPT_FILE, STDOUT); |
|
| 138 | + $index = (int)$ch; |
|
| 139 | + $fileinfo = $chFpMap[$index]; |
|
| 140 | + unset($chFpMap[$index]); |
|
| 141 | + $fp = $fileinfo['fp']; |
|
| 142 | + $filepath = $fileinfo['filepath']; |
|
| 143 | + fclose($fp); |
|
| 144 | + if (CURLE_OK === $errno && 200 === $info['http_code']) { |
|
| 145 | + ++$this->successCnt; |
|
| 146 | + } else { |
|
| 147 | + ++$this->failureCnt; |
|
| 148 | + unlink($filepath); |
|
| 149 | + } |
|
| 150 | + $this->io->write($this->makeDownloadingText($info['url'])); |
|
| 151 | + curl_multi_remove_handle($mh, $ch); |
|
| 152 | + $unused[] = $ch; |
|
| 149 | 153 | } |
| 150 | - $this->io->write($this->makeDownloadingText($info['url'])); |
|
| 151 | - curl_multi_remove_handle($mh, $ch); |
|
| 152 | - $unused[] = $ch; |
|
| 153 | - } |
|
| 154 | - } while ($remains); |
|
| 154 | + } while ($remains); |
|
| 155 | 155 | |
| 156 | - if ($packages) { |
|
| 157 | - break 2; |
|
| 158 | - } |
|
| 156 | + if ($packages) { |
|
| 157 | + break 2; |
|
| 158 | + } |
|
| 159 | 159 | } |
| 160 | 160 | } while ($running); |
| 161 | 161 | } while ($packages); |
@@ -104,7 +104,7 @@ |
||
| 104 | 104 | if ($pluginConfig['insecure']) { |
| 105 | 105 | $opts[CURLOPT_VERIFYPEER] = false; |
| 106 | 106 | } |
| 107 | - if (! empty($pluginConfig['capath'])) { |
|
| 107 | + if (!empty($pluginConfig['capath'])) { |
|
| 108 | 108 | $opts[CURLOPT_CAPATH] = $pluginConfig['capath']; |
| 109 | 109 | } |
| 110 | 110 | unset($opts[CURLOPT_ENCODING]); |
@@ -63,11 +63,11 @@ discard block |
||
| 63 | 63 | * |
| 64 | 64 | * @return bool true |
| 65 | 65 | */ |
| 66 | - public function copy($origin, $fileUrl, $fileName, $progress=true, $options=array()) |
|
| 66 | + public function copy($origin, $fileUrl, $fileName, $progress = true, $options = array()) |
|
| 67 | 67 | { |
| 68 | 68 | $that = $this; // for PHP5.3 |
| 69 | 69 | |
| 70 | - return $this->fetch($origin, $fileUrl, $progress, $options, function ($ch, $request) use ($that, $fileName) { |
|
| 70 | + return $this->fetch($origin, $fileUrl, $progress, $options, function($ch, $request) use ($that, $fileName) { |
|
| 71 | 71 | $fp = $that->createFile($fileName); |
| 72 | 72 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, false); |
| 73 | 73 | curl_setopt($ch, CURLOPT_FILE, $fp); |
@@ -95,11 +95,11 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @return bool|string The content |
| 97 | 97 | */ |
| 98 | - public function getContents($origin, $fileUrl, $progress=true, $options=array()) |
|
| 98 | + public function getContents($origin, $fileUrl, $progress = true, $options = array()) |
|
| 99 | 99 | { |
| 100 | 100 | $that = $this; // for PHP5.3 |
| 101 | 101 | |
| 102 | - return $this->fetch($origin, $fileUrl, $progress, $options, function ($ch, $request) use ($that) { |
|
| 102 | + return $this->fetch($origin, $fileUrl, $progress, $options, function($ch, $request) use ($that) { |
|
| 103 | 103 | // This order is important. |
| 104 | 104 | curl_setopt($ch, CURLOPT_FILE, STDOUT); |
| 105 | 105 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | if ($this->pluginConfig['insecure']) { |
| 158 | 158 | $opts[CURLOPT_VERIFYPEER] = false; |
| 159 | 159 | } |
| 160 | - if (! empty($pluginConfig['capath'])) { |
|
| 160 | + if (!empty($pluginConfig['capath'])) { |
|
| 161 | 161 | $opts[CURLOPT_CAPATH] = $pluginConfig['capath']; |
| 162 | 162 | } |
| 163 | 163 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | $config = $this->config->get('prestissimo'); |
| 110 | - if (! is_array($config)) { |
|
| 110 | + if (!is_array($config)) { |
|
| 111 | 111 | $config = array(); |
| 112 | 112 | } |
| 113 | 113 | $config += array( |
@@ -120,22 +120,22 @@ discard block |
||
| 120 | 120 | 'privatePackages' => array(), |
| 121 | 121 | ); |
| 122 | 122 | |
| 123 | - if (! is_int($config['maxConnections']) || $config['maxConnections'] < 1) { |
|
| 123 | + if (!is_int($config['maxConnections']) || $config['maxConnections'] < 1) { |
|
| 124 | 124 | $config['maxConnections'] = 6; |
| 125 | 125 | } |
| 126 | - if (! is_int($config['minConnections']) || $config['minConnections'] > $config['maxConnections']) { |
|
| 126 | + if (!is_int($config['minConnections']) || $config['minConnections'] > $config['maxConnections']) { |
|
| 127 | 127 | $config['minConnections'] = 3; |
| 128 | 128 | } |
| 129 | - if (! is_bool($config['pipeline'])) { |
|
| 129 | + if (!is_bool($config['pipeline'])) { |
|
| 130 | 130 | $config['pipeline'] = (bool)$config['pipeline']; |
| 131 | 131 | } |
| 132 | - if (! is_bool($config['insecure'])) { |
|
| 132 | + if (!is_bool($config['insecure'])) { |
|
| 133 | 133 | $config['insecure'] = (bool)$config['insecure']; |
| 134 | 134 | } |
| 135 | - if (! is_string($config['capath'])) { |
|
| 135 | + if (!is_string($config['capath'])) { |
|
| 136 | 136 | $config['capath'] = ''; |
| 137 | 137 | } |
| 138 | - if (! is_array($config['privatePackages'])) { |
|
| 138 | + if (!is_array($config['privatePackages'])) { |
|
| 139 | 139 | $config['privatePackages'] = (array)$config['privatePackages']; |
| 140 | 140 | } |
| 141 | 141 | |