@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | class Request extends Http { |
17 | 17 | protected static $curlAlias = array( |
18 | 18 | 'url' => 'CURLOPT_URL', |
19 | - 'debug' => 'CURLOPT_VERBOSE',//for debug verbose |
|
19 | + 'debug' => 'CURLOPT_VERBOSE', //for debug verbose |
|
20 | 20 | 'method' => 'CURLOPT_CUSTOMREQUEST', |
21 | 21 | 'data' => 'CURLOPT_POSTFIELDS', // array or string , file begin with '@' |
22 | 22 | 'ua' => 'CURLOPT_USERAGENT', |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | if (null === ($rawField = constant($alias))) {throw new InvalidArgumentException('field is invalid'); |
83 | 83 | } |
84 | 84 | |
85 | - return isset($this->options[$rawField])?$this->options[$rawField]:false; |
|
85 | + return isset($this->options[$rawField]) ? $this->options[$rawField] : false; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | |
@@ -116,10 +116,10 @@ discard block |
||
116 | 116 | } |
117 | 117 | |
118 | 118 | if (isset($this->options['data'])) { |
119 | - $this->options['data'] = is_array($this->options['data'])?http_build_query($this->options['data']):$this->options['data'];//for better compatibility |
|
119 | + $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data']; //for better compatibility |
|
120 | 120 | } |
121 | 121 | if (isset($this->withURIQuery)) { |
122 | - $this->options['url'] .= strpos($this->options['url'], '?') === FALSE?'?':'&'; |
|
122 | + $this->options['url'] .= strpos($this->options['url'], '?') === FALSE ? '?' : '&'; |
|
123 | 123 | $this->options['url'] .= $this->withURIQuery; |
124 | 124 | } |
125 | 125 | if (isset($this->options['callback'])) { |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | return $alias; |
247 | 247 | } |
248 | 248 | public function makeResponse($isMultiCurl = false) { |
249 | - $body = $isMultiCurl?curl_multi_getcontent($this->curlHandle):curl_exec($this->curlHandle); |
|
249 | + $body = $isMultiCurl ? curl_multi_getcontent($this->curlHandle) : curl_exec($this->curlHandle); |
|
250 | 250 | $info = curl_getinfo($this->curlHandle); |
251 | 251 | $errno = curl_errno($this->curlHandle); |
252 | 252 | $error = curl_error($this->curlHandle); |
@@ -70,25 +70,25 @@ |
||
70 | 70 | */ |
71 | 71 | public function execute() { |
72 | 72 | $sleepTime = 1000;//microsecond, prevent CPU 100% |
73 | - do{ |
|
74 | - curl_multi_exec(self::$multiHandler, $active); |
|
75 | - // bug in PHP 5.3.18+ where curl_multi_select can return -1 |
|
73 | + do{ |
|
74 | + curl_multi_exec(self::$multiHandler, $active); |
|
75 | + // bug in PHP 5.3.18+ where curl_multi_select can return -1 |
|
76 | 76 | // https://bugs.php.net/bug.php?id=63411 |
77 | - if (curl_multi_select(self::$multiHandler) == -1) { |
|
78 | - usleep($sleepTime); |
|
79 | - } |
|
80 | - usleep($sleepTime); |
|
81 | - }while($active); |
|
82 | - $return = array(); |
|
77 | + if (curl_multi_select(self::$multiHandler) == -1) { |
|
78 | + usleep($sleepTime); |
|
79 | + } |
|
80 | + usleep($sleepTime); |
|
81 | + }while($active); |
|
82 | + $return = array(); |
|
83 | 83 | foreach (self::$requestPool as $request) { |
84 | 84 | $response = $request->makeResponse(true); |
85 | - $func = $response->request->endCallback(); |
|
85 | + $func = $response->request->endCallback(); |
|
86 | 86 | if (isset($func)) { |
87 | 87 | $func($response); |
88 | 88 | } |
89 | 89 | $return[] = $response; |
90 | - curl_multi_remove_handle(self::$multiHandler, $request->curlHandle); |
|
91 | - curl_close($request->curlHandle); |
|
90 | + curl_multi_remove_handle(self::$multiHandler, $request->curlHandle); |
|
91 | + curl_close($request->curlHandle); |
|
92 | 92 | } |
93 | 93 | curl_multi_close(self::$multiHandler); |
94 | 94 | return $return; |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | * @return array(Response) |
70 | 70 | */ |
71 | 71 | public function execute() { |
72 | - $sleepTime = 1000;//microsecond, prevent CPU 100% |
|
73 | - do{ |
|
72 | + $sleepTime = 1000; //microsecond, prevent CPU 100% |
|
73 | + do { |
|
74 | 74 | curl_multi_exec(self::$multiHandler, $active); |
75 | 75 | // bug in PHP 5.3.18+ where curl_multi_select can return -1 |
76 | 76 | // https://bugs.php.net/bug.php?id=63411 |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | usleep($sleepTime); |
79 | 79 | } |
80 | 80 | usleep($sleepTime); |
81 | - }while($active); |
|
81 | + }while ($active); |
|
82 | 82 | $return = array(); |
83 | 83 | foreach (self::$requestPool as $request) { |
84 | 84 | $response = $request->makeResponse(true); |