Completed
Pull Request — 1.11.x (#1599)
by José
28:19
created
plugin/buycourses/src/Requests/Proxy/HTTP.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -57,16 +57,13 @@
 block discarded – undo
57 57
 	public function __construct($args = null) {
58 58
 		if (is_string($args)) {
59 59
 			$this->proxy = $args;
60
-		}
61
-		elseif (is_array($args)) {
60
+		} elseif (is_array($args)) {
62 61
 			if (count($args) == 1) {
63 62
 				list($this->proxy) = $args;
64
-			}
65
-			elseif (count($args) == 3) {
63
+			} elseif (count($args) == 3) {
66 64
 				list($this->proxy, $this->user, $this->pass) = $args;
67 65
 				$this->use_authentication = true;
68
-			}
69
-			else {
66
+			} else {
70 67
 				throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs');
71 68
 			}
72 69
 		}
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/IDNAEncoder.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -291,11 +291,9 @@
 block discarded – undo
291 291
 #								tmax if k >= bias + tmax, or k - bias otherwise
292 292
 						if ($k <= ($bias + self::BOOTSTRAP_TMIN)) {
293 293
 							$t = self::BOOTSTRAP_TMIN;
294
-						}
295
-						elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
294
+						} elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
296 295
 							$t = self::BOOTSTRAP_TMAX;
297
-						}
298
-						else {
296
+						} else {
299 297
 							$t = $k - $bias;
300 298
 						}
301 299
 #						if q < t then break
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/Response.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,8 +112,7 @@
 block discarded – undo
112 112
 			if (!$allow_redirects) {
113 113
 				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
114 114
 			}
115
-		}
116
-		elseif (!$this->success) {
115
+		} elseif (!$this->success) {
117 116
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
118 117
 			throw new $exception(null, $this);
119 118
 		}
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/Session.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -249,8 +249,7 @@
 block discarded – undo
249 249
 			if (is_array($this->data)) {
250 250
 				$request['data'] = $this->data;
251 251
 			}
252
-		}
253
-		elseif (is_array($request['data']) && is_array($this->data)) {
252
+		} elseif (is_array($request['data']) && is_array($this->data)) {
254 253
 			$request['data'] = array_merge($this->data, $request['data']);
255 254
 		}
256 255
 
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/Cookie.php 1 patch
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -280,8 +280,7 @@  discard block
 block discarded – undo
280 280
 				$delta_seconds = (int) $value;
281 281
 				if ($delta_seconds <= 0) {
282 282
 					$expiry_time = 0;
283
-				}
284
-				else {
283
+				} else {
285 284
 					$expiry_time = $this->reference_time + $delta_seconds;
286 285
 				}
287 286
 
@@ -338,8 +337,7 @@  discard block
 block discarded – undo
338 337
 				// Ignore non-associative attributes
339 338
 				if (is_numeric($key)) {
340 339
 					$parts[] = $value;
341
-				}
342
-				else {
340
+				} else {
343 341
 					$parts[] = sprintf('%s=%s', $key, $value);
344 342
 				}
345 343
 			}
@@ -385,8 +383,7 @@  discard block
 block discarded – undo
385 383
 
386 384
 		if (!empty($name)) {
387 385
 			$value = $string;
388
-		}
389
-		elseif (strpos($kvparts, '=') === false) {
386
+		} elseif (strpos($kvparts, '=') === false) {
390 387
 			// Some sites might only have a value without the equals separator.
391 388
 			// Deviate from RFC 6265 and pretend it was actually a blank name
392 389
 			// (`=foo`)
@@ -394,8 +391,7 @@  discard block
 block discarded – undo
394 391
 			// https://bugzilla.mozilla.org/show_bug.cgi?id=169091
395 392
 			$name = '';
396 393
 			$value = $kvparts;
397
-		}
398
-		else {
394
+		} else {
399 395
 			list($name, $value) = explode('=', $kvparts, 2);
400 396
 		}
401 397
 		$name = trim($name);
@@ -409,8 +405,7 @@  discard block
 block discarded – undo
409 405
 				if (strpos($part, '=') === false) {
410 406
 					$part_key = $part;
411 407
 					$part_value = true;
412
-				}
413
-				else {
408
+				} else {
414 409
 					list($part_key, $part_value) = explode('=', $part, 2);
415 410
 					$part_value = trim($part_value);
416 411
 				}
@@ -445,8 +440,7 @@  discard block
 block discarded – undo
445 440
 			if (empty($parsed->attributes['domain']) && !empty($origin)) {
446 441
 				$parsed->attributes['domain'] = $origin->host;
447 442
 				$parsed->flags['host-only'] = true;
448
-			}
449
-			else {
443
+			} else {
450 444
 				$parsed->flags['host-only'] = false;
451 445
 			}
452 446
 
@@ -460,14 +454,12 @@  discard block
 block discarded – undo
460 454
 					// the uri-path is not a %x2F ("/") character, output
461 455
 					// %x2F ("/") and skip the remaining steps.
462 456
 					$path = '/';
463
-				}
464
-				elseif (substr_count($path, '/') === 1) {
457
+				} elseif (substr_count($path, '/') === 1) {
465 458
 					// If the uri-path contains no more than one %x2F ("/")
466 459
 					// character, output %x2F ("/") and skip the remaining
467 460
 					// step.
468 461
 					$path = '/';
469
-				}
470
-				else {
462
+				} else {
471 463
 					// Output the characters of the uri-path from the first
472 464
 					// character up to, but not including, the right-most
473 465
 					// %x2F ("/").
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/Transport/cURL.php 1 patch
Braces   +10 added lines, -20 removed lines patch added patch discarded remove patch
@@ -149,8 +149,7 @@  discard block
 block discarded – undo
149 149
 			if ($options['verify'] === false) {
150 150
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
151 151
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
152
-			}
153
-			elseif (is_string($options['verify'])) {
152
+			} elseif (is_string($options['verify'])) {
154 153
 				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
155 154
 			}
156 155
 		}
@@ -246,8 +245,7 @@  discard block
 block discarded – undo
246 245
 								);
247 246
 					$responses[$key] = $exception;
248 247
 					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
249
-				}
250
-				else {
248
+				} else {
251 249
 					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
252 250
 
253 251
 					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
@@ -322,8 +320,7 @@  discard block
 block discarded – undo
322 320
 			if ($data_format === 'query') {
323 321
 				$url = self::format_get($url, $data);
324 322
 				$data = '';
325
-			}
326
-			elseif (!is_string($data)) {
323
+			} elseif (!is_string($data)) {
327 324
 				$data = http_build_query($data, null, '&');
328 325
 			}
329 326
 		}
@@ -361,15 +358,13 @@  discard block
 block discarded – undo
361 358
 
362 359
 		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
363 360
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
364
-		}
365
-		else {
361
+		} else {
366 362
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
367 363
 		}
368 364
 
369 365
 		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
370 366
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
371
-		}
372
-		else {
367
+		} else {
373 368
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
374 369
 		}
375 370
 		curl_setopt($this->handle, CURLOPT_URL, $url);
@@ -380,8 +375,7 @@  discard block
 block discarded – undo
380 375
 		}
381 376
 		if ($options['protocol_version'] === 1.1) {
382 377
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
383
-		}
384
-		else {
378
+		} else {
385 379
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
386 380
 		}
387 381
 
@@ -408,8 +402,7 @@  discard block
 block discarded – undo
408 402
 		if ($options['filename'] !== false) {
409 403
 			fclose($this->stream_handle);
410 404
 			$this->headers = trim($this->headers);
411
-		}
412
-		else {
405
+		} else {
413 406
 			$this->headers .= $response;
414 407
 		}
415 408
 
@@ -479,8 +472,7 @@  discard block
 block discarded – undo
479 472
 
480 473
 		if ($this->stream_handle) {
481 474
 			fwrite($this->stream_handle, $data);
482
-		}
483
-		else {
475
+		} else {
484 476
 			$this->response_data .= $data;
485 477
 		}
486 478
 
@@ -500,8 +492,7 @@  discard block
 block discarded – undo
500 492
 			$url_parts = parse_url($url);
501 493
 			if (empty($url_parts['query'])) {
502 494
 				$query = $url_parts['query'] = '';
503
-			}
504
-			else {
495
+			} else {
505 496
 				$query = $url_parts['query'];
506 497
 			}
507 498
 
@@ -510,8 +501,7 @@  discard block
 block discarded – undo
510 501
 
511 502
 			if (empty($url_parts['query'])) {
512 503
 				$url .= '?' . $query;
513
-			}
514
-			else {
504
+			} else {
515 505
 				$url = str_replace($url_parts['query'], $query, $url);
516 506
 			}
517 507
 		}
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/Transport/fsockopen.php 1 patch
Braces   +10 added lines, -20 removed lines patch added patch discarded remove patch
@@ -92,8 +92,7 @@  discard block
 block discarded – undo
92 92
 			if (isset($options['verify'])) {
93 93
 				if ($options['verify'] === false) {
94 94
 					$context_options['verify_peer'] = false;
95
-				}
96
-				elseif (is_string($options['verify'])) {
95
+				} elseif (is_string($options['verify'])) {
97 96
 					$context_options['cafile'] = $options['verify'];
98 97
 				}
99 98
 			}
@@ -104,8 +103,7 @@  discard block
 block discarded – undo
104 103
 			}
105 104
 
106 105
 			stream_context_set_option($context, array('ssl' => $context_options));
107
-		}
108
-		else {
106
+		} else {
109 107
 			$remote_socket = 'tcp://' . $host;
110 108
 		}
111 109
 
@@ -142,8 +140,7 @@  discard block
 block discarded – undo
142 140
 		if ($data_format === 'query') {
143 141
 			$path = self::format_get($url_parts, $data);
144 142
 			$data = '';
145
-		}
146
-		else {
143
+		} else {
147 144
 			$path = self::format_get($url_parts, array());
148 145
 		}
149 146
 
@@ -155,8 +152,7 @@  discard block
 block discarded – undo
155 152
 		if ($options['type'] !== Requests::TRACE) {
156 153
 			if (is_array($data)) {
157 154
 				$request_body = http_build_query($data, null, '&');
158
-			}
159
-			else {
155
+			} else {
160 156
 				$request_body = $data;
161 157
 			}
162 158
 
@@ -222,8 +218,7 @@  discard block
 block discarded – undo
222 218
 		$timeout_sec = (int) floor($options['timeout']);
223 219
 		if ($timeout_sec == $options['timeout']) {
224 220
 			$timeout_msec = 0;
225
-		}
226
-		else {
221
+		} else {
227 222
 			$timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
228 223
 		}
229 224
 		stream_set_timeout($socket, $timeout_sec, $timeout_msec);
@@ -271,8 +266,7 @@  discard block
 block discarded – undo
271 266
 				$size += strlen($block);
272 267
 				if ($download) {
273 268
 					fwrite($download, $block);
274
-				}
275
-				else {
269
+				} else {
276 270
 					$body .= $block;
277 271
 				}
278 272
 			}
@@ -281,8 +275,7 @@  discard block
 block discarded – undo
281 275
 
282 276
 		if ($download) {
283 277
 			fclose($download);
284
-		}
285
-		else {
278
+		} else {
286 279
 			$this->headers .= "\r\n\r\n" . $body;
287 280
 		}
288 281
 		fclose($socket);
@@ -307,8 +300,7 @@  discard block
 block discarded – undo
307 300
 				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
308 301
 
309 302
 				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
310
-			}
311
-			catch (Requests_Exception $e) {
303
+			} catch (Requests_Exception $e) {
312 304
 				$responses[$id] = $e;
313 305
 			}
314 306
 
@@ -359,12 +351,10 @@  discard block
 block discarded – undo
359 351
 		if (isset($url_parts['path'])) {
360 352
 			if (isset($url_parts['query'])) {
361 353
 				$get = $url_parts['path'] . '?' . $url_parts['query'];
362
-			}
363
-			else {
354
+			} else {
364 355
 				$get = $url_parts['path'];
365 356
 			}
366
-		}
367
-		else {
357
+		} else {
368 358
 			$get = '/';
369 359
 		}
370 360
 		return $get;
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/IRI.php 1 patch
Braces   +30 added lines, -60 removed lines patch added patch discarded remove patch
@@ -155,8 +155,7 @@  discard block
 block discarded – undo
155 155
 	public function __set($name, $value) {
156 156
 		if (method_exists($this, 'set_' . $name)) {
157 157
 			call_user_func(array($this, 'set_' . $name), $value);
158
-		}
159
-		elseif (
158
+		} elseif (
160 159
 			   $name === 'iauthority'
161 160
 			|| $name === 'iuserinfo'
162 161
 			|| $name === 'ihost'
@@ -187,8 +186,7 @@  discard block
 block discarded – undo
187 186
 		) {
188 187
 			$method = 'get_' . $name;
189 188
 			$return = $this->$method();
190
-		}
191
-		elseif (array_key_exists($name, $props)) {
189
+		} elseif (array_key_exists($name, $props)) {
192 190
 			$return = $this->$name;
193 191
 		}
194 192
 		// host -> ihost
@@ -200,16 +198,14 @@  discard block
 block discarded – undo
200 198
 		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
201 199
 			$name = $prop;
202 200
 			$return = $this->$prop;
203
-		}
204
-		else {
201
+		} else {
205 202
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
206 203
 			$return = null;
207 204
 		}
208 205
 
209 206
 		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
210 207
 			return $this->normalization[$this->scheme][$name];
211
-		}
212
-		else {
208
+		} else {
213 209
 			return $return;
214 210
 		}
215 211
 	}
@@ -259,8 +255,7 @@  discard block
 block discarded – undo
259 255
 		}
260 256
 		if (!$relative->is_valid()) {
261 257
 			return false;
262
-		}
263
-		elseif ($relative->scheme !== null) {
258
+		} elseif ($relative->scheme !== null) {
264 259
 			return clone $relative;
265 260
 		}
266 261
 
@@ -275,8 +270,7 @@  discard block
 block discarded – undo
275 270
 			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
276 271
 				$target = clone $relative;
277 272
 				$target->scheme = $base->scheme;
278
-			}
279
-			else {
273
+			} else {
280 274
 				$target = new Requests_IRI;
281 275
 				$target->scheme = $base->scheme;
282 276
 				$target->iuserinfo = $base->iuserinfo;
@@ -285,32 +279,26 @@  discard block
 block discarded – undo
285 279
 				if ($relative->ipath !== '') {
286 280
 					if ($relative->ipath[0] === '/') {
287 281
 						$target->ipath = $relative->ipath;
288
-					}
289
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
282
+					} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
290 283
 						$target->ipath = '/' . $relative->ipath;
291
-					}
292
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
284
+					} elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
293 285
 						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
294
-					}
295
-					else {
286
+					} else {
296 287
 						$target->ipath = $relative->ipath;
297 288
 					}
298 289
 					$target->ipath = $target->remove_dot_segments($target->ipath);
299 290
 					$target->iquery = $relative->iquery;
300
-				}
301
-				else {
291
+				} else {
302 292
 					$target->ipath = $base->ipath;
303 293
 					if ($relative->iquery !== null) {
304 294
 						$target->iquery = $relative->iquery;
305
-					}
306
-					elseif ($base->iquery !== null) {
295
+					} elseif ($base->iquery !== null) {
307 296
 						$target->iquery = $base->iquery;
308 297
 					}
309 298
 				}
310 299
 				$target->ifragment = $relative->ifragment;
311 300
 			}
312
-		}
313
-		else {
301
+		} else {
314 302
 			$target = clone $base;
315 303
 			$target->ifragment = null;
316 304
 		}
@@ -362,8 +350,7 @@  discard block
 block discarded – undo
362 350
 			// then remove that prefix from the input buffer; otherwise,
363 351
 			if (strpos($input, '../') === 0) {
364 352
 				$input = substr($input, 3);
365
-			}
366
-			elseif (strpos($input, './') === 0) {
353
+			} elseif (strpos($input, './') === 0) {
367 354
 				$input = substr($input, 2);
368 355
 			}
369 356
 			// B: if the input buffer begins with a prefix of "/./" or "/.",
@@ -371,8 +358,7 @@  discard block
 block discarded – undo
371 358
 			// with "/" in the input buffer; otherwise,
372 359
 			elseif (strpos($input, '/./') === 0) {
373 360
 				$input = substr($input, 2);
374
-			}
375
-			elseif ($input === '/.') {
361
+			} elseif ($input === '/.') {
376 362
 				$input = '/';
377 363
 			}
378 364
 			// C: if the input buffer begins with a prefix of "/../" or "/..",
@@ -382,8 +368,7 @@  discard block
 block discarded – undo
382 368
 			elseif (strpos($input, '/../') === 0) {
383 369
 				$input = substr($input, 3);
384 370
 				$output = substr_replace($output, '', strrpos($output, '/'));
385
-			}
386
-			elseif ($input === '/..') {
371
+			} elseif ($input === '/..') {
387 372
 				$input = '/';
388 373
 				$output = substr_replace($output, '', strrpos($output, '/'));
389 374
 			}
@@ -399,8 +384,7 @@  discard block
 block discarded – undo
399 384
 			elseif (($pos = strpos($input, '/', 1)) !== false) {
400 385
 				$output .= substr($input, 0, $pos);
401 386
 				$input = substr_replace($input, '', 0, $pos);
402
-			}
403
-			else {
387
+			} else {
404 388
 				$output .= $input;
405 389
 				$input = '';
406 390
 			}
@@ -482,8 +466,7 @@  discard block
 block discarded – undo
482 466
 							break;
483 467
 						}
484 468
 					}
485
-				}
486
-				else {
469
+				} else {
487 470
 					$position = $strlen - 1;
488 471
 					$valid = false;
489 472
 				}
@@ -634,8 +617,7 @@  discard block
 block discarded – undo
634 617
 					for ($j = $start; $j <= $i; $j++) {
635 618
 						$string .= '%' . strtoupper($bytes[$j]);
636 619
 					}
637
-				}
638
-				else {
620
+				} else {
639 621
 					for ($j = $start; $j <= $i; $j++) {
640 622
 						$string .= chr(hexdec($bytes[$j]));
641 623
 					}
@@ -760,12 +742,10 @@  discard block
 block discarded – undo
760 742
 	protected function set_scheme($scheme) {
761 743
 		if ($scheme === null) {
762 744
 			$this->scheme = null;
763
-		}
764
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
745
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
765 746
 			$this->scheme = null;
766 747
 			return false;
767
-		}
768
-		else {
748
+		} else {
769 749
 			$this->scheme = strtolower($scheme);
770 750
 		}
771 751
 		return true;
@@ -803,8 +783,7 @@  discard block
 block discarded – undo
803 783
 		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
804 784
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
805 785
 			$remaining = substr($remaining, $iuserinfo_end + 1);
806
-		}
807
-		else {
786
+		} else {
808 787
 			$iuserinfo = null;
809 788
 		}
810 789
 		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
@@ -813,8 +792,7 @@  discard block
 block discarded – undo
813 792
 				$port = null;
814 793
 			}
815 794
 			$remaining = substr($remaining, 0, $port_start);
816
-		}
817
-		else {
795
+		} else {
818 796
 			$port = null;
819 797
 		}
820 798
 
@@ -839,8 +817,7 @@  discard block
 block discarded – undo
839 817
 	protected function set_userinfo($iuserinfo) {
840 818
 		if ($iuserinfo === null) {
841 819
 			$this->iuserinfo = null;
842
-		}
843
-		else {
820
+		} else {
844 821
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
845 822
 			$this->scheme_normalization();
846 823
 		}
@@ -863,13 +840,11 @@  discard block
 block discarded – undo
863 840
 		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
864 841
 			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
865 842
 				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
866
-			}
867
-			else {
843
+			} else {
868 844
 				$this->ihost = null;
869 845
 				return false;
870 846
 			}
871
-		}
872
-		else {
847
+		} else {
873 848
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
874 849
 
875 850
 			// Lowercase, but ignore pct-encoded sections (as they should
@@ -880,8 +855,7 @@  discard block
 block discarded – undo
880 855
 			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
881 856
 				if ($ihost[$position] === '%') {
882 857
 					$position += 3;
883
-				}
884
-				else {
858
+				} else {
885 859
 					$ihost[$position] = strtolower($ihost[$position]);
886 860
 					$position++;
887 861
 				}
@@ -934,8 +908,7 @@  discard block
 block discarded – undo
934 908
 
935 909
 		if (isset($cache[$ipath])) {
936 910
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
937
-		}
938
-		else {
911
+		} else {
939 912
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
940 913
 			$removed = $this->remove_dot_segments($valid);
941 914
 
@@ -955,8 +928,7 @@  discard block
 block discarded – undo
955 928
 	protected function set_query($iquery) {
956 929
 		if ($iquery === null) {
957 930
 			$this->iquery = null;
958
-		}
959
-		else {
931
+		} else {
960 932
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
961 933
 			$this->scheme_normalization();
962 934
 		}
@@ -972,8 +944,7 @@  discard block
 block discarded – undo
972 944
 	protected function set_fragment($ifragment) {
973 945
 		if ($ifragment === null) {
974 946
 			$this->ifragment = null;
975
-		}
976
-		else {
947
+		} else {
977 948
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
978 949
 			$this->scheme_normalization();
979 950
 		}
@@ -1076,8 +1047,7 @@  discard block
 block discarded – undo
1076 1047
 		$iauthority = $this->get_iauthority();
1077 1048
 		if (is_string($iauthority)) {
1078 1049
 			return $this->to_uri($iauthority);
1079
-		}
1080
-		else {
1050
+		} else {
1081 1051
 			return $iauthority;
1082 1052
 		}
1083 1053
 	}
Please login to merge, or discard this patch.
plugin/buycourses/src/Requests/IPv6.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -106,8 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
 		if ($ip_parts[1] !== '') {
108 108
 			return implode(':', $ip_parts);
109
-		}
110
-		else {
109
+		} else {
111 110
 			return $ip_parts[0];
112 111
 		}
113 112
 	}
@@ -130,8 +129,7 @@  discard block
 block discarded – undo
130 129
 			$ipv6_part = substr($ip, 0, $pos);
131 130
 			$ipv4_part = substr($ip, $pos + 1);
132 131
 			return array($ipv6_part, $ipv4_part);
133
-		}
134
-		else {
132
+		} else {
135 133
 			return array($ip, '');
136 134
 		}
137 135
 	}
@@ -182,8 +180,7 @@  discard block
 block discarded – undo
182 180
 				}
183 181
 			}
184 182
 			return true;
185
-		}
186
-		else {
183
+		} else {
187 184
 			return false;
188 185
 		}
189 186
 	}
Please login to merge, or discard this patch.