| @@ -13,5 +13,5 @@ | ||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 |  class InvalidOperationException extends \LogicException{ | 
| 16 | - protected $code = 2; | |
| 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 InvalidOperationException extends \LogicException{ | |
| 15 | +class InvalidOperationException extends \LogicException { | |
| 16 | 16 | protected $code = 2; | 
| 17 | 17 | } | 
| 18 | 18 | \ No newline at end of file | 
| @@ -13,5 +13,5 @@ | ||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 |  class UnexpectedResponseException extends \UnexpectedValueException { | 
| 16 | - protected $code = 3; | |
| 16 | + protected $code = 3; | |
| 17 | 17 | } | 
| 18 | 18 | \ No newline at end of file | 
| @@ -13,5 +13,5 @@ | ||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 |  class InvalidArgumentException extends \LogicException{ | 
| 16 | - protected $code = 1; | |
| 16 | + protected $code = 1; | |
| 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 | 
| @@ -15,80 +15,80 @@ | ||
| 15 | 15 | |
| 16 | 16 | class Response | 
| 17 | 17 |  { | 
| 18 | - public | |
| 19 | - $code, | |
| 20 | - $errorCode, | |
| 21 | - $error, | |
| 22 | - $header, | |
| 23 | - $body, | |
| 24 | - /** | |
| 25 | - * @var Request | |
| 26 | - */ | |
| 27 | - $request, | |
| 28 | - $contentType, | |
| 29 | - $charset, | |
| 30 | - $duration, | |
| 31 | - $info; | |
| 32 | - protected function __construct() | |
| 33 | -    { | |
| 34 | - } | |
| 18 | + public | |
| 19 | + $code, | |
| 20 | + $errorCode, | |
| 21 | + $error, | |
| 22 | + $header, | |
| 23 | + $body, | |
| 24 | + /** | |
| 25 | + * @var Request | |
| 26 | + */ | |
| 27 | + $request, | |
| 28 | + $contentType, | |
| 29 | + $charset, | |
| 30 | + $duration, | |
| 31 | + $info; | |
| 32 | + protected function __construct() | |
| 33 | +	{ | |
| 34 | + } | |
| 35 | 35 | |
| 36 | -    public static function create(Request $request, $body, $info, $errorCode, $error){ | |
| 37 | - $self = new self; | |
| 38 | - $self->request = $request; | |
| 39 | - $self->body = $body; | |
| 40 | - $self->info = $info; | |
| 41 | - $self->errorCode = $errorCode; | |
| 42 | - $self->error = $error; | |
| 43 | - $self->parse(); | |
| 44 | - $self->check(); | |
| 45 | - return $self; | |
| 46 | - } | |
| 47 | -    public function check(){ | |
| 36 | +	public static function create(Request $request, $body, $info, $errorCode, $error){ | |
| 37 | + $self = new self; | |
| 38 | + $self->request = $request; | |
| 39 | + $self->body = $body; | |
| 40 | + $self->info = $info; | |
| 41 | + $self->errorCode = $errorCode; | |
| 42 | + $self->error = $error; | |
| 43 | + $self->parse(); | |
| 44 | + $self->check(); | |
| 45 | + return $self; | |
| 46 | + } | |
| 47 | +	public function check(){ | |
| 48 | 48 | |
| 49 | - } | |
| 50 | -    public function parse(){ | |
| 51 | -        if($this->body && $this->request->getIni('header')){//has header | |
| 52 | - $headers = rtrim(substr($this->body, 0, $this->info['header_size'])); | |
| 53 | - $this->body = substr($this->body, $this->info['header_size']); | |
| 54 | - $headers = explode(PHP_EOL, $headers); | |
| 55 | - array_shift($headers); // HTTP HEADER | |
| 56 | -            foreach($headers as $h) { | |
| 57 | - if(false !== strpos($h, ':')) | |
| 58 | -                    list($k, $v) = explode(':', $h, 2); | |
| 59 | - else | |
| 60 | - list($k, $v) = array($h,''); | |
| 49 | + } | |
| 50 | +	public function parse(){ | |
| 51 | +		if($this->body && $this->request->getIni('header')){//has header | |
| 52 | + $headers = rtrim(substr($this->body, 0, $this->info['header_size'])); | |
| 53 | + $this->body = substr($this->body, $this->info['header_size']); | |
| 54 | + $headers = explode(PHP_EOL, $headers); | |
| 55 | + array_shift($headers); // HTTP HEADER | |
| 56 | +			foreach($headers as $h) { | |
| 57 | + if(false !== strpos($h, ':')) | |
| 58 | +					list($k, $v) = explode(':', $h, 2); | |
| 59 | + else | |
| 60 | + list($k, $v) = array($h,''); | |
| 61 | 61 | |
| 62 | - $this->header[trim($k)] = trim($v); | |
| 63 | - } | |
| 64 | - } | |
| 65 | - $this->code = $this->info['http_code']; | |
| 66 | - $this->duration = $this->info['total_time']; | |
| 67 | - $this->contentType = $this->info['content_type']; | |
| 68 | - $content_type = isset($this->info['content_type']) ? $this->info['content_type'] : ''; | |
| 69 | -        $content_type = explode(';', $content_type); | |
| 70 | - $this->contentType = $content_type[0]; | |
| 71 | -        if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) { | |
| 72 | -            list( , $this->charset) = explode('=', $content_type[1]); | |
| 73 | - } | |
| 74 | - } | |
| 62 | + $this->header[trim($k)] = trim($v); | |
| 63 | + } | |
| 64 | + } | |
| 65 | + $this->code = $this->info['http_code']; | |
| 66 | + $this->duration = $this->info['total_time']; | |
| 67 | + $this->contentType = $this->info['content_type']; | |
| 68 | + $content_type = isset($this->info['content_type']) ? $this->info['content_type'] : ''; | |
| 69 | +		$content_type = explode(';', $content_type); | |
| 70 | + $this->contentType = $content_type[0]; | |
| 71 | +		if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) { | |
| 72 | +			list( , $this->charset) = explode('=', $content_type[1]); | |
| 73 | + } | |
| 74 | + } | |
| 75 | 75 | |
| 76 | - /** | |
| 77 | - * Status Code Definitions | |
| 78 | - * | |
| 79 | - * Informational 1xx | |
| 80 | - * Successful 2xx | |
| 81 | - * Redirection 3xx | |
| 82 | - * Client Error 4xx | |
| 83 | - * Server Error 5xx | |
| 84 | - * | |
| 85 | - * http://pretty-rfc.herokuapp.com/RFC2616#status.codes | |
| 86 | - * | |
| 87 | - * @return bool Did we receive a 4xx or 5xx? | |
| 88 | - */ | |
| 89 | - public function hasErrors() | |
| 90 | -    { | |
| 91 | - return $this->code == 0 || $this->code >= 400; | |
| 92 | - } | |
| 76 | + /** | |
| 77 | + * Status Code Definitions | |
| 78 | + * | |
| 79 | + * Informational 1xx | |
| 80 | + * Successful 2xx | |
| 81 | + * Redirection 3xx | |
| 82 | + * Client Error 4xx | |
| 83 | + * Server Error 5xx | |
| 84 | + * | |
| 85 | + * http://pretty-rfc.herokuapp.com/RFC2616#status.codes | |
| 86 | + * | |
| 87 | + * @return bool Did we receive a 4xx or 5xx? | |
| 88 | + */ | |
| 89 | + public function hasErrors() | |
| 90 | +	{ | |
| 91 | + return $this->code == 0 || $this->code >= 400; | |
| 92 | + } | |
| 93 | 93 | |
| 94 | 94 | } | 
| 95 | 95 | \ No newline at end of file | 
| @@ -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 | |
| @@ -35,15 +35,15 @@ discard block | ||
| 35 | 35 | 'timeout_ms' => 'CURLOPT_TIMEOUT_MS', // milliseconds, libcurl version > 7.36.0 , | 
| 36 | 36 | ); | 
| 37 | 37 | public $curlHandle; | 
| 38 | - protected $options = array( | |
| 39 | - 'CURLOPT_MAXREDIRS' => 10, | |
| 38 | + protected $options = array( | |
| 39 | + 'CURLOPT_MAXREDIRS' => 10, | |
| 40 | 40 | // 'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4,//IPv4 | 
| 41 | - 'header' => true, | |
| 42 | - 'method' => self::GET, | |
| 43 | - 'transfer' => true, | |
| 44 | - 'follow_location' => true, | |
| 45 | - 'timeout' => 0); | |
| 46 | - protected $endCallback; | |
| 41 | + 'header' => true, | |
| 42 | + 'method' => self::GET, | |
| 43 | + 'transfer' => true, | |
| 44 | + 'follow_location' => true, | |
| 45 | + 'timeout' => 0); | |
| 46 | + protected $endCallback; | |
| 47 | 47 | protected $withURIQuery; | 
| 48 | 48 | |
| 49 | 49 |  	protected function __construct() { | 
| @@ -222,7 +222,7 @@ discard block | ||
| 222 | 222 | |
| 223 | 223 | self::filterAndRaw($this->options); | 
| 224 | 224 | |
| 225 | - curl_setopt_array($this->curlHandle, $this->options); | |
| 225 | + curl_setopt_array($this->curlHandle, $this->options); | |
| 226 | 226 | |
| 227 | 227 | return $this; | 
| 228 | 228 | } | 
| @@ -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); |