@@ -402,8 +402,7 @@ discard block |
||
| 402 | 402 | $this->uri->setScheme(parse_url($baseUrl, PHP_URL_SCHEME)); |
| 403 | 403 | $this->uri->setHost(parse_url($baseUrl, PHP_URL_HOST)); |
| 404 | 404 | $this->uri->setPort(parse_url($baseUrl, PHP_URL_PORT)); |
| 405 | - } |
|
| 406 | - else |
|
| 405 | + } else |
|
| 407 | 406 | { |
| 408 | 407 | if ( ! $this->http->isCli()) |
| 409 | 408 | { |
@@ -466,8 +465,7 @@ discard block |
||
| 466 | 465 | { |
| 467 | 466 | Locale::setDefault($locale); |
| 468 | 467 | } |
| 469 | - } |
|
| 470 | - catch (Exception $exception) {} |
|
| 468 | + } catch (Exception $exception) {} |
|
| 471 | 469 | |
| 472 | 470 | return $this; |
| 473 | 471 | } |
@@ -731,8 +729,7 @@ discard block |
||
| 731 | 729 | { |
| 732 | 730 | if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) { |
| 733 | 731 | $host = $forawardedHost[0]; |
| 734 | - } |
|
| 735 | - elseif ( ! $host = $this->headers->get('HOST')) { |
|
| 732 | + } elseif ( ! $host = $this->headers->get('HOST')) { |
|
| 736 | 733 | if ( ! $host = $this->server->get('SERVER_NAME')) { |
| 737 | 734 | $host = $this->server->get('REMOTE_ADDR', ''); |
| 738 | 735 | } |
@@ -831,12 +828,10 @@ discard block |
||
| 831 | 828 | if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') |
| 832 | 829 | { |
| 833 | 830 | return true; |
| 834 | - } |
|
| 835 | - elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') |
|
| 831 | + } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') |
|
| 836 | 832 | { |
| 837 | 833 | return true; |
| 838 | - } |
|
| 839 | - elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') |
|
| 834 | + } elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') |
|
| 840 | 835 | { |
| 841 | 836 | return true; |
| 842 | 837 | } |
@@ -878,8 +873,7 @@ discard block |
||
| 878 | 873 | if (array_key_exists($key, $all)) |
| 879 | 874 | { |
| 880 | 875 | return $all[$key]; |
| 881 | - } |
|
| 882 | - else |
|
| 876 | + } else |
|
| 883 | 877 | { |
| 884 | 878 | return $key; |
| 885 | 879 | } |
@@ -895,8 +889,7 @@ discard block |
||
| 895 | 889 | try |
| 896 | 890 | { |
| 897 | 891 | $content = $this->getContent(); |
| 898 | - } |
|
| 899 | - catch (LogicException $e) |
|
| 892 | + } catch (LogicException $e) |
|
| 900 | 893 | { |
| 901 | 894 | if (PHP_VERSION_ID > 70400) |
| 902 | 895 | { |