@@ -20,19 +20,19 @@ discard block |
||
| 20 | 20 | return ''; |
| 21 | 21 | } |
| 22 | 22 | $url = ''; |
| 23 | - $url .= isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; |
|
| 23 | + $url .= isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : ''; |
|
| 24 | 24 | $url .= isset($parsed_url['host']) ? $parsed_url['host'] : ''; |
| 25 | - $url .= isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; |
|
| 25 | + $url .= isset($parsed_url['port']) ? ':'.$parsed_url['port'] : ''; |
|
| 26 | 26 | $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; |
| 27 | - $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; |
|
| 28 | - $url .= $user . (($user || $pass) ? "$pass@" : ''); |
|
| 27 | + $pass = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : ''; |
|
| 28 | + $url .= $user.(($user || $pass) ? "$pass@" : ''); |
|
| 29 | 29 | if (!empty($url)) { |
| 30 | - $url .= isset($parsed_url['path']) ? '/' . ltrim($parsed_url['path'], '/') : ''; |
|
| 30 | + $url .= isset($parsed_url['path']) ? '/'.ltrim($parsed_url['path'], '/') : ''; |
|
| 31 | 31 | } elseif (empty($url)) { |
| 32 | 32 | $url .= isset($parsed_url['path']) ? $parsed_url['path'] : ''; |
| 33 | 33 | } |
| 34 | - $url .= isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; |
|
| 35 | - $url .= isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; |
|
| 34 | + $url .= isset($parsed_url['query']) ? '?'.$parsed_url['query'] : ''; |
|
| 35 | + $url .= isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : ''; |
|
| 36 | 36 | |
| 37 | 37 | return $url; |
| 38 | 38 | } |
@@ -79,8 +79,8 @@ discard block |
||
| 79 | 79 | public static function substituteAttributesInRoute($attributes, $route) |
| 80 | 80 | { |
| 81 | 81 | foreach ($attributes as $key => $value) { |
| 82 | - $route = str_replace('{' . $key . '}', $value, $route); |
|
| 83 | - $route = str_replace('{' . $key . '?}', $value, $route); |
|
| 82 | + $route = str_replace('{'.$key.'}', $value, $route); |
|
| 83 | + $route = str_replace('{'.$key.'?}', $value, $route); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | // delete empty optional arguments that are not in the $attributes array |
@@ -75,8 +75,8 @@ |
||
| 75 | 75 | $regional = tongue()->speaking('regional', $locale); |
| 76 | 76 | |
| 77 | 77 | if ($regional) { |
| 78 | - setlocale(LC_TIME, $regional . '.UTF-8'); |
|
| 79 | - setlocale(LC_MONETARY, $regional . '.UTF-8'); |
|
| 78 | + setlocale(LC_TIME, $regional.'.UTF-8'); |
|
| 79 | + setlocale(LC_MONETARY, $regional.'.UTF-8'); |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | /** |
@@ -28,7 +28,10 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | protected static function configDomainIsSet(): bool |
| 30 | 30 | { |
| 31 | - if (!$domain = Config::domain()) return false; // config was not set |
|
| 31 | + if (!$domain = Config::domain()) { |
|
| 32 | + return false; |
|
| 33 | + } |
|
| 34 | + // config was not set |
|
| 32 | 35 | |
| 33 | 36 | //the host could have a different domain, thats why we check it here |
| 34 | 37 | return Str::contains(self::host(), $domain); |
@@ -20,7 +20,9 @@ |
||
| 20 | 20 | |
| 21 | 21 | public function get(): ?string |
| 22 | 22 | { |
| 23 | - if (!$this->has()) return null; |
|
| 23 | + if (!$this->has()) { |
|
| 24 | + return null; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | try { |
| 26 | 28 | //Somehow I got this error: unserialize(): Error at offset 0 of 2 bytes |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | if (Config::beautify() && Localization::fromUrl() === Config::fallbackLocale()) { |
| 57 | 57 | $parsed_url['host'] = $domain; |
| 58 | 58 | } else { |
| 59 | - $parsed_url['host'] = tongue()->current() . '.' . $domain; |
|
| 59 | + $parsed_url['host'] = tongue()->current().'.'.$domain; |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return Accent::unparseUrl($parsed_url); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | // Add locale to the host |
| 170 | - return $locale . '.' . Url::domain(); |
|
| 170 | + return $locale.'.'.Url::domain(); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |