Kdyby / Translation

src/TranslationLoader.php

Spacing +2 added lines, -2 removed lines

@@ -95,8 +95,8 @@
 	{
 		foreach ($this->getLoaders() as $format => $loader) {
 			// load any existing translation files
-			$extension = $catalogue->getLocale() . '.' . $format;
-			foreach (Finder::findFiles('*.' . $extension)->from($directory) as $file) {
+			$extension = $catalogue->getLocale().'.'.$format;
+			foreach (Finder::findFiles('*.'.$extension)->from($directory) as $file) {
 				/** @var \SplFileInfo $file */
 				$domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);
 				$this->loadResource($format, $file->getPathname(), $domain, $catalogue);

src/LocaleResolver/AcceptHeaderResolver.php

Spacing +4 added lines, -4 removed lines

@@ -65,10 +65,10 @@
 			return NULL;
 		}
 
-		$s = strtolower($header);  // case insensitive
-		$s = strtr($s, '_', '-');  // cs_CZ means cs-CZ
-		rsort($langs);             // first more specific
-		preg_match_all('#(' . implode('|', $langs) . ')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#', $s, $matches);
+		$s = strtolower($header); // case insensitive
+		$s = strtr($s, '_', '-'); // cs_CZ means cs-CZ
+		rsort($langs); // first more specific
+		preg_match_all('#('.implode('|', $langs).')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#', $s, $matches);
 
 		if (!$matches[0]) {
 			return NULL;

src/Translator.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 	 * Translates the given string.
 	 *
 	 * @param string|\Kdyby\Translation\Phrase|mixed $message The message id
-	 * @param int|array|NULL $count The number to use to find the indice of the message
+	 * @param integer|null $count The number to use to find the indice of the message
 	 * @param string|array|NULL $parameters An array of parameters for the message
 	 * @param string|NULL $domain The domain for the message
 	 * @param string|NULL $locale The locale

Spacing +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
 
 		$tmp = [];
 		foreach ($parameters as $key => $val) {
-			$tmp['%' . trim($key, '%') . '%'] = $val;
+			$tmp['%'.trim($key, '%').'%'] = $val;
 		}
 		$parameters = $tmp;
 
@@ -514,7 +514,7 @@ 
 	 */
 	public static function buildWhitelistRegexp($whitelist)
 	{
-		return ($whitelist !== NULL) ? '~^(' . implode('|', $whitelist) . ')~i' : NULL;
+		return ($whitelist !== NULL) ? '~^('.implode('|', $whitelist).')~i' : NULL;
 	}
 
 }

src/Extractors/LatteExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 
 			if ($token->name === '/_' || ($token->name === '_' && $token->closing === TRUE)) {
 				if ($buffer !== NULL) {
-					$catalogue->set(($this->prefix ? $this->prefix . '.' : '') . $buffer, $buffer);
+					$catalogue->set(($this->prefix ? $this->prefix.'.' : '').$buffer, $buffer);
 					$buffer = NULL;
 				}
 
@@ -86,7 +86,7 @@ 
 					$message = substr(trim($message), 1, -1);
 				}
 
-				$catalogue->set(($this->prefix ? $this->prefix . '.' : '') . $message, $message);
+				$catalogue->set(($this->prefix ? $this->prefix.'.' : '').$message, $message);
 			}
 		}
 	}

src/LocaleResolver/SessionResolver.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	{
 		if (!$this->session->isStarted() && $this->httpResponse->isSent()) {
 			trigger_error(
-				'The advice of session locale resolver is required but the session has not been started and headers had been already sent. ' .
+				'The advice of session locale resolver is required but the session has not been started and headers had been already sent. '.
 				'Either start your sessions earlier or disabled the SessionResolver.',
 				E_USER_WARNING
 			);
@@ -89,7 +89,7 @@ 
 			return NULL;
 		}
 
-		$short = array_map(function ($locale) {
+		$short = array_map(function($locale) {
 			return substr($locale, 0, 2);
 		}, $translator->getAvailableLocales());
 

src/Diagnostics/Panel.php

Doc Comments +3 added lines, -1 removed lines

@@ -225,7 +225,7 @@ 
 	}
 
 	/**
-	 * @param \Exception|\Throwable $e
+	 * @param \Exception $e
 	 * @param string|NULL $domain
 	 */
 	public function choiceError($e, $domain)
@@ -330,6 +330,8 @@ 
 	/**
 	 * Returns link to editor.
 	 *
+	 * @param integer $line
+	 * @param string $text
 	 * @return \Nette\Utils\Html|string
 	 */
 	private static function editorLink($file, $line, $text = NULL)

Spacing +24 added lines, -25 removed lines

@@ -83,7 +83,7 @@ 
 	public function getTab()
 	{
 		return '<span title="Translation"><img width="16px" height="16px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DExAuL9uIsPUAAAQ2SURBVFjD7Ze9bxxVFMV/583skjgOIXEaKCNFAgmQ+ExS8qEUCEHH30BBScG/QM1fEmgoAAkoAigSKKFASElHESEFbGcdez7uoXhvZteW7ewmQjRMsTs7s/Pufeece+4d+P/4jw8ddvHq1avv2b5mm02Lr9Y7/gpQBCFDD5YhgsAoRLhHMtHnRYNAAb3yt92//9y3v3x+MFY6LIGIuGYbKedngzAGsPK5Kb8BGRAu9xiuL+zQ6NphsQ5NYB7YhA1jQCObyOHG/3sMlpM0hmGNcmXh7w9PYL5wfsphbCMPaOR7BipEJahV0FHZvZ2D+1i2qY+gYERCZTGZzLdFkLNIht/v72AHGM5Pa85MqowUc4p81PaPo2CgIa9RxOZ8jowDZm0WXo2oBdttN8ihIABC5dPLI7BIQQA5prEGIeYdbnVtSSpD3WCaCCqpMB8jXSshEBFEROZ9TCTvepC/be63HWA2ppNRoJttP1flvkp5BArmNBQl5zSIMJtNRxJEwHqVOF1XGLHVdSQp+0CpAi1UytJVYHteBQ7cm7AgIKnAH7CWhBDrVRqfud91UERLFNPyihQMwaOUIAI5I9D0PU2Xz9frCjs4WVVUMhJstR2SwaUWgvx7VQqyG2b4IoIoO9xsWipllJ6sK1JB7Exd4whmbUcYlCVcRKrVq0DSqCIVRlPZ4SCqO7MHC0Ey1Epiu+k5XafMvbRaFXCgdBxBOIgw202/TyNBtmuHibJRYba6LjuAsgjjCA3UxwWPCEwanRCJ7bYd/eHspFootdwhdvqeJsyegyaCSVK271US2E9BNp8otbTd9STlB89NJvRFmJREJ4K7e0El2Op6NiY1x7GQlpoawihgq+lIZF2s1xWdu9GAcO6Yp6rcE4OcwGDGR7nhUglYRjL32pbOQdMH61VCzgiFc8eUs+2cTIkuoI2MmH20D9TLzEzuTafgwtp0dNXO5FlhsOvSh23zzBPTBfDm4ny0BBBWAInWpSmVmSDzqrEko0TpBwct9W+xGgKL41hWoMeJB/LQsa/JlOYkVDrmAHlpwnF0M6of2gdIC7vUvDUNk1HMbwVRbmo+jA3tOlaYByTYbRJdiG1E3UFFg2IvLxqm67qR1yg71kLflDXvwhHhsxtbSycw2xWffXiPP+/NmFTiGyX21t9m99RbWDCZ1Fy5dAlJeXyz6aOfz48Mzli6aPTp8rMXz/585UVeun7z4WW418Kll0/w9Pk1/t5JTHdh2otpElMl1PX8eP06fdus9ObhQ2g4VBrVxpvvdl/Ovmgacev2Dnf+2GXnxi6zGw/KMJrNJUXPS6fXmCaNw+d8GNV8KHXgp87xyg83tVQCALPvLlvCVUK/3tnh9t3mkw8+/u3Tx3kNu/H6C7z6063lnLBU4dd98NHzF9Z47eKpE4/7Hngw+LHHzveX3zmAyBv/xsvpP+li/lm3bxkuAAAAAElFTkSuQmCC" />'
-			. $this->translator->getLocale() . ($this->untranslated ? ' <b>(' . count(array_unique($this->untranslated, SORT_REGULAR)) . ' errors)</b>' : '')
+			. $this->translator->getLocale().($this->untranslated ? ' <b>('.count(array_unique($this->untranslated, SORT_REGULAR)).' errors)</b>' : '')
 			. '</span>';
 	}
 
@@ -114,17 +114,17 @@ 
 
 				/** @var \Nette\Application\Request[] $snapshot */
 				$params = $snapshot['request']->getParameters();
-				$s .= '<tr><th width="10px">&nbsp;</th>' .
-					'<th>' . $h($snapshot['request']->getPresenterName() . (isset($params['action']) ? ':' . $params['action'] : '')) . '</th>' .
-					'<th>' . $h($snapshot['locale']) . '</th></tr>';
+				$s .= '<tr><th width="10px">&nbsp;</th>'.
+					'<th>'.$h($snapshot['request']->getPresenterName().(isset($params['action']) ? ':'.$params['action'] : '')).'</th>'.
+					'<th>'.$h($snapshot['locale']).'</th></tr>';
 
 				$l = 1;
 				/** @var mixed[][] $snapshot */
 				foreach ($snapshot['resolvers'] as $name => $resolvedLocale) {
-					$s .= '<tr><td>' . ($l++) . '.</td><td>' . $h($name) . '</td><td>' . $h($resolvedLocale) . '</td></tr>';
+					$s .= '<tr><td>'.($l++).'.</td><td>'.$h($name).'</td><td>'.$h($resolvedLocale).'</td></tr>';
 				}
 
-				$panel[] = '<table style="width:100%">' . $s . '</table>';
+				$panel[] = '<table style="width:100%">'.$s.'</table>';
 			}
 		}
 
@@ -142,14 +142,13 @@ 
 			}
 
 			$panel[] = '<h2>Ignored resources</h2>';
-			$panel[] = '<p>Whitelist config: ' . implode(', ', array_map($h, $this->localeWhitelist)) . '</p>';
+			$panel[] = '<p>Whitelist config: '.implode(', ', array_map($h, $this->localeWhitelist)).'</p>';
 			$panel[] = $this->renderResources($this->ignoredResources);
 		}
 
-		return empty($panel) ? '' :
-			'<h1>Missing translations: ' . count(array_unique($this->untranslated, SORT_REGULAR)) .
-			', Resources: ' . count(Arrays::flatten($this->resources)) . '</h1>' .
-			'<div class="nette-inner tracy-inner kdyby-TranslationPanel" style="min-width:500px">' . implode($panel) . '</div>' .
+		return empty($panel) ? '' : '<h1>Missing translations: '.count(array_unique($this->untranslated, SORT_REGULAR)).
+			', Resources: '.count(Arrays::flatten($this->resources)).'</h1>'.
+			'<div class="nette-inner tracy-inner kdyby-TranslationPanel" style="min-width:500px">'.implode($panel).'</div>'.
 			'<style>
 				#nette-debug .kdyby-TranslationPanel h2,
 				#tracy-debug .kdyby-TranslationPanel h2 {font-size: 23px;}
@@ -167,19 +166,19 @@ 
 			$s .= '<tr><td>';
 
 			if ($message instanceof \Exception || $message instanceof \Throwable) {
-				$s .= '<span style="color:red">' . $h($message->getMessage()) . '</span>';
+				$s .= '<span style="color:red">'.$h($message->getMessage()).'</span>';
 
 			} elseif ($message instanceof Html) {
-				$s .= '<span style="color:red">Nette\Utils\Html(' . $h((string) $message) . ')</span>';
+				$s .= '<span style="color:red">Nette\Utils\Html('.$h((string) $message).')</span>';
 
 			} else {
 				$s .= $h($message);
 			}
 
-			$s .= '</td><td>' . $h($untranslated['domain']) . '</td></tr>';
+			$s .= '</td><td>'.$h($untranslated['domain']).'</td></tr>';
 		}
 
-		return '<table style="width:100%"><tr><th>Untranslated message</th><th>Translation domain</th></tr>' . $s . '</table>';
+		return '<table style="width:100%"><tr><th>Untranslated message</th><th>Translation domain</th></tr>'.$s.'</table>';
 	}
 
 	private function renderResources($resourcesMap)
@@ -191,25 +190,25 @@ 
 		foreach ($resourcesMap as $locale => $resources) {
 			foreach ($resources as $resourcePath => $domain) {
 				$s .= '<tr>';
-				$s .= '<td>' . $h($locale) . '</td>';
-				$s .= '<td>' . $h($domain) . '</td>';
+				$s .= '<td>'.$h($locale).'</td>';
+				$s .= '<td>'.$h($domain).'</td>';
 
-				$relativePath = str_replace(rtrim($this->rootDir, '/') . '/', '', $resourcePath);
+				$relativePath = str_replace(rtrim($this->rootDir, '/').'/', '', $resourcePath);
 				if (Strings::startsWith($relativePath, 'vendor/')) {
 					$parts = explode('/', $relativePath, 4);
 					$left = array_pop($parts);
-					$relativePath = $h(implode('/', $parts) . '/.../') . '<b>' . $h(basename($left)) . '</b>';
+					$relativePath = $h(implode('/', $parts).'/.../').'<b>'.$h(basename($left)).'</b>';
 
 				} else {
-					$relativePath = $h(dirname($relativePath)) . '/<b>' . $h(basename($relativePath)) . '</b>';
+					$relativePath = $h(dirname($relativePath)).'/<b>'.$h(basename($relativePath)).'</b>';
 				}
 
-				$s .= '<td>' . self::editorLink($resourcePath, 1, $relativePath) . '</td>';
+				$s .= '<td>'.self::editorLink($resourcePath, 1, $relativePath).'</td>';
 				$s .= '</tr>';
 			}
 		}
 
-		return '<table style="width:100%"><tr><th>Locale</th><th>Domain</th><th>Resource filename</th></tr>' . $s . '</table>';
+		return '<table style="width:100%"><tr><th>Locale</th><th>Domain</th><th>Resource filename</th></tr>'.$s.'</table>';
 	}
 
 	/**
@@ -315,14 +314,14 @@ 
 			return NULL;
 		}
 
-		$method = YamlFileLoader::class . '::load';
+		$method = YamlFileLoader::class.'::load';
 		$call = Helpers::findTrace($e->getPrevious()->getTrace(), $method);
 		if ($call !== NULL) {
 			return [
 				'tab' => 'YAML dictionary',
-				'panel' => '<p><b>File:</b> ' . self::editorLink($call['args'][0], $previous->getParsedLine()) . '</p>'
+				'panel' => '<p><b>File:</b> '.self::editorLink($call['args'][0], $previous->getParsedLine()).'</p>'
 					. ($previous->getParsedLine() ? BlueScreen::highlightFile($call['args'][0], $previous->getParsedLine()) : '')
-					. '<p>' . $previous->getMessage() . ' </p>',
+					. '<p>'.$previous->getMessage().' </p>',
 			];
 		}
 	}

src/IResourceLoader.php

Doc Comments +2 added lines

@@ -21,6 +21,7 @@ 
 	 *
 	 * @param string $format The format of the loader
 	 * @param \Symfony\Component\Translation\Loader\LoaderInterface $loader
+	 * @return void
 	 */
 	public function addLoader($format, LoaderInterface $loader);
 
@@ -35,6 +36,7 @@ 
 	 * @param string $domain
 	 * @param \Symfony\Component\Translation\MessageCatalogue $catalogue
 	 * @throws \Kdyby\Translation\LoaderNotFoundException
+	 * @return void
 	 */
 	public function loadResource($format, $resource, $domain, MessageCatalogue $catalogue);
 

src/PrefixedTranslator.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
 	}
 
 	/**
-	 * @param string|\Kdyby\Translation\Phrase $message
-	 * @param int|array|NULL $count
+	 * @param string $message
+	 * @param integer|null $count
 	 * @param array|string|NULL $parameters
 	 * @param string|NULL $domain
 	 * @param string|NULL $locale

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 	public function translate($message, $count = NULL, $parameters = [], $domain = NULL, $locale = NULL)
 	{
 		$translationString = ($message instanceof Phrase ? $message->message : $message);
-		$prefix = $this->prefix . '.';
+		$prefix = $this->prefix.'.';
 
 		if (Strings::startsWith($message, '//')) {
 			$prefix = NULL;
@@ -71,7 +71,7 @@ 
 		}
 
 		if ($message instanceof Phrase) {
-			return $this->translator->translate(new Phrase($prefix . $translationString, $message->count, $message->parameters, $message->domain, $message->locale));
+			return $this->translator->translate(new Phrase($prefix.$translationString, $message->count, $message->parameters, $message->domain, $message->locale));
 		}
 
 		if (is_array($count)) {
@@ -81,7 +81,7 @@ 
 			$count = NULL;
 		}
 
-		return $this->translator->translate($prefix . $translationString, $count, (array) $parameters, $domain, $locale);
+		return $this->translator->translate($prefix.$translationString, $count, (array) $parameters, $domain, $locale);
 	}
 
 	/**

src/Latte/TranslateMacros.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 				$value = var_export($node->content, TRUE);
 				$node->content = '';
 			} else {
-				$node->openingCode = '<?php ob_start(function () {}) ?>' . $node->openingCode;
+				$node->openingCode = '<?php ob_start(function () {}) ?>'.$node->openingCode;
 				$value = 'ob_get_clean()';
 			}
 
@@ -79,7 +79,7 @@ 
 				throw new \Latte\CompileException('Expected message prefix, none given');
 			}
 
-			return $writer->write('$_translator = ' . PrefixedTranslator::class . '::register($this, %node.word);');
+			return $writer->write('$_translator = '.PrefixedTranslator::class.'::register($this, %node.word);');
 		}
 	}