@@ -101,7 +101,8 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | public function getLocaleDirectory(string $locale, ?string $directory = null): string |
| 103 | 103 | { |
| 104 | - if ($directory !== null) { |
|
| 104 | + if ($directory !== null) |
|
| 105 | + { |
|
| 105 | 106 | return \rtrim($directory, '/') . '/' . $locale . '/'; |
| 106 | 107 | } |
| 107 | 108 | |
@@ -116,9 +117,12 @@ discard block |
||
| 116 | 117 | $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle)); |
| 117 | 118 | $domains = (array) ($this->config['domains'] ?? []); |
| 118 | 119 | |
| 119 | - foreach ($domains as $domain => $patterns) { |
|
| 120 | - foreach ($patterns as $pattern) { |
|
| 121 | - if ($this->matcher->matches($bundle, $pattern)) { |
|
| 120 | + foreach ($domains as $domain => $patterns) |
|
| 121 | + { |
|
| 122 | + foreach ($patterns as $pattern) |
|
| 123 | + { |
|
| 124 | + if ($this->matcher->matches($bundle, $pattern)) |
|
| 125 | + { |
|
| 122 | 126 | return $domain; |
| 123 | 127 | } |
| 124 | 128 | } |
@@ -23,8 +23,10 @@ discard block |
||
| 23 | 23 | { |
| 24 | 24 | $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale)); |
| 25 | 25 | |
| 26 | - foreach ($this->getDirectories() as $directory) { |
|
| 27 | - if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) { |
|
| 26 | + foreach ($this->getDirectories() as $directory) |
|
| 27 | + { |
|
| 28 | + if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) |
|
| 29 | + { |
|
| 28 | 30 | return true; |
| 29 | 31 | } |
| 30 | 32 | } |
@@ -35,13 +37,15 @@ discard block |
||
| 35 | 37 | public function getLocales(): array |
| 36 | 38 | { |
| 37 | 39 | $directories = $this->getDirectories(); |
| 38 | - if ($directories === []) { |
|
| 40 | + if ($directories === []) |
|
| 41 | + { |
|
| 39 | 42 | return []; |
| 40 | 43 | } |
| 41 | 44 | |
| 42 | 45 | $finder = new Finder(); |
| 43 | 46 | $locales = []; |
| 44 | - foreach ($finder->in($directories)->directories() as $directory) { |
|
| 47 | + foreach ($finder->in($directories)->directories() as $directory) |
|
| 48 | + { |
|
| 45 | 49 | $locales[] = $directory->getFilename(); |
| 46 | 50 | } |
| 47 | 51 | |
@@ -53,19 +57,23 @@ discard block |
||
| 53 | 57 | $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale)); |
| 54 | 58 | $catalogue = new Catalogue($locale); |
| 55 | 59 | |
| 56 | - if (!$this->hasLocale($locale)) { |
|
| 60 | + if (!$this->hasLocale($locale)) |
|
| 61 | + { |
|
| 57 | 62 | return $catalogue; |
| 58 | 63 | } |
| 59 | 64 | |
| 60 | 65 | $directories = []; |
| 61 | - foreach ($this->getDirectories() as $directory) { |
|
| 62 | - if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) { |
|
| 66 | + foreach ($this->getDirectories() as $directory) |
|
| 67 | + { |
|
| 68 | + if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) |
|
| 69 | + { |
|
| 63 | 70 | $directories[] = $this->config->getLocaleDirectory($locale, $directory); |
| 64 | 71 | } |
| 65 | 72 | } |
| 66 | 73 | |
| 67 | 74 | $finder = new Finder(); |
| 68 | - foreach ($finder->in($directories)->files() as $file) { |
|
| 75 | + foreach ($finder->in($directories)->files() as $file) |
|
| 76 | + { |
|
| 69 | 77 | $this->getLogger()->info( |
| 70 | 78 | \sprintf( |
| 71 | 79 | "found locale domain file '%s'", |
@@ -77,7 +85,8 @@ discard block |
||
| 77 | 85 | //Per application agreement domain name must present in filename |
| 78 | 86 | $domain = \strstr($file->getFilename(), '.', true); |
| 79 | 87 | |
| 80 | - if (!$this->config->hasLoader($file->getExtension())) { |
|
| 88 | + if (!$this->config->hasLoader($file->getExtension())) |
|
| 89 | + { |
|
| 81 | 90 | $this->getLogger()->warning( |
| 82 | 91 | \sprintf( |
| 83 | 92 | "unable to load domain file '%s', no loader found", |
@@ -107,12 +116,15 @@ discard block |
||
| 107 | 116 | private function getDirectories(): array |
| 108 | 117 | { |
| 109 | 118 | $directories = []; |
| 110 | - if (\is_dir($this->config->getLocalesDirectory())) { |
|
| 119 | + if (\is_dir($this->config->getLocalesDirectory())) |
|
| 120 | + { |
|
| 111 | 121 | $directories[] = $this->config->getLocalesDirectory(); |
| 112 | 122 | } |
| 113 | 123 | |
| 114 | - foreach ($this->config->getDirectories() as $directory) { |
|
| 115 | - if (\is_dir($directory)) { |
|
| 124 | + foreach ($this->config->getDirectories() as $directory) |
|
| 125 | + { |
|
| 126 | + if (\is_dir($directory)) |
|
| 127 | + { |
|
| 116 | 128 | $directories[] = $directory; |
| 117 | 129 | } |
| 118 | 130 | } |