Completed
Pull Request — master (#163)
by Roman
09:46
created
src/TranslationLoader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,8 +95,8 @@
 block discarded – undo
95 95
 	{
96 96
 		foreach ($this->getLoaders() as $format => $loader) {
97 97
 			// load any existing translation files
98
-			$extension = $catalogue->getLocale() . '.' . $format;
99
-			foreach (Finder::findFiles('*.' . $extension)->from($directory) as $file) {
98
+			$extension = $catalogue->getLocale().'.'.$format;
99
+			foreach (Finder::findFiles('*.'.$extension)->from($directory) as $file) {
100 100
 				/** @var \SplFileInfo $file */
101 101
 				$domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);
102 102
 				$this->loadResource($format, $file->getPathname(), $domain, $catalogue);
Please login to merge, or discard this patch.
src/LocaleResolver/AcceptHeaderResolver.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,10 +65,10 @@
 block discarded – undo
65 65
 			return NULL;
66 66
 		}
67 67
 
68
-		$s = strtolower($header);  // case insensitive
69
-		$s = strtr($s, '_', '-');  // cs_CZ means cs-CZ
70
-		rsort($langs);             // first more specific
71
-		preg_match_all('#(' . implode('|', $langs) . ')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#', $s, $matches);
68
+		$s = strtolower($header); // case insensitive
69
+		$s = strtr($s, '_', '-'); // cs_CZ means cs-CZ
70
+		rsort($langs); // first more specific
71
+		preg_match_all('#('.implode('|', $langs).')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#', $s, $matches);
72 72
 
73 73
 		if (!$matches[0]) {
74 74
 			return NULL;
Please login to merge, or discard this patch.
src/Translator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 		$tmp = [];
184 184
 		foreach ($parameters as $key => $val) {
185
-			$tmp['%' . trim($key, '%') . '%'] = $val;
185
+			$tmp['%'.trim($key, '%').'%'] = $val;
186 186
 		}
187 187
 		$parameters = $tmp;
188 188
 
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
 	 */
515 515
 	public static function buildWhitelistRegexp($whitelist)
516 516
 	{
517
-		return ($whitelist !== NULL) ? '~^(' . implode('|', $whitelist) . ')~i' : NULL;
517
+		return ($whitelist !== NULL) ? '~^('.implode('|', $whitelist).')~i' : NULL;
518 518
 	}
519 519
 
520 520
 }
Please login to merge, or discard this patch.
src/Extractors/LatteExtractor.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
 			if ($token->name === '/_' || ($token->name === '_' && $token->closing === TRUE)) {
72 72
 				if ($buffer !== NULL) {
73
-					$catalogue->set(($this->prefix ? $this->prefix . '.' : '') . $buffer, $buffer);
73
+					$catalogue->set(($this->prefix ? $this->prefix.'.' : '').$buffer, $buffer);
74 74
 					$buffer = NULL;
75 75
 				}
76 76
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 					$message = substr(trim($message), 1, -1);
87 87
 				}
88 88
 
89
-				$catalogue->set(($this->prefix ? $this->prefix . '.' : '') . $message, $message);
89
+				$catalogue->set(($this->prefix ? $this->prefix.'.' : '').$message, $message);
90 90
 			}
91 91
 		}
92 92
 	}
Please login to merge, or discard this patch.
src/LocaleResolver/SessionResolver.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	{
79 79
 		if (!$this->session->isStarted() && $this->httpResponse->isSent()) {
80 80
 			trigger_error(
81
-				'The advice of session locale resolver is required but the session has not been started and headers had been already sent. ' .
81
+				'The advice of session locale resolver is required but the session has not been started and headers had been already sent. '.
82 82
 				'Either start your sessions earlier or disabled the SessionResolver.',
83 83
 				E_USER_WARNING
84 84
 			);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 			return NULL;
90 90
 		}
91 91
 
92
-		$short = array_map(function ($locale) {
92
+		$short = array_map(function($locale) {
93 93
 			return substr($locale, 0, 2);
94 94
 		}, $translator->getAvailableLocales());
95 95
 
Please login to merge, or discard this patch.
src/Latte/TranslateMacros.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 				$value = var_export($node->content, TRUE);
45 45
 				$node->content = '';
46 46
 			} else {
47
-				$node->openingCode = '<?php ob_start(function () {}) ?>' . $node->openingCode;
47
+				$node->openingCode = '<?php ob_start(function () {}) ?>'.$node->openingCode;
48 48
 				$value = 'ob_get_clean()';
49 49
 			}
50 50
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 				throw new \Latte\CompileException('Expected message prefix, none given');
80 80
 			}
81 81
 
82
-			return $writer->write('$_translator = ' . PrefixedTranslator::class . '::register($this, %node.word);');
82
+			return $writer->write('$_translator = '.PrefixedTranslator::class.'::register($this, %node.word);');
83 83
 		}
84 84
 	}
85 85
 
Please login to merge, or discard this patch.
src/Caching/PhpFileStorage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,12 +47,12 @@
 block discarded – undo
47 47
 	{
48 48
 		$cacheKey = substr_replace(
49 49
 			$key,
50
-			trim(strtr($this->hint, '\\/@', '.._'), '.') . '-',
50
+			trim(strtr($this->hint, '\\/@', '.._'), '.').'-',
51 51
 			strpos($key, Cache::NAMESPACE_SEPARATOR) + 1,
52 52
 			0
53 53
 		);
54 54
 
55
-		return parent::getCacheFile($cacheKey) . '.php';
55
+		return parent::getCacheFile($cacheKey).'.php';
56 56
 	}
57 57
 
58 58
 }
Please login to merge, or discard this patch.
src/CatalogueCompiler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 EOF
151 151
 			, $locale, $availableCatalogues[$locale]->all(), new PhpLiteral($fallbackContent));
152 152
 
153
-		return '<?php' . "\n\n" . $content;
153
+		return '<?php'."\n\n".$content;
154 154
 	}
155 155
 
156 156
 	/**
Please login to merge, or discard this patch.
src/DI/TranslationExtension.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 
130 130
 		$builder->addDefinition($this->prefix('helpers'))
131 131
 			->setClass(TemplateHelpers::class)
132
-			->setFactory($this->prefix('@default') . '::createTemplateHelpers');
132
+			->setFactory($this->prefix('@default').'::createTemplateHelpers');
133 133
 
134 134
 		$builder->addDefinition($this->prefix('fallbackResolver'))
135 135
 			->setClass(FallbackResolver::class);
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		$builder->addDefinition($this->prefix('loader'))
154 154
 			->setClass(TranslationLoader::class);
155 155
 
156
-		$loaders = $this->loadFromFile(__DIR__ . '/config/loaders.neon');
156
+		$loaders = $this->loadFromFile(__DIR__.'/config/loaders.neon');
157 157
 		$this->loadLoaders($loaders, $config['loaders'] ?: array_keys($loaders));
158 158
 
159 159
 		if ($this->isRegisteredConsoleExtension()) {
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
 	{
217 217
 		$builder = $this->getContainerBuilder();
218 218
 
219
-		foreach ($this->loadFromFile(__DIR__ . '/config/dumpers.neon') as $format => $class) {
220
-			$builder->addDefinition($this->prefix('dumper.' . $format))
219
+		foreach ($this->loadFromFile(__DIR__.'/config/dumpers.neon') as $format => $class) {
220
+			$builder->addDefinition($this->prefix('dumper.'.$format))
221 221
 				->setClass($class)
222 222
 				->addTag(self::TAG_DUMPER, $format);
223 223
 		}
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 			if (array_search($format, $allowed) === FALSE) {
232 232
 				continue;
233 233
 			}
234
-			$builder->addDefinition($this->prefix('loader.' . $format))
234
+			$builder->addDefinition($this->prefix('loader.'.$format))
235 235
 				->setClass($class)
236 236
 				->addTag(self::TAG_LOADER, $format);
237 237
 		}
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
 	{
242 242
 		$builder = $this->getContainerBuilder();
243 243
 
244
-		foreach ($this->loadFromFile(__DIR__ . '/config/extractors.neon') as $format => $class) {
245
-			$builder->addDefinition($this->prefix('extractor.' . $format))
244
+		foreach ($this->loadFromFile(__DIR__.'/config/extractors.neon') as $format => $class) {
245
+			$builder->addDefinition($this->prefix('extractor.'.$format))
246 246
 				->setClass($class)
247 247
 				->addTag(self::TAG_EXTRACTOR, $format);
248 248
 		}
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 
256 256
 		$this->beforeCompileLogging($config);
257 257
 
258
-		$registerToLatte = function (ServiceDefinition $def) {
258
+		$registerToLatte = function(ServiceDefinition $def) {
259 259
 			$def->addSetup('?->onCompile[] = function($engine) { ?::install($engine->getCompiler()); }', ['@self', new PhpLiteral(TranslateMacros::class)]);
260 260
 
261 261
 			$def->addSetup('addProvider', ['translator', $this->prefix('@default')])
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 		foreach ($builder->findByTag(self::TAG_EXTRACTOR) as $extractorId => $meta) {
296 296
 			Validators::assert($meta, 'string:2..');
297 297
 
298
-			$extractor->addSetup('addExtractor', [$meta, '@' . $extractorId]);
298
+			$extractor->addSetup('addExtractor', [$meta, '@'.$extractorId]);
299 299
 
300 300
 			$builder->getDefinition($extractorId)->setAutowired(FALSE);
301 301
 		}
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 		foreach ($builder->findByTag(self::TAG_DUMPER) as $dumperId => $meta) {
305 305
 			Validators::assert($meta, 'string:2..');
306 306
 
307
-			$writer->addSetup('addDumper', [$meta, '@' . $dumperId]);
307
+			$writer->addSetup('addDumper', [$meta, '@'.$dumperId]);
308 308
 
309 309
 			$builder->getDefinition($dumperId)->setAutowired(FALSE);
310 310
 		}
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 			$config['dirs'] = array_merge($config['dirs'], array_values($extension->getTranslationResources()));
328 328
 		}
329 329
 
330
-		$config['dirs'] = array_map(function ($dir) {
330
+		$config['dirs'] = array_map(function($dir) {
331 331
 			return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, $dir);
332 332
 		}, $config['dirs']);
333 333
 
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 		$whitelistRegexp = KdybyTranslator::buildWhitelistRegexp($config['whitelist']);
371 371
 		$translator = $builder->getDefinition($this->prefix('default'));
372 372
 
373
-		$mask = array_map(function ($value) {
374
-			return '*.*.' . $value;
373
+		$mask = array_map(function($value) {
374
+			return '*.*.'.$value;
375 375
 		}, array_keys($this->loaders));
376 376
 
377 377
 		foreach (Finder::findFiles($mask)->from($dirs) as $file) {
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 	 */
462 462
 	public static function register(Configurator $configurator)
463 463
 	{
464
-		$configurator->onCompile[] = function ($config, Compiler $compiler) {
464
+		$configurator->onCompile[] = function($config, Compiler $compiler) {
465 465
 			$compiler->addExtension('translation', new TranslationExtension());
466 466
 		};
467 467
 	}
Please login to merge, or discard this patch.