@@ -18,9 +18,9 @@ |
||
18 | 18 | public function resolve(): ?string |
19 | 19 | { |
20 | 20 | /** @var LocaleResolver $resolver */ |
21 | - foreach ($this->items as $resolver) { |
|
21 | + foreach($this->items as $resolver) { |
|
22 | 22 | $lang = $resolver->resolve(); |
23 | - if ($lang !== null) { |
|
23 | + if($lang !== null) { |
|
24 | 24 | return $lang; |
25 | 25 | } |
26 | 26 | } |
@@ -11,8 +11,7 @@ |
||
11 | 11 | * |
12 | 12 | * @author Jakub Konečný |
13 | 13 | */ |
14 | -final class ChainLocaleResolver extends Collection implements LocaleResolver |
|
15 | -{ |
|
14 | +final class ChainLocaleResolver extends Collection implements LocaleResolver { |
|
16 | 15 | protected string $class = LocaleResolver::class; |
17 | 16 | |
18 | 17 | public function resolve(): ?string |
@@ -12,8 +12,7 @@ |
||
12 | 12 | * |
13 | 13 | * @author Jakub Konečný |
14 | 14 | */ |
15 | -final class FallbackLocaleResolver implements LocaleResolver |
|
16 | -{ |
|
15 | +final class FallbackLocaleResolver implements LocaleResolver { |
|
17 | 16 | /** |
18 | 17 | * Resolve language |
19 | 18 | * |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | public function __construct(IRequest $request = null) |
23 | 23 | { |
24 | - if ($request === null) { |
|
24 | + if($request === null) { |
|
25 | 25 | $request = (new RequestFactory())->fromGlobals(); |
26 | 26 | } |
27 | 27 | $this->request = $request; |
@@ -40,27 +40,27 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function resolve(): ?string |
42 | 42 | { |
43 | - if ($this->loader === null) { |
|
43 | + if($this->loader === null) { |
|
44 | 44 | throw new LoaderNotSetException("Loader is not available, cannot detect possible languages."); |
45 | 45 | } |
46 | 46 | $header = $this->request->getHeader("Accept-Language"); |
47 | 47 | $langs = $this->loader->getAvailableLanguages(); |
48 | - if ($header === null) { |
|
48 | + if($header === null) { |
|
49 | 49 | return null; |
50 | 50 | } |
51 | - $s = strtolower($header); // case insensitive |
|
52 | - $s = strtr($s, '_', '-'); // cs_CZ means cs-CZ |
|
53 | - rsort($langs); // first more specific |
|
51 | + $s = strtolower($header); // case insensitive |
|
52 | + $s = strtr($s, '_', '-'); // cs_CZ means cs-CZ |
|
53 | + rsort($langs); // first more specific |
|
54 | 54 | $pattern = ')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#'; |
55 | 55 | preg_match_all('#(' . implode('|', $langs) . $pattern, $s, $matches); |
56 | - if (!isset($matches[0])) { |
|
56 | + if(!isset($matches[0])) { |
|
57 | 57 | return null; |
58 | 58 | } |
59 | 59 | $max = 0; |
60 | 60 | $lang = null; |
61 | - foreach ($matches[1] as $key => $value) { |
|
61 | + foreach($matches[1] as $key => $value) { |
|
62 | 62 | $q = ($matches[2][$key] === '') ? 1.0 : (float) $matches[2][$key]; |
63 | - if ($q > $max) { |
|
63 | + if($q > $max) { |
|
64 | 64 | $max = $q; |
65 | 65 | $lang = $value; |
66 | 66 | } |
@@ -14,13 +14,11 @@ |
||
14 | 14 | * |
15 | 15 | * @author Jakub Konečný |
16 | 16 | */ |
17 | -final class HeaderLocaleResolver implements LoaderAwareLocaleResolver |
|
18 | -{ |
|
17 | +final class HeaderLocaleResolver implements LoaderAwareLocaleResolver { |
|
19 | 18 | private ?Loader $loader = null; |
20 | 19 | private IRequest $request; |
21 | 20 | |
22 | - public function __construct(IRequest $request = null) |
|
23 | - { |
|
21 | + public function __construct(IRequest $request = null) { |
|
24 | 22 | if ($request === null) { |
25 | 23 | $request = (new RequestFactory())->fromGlobals(); |
26 | 24 | } |
@@ -11,8 +11,7 @@ |
||
11 | 11 | * |
12 | 12 | * @author Jakub Konečný |
13 | 13 | */ |
14 | -final class ManualLocaleResolver implements SettableLocaleResolver |
|
15 | -{ |
|
14 | +final class ManualLocaleResolver implements SettableLocaleResolver { |
|
16 | 15 | public ?string $lang = null; |
17 | 16 | |
18 | 17 | /** |
@@ -3,11 +3,11 @@ |
||
3 | 3 | |
4 | 4 | namespace Nexendrie\Translation; |
5 | 5 | |
6 | -if (false) { // @phpstan-ignore if.alwaysFalse |
|
6 | +if(false) { // @phpstan-ignore if.alwaysFalse |
|
7 | 7 | /** @deprecated Use LoaderAwareLocaleResolver */ |
8 | 8 | interface ILoaderAwareLocaleResolver extends LoaderAwareLocaleResolver |
9 | 9 | { |
10 | 10 | } |
11 | -} elseif (!interface_exists(ILoaderAwareLocaleResolver::class)) { |
|
11 | +} elseif(!interface_exists(ILoaderAwareLocaleResolver::class)) { |
|
12 | 12 | class_alias(LoaderAwareLocaleResolver::class, ILoaderAwareLocaleResolver::class); |
13 | 13 | } |
@@ -3,10 +3,10 @@ |
||
3 | 3 | |
4 | 4 | namespace Nexendrie\Translation; |
5 | 5 | |
6 | -if (false) { // @phpstan-ignore if.alwaysFalse |
|
6 | +if (false) { |
|
7 | +// @phpstan-ignore if.alwaysFalse |
|
7 | 8 | /** @deprecated Use LoaderAwareLocaleResolver */ |
8 | - interface ILoaderAwareLocaleResolver extends LoaderAwareLocaleResolver |
|
9 | - { |
|
9 | + interface ILoaderAwareLocaleResolver extends LoaderAwareLocaleResolver { |
|
10 | 10 | } |
11 | 11 | } elseif (!interface_exists(ILoaderAwareLocaleResolver::class)) { |
12 | 12 | class_alias(LoaderAwareLocaleResolver::class, ILoaderAwareLocaleResolver::class); |
@@ -3,11 +3,11 @@ |
||
3 | 3 | |
4 | 4 | namespace Nexendrie\Translation; |
5 | 5 | |
6 | -if (false) { // @phpstan-ignore if.alwaysFalse |
|
6 | +if(false) { // @phpstan-ignore if.alwaysFalse |
|
7 | 7 | /** @deprecated Use FileLoader */ |
8 | 8 | interface IFileLoader extends FileLoader |
9 | 9 | { |
10 | 10 | } |
11 | -} elseif (!interface_exists(IFileLoader::class)) { |
|
11 | +} elseif(!interface_exists(IFileLoader::class)) { |
|
12 | 12 | class_alias(FileLoader::class, IFileLoader::class); |
13 | 13 | } |
@@ -3,10 +3,10 @@ |
||
3 | 3 | |
4 | 4 | namespace Nexendrie\Translation; |
5 | 5 | |
6 | -if (false) { // @phpstan-ignore if.alwaysFalse |
|
6 | +if (false) { |
|
7 | +// @phpstan-ignore if.alwaysFalse |
|
7 | 8 | /** @deprecated Use FileLoader */ |
8 | - interface IFileLoader extends FileLoader |
|
9 | - { |
|
9 | + interface IFileLoader extends FileLoader { |
|
10 | 10 | } |
11 | 11 | } elseif (!interface_exists(IFileLoader::class)) { |
12 | 12 | class_alias(FileLoader::class, IFileLoader::class); |
@@ -8,7 +8,6 @@ |
||
8 | 8 | * |
9 | 9 | * @author Jakub Konečný |
10 | 10 | */ |
11 | -interface LoaderAwareLocaleResolver extends LocaleResolver |
|
12 | -{ |
|
11 | +interface LoaderAwareLocaleResolver extends LocaleResolver { |
|
13 | 12 | public function setLoader(Loader $loader): void; |
14 | 13 | } |
@@ -3,11 +3,11 @@ |
||
3 | 3 | |
4 | 4 | namespace Nexendrie\Translation; |
5 | 5 | |
6 | -if (false) { // @phpstan-ignore if.alwaysFalse |
|
6 | +if(false) { // @phpstan-ignore if.alwaysFalse |
|
7 | 7 | /** @deprecated Use LocaleResolver */ |
8 | 8 | interface ILocaleResolver extends LocaleResolver |
9 | 9 | { |
10 | 10 | } |
11 | -} elseif (!interface_exists(ILocaleResolver::class)) { |
|
11 | +} elseif(!interface_exists(ILocaleResolver::class)) { |
|
12 | 12 | class_alias(LocaleResolver::class, ILocaleResolver::class); |
13 | 13 | } |
@@ -3,10 +3,10 @@ |
||
3 | 3 | |
4 | 4 | namespace Nexendrie\Translation; |
5 | 5 | |
6 | -if (false) { // @phpstan-ignore if.alwaysFalse |
|
6 | +if (false) { |
|
7 | +// @phpstan-ignore if.alwaysFalse |
|
7 | 8 | /** @deprecated Use LocaleResolver */ |
8 | - interface ILocaleResolver extends LocaleResolver |
|
9 | - { |
|
9 | + interface ILocaleResolver extends LocaleResolver { |
|
10 | 10 | } |
11 | 11 | } elseif (!interface_exists(ILocaleResolver::class)) { |
12 | 12 | class_alias(LocaleResolver::class, ILocaleResolver::class); |
@@ -20,13 +20,13 @@ |
||
20 | 20 | |
21 | 21 | public function choose(string $message, int $count): string |
22 | 22 | { |
23 | - if (!$this->isMultiChoice($message)) { |
|
23 | + if(!$this->isMultiChoice($message)) { |
|
24 | 24 | return $message; |
25 | 25 | } |
26 | 26 | $variants = explode("|", $message); |
27 | - foreach ($variants as $variant) { |
|
27 | + foreach($variants as $variant) { |
|
28 | 28 | $interval = Intervals::findInterval($variant); |
29 | - if (is_string($interval) && Intervals::isInInterval($count, $interval)) { |
|
29 | + if(is_string($interval) && Intervals::isInInterval($count, $interval)) { |
|
30 | 30 | return Strings::trim((string) Strings::after($variant, $interval)); |
31 | 31 | } |
32 | 32 | } |
@@ -11,8 +11,7 @@ |
||
11 | 11 | * |
12 | 12 | * @author Jakub Konečný |
13 | 13 | */ |
14 | -final class MessageSelector implements IMessageSelector |
|
15 | -{ |
|
14 | +final class MessageSelector implements IMessageSelector { |
|
16 | 15 | public function isMultiChoice(string $message): bool |
17 | 16 | { |
18 | 17 | return is_string(Intervals::findInterval($message)) && str_contains($message, "|"); |