@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | class Request extends Http { |
18 | 18 | protected static $curlAlias = array( |
19 | 19 | 'url' => 'CURLOPT_URL', |
20 | - 'debug' => 'CURLOPT_VERBOSE',//for debug verbose |
|
20 | + 'debug' => 'CURLOPT_VERBOSE', //for debug verbose |
|
21 | 21 | 'method' => 'CURLOPT_CUSTOMREQUEST', |
22 | 22 | 'data' => 'CURLOPT_POSTFIELDS', // array or string , file begin with '@' |
23 | 23 | 'ua' => 'CURLOPT_USERAGENT', |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | public $curlHandle; |
38 | 38 | protected $options = array( |
39 | 39 | 'CURLOPT_MAXREDIRS' => 10, |
40 | - 'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4,//IPv4 |
|
40 | + 'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4, //IPv4 |
|
41 | 41 | 'header' => true, |
42 | 42 | 'method' => self::GET, |
43 | 43 | 'transfer' => true, |
@@ -85,11 +85,11 @@ discard block |
||
85 | 85 | if (null === ($rawField = constant($alias))) {throw new InvalidArgumentException('field is invalid'); |
86 | 86 | } |
87 | 87 | |
88 | - return isset($this->options[$rawField])?$this->options[$rawField]:false; |
|
88 | + return isset($this->options[$rawField]) ? $this->options[$rawField] : false; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | public function hasInitialized() { |
92 | - return $this->curlHandle?true:false; |
|
92 | + return $this->curlHandle ? true : false; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | public function addQuery($data) { |
@@ -122,10 +122,10 @@ discard block |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | if (isset($this->options['data'])) { |
125 | - $this->options['data'] = is_array($this->options['data'])?http_build_query($this->options['data']):$this->options['data'];//for better compatibility |
|
125 | + $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data']; //for better compatibility |
|
126 | 126 | } |
127 | 127 | if (isset($this->withURIQuery)) { |
128 | - $this->options['url'] .= strpos($this->options['url'], '?') === FALSE?'?':'&'; |
|
128 | + $this->options['url'] .= strpos($this->options['url'], '?') === FALSE ? '?' : '&'; |
|
129 | 129 | $this->options['url'] .= $this->withURIQuery; |
130 | 130 | } |
131 | 131 | if (isset($this->options['callback'])) { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | return $alias; |
253 | 253 | } |
254 | 254 | public function makeResponse($isMultiCurl = false) { |
255 | - $body = $isMultiCurl?curl_multi_getcontent($this->curlHandle):curl_exec($this->curlHandle); |
|
255 | + $body = $isMultiCurl ? curl_multi_getcontent($this->curlHandle) : curl_exec($this->curlHandle); |
|
256 | 256 | $info = curl_getinfo($this->curlHandle); |
257 | 257 | $errno = curl_errno($this->curlHandle); |
258 | 258 | $error = curl_error($this->curlHandle); |
@@ -12,6 +12,6 @@ |
||
12 | 12 | namespace MultiHttp\Exception; |
13 | 13 | |
14 | 14 | |
15 | -class InvalidOperationException extends \LogicException{ |
|
15 | +class InvalidOperationException extends \LogicException { |
|
16 | 16 | protected $code = 2; |
17 | 17 | } |
18 | 18 | \ No newline at end of file |
@@ -12,6 +12,6 @@ |
||
12 | 12 | namespace MultiHttp\Exception; |
13 | 13 | |
14 | 14 | |
15 | -class InvalidArgumentException extends \LogicException{ |
|
15 | +class InvalidArgumentException extends \LogicException { |
|
16 | 16 | protected $code = 1; |
17 | 17 | } |
18 | 18 | \ No newline at end of file |
@@ -39,7 +39,7 @@ |
||
39 | 39 | |
40 | 40 | abstract function put($uri, array $payload = array(), array $options = array()); |
41 | 41 | |
42 | - abstract function get($uri, array $options = array()); |
|
42 | + abstract function get($uri, array $options = array()); |
|
43 | 43 | |
44 | 44 | abstract function head($uri, array $options = array()); |
45 | 45 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | } |
35 | 35 | |
36 | - public static function create(Request $request, $body, $info, $errorCode, $error){ |
|
36 | + public static function create(Request $request, $body, $info, $errorCode, $error) { |
|
37 | 37 | $self = new self; |
38 | 38 | $self->request = $request; |
39 | 39 | $self->body = $body; |
@@ -44,20 +44,20 @@ discard block |
||
44 | 44 | $self->check(); |
45 | 45 | return $self; |
46 | 46 | } |
47 | - public function check(){ |
|
47 | + public function check() { |
|
48 | 48 | |
49 | 49 | } |
50 | - public function parse(){ |
|
51 | - if($this->body && $this->request->getIni('header')){//has header |
|
50 | + public function parse() { |
|
51 | + if ($this->body && $this->request->getIni('header')) {//has header |
|
52 | 52 | $headers = rtrim(substr($this->body, 0, $this->info['header_size'])); |
53 | 53 | $this->body = substr($this->body, $this->info['header_size']); |
54 | 54 | $headers = explode(PHP_EOL, $headers); |
55 | 55 | array_shift($headers); // HTTP HEADER |
56 | - foreach($headers as $h) { |
|
57 | - if(false !== strpos($h, ':')) |
|
56 | + foreach ($headers as $h) { |
|
57 | + if (false !== strpos($h, ':')) |
|
58 | 58 | list($k, $v) = explode(':', $h, 2); |
59 | 59 | else |
60 | - list($k, $v) = array($h,''); |
|
60 | + list($k, $v) = array($h, ''); |
|
61 | 61 | |
62 | 62 | $this->header[trim($k)] = trim($v); |
63 | 63 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $content_type = explode(';', $content_type); |
70 | 70 | $this->contentType = $content_type[0]; |
71 | 71 | if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) { |
72 | - list( , $this->charset) = explode('=', $content_type[1]); |
|
72 | + list(, $this->charset) = explode('=', $content_type[1]); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @return array(Response) |
70 | 70 | */ |
71 | 71 | public function execute() { |
72 | - $sleepTime = 1000;//microsecond, prevent CPU 100% |
|
72 | + $sleepTime = 1000; //microsecond, prevent CPU 100% |
|
73 | 73 | //prepare conf |
74 | 74 | while (($multiFlg = curl_multi_exec(self::$multiHandler, $active)) == CURLM_CALL_MULTI_PERFORM); |
75 | 75 | //fetch data |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | // } |
85 | 85 | |
86 | 86 | |
87 | - do{ |
|
87 | + do { |
|
88 | 88 | curl_multi_exec(self::$multiHandler, $active); |
89 | 89 | // bug in PHP 5.3.18+ where curl_multi_select can return -1 |
90 | 90 | // https://bugs.php.net/bug.php?id=63411 |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | usleep($sleepTime); |
93 | 93 | } |
94 | 94 | usleep($sleepTime); |
95 | - }while($active); |
|
95 | + }while ($active); |
|
96 | 96 | |
97 | 97 | |
98 | 98 | $return = array(); |