|  | @@ -152,7 +152,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 152 | 152 |   | 
                                                                                                            
                                                            | 153 | 153 |  		$builder->addDefinition($this->prefix('helpers')) | 
                                                                                                            
                                                            | 154 | 154 |  			->setClass(TemplateHelpers::class) | 
                                                                                                            
                                                            | 155 |  | -			->setFactory($this->prefix('@default') . '::createTemplateHelpers'); | 
                                                                                                            
                                                            |  | 155 | +			->setFactory($this->prefix('@default').'::createTemplateHelpers'); | 
                                                                                                            
                                                            | 156 | 156 |   | 
                                                                                                            
                                                            | 157 | 157 |  		$builder->addDefinition($this->prefix('fallbackResolver')) | 
                                                                                                            
                                                            | 158 | 158 |  			->setClass(FallbackResolver::class); | 
                                                                                                                                                        
                                                        |  | @@ -186,7 +186,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 186 | 186 |  		$builder->addDefinition($this->prefix('loader')) | 
                                                                                                            
                                                            | 187 | 187 |  			->setClass(TranslationLoader::class); | 
                                                                                                            
                                                            | 188 | 188 |   | 
                                                                                                            
                                                            | 189 |  | -		$loaders = $this->loadFromFile(__DIR__ . '/config/loaders.neon'); | 
                                                                                                            
                                                            |  | 189 | +		$loaders = $this->loadFromFile(__DIR__.'/config/loaders.neon'); | 
                                                                                                            
                                                            | 190 | 190 |  		$this->loadLoaders($loaders, $config['loaders'] ?: array_keys($loaders)); | 
                                                                                                            
                                                            | 191 | 191 |   | 
                                                                                                            
                                                            | 192 | 192 |  		if ($this->isRegisteredConsoleExtension()) { | 
                                                                                                                                                        
                                                        |  | @@ -250,8 +250,8 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 250 | 250 |  	{ | 
                                                                                                            
                                                            | 251 | 251 |  		$builder = $this->getContainerBuilder(); | 
                                                                                                            
                                                            | 252 | 252 |   | 
                                                                                                            
                                                            | 253 |  | -		foreach ($this->loadFromFile(__DIR__ . '/config/dumpers.neon') as $format => $class) { | 
                                                                                                            
                                                            | 254 |  | -			$builder->addDefinition($this->prefix('dumper.' . $format)) | 
                                                                                                            
                                                            |  | 253 | +		foreach ($this->loadFromFile(__DIR__.'/config/dumpers.neon') as $format => $class) { | 
                                                                                                            
                                                            |  | 254 | +			$builder->addDefinition($this->prefix('dumper.'.$format)) | 
                                                                                                            
                                                            | 255 | 255 |  				->setClass($class) | 
                                                                                                            
                                                            | 256 | 256 |  				->addTag(self::TAG_DUMPER, $format); | 
                                                                                                            
                                                            | 257 | 257 |  		} | 
                                                                                                                                                        
                                                        |  | @@ -265,7 +265,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 265 | 265 |  			if (array_search($format, $allowed) === FALSE) { | 
                                                                                                            
                                                            | 266 | 266 |  				continue; | 
                                                                                                            
                                                            | 267 | 267 |  			} | 
                                                                                                            
                                                            | 268 |  | -			$builder->addDefinition($this->prefix('loader.' . $format)) | 
                                                                                                            
                                                            |  | 268 | +			$builder->addDefinition($this->prefix('loader.'.$format)) | 
                                                                                                            
                                                            | 269 | 269 |  				->setClass($class) | 
                                                                                                            
                                                            | 270 | 270 |  				->addTag(self::TAG_LOADER, $format); | 
                                                                                                            
                                                            | 271 | 271 |  		} | 
                                                                                                                                                        
                                                        |  | @@ -275,8 +275,8 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 275 | 275 |  	{ | 
                                                                                                            
                                                            | 276 | 276 |  		$builder = $this->getContainerBuilder(); | 
                                                                                                            
                                                            | 277 | 277 |   | 
                                                                                                            
                                                            | 278 |  | -		foreach ($this->loadFromFile(__DIR__ . '/config/extractors.neon') as $format => $class) { | 
                                                                                                            
                                                            | 279 |  | -			$builder->addDefinition($this->prefix('extractor.' . $format)) | 
                                                                                                            
                                                            |  | 278 | +		foreach ($this->loadFromFile(__DIR__.'/config/extractors.neon') as $format => $class) { | 
                                                                                                            
                                                            |  | 279 | +			$builder->addDefinition($this->prefix('extractor.'.$format)) | 
                                                                                                            
                                                            | 280 | 280 |  				->setClass($class) | 
                                                                                                            
                                                            | 281 | 281 |  				->addTag(self::TAG_EXTRACTOR, $format); | 
                                                                                                            
                                                            | 282 | 282 |  		} | 
                                                                                                                                                        
                                                        |  | @@ -290,7 +290,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 290 | 290 |   | 
                                                                                                            
                                                            | 291 | 291 |  		$this->beforeCompileLogging($config); | 
                                                                                                            
                                                            | 292 | 292 |   | 
                                                                                                            
                                                            | 293 |  | -		$registerToLatte = function (FactoryDefinition $def) { | 
                                                                                                            
                                                            |  | 293 | +		$registerToLatte = function(FactoryDefinition $def) { | 
                                                                                                            
                                                            | 294 | 294 |  			$def->getResultDefinition()->addSetup('?->onCompile[] = function($engine) { ?::install($engine->getCompiler()); }', ['@self', new PhpLiteral(TranslateMacros::class)]); | 
                                                                                                            
                                                            | 295 | 295 |   | 
                                                                                                            
                                                            | 296 | 296 |  			$def->getResultDefinition() | 
                                                                                                                                                        
                                                        |  | @@ -298,7 +298,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 298 | 298 |  				->addSetup('addFilter', ['translate', [$this->prefix('@helpers'), 'translateFilterAware']]); | 
                                                                                                            
                                                            | 299 | 299 |  		}; | 
                                                                                                            
                                                            | 300 | 300 |   | 
                                                                                                            
                                                            | 301 |  | -		$latteFactoryService = $builder->getByType(LatteFactory::class)?: $builder->getByType(ILatteFactory::class); | 
                                                                                                            
                                                            |  | 301 | +		$latteFactoryService = $builder->getByType(LatteFactory::class) ?: $builder->getByType(ILatteFactory::class); | 
                                                                                                            
                                                            | 302 | 302 |  		if (!$latteFactoryService || !self::isOfType($builder->getDefinition($latteFactoryService)->getClass(), LatteEngine::class)) { | 
                                                                                                            
                                                            | 303 | 303 |  			$latteFactoryService = 'nette.latteFactory'; | 
                                                                                                            
                                                            | 304 | 304 |  		} | 
                                                                                                                                                        
                                                        |  | @@ -335,7 +335,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 335 | 335 |  		foreach ($builder->findByTag(self::TAG_EXTRACTOR) as $extractorId => $meta) { | 
                                                                                                            
                                                            | 336 | 336 |  			Validators::assert($meta, 'string:2..'); | 
                                                                                                            
                                                            | 337 | 337 |   | 
                                                                                                            
                                                            | 338 |  | -			$extractor->addSetup('addExtractor', [$meta, '@' . $extractorId]); | 
                                                                                                            
                                                            |  | 338 | +			$extractor->addSetup('addExtractor', [$meta, '@'.$extractorId]); | 
                                                                                                            
                                                            | 339 | 339 |   | 
                                                                                                            
                                                            | 340 | 340 |  			$builder->getDefinition($extractorId)->setAutowired(FALSE); | 
                                                                                                            
                                                            | 341 | 341 |  		} | 
                                                                                                                                                        
                                                        |  | @@ -345,7 +345,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 345 | 345 |  		foreach ($builder->findByTag(self::TAG_DUMPER) as $dumperId => $meta) { | 
                                                                                                            
                                                            | 346 | 346 |  			Validators::assert($meta, 'string:2..'); | 
                                                                                                            
                                                            | 347 | 347 |   | 
                                                                                                            
                                                            | 348 |  | -			$writer->addSetup('addDumper', [$meta, '@' . $dumperId]); | 
                                                                                                            
                                                            |  | 348 | +			$writer->addSetup('addDumper', [$meta, '@'.$dumperId]); | 
                                                                                                            
                                                            | 349 | 349 |   | 
                                                                                                            
                                                            | 350 | 350 |  			$builder->getDefinition($dumperId)->setAutowired(FALSE); | 
                                                                                                            
                                                            | 351 | 351 |  		} | 
                                                                                                                                                        
                                                        |  | @@ -369,7 +369,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 369 | 369 |  			$config['dirs'] = array_merge($config['dirs'], array_values($extension->getTranslationResources())); | 
                                                                                                            
                                                            | 370 | 370 |  		} | 
                                                                                                            
                                                            | 371 | 371 |   | 
                                                                                                            
                                                            | 372 |  | -		$config['dirs'] = array_map(function ($dir) use ($builder) { | 
                                                                                                            
                                                            |  | 372 | +		$config['dirs'] = array_map(function($dir) use ($builder) { | 
                                                                                                            
                                                            | 373 | 373 |  			return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, Helpers::expand($dir, $builder->parameters)); | 
                                                                                                            
                                                            | 374 | 374 |  		}, $config['dirs']); | 
                                                                                                            
                                                            | 375 | 375 |   | 
                                                                                                                                                        
                                                        |  | @@ -414,8 +414,8 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 414 | 414 |  		/** @var \Nette\DI\Definitions\ServiceDefinition $translator */ | 
                                                                                                            
                                                            | 415 | 415 |  		$translator = $builder->getDefinition($this->prefix('default')); | 
                                                                                                            
                                                            | 416 | 416 |   | 
                                                                                                            
                                                            | 417 |  | -		$mask = array_map(function ($value) { | 
                                                                                                            
                                                            | 418 |  | -			return '*.*.' . $value; | 
                                                                                                            
                                                            |  | 417 | +		$mask = array_map(function($value) { | 
                                                                                                            
                                                            |  | 418 | +			return '*.*.'.$value; | 
                                                                                                            
                                                            | 419 | 419 |  		}, array_keys($this->loaders)); | 
                                                                                                            
                                                            | 420 | 420 |   | 
                                                                                                            
                                                            | 421 | 421 |  		foreach (Finder::findFiles($mask)->from($dirs) as $file) { | 
                                                                                                                                                        
                                                        |  | @@ -498,7 +498,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 498 | 498 |  	 */ | 
                                                                                                            
                                                            | 499 | 499 |  	public static function register(Configurator $configurator) | 
                                                                                                            
                                                            | 500 | 500 |  	{ | 
                                                                                                            
                                                            | 501 |  | -		$configurator->onCompile[] = function ($config, Compiler $compiler) { | 
                                                                                                            
                                                            |  | 501 | +		$configurator->onCompile[] = function($config, Compiler $compiler) { | 
                                                                                                            
                                                            | 502 | 502 |  			$compiler->addExtension('translation', new TranslationExtension()); | 
                                                                                                            
                                                            | 503 | 503 |  		}; | 
                                                                                                            
                                                            | 504 | 504 |  	} |