@@ -379,32 +379,32 @@ |
||
379 | 379 | }, array_keys($this->loaders)); |
380 | 380 | |
381 | 381 | foreach ($dirs as $baseDomain => $dir) { |
382 | - foreach (Finder::findFiles($mask)->from($dir) as $file) { |
|
383 | - /* @var $file \SplFileInfo */ |
|
384 | - if (!preg_match('~^(?P<domain>.*?)\.(?P<locale>[^\.]+)\.(?P<format>[^\.]+)$~', $file->getFilename(), $m)) { |
|
385 | - continue; |
|
386 | - } |
|
387 | - |
|
388 | - $relativePath = str_replace($dir, '', $file->getPath()); |
|
389 | - if($relativePath !== '') { |
|
390 | - $foldersDomain = str_replace(DIRECTORY_SEPARATOR, '.', $relativePath); |
|
391 | - $foldersDomain = ltrim($foldersDomain, '.'); |
|
392 | - $m['domain'] = "$foldersDomain.{$m['domain']}"; |
|
393 | - } |
|
394 | - |
|
395 | - if (is_string($baseDomain)) { |
|
396 | - $m['domain'] = "$baseDomain.{$m['domain']}"; |
|
397 | - } |
|
398 | - |
|
399 | - if ($whitelistRegexp && !preg_match($whitelistRegexp, $m['locale']) && $builder->parameters['productionMode']) { |
|
400 | - continue; // ignore in production mode, there is no need to pass the ignored resources |
|
401 | - } |
|
402 | - |
|
403 | - $this->validateResource($m['format'], $file->getPathname(), $m['locale'], $m['domain']); |
|
404 | - $translator->addSetup('addResource', [$m['format'], $file->getPathname(), $m['locale'], $m['domain']]); |
|
405 | - $builder->addDependency($file->getPathname()); |
|
406 | - } |
|
407 | - } |
|
382 | + foreach (Finder::findFiles($mask)->from($dir) as $file) { |
|
383 | + /* @var $file \SplFileInfo */ |
|
384 | + if (!preg_match('~^(?P<domain>.*?)\.(?P<locale>[^\.]+)\.(?P<format>[^\.]+)$~', $file->getFilename(), $m)) { |
|
385 | + continue; |
|
386 | + } |
|
387 | + |
|
388 | + $relativePath = str_replace($dir, '', $file->getPath()); |
|
389 | + if($relativePath !== '') { |
|
390 | + $foldersDomain = str_replace(DIRECTORY_SEPARATOR, '.', $relativePath); |
|
391 | + $foldersDomain = ltrim($foldersDomain, '.'); |
|
392 | + $m['domain'] = "$foldersDomain.{$m['domain']}"; |
|
393 | + } |
|
394 | + |
|
395 | + if (is_string($baseDomain)) { |
|
396 | + $m['domain'] = "$baseDomain.{$m['domain']}"; |
|
397 | + } |
|
398 | + |
|
399 | + if ($whitelistRegexp && !preg_match($whitelistRegexp, $m['locale']) && $builder->parameters['productionMode']) { |
|
400 | + continue; // ignore in production mode, there is no need to pass the ignored resources |
|
401 | + } |
|
402 | + |
|
403 | + $this->validateResource($m['format'], $file->getPathname(), $m['locale'], $m['domain']); |
|
404 | + $translator->addSetup('addResource', [$m['format'], $file->getPathname(), $m['locale'], $m['domain']]); |
|
405 | + $builder->addDependency($file->getPathname()); |
|
406 | + } |
|
407 | + } |
|
408 | 408 | } |
409 | 409 | |
410 | 410 | /** |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | $builder->addDefinition($this->prefix('helpers')) |
132 | 132 | ->setClass(TemplateHelpers::class) |
133 | - ->setFactory($this->prefix('@default') . '::createTemplateHelpers'); |
|
133 | + ->setFactory($this->prefix('@default').'::createTemplateHelpers'); |
|
134 | 134 | |
135 | 135 | $builder->addDefinition($this->prefix('fallbackResolver')) |
136 | 136 | ->setClass(FallbackResolver::class); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $builder->addDefinition($this->prefix('loader')) |
158 | 158 | ->setClass(TranslationLoader::class); |
159 | 159 | |
160 | - $loaders = $this->loadFromFile(__DIR__ . '/config/loaders.neon'); |
|
160 | + $loaders = $this->loadFromFile(__DIR__.'/config/loaders.neon'); |
|
161 | 161 | $this->loadLoaders($loaders, $config['loaders'] ?: array_keys($loaders)); |
162 | 162 | |
163 | 163 | if ($this->isRegisteredConsoleExtension()) { |
@@ -220,8 +220,8 @@ discard block |
||
220 | 220 | { |
221 | 221 | $builder = $this->getContainerBuilder(); |
222 | 222 | |
223 | - foreach ($this->loadFromFile(__DIR__ . '/config/dumpers.neon') as $format => $class) { |
|
224 | - $builder->addDefinition($this->prefix('dumper.' . $format)) |
|
223 | + foreach ($this->loadFromFile(__DIR__.'/config/dumpers.neon') as $format => $class) { |
|
224 | + $builder->addDefinition($this->prefix('dumper.'.$format)) |
|
225 | 225 | ->setClass($class) |
226 | 226 | ->addTag(self::TAG_DUMPER, $format); |
227 | 227 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | if (array_search($format, $allowed) === FALSE) { |
236 | 236 | continue; |
237 | 237 | } |
238 | - $builder->addDefinition($this->prefix('loader.' . $format)) |
|
238 | + $builder->addDefinition($this->prefix('loader.'.$format)) |
|
239 | 239 | ->setClass($class) |
240 | 240 | ->addTag(self::TAG_LOADER, $format); |
241 | 241 | } |
@@ -245,8 +245,8 @@ discard block |
||
245 | 245 | { |
246 | 246 | $builder = $this->getContainerBuilder(); |
247 | 247 | |
248 | - foreach ($this->loadFromFile(__DIR__ . '/config/extractors.neon') as $format => $class) { |
|
249 | - $builder->addDefinition($this->prefix('extractor.' . $format)) |
|
248 | + foreach ($this->loadFromFile(__DIR__.'/config/extractors.neon') as $format => $class) { |
|
249 | + $builder->addDefinition($this->prefix('extractor.'.$format)) |
|
250 | 250 | ->setClass($class) |
251 | 251 | ->addTag(self::TAG_EXTRACTOR, $format); |
252 | 252 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | |
260 | 260 | $this->beforeCompileLogging($config); |
261 | 261 | |
262 | - $registerToLatte = function (ServiceDefinition $def) { |
|
262 | + $registerToLatte = function(ServiceDefinition $def) { |
|
263 | 263 | $def->addSetup('?->onCompile[] = function($engine) { ?::install($engine->getCompiler()); }', ['@self', new PhpLiteral(TranslateMacros::class)]); |
264 | 264 | |
265 | 265 | $def->addSetup('addProvider', ['translator', $this->prefix('@default')]) |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | foreach ($builder->findByTag(self::TAG_EXTRACTOR) as $extractorId => $meta) { |
300 | 300 | Validators::assert($meta, 'string:2..'); |
301 | 301 | |
302 | - $extractor->addSetup('addExtractor', [$meta, '@' . $extractorId]); |
|
302 | + $extractor->addSetup('addExtractor', [$meta, '@'.$extractorId]); |
|
303 | 303 | |
304 | 304 | $builder->getDefinition($extractorId)->setAutowired(FALSE); |
305 | 305 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | foreach ($builder->findByTag(self::TAG_DUMPER) as $dumperId => $meta) { |
309 | 309 | Validators::assert($meta, 'string:2..'); |
310 | 310 | |
311 | - $writer->addSetup('addDumper', [$meta, '@' . $dumperId]); |
|
311 | + $writer->addSetup('addDumper', [$meta, '@'.$dumperId]); |
|
312 | 312 | |
313 | 313 | $builder->getDefinition($dumperId)->setAutowired(FALSE); |
314 | 314 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | $config['dirs'] = array_merge($config['dirs'], $extension->getTranslationResources()); |
332 | 332 | } |
333 | 333 | |
334 | - $config['dirs'] = array_map(function ($dir) { |
|
334 | + $config['dirs'] = array_map(function($dir) { |
|
335 | 335 | return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, $dir); |
336 | 336 | }, $config['dirs']); |
337 | 337 | |
@@ -374,8 +374,8 @@ discard block |
||
374 | 374 | $whitelistRegexp = KdybyTranslator::buildWhitelistRegexp($config['whitelist']); |
375 | 375 | $translator = $builder->getDefinition($this->prefix('default')); |
376 | 376 | |
377 | - $mask = array_map(function ($value) { |
|
378 | - return '*.*.' . $value; |
|
377 | + $mask = array_map(function($value) { |
|
378 | + return '*.*.'.$value; |
|
379 | 379 | }, array_keys($this->loaders)); |
380 | 380 | |
381 | 381 | foreach ($dirs as $baseDomain => $dir) { |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | } |
387 | 387 | |
388 | 388 | $relativePath = str_replace($dir, '', $file->getPath()); |
389 | - if($relativePath !== '') { |
|
389 | + if ($relativePath !== '') { |
|
390 | 390 | $foldersDomain = str_replace(DIRECTORY_SEPARATOR, '.', $relativePath); |
391 | 391 | $foldersDomain = ltrim($foldersDomain, '.'); |
392 | 392 | $m['domain'] = "$foldersDomain.{$m['domain']}"; |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | */ |
479 | 479 | public static function register(Configurator $configurator) |
480 | 480 | { |
481 | - $configurator->onCompile[] = function ($config, Compiler $compiler) { |
|
481 | + $configurator->onCompile[] = function($config, Compiler $compiler) { |
|
482 | 482 | $compiler->addExtension('translation', new TranslationExtension()); |
483 | 483 | }; |
484 | 484 | } |