chillerlan / php-curl

examples/GW2API/ItemMultiResponseHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 	/**
 	 * Write some info to the CLI
 	 *
-	 * @param $str
+	 * @param string $str
 	 */
 	protected function logToCLI($str){
 		echo '['.date('c', time()).']'.sprintf('[%10ss] ', sprintf('%01.4f', microtime(true) - $this->starttime)).$str.PHP_EOL;

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use chillerlan\Database\Drivers\MySQLi\MySQLiDriver;
 use chillerlan\Database\Traits\DatabaseTrait;
 use chillerlan\Database\DBOptions;
-use chillerlan\Database\Drivers\PDO\PDOMySQLDriver;
 use chillerlan\TinyCurl\MultiRequest;
 use chillerlan\TinyCurl\MultiRequestOptions;
 use chillerlan\TinyCurl\Request;

Indentation +5 added lines, -5 removed lines

@@ -206,11 +206,11 @@
 		}, self::API_LANGUAGES);
 
 		$sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS `'.self::TEMP_TABLE.'` ('
-		       .'`id` int(10) unsigned NOT NULL,'
-		       .substr(implode(' ', $sql_lang), 0, -1)
-		       .' `updated` tinyint(1) unsigned NOT NULL DEFAULT 0,'
-		       .'`response_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,'
-		       .'PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin';
+			   .'`id` int(10) unsigned NOT NULL,'
+			   .substr(implode(' ', $sql_lang), 0, -1)
+			   .' `updated` tinyint(1) unsigned NOT NULL DEFAULT 0,'
+			   .'`response_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,'
+			   .'PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin';
 		$this->DBDriverInterface->raw('DROP TEMPORARY TABLE IF EXISTS `'.self::TEMP_TABLE.'`');
 		$this->DBDriverInterface->raw($sql);
 	}

Spacing +20 added lines, -20 removed lines

@@ -27,7 +27,7 @@ 
 /**
  * Class ItemMultiResponseHandler
  */
-class ItemMultiResponseHandler implements MultiResponseHandlerInterface{
+class ItemMultiResponseHandler implements MultiResponseHandlerInterface {
 	use DatabaseTrait;
 
 	/**
@@ -73,7 +73,7 @@ 
 	 *
 	 * @param \chillerlan\TinyCurl\MultiRequest $multiRequest
 	 */
-	public function __construct(MultiRequest $multiRequest = null){
+	public function __construct(MultiRequest $multiRequest = null) {
 		$this->multiRequest = $multiRequest;
 
 		(new Dotenv(self::CONFIGDIR))->load();
@@ -92,7 +92,7 @@ 
 	/**
 	 * start the mayhem
 	 */
-	public function init(){
+	public function init() {
 		$this->createTempTable();
 		$this->getURLs();
 
@@ -133,7 +133,7 @@ 
 	 * @return bool|\chillerlan\TinyCurl\URL
 	 * @internal
 	 */
-	public function handleResponse(ResponseInterface $response){
+	public function handleResponse(ResponseInterface $response) {
 		$info = $response->info;
 		$this->callback++;
 
@@ -141,11 +141,11 @@ 
 		parse_str(parse_url($info->url, PHP_URL_QUERY), $params);
 
 		// there be dragons.
-		if(in_array($info->http_code, [200, 206], true)){
+		if (in_array($info->http_code, [200, 206], true)) {
 			$lang = $response->headers->{'content-language'} ?: $params['lang'];
 
 			// discard the response when it's impossible to determine the language
-			if(!in_array($lang, self::API_LANGUAGES)){
+			if (!in_array($lang, self::API_LANGUAGES)) {
 				$this->logToCLI('URL discarded. ('.$info->url.')');
 				return false;
 			}
@@ -153,7 +153,7 @@ 
 			$sql = 'UPDATE '.self::TEMP_TABLE.' SET `'.$lang.'` = ? WHERE `id` = ?';
 			$values = [];
 
-			foreach($response->json as $item){
+			foreach ($response->json as $item) {
 #				$this->logToCLI(str_pad($item->id, 5).' - '.$item->name);
 				// just dumping the raw JSON for each item here because i'm lazy (or to process the itemdata later)
 				$values[] = [json_encode($item), $item->id];
@@ -161,10 +161,10 @@ 
 
 			// insert the data as soon as we receive it
 			// this will result in a couple more database writes but won't block the responses much
-			if($this->DBDriverInterface->multi($sql, $values)){
-				$this->logToCLI('['.str_pad($this->callback, 6, ' ',STR_PAD_RIGHT).']['.$lang.'] '.md5($response->info->url).' updated');
+			if ($this->DBDriverInterface->multi($sql, $values)) {
+				$this->logToCLI('['.str_pad($this->callback, 6, ' ', STR_PAD_RIGHT).']['.$lang.'] '.md5($response->info->url).' updated');
 			}
-			else{
+			else {
 				// retry if the insert failed for whatever reason
 				$this->logToCLI('SQL insert failed, retrying URL. ('.$info->url.')');
 				return new URL($info->url);
@@ -175,12 +175,12 @@ 
 		}
 		// instant retry on a 502
 		// https://gitter.im/arenanet/api-cdi?at=56c3ba6ba5bdce025f69bcc8
-		else if($info->http_code === 502){
+		else if ($info->http_code === 502) {
 			$this->logToCLI('URL readded due to a 502. ('.$info->url.')');
 			return new URL($info->url);
 		}
 		// examine and add the failed response to retry later @todo
-		else{
+		else {
 			$this->logToCLI('('.$info->url.')');
 			return false;
 		}
@@ -192,16 +192,16 @@ 
 	 *
 	 * @param $str
 	 */
-	protected function logToCLI($str){
+	protected function logToCLI($str) {
 		echo '['.date('c', time()).']'.sprintf('[%10ss] ', sprintf('%01.4f', microtime(true) - $this->starttime)).$str.PHP_EOL;
 	}
 
 	/**
 	 * Creates a temporary table to receive the item responses on the fly
 	 */
-	protected function createTempTable(){
+	protected function createTempTable() {
 
-		$sql_lang = array_map(function($lang){
+		$sql_lang = array_map(function($lang) {
 			return '`'.$lang.'` text COLLATE utf8mb4_bin NOT NULL, ';
 		}, self::API_LANGUAGES);
 
@@ -218,17 +218,17 @@ 
 	/**
 	 * @throws \chillerlan\TinyCurl\RequestException
 	 */
-	protected function getURLs(){
+	protected function getURLs() {
 		$this->starttime = microtime(true);
 		$this->logToCLI('self::getURLs() fetch');
 
 		$response = (new Request)->fetch(new URL('https://api.guildwars2.com/v2/items'));
 
-		if($response->info->http_code !== 200){
+		if ($response->info->http_code !== 200) {
 			throw new Exception('failed to get /v2/items');
 		}
 
-		$values = array_map(function($item){
+		$values = array_map(function($item) {
 			return [$item];
 		}, $response->json);
 
@@ -238,8 +238,8 @@ 
 
 		$chunks = array_chunk($response->json, self::CHUNK_SIZE);
 
-		array_map(function($chunk){
-			foreach(self::API_LANGUAGES as $lang){
+		array_map(function($chunk) {
+			foreach (self::API_LANGUAGES as $lang) {
 				$this->urls[] = new URL(self::API_BASE.'?lang='.$lang.'&ids='.implode(',', $chunk));
 			}
 		}, $chunks);

Braces +1 added lines, -2 removed lines

@@ -188,8 +188,7 @@
 				$curl = curl_init($url);
 				curl_setopt_array($curl, $this->curl_options);
 				curl_multi_add_handle($this->curl_multi, $curl);
-			}
-			else{
+			} else{
 				// retry on next if we don't get what we expect
 				$this->createHandle();
 			}

examples/functions.php

Spacing +14 added lines, -14 removed lines

@@ -15,15 +15,15 @@ 
  *
  * @return array
  */
-if(!function_exists('array_sort_recursive')){
+if (!function_exists('array_sort_recursive')) {
 
-	function array_sort_recursive(array $array){
+	function array_sort_recursive(array $array) {
 		array_multisort($array);
 		ksort($array);
 
-		foreach($array as $key => $value){
+		foreach ($array as $key => $value) {
 
-			if(is_array($value)){
+			if (is_array($value)) {
 				$array[$key] = array_sort_recursive($value);
 			}
 
@@ -41,27 +41,27 @@ 
  * @return array
  * @link http://php.net/manual/function.array-diff-assoc.php#111675
  */
-if(!function_exists('array_diff_assoc_recursive')){
+if (!function_exists('array_diff_assoc_recursive')) {
 
-	function array_diff_assoc_recursive(array $arr1, array $arr2, $identical = false){
+	function array_diff_assoc_recursive(array $arr1, array $arr2, $identical = false) {
 		$diff = $identical ? array_diff_key($arr2, $arr1) : [];
 
-		foreach($arr1 as $key => $value){
+		foreach ($arr1 as $key => $value) {
 
-			if(is_array($value)){
+			if (is_array($value)) {
 
-				if(!isset($arr2[$key]) || !is_array($arr2[$key])){
+				if (!isset($arr2[$key]) || !is_array($arr2[$key])) {
 					$diff[$key] = $value;
 				}
-				else{
+				else {
 					$new_diff = array_diff_assoc_recursive($value, $arr2[$key], $identical);
-					if(!empty($new_diff)){
+					if (!empty($new_diff)) {
 						$diff[$key] = $new_diff;
 					}
 				}
 
 			}
-			else if(!array_key_exists($key, $arr2) || $arr2[$key] !== $value){
+			else if (!array_key_exists($key, $arr2) || $arr2[$key] !== $value) {
 				$diff[$key] = $value;
 			}
 
@@ -75,8 +75,8 @@ 
 /**
  * Checks wether the script is running in CLI mode.
  */
-if(!function_exists('is_cli')){
-	function is_cli(){
+if (!function_exists('is_cli')) {
+	function is_cli() {
 		return !isset($_SERVER['SERVER_SOFTWARE']) && (PHP_SAPI === 'cli' || (is_numeric($_SERVER['argc']) && $_SERVER['argc'] > 0));
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -52,16 +52,14 @@
 
 				if(!isset($arr2[$key]) || !is_array($arr2[$key])){
 					$diff[$key] = $value;
-				}
-				else{
+				} else{
 					$new_diff = array_diff_assoc_recursive($value, $arr2[$key], $identical);
 					if(!empty($new_diff)){
 						$diff[$key] = $new_diff;
 					}
 				}
 
-			}
-			else if(!array_key_exists($key, $arr2) || $arr2[$key] !== $value){
+			} else if(!array_key_exists($key, $arr2) || $arr2[$key] !== $value){
 				$diff[$key] = $value;
 			}
 

examples/gw2api.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- *
- * @filesource   gw2api.php
- * @created      17.02.2016
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2016 Smiley
- * @license      MIT
- */
+	 *
+	 * @filesource   gw2api.php
+	 * @created      17.02.2016
+	 * @author       Smiley <smiley@chillerlan.net>
+	 * @copyright    2016 Smiley
+	 * @license      MIT
+	 */
 
 namespace Example;
 

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 require_once '../vendor/autoload.php';
 require_once 'functions.php';
 
-if(!is_cli()){
+if (!is_cli()) {
 	throw new \Exception('no way, buddy.');
 }
 

src/MultiRequest.php

Spacing +27 added lines, -27 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @link http://www.onlineaspect.com/2009/01/26/how-to-use-curl_multi-without-blocking/
  */
-class MultiRequest{
+class MultiRequest {
 
 	/**
 	 * the curl_multi master handle
@@ -64,15 +64,15 @@ 
 	 *
 	 * @param \chillerlan\TinyCurl\MultiRequestOptions $options
 	 */
-	public function __construct(MultiRequestOptions $options = null){
+	public function __construct(MultiRequestOptions $options = null) {
 
-		if(!$options){
+		if (!$options) {
 			$options = new MultiRequestOptions;
 		}
 
 		$this->options = $options;
 
-		if($this->options->handler){
+		if ($this->options->handler) {
 			$this->setHandler();
 		}
 
@@ -92,8 +92,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public function __destruct(){
-		if($this->curl_multi){
+	public function __destruct() {
+		if ($this->curl_multi) {
 			curl_multi_close($this->curl_multi);
 		}
 	}
@@ -104,17 +104,17 @@ 
 	 * @return $this
 	 * @throws \chillerlan\TinyCurl\RequestException
 	 */
-	public function setHandler(MultiResponseHandlerInterface $handler = null){
+	public function setHandler(MultiResponseHandlerInterface $handler = null) {
 
-		if(!$handler){
+		if (!$handler) {
 
-			if(!class_exists($this->options->handler)){
+			if (!class_exists($this->options->handler)) {
 				throw new RequestException('!$this->options->handler');
 			}
 
 			$handler = new $this->options->handler($this);
 
-			if(!is_a($handler, MultiResponseHandlerInterface::class)){
+			if (!is_a($handler, MultiResponseHandlerInterface::class)) {
 				throw new RequestException('!is_a($handler)');
 			}
 
@@ -131,9 +131,9 @@ 
 	 * @return $this
 	 * @throws \chillerlan\TinyCurl\RequestException
 	 */
-	public function fetch(array $urls){
+	public function fetch(array $urls) {
 
-		if(empty($urls)){
+		if (empty($urls)) {
 			throw new RequestException('empty($urls)');
 		}
 
@@ -142,12 +142,12 @@ 
 
 		$url_count = count($this->stack);
 
-		if($this->options->window_size > $url_count){
+		if ($this->options->window_size > $url_count) {
 			$this->options->window_size = $url_count;
 		}
 
 		// shoot out the first batch of requests
-		array_map(function(){
+		array_map(function() {
 			$this->createHandle();
 		}, range(1, $this->options->window_size));
 
@@ -163,7 +163,7 @@ 
 	 * @see \chillerlan\TinyCurl\Response\MultiResponseHandlerInterface
 	 * @return $this
 	 */
-	public function addResponse($response){
+	public function addResponse($response) {
 		$this->responses[] = $response;
 
 		return $this;
@@ -172,24 +172,24 @@ 
 	/**
 	 * @return array
 	 */
-	public function getResponseData(){
+	public function getResponseData() {
 		return $this->responses;
 	}
 
 	/**
 	 * creates a new handle for $request[$index]
 	 */
-	protected function createHandle(){
+	protected function createHandle() {
 
-		if(!empty($this->stack)){
+		if (!empty($this->stack)) {
 			$url = array_shift($this->stack);
 
-			if($url instanceof URL){
+			if ($url instanceof URL) {
 				$curl = curl_init($url);
 				curl_setopt_array($curl, $this->curl_options);
 				curl_multi_add_handle($this->curl_multi, $curl);
 			}
-			else{
+			else {
 				// retry on next if we don't get what we expect
 				$this->createHandle();
 			}
@@ -201,19 +201,19 @@ 
 	/**
 	 * processes the requests
 	 */
-	protected function processStack(){
+	protected function processStack() {
 
-		do{
+		do {
 
-			if(curl_multi_exec($this->curl_multi, $active) !== CURLM_OK){
+			if (curl_multi_exec($this->curl_multi, $active) !== CURLM_OK) {
 				break; // @codeCoverageIgnore
 			}
 
 			// welcome to callback hell.
-			while($state = curl_multi_info_read($this->curl_multi)){
+			while ($state = curl_multi_info_read($this->curl_multi)) {
 				$url = $this->multiResponseHandler->handleResponse(new MultiResponse($state['handle']));
 
-				if($url instanceof URL){
+				if ($url instanceof URL) {
 					$this->stack[] = $url;
 				}
 
@@ -221,12 +221,12 @@ 
 				curl_multi_remove_handle($this->curl_multi, $state['handle']);
 			}
 
-			if($active){
+			if ($active) {
 				curl_multi_select($this->curl_multi, $this->options->timeout);
 			}
 
 		}
-		while($active);
+		while ($active);
 
 	}
 

Braces +1 added lines, -2 removed lines

@@ -188,8 +188,7 @@
 				$curl = curl_init($url);
 				curl_setopt_array($curl, $this->curl_options);
 				curl_multi_add_handle($this->curl_multi, $curl);
-			}
-			else{
+			} else{
 				// retry on next if we don't get what we expect
 				$this->createHandle();
 			}

src/MultiRequestOptions.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 /**
  * Class MultiRequestOptions
  */
-class MultiRequestOptions extends RequestOptions{
+class MultiRequestOptions extends RequestOptions {
 
 	public $handler = null;
 

src/Request.php

Spacing +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
 /**
  *
  */
-class Request{
+class Request {
 
 	/**
 	 * The cURL connection
@@ -37,9 +37,9 @@ 
 	 *
 	 * @param \chillerlan\TinyCurl\RequestOptions $options
 	 */
-	public function __construct(RequestOptions $options = null){
+	public function __construct(RequestOptions $options = null) {
 
-		if(!$options){
+		if (!$options) {
 			$options = new RequestOptions;
 		}
 
@@ -51,7 +51,7 @@ 
 	 *
 	 * @return ResponseInterface
 	 */
-	protected function getResponse($url){
+	protected function getResponse($url) {
 		$ca_info = is_file($this->options->ca_info) ? $this->options->ca_info : null;
 
 		curl_setopt_array($this->curl, $this->options->curl_options + [
@@ -71,10 +71,10 @@ 
 	 * @return \chillerlan\TinyCurl\Response\ResponseInterface
 	 * @throws \chillerlan\TinyCurl\RequestException
 	 */
-	public function fetch(URL $url){
+	public function fetch(URL $url) {
 		$this->curl = curl_init();
 
-		if(!$url->host || !in_array($url->scheme, ['http', 'https', 'ftp'], true)){
+		if (!$url->host || !in_array($url->scheme, ['http', 'https', 'ftp'], true)) {
 			throw new RequestException('$url');
 		}
 
@@ -86,10 +86,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function extractShortUrl($url){
+	public function extractShortUrl($url) {
 		$urls = [$url];
 
-		while($url = $this->extract($url)){
+		while ($url = $this->extract($url)) {
 			$urls[] = $url;
 		}
 
@@ -102,7 +102,7 @@ 
 	 * @return string|bool
 	 * @link http://www.internoetics.com/2012/11/12/resolve-short-urls-to-their-destination-url-php-api/
 	 */
-	protected function extract($url){
+	protected function extract($url) {
 		$this->curl = curl_init();
 
 		curl_setopt_array($this->curl, [
@@ -114,7 +114,7 @@ 
 		$info    = $response->info;
 		$headers = $response->headers;
 
-		switch(true){
+		switch (true) {
 			// check curl_info()
 			case in_array($info->http_code, range(300, 308), true) && isset($info->redirect_url) && !empty($info->redirect_url):
 				return $info->redirect_url;

src/RequestException.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 /**
  * Class RequestException
  */
-class RequestException extends Exception{
+class RequestException extends Exception {
 
 }

src/RequestOptions.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 /**
  * Class RequestOptions
  */
-class RequestOptions{
+class RequestOptions {
 
 	/**
 	 * options for each curl instance

src/Response/MultiResponse.php

Spacing +4 added lines, -4 removed lines

@@ -15,19 +15,19 @@
 /**
  *
  */
-class MultiResponse extends Response implements ResponseInterface{
+class MultiResponse extends Response implements ResponseInterface {
 
 	/**
 	 * Fills self::$response_body and calls self::getInfo()
 	 */
-	protected function exec(){
+	protected function exec() {
 		$response = explode("\r\n\r\n", curl_multi_getcontent($this->curl), 2);
 		$headers = isset($response[0]) ? explode("\r\n", $response[0]) : null;
 		$this->response_body = isset($response[1]) ? $response[1] : null;
 		$this->getInfo();
 
-		if(is_array($headers)){
-			foreach($headers as $line){
+		if (is_array($headers)) {
+			foreach ($headers as $line) {
 				$this->headerLine(null, $line);
 			}
 		}