@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | /** |
| 82 | 82 | * Get the content. |
| 83 | 83 | * |
| 84 | - * @param string $originUrl The origin URL |
|
| 84 | + * @param string $origin The origin URL |
|
| 85 | 85 | * @param string $fileUrl The file URL |
| 86 | 86 | * @param bool $progress Display the progression |
| 87 | 87 | * @param array $options Additional context options |
@@ -101,6 +101,11 @@ discard block |
||
| 101 | 101 | }); |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | + /** |
|
| 105 | + * @param string $fileUrl |
|
| 106 | + * @param boolean $progress |
|
| 107 | + * @param \Closure $exec |
|
| 108 | + */ |
|
| 104 | 109 | protected function fetch($origin, $fileUrl, $progress, $options, $exec) |
| 105 | 110 | { |
| 106 | 111 | do { |
@@ -205,11 +210,6 @@ discard block |
||
| 205 | 210 | } |
| 206 | 211 | |
| 207 | 212 | /** |
| 208 | - * @param resource<curl> $ch |
|
| 209 | - * @param int $downBytesMax |
|
| 210 | - * @param int $downBytes |
|
| 211 | - * @param int $upBytesMax |
|
| 212 | - * @param int $upBytes |
|
| 213 | 213 | */ |
| 214 | 214 | public function progress() |
| 215 | 215 | { |
@@ -230,6 +230,9 @@ discard block |
||
| 230 | 230 | return 0; |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | + /** |
|
| 234 | + * @param string $fileName |
|
| 235 | + */ |
|
| 233 | 236 | public static function createFile($fileName) |
| 234 | 237 | { |
| 235 | 238 | if (is_dir($fileName)) { |
@@ -56,11 +56,11 @@ discard block |
||
| 56 | 56 | * |
| 57 | 57 | * @return bool true |
| 58 | 58 | */ |
| 59 | - public function copy($origin, $fileUrl, $fileName, $progress=true, $options=array()) |
|
| 59 | + public function copy($origin, $fileUrl, $fileName, $progress = true, $options = array()) |
|
| 60 | 60 | { |
| 61 | 61 | $that = $this; // for PHP5.3 |
| 62 | 62 | |
| 63 | - return $this->fetch($origin, $fileUrl, $progress, $options, function ($ch, $request) use ($that, $fileName) { |
|
| 63 | + return $this->fetch($origin, $fileUrl, $progress, $options, function($ch, $request) use ($that, $fileName) { |
|
| 64 | 64 | $fp = $that->createFile($fileName); |
| 65 | 65 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, false); |
| 66 | 66 | curl_setopt($ch, CURLOPT_FILE, $fp); |
@@ -88,11 +88,11 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return bool|string The content |
| 90 | 90 | */ |
| 91 | - public function getContents($origin, $fileUrl, $progress=true, $options=array()) |
|
| 91 | + public function getContents($origin, $fileUrl, $progress = true, $options = array()) |
|
| 92 | 92 | { |
| 93 | 93 | $that = $this; // for PHP5.3 |
| 94 | 94 | |
| 95 | - return $this->fetch($origin, $fileUrl, $progress, $options, function ($ch, $request) use ($that) { |
|
| 95 | + return $this->fetch($origin, $fileUrl, $progress, $options, function($ch, $request) use ($that) { |
|
| 96 | 96 | // This order is important. |
| 97 | 97 | curl_setopt($ch, CURLOPT_FILE, STDOUT); |
| 98 | 98 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); |