@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @var string[] |
| 31 | 31 | */ |
| 32 | - private $domains = [ 'messages' ]; |
|
| 32 | + private $domains = ['messages']; |
|
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * @param array $data Constructor data. |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | if (is_array($val)) { |
| 267 | 267 | return !!array_filter( |
| 268 | 268 | $val, |
| 269 | - function ($v, $k) { |
|
| 269 | + function($v, $k) { |
|
| 270 | 270 | if (is_string($k) && strlen($k) > 0) { |
| 271 | 271 | if (is_string($v) && strlen($v) > 0) { |
| 272 | 272 | return true; |
@@ -7,10 +7,8 @@ |
||
| 7 | 7 | use Psr\Http\Message\ResponseInterface; |
| 8 | 8 | |
| 9 | 9 | // From Pimple |
| 10 | -use Pimple\Container; |
|
| 11 | 10 | |
| 12 | 11 | // From `charcoal-translator` |
| 13 | -use Charcoal\Translator\LocalesManager; |
|
| 14 | 12 | use Charcoal\Translator\TranslatorAwareTrait; |
| 15 | 13 | |
| 16 | 14 | /** |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | 'browser_language' => null, |
| 116 | 116 | |
| 117 | 117 | 'use_path' => true, |
| 118 | - 'excluded_path' => [ '^/admin\b' ], |
|
| 118 | + 'excluded_path' => ['^/admin\b'], |
|
| 119 | 119 | 'path_regexp' => '^/([a-z]{2})\b', |
| 120 | 120 | |
| 121 | 121 | 'use_params' => false, |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | /** |
| 173 | 173 | * @param RequestInterface $request The PSR-7 HTTP request. |
| 174 | - * @return null|string |
|
| 174 | + * @return string |
|
| 175 | 175 | */ |
| 176 | 176 | private function getLanguage(RequestInterface $request) |
| 177 | 177 | { |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | /** |
| 285 | - * @return mixed |
|
| 285 | + * @return string |
|
| 286 | 286 | */ |
| 287 | 287 | private function getLanguageFromBrowser() |
| 288 | 288 | { |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | /** |
| 222 | 222 | * Available locales (languages) |
| 223 | - * @return array Locales. |
|
| 223 | + * @return string[] Locales. |
|
| 224 | 224 | */ |
| 225 | 225 | protected function locales() |
| 226 | 226 | { |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | |
| 446 | 446 | /** |
| 447 | 447 | * @param array $translations The translations to save in CSV. |
| 448 | - * @return TranslateScript Chainable |
|
| 448 | + * @return TranslationParserScript Chainable |
|
| 449 | 449 | */ |
| 450 | 450 | public function toCSV(array $translations) |
| 451 | 451 | { |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | $t = count($array[$index]); |
| 365 | 365 | $locales = $this->locales(); |
| 366 | 366 | |
| 367 | - for (; $i<$t; $i++) { |
|
| 367 | + for (; $i < $t; $i++) { |
|
| 368 | 368 | $this->climate()->inline('.'); |
| 369 | 369 | $orig = $array[$index][$i]; |
| 370 | 370 | foreach ($locales as $lang) { |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | // $max = $this->maxRecursiveLevel(); |
| 395 | 395 | $i = 1; |
| 396 | 396 | $files = glob($pattern, $flags); |
| 397 | - foreach (glob(dirname($pattern).'/*', (GLOB_ONLYDIR|GLOB_NOSORT)) as $dir) { |
|
| 397 | + foreach (glob(dirname($pattern).'/*', (GLOB_ONLYDIR | GLOB_NOSORT)) as $dir) { |
|
| 398 | 398 | $files = array_merge($files, $this->globRecursive($dir.'/'.basename($pattern), $flags)); |
| 399 | 399 | $i++; |
| 400 | 400 | // if ($i >= $max) { |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | foreach ($trans as $key => $translation) { |
| 481 | - $data = [ $key, $translation ]; |
|
| 481 | + $data = [$key, $translation]; |
|
| 482 | 482 | fputcsv($file, $data, $separator, $enclosure); |
| 483 | 483 | } |
| 484 | 484 | fclose($file); |
@@ -105,11 +105,11 @@ discard block |
||
| 105 | 105 | * as the default language. |
| 106 | 106 | */ |
| 107 | 107 | $localesConfig = $container['locales/config']; |
| 108 | - $availableLocales = array_filter($localesConfig['languages'], function ($locale) { |
|
| 108 | + $availableLocales = array_filter($localesConfig['languages'], function($locale) { |
|
| 109 | 109 | return !(isset($locale['active']) && !$locale['active']); |
| 110 | 110 | }); |
| 111 | 111 | |
| 112 | - $acceptedLanguages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); |
|
| 112 | + $acceptedLanguages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); |
|
| 113 | 113 | foreach ($acceptedLanguages as $acceptedLang) { |
| 114 | 114 | $lang = explode(';', $acceptedLang); |
| 115 | 115 | $lang = trim($lang[0]); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | * @param Container $container Pimple DI container. |
| 163 | 163 | * @return LocalesManager |
| 164 | 164 | */ |
| 165 | - $container['locales/manager'] = function (Container $container) { |
|
| 165 | + $container['locales/manager'] = function(Container $container) { |
|
| 166 | 166 | $localesConfig = $container['locales/config']; |
| 167 | 167 | return new LocalesManager([ |
| 168 | 168 | 'locales' => $localesConfig['languages'], |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * @param Container $container Pimple DI container. |
| 184 | 184 | * @return TranslatorConfig |
| 185 | 185 | */ |
| 186 | - $container['translator/config'] = function (Container $container) { |
|
| 186 | + $container['translator/config'] = function(Container $container) { |
|
| 187 | 187 | $appConfig = isset($container['config']) ? $container['config'] : []; |
| 188 | 188 | $translatorConfig = isset($appConfig['translator']) ? $appConfig['translator'] : null; |
| 189 | 189 | return new TranslatorConfig($translatorConfig); |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * @param Container $container Pimple DI container. |
| 196 | 196 | * @return array |
| 197 | 197 | */ |
| 198 | - $container['translator/translations'] = function (Container $container) { |
|
| 198 | + $container['translator/translations'] = function(Container $container) { |
|
| 199 | 199 | $translatorConfig = $container['translator/config']; |
| 200 | 200 | return $translatorConfig['translations']; |
| 201 | 201 | }; |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | * |
| 206 | 206 | * @return MessageSelector |
| 207 | 207 | */ |
| 208 | - $container['translator/message-selector'] = function () { |
|
| 208 | + $container['translator/message-selector'] = function() { |
|
| 209 | 209 | return new MessageSelector(); |
| 210 | 210 | }; |
| 211 | 211 | |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | * @param Container $container Pimple DI container. |
| 217 | 217 | * @return Translator |
| 218 | 218 | */ |
| 219 | - $container['translator'] = function (Container $container) { |
|
| 219 | + $container['translator'] = function(Container $container) { |
|
| 220 | 220 | $translatorConfig = $container['translator/config']; |
| 221 | 221 | $translator = new Translator([ |
| 222 | 222 | 'manager' => $container['locales/manager'], |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | * @param Container $container |
| 354 | 354 | * @return LanguageMiddleware |
| 355 | 355 | */ |
| 356 | - $container['middlewares/charcoal/translator/middleware/language'] = function (Container $container) { |
|
| 356 | + $container['middlewares/charcoal/translator/middleware/language'] = function(Container $container) { |
|
| 357 | 357 | $middlewareConfig = $container['config']['middlewares']['charcoal/translator/middleware/language']; |
| 358 | 358 | $middlewareConfig = array_replace( |
| 359 | 359 | [ |