@@ -206,11 +206,11 @@ |
||
| 206 | 206 | }, self::API_LANGUAGES); |
| 207 | 207 | |
| 208 | 208 | $sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS `'.self::TEMP_TABLE.'` (' |
| 209 | - .'`id` int(10) unsigned NOT NULL,' |
|
| 210 | - .substr(implode(' ', $sql_lang), 0, -1) |
|
| 211 | - .' `updated` tinyint(1) unsigned NOT NULL DEFAULT 0,' |
|
| 212 | - .'`response_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,' |
|
| 213 | - .'PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin'; |
|
| 209 | + .'`id` int(10) unsigned NOT NULL,' |
|
| 210 | + .substr(implode(' ', $sql_lang), 0, -1) |
|
| 211 | + .' `updated` tinyint(1) unsigned NOT NULL DEFAULT 0,' |
|
| 212 | + .'`response_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,' |
|
| 213 | + .'PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin'; |
|
| 214 | 214 | $this->DBDriverInterface->raw('DROP TEMPORARY TABLE IF EXISTS `'.self::TEMP_TABLE.'`'); |
| 215 | 215 | $this->DBDriverInterface->raw($sql); |
| 216 | 216 | } |
@@ -188,8 +188,7 @@ |
||
| 188 | 188 | $curl = curl_init($url); |
| 189 | 189 | curl_setopt_array($curl, $this->curl_options); |
| 190 | 190 | curl_multi_add_handle($this->curl_multi, $curl); |
| 191 | - } |
|
| 192 | - else{ |
|
| 191 | + } else{ |
|
| 193 | 192 | // retry on next if we don't get what we expect |
| 194 | 193 | $this->createHandle(); |
| 195 | 194 | } |
@@ -52,16 +52,14 @@ |
||
| 52 | 52 | |
| 53 | 53 | if(!isset($arr2[$key]) || !is_array($arr2[$key])){ |
| 54 | 54 | $diff[$key] = $value; |
| 55 | - } |
|
| 56 | - else{ |
|
| 55 | + } else{ |
|
| 57 | 56 | $new_diff = array_diff_assoc_recursive($value, $arr2[$key], $identical); |
| 58 | 57 | if(!empty($new_diff)){ |
| 59 | 58 | $diff[$key] = $new_diff; |
| 60 | 59 | } |
| 61 | 60 | } |
| 62 | 61 | |
| 63 | - } |
|
| 64 | - else if(!array_key_exists($key, $arr2) || $arr2[$key] !== $value){ |
|
| 62 | + } else if(!array_key_exists($key, $arr2) || $arr2[$key] !== $value){ |
|
| 65 | 63 | $diff[$key] = $value; |
| 66 | 64 | } |
| 67 | 65 | |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @filesource gw2api.php |
|
| 5 | - * @created 17.02.2016 |
|
| 6 | - * @author Smiley <[email protected]> |
|
| 7 | - * @copyright 2016 Smiley |
|
| 8 | - * @license MIT |
|
| 9 | - */ |
|
| 3 | + * |
|
| 4 | + * @filesource gw2api.php |
|
| 5 | + * @created 17.02.2016 |
|
| 6 | + * @author Smiley <[email protected]> |
|
| 7 | + * @copyright 2016 Smiley |
|
| 8 | + * @license MIT |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | namespace Example; |
| 12 | 12 | |
@@ -188,8 +188,7 @@ |
||
| 188 | 188 | $curl = curl_init($url); |
| 189 | 189 | curl_setopt_array($curl, $this->curl_options); |
| 190 | 190 | curl_multi_add_handle($this->curl_multi, $curl); |
| 191 | - } |
|
| 192 | - else{ |
|
| 191 | + } else{ |
|
| 193 | 192 | // retry on next if we don't get what we expect |
| 194 | 193 | $this->createHandle(); |
| 195 | 194 | } |