Procházet zdrojové kódy

style: unalign spaces as per new StyleCi

rugk před 1 měsícem
rodič
revize
96963b11dc
2 změnil soubory, kde provedl 15 přidání a 14 odebrání
  1. 9 8
      lib/I18n.php
  2. 6 6
      tst/I18nTest.php

+ 9 - 8
lib/I18n.php

@@ -13,8 +13,9 @@ namespace PrivateBin;
 
 
 use AppendIterator;
 use AppendIterator;
 use GlobIterator;
 use GlobIterator;
-use function in_array;
+
 use function array_key_exists;
 use function array_key_exists;
+use function in_array;
 
 
 /**
 /**
  * I18n
  * I18n
@@ -118,8 +119,8 @@ class I18n
         array_unshift($args, $messageId);
         array_unshift($args, $messageId);
         if (is_array(self::$_translations[$messageId])) {
         if (is_array(self::$_translations[$messageId])) {
             $number = (int) $args[1];
             $number = (int) $args[1];
-            $key    = self::_getPluralForm($number);
-            $max    = count(self::$_translations[$messageId]) - 1;
+            $key = self::_getPluralForm($number);
+            $max = count(self::$_translations[$messageId]) - 1;
             if ($key > $max) {
             if ($key > $max) {
                 $key = $max;
                 $key = $max;
             }
             }
@@ -185,7 +186,7 @@ class I18n
         if (self::$_language === 'en') {
         if (self::$_language === 'en') {
             self::$_translations = [];
             self::$_translations = [];
         } else {
         } else {
-            $data                = file_get_contents(self::_getPath(self::$_language . '.json'));
+            $data = file_get_contents(self::_getPath(self::$_language . '.json'));
             self::$_translations = Json::decode($data);
             self::$_translations = Json::decode($data);
         }
         }
     }
     }
@@ -290,7 +291,7 @@ class I18n
     protected static function _normalizeBrowserLanguages($languages, $availableLanguages)
     protected static function _normalizeBrowserLanguages($languages, $availableLanguages)
     {
     {
         // Base zh stays before zh-tw because regional locales are appended after base locales.
         // Base zh stays before zh-tw because regional locales are appended after base locales.
-        $hasSimplifiedChinese  = in_array('zh', $availableLanguages, true);
+        $hasSimplifiedChinese = in_array('zh', $availableLanguages, true);
         $hasTraditionalChinese = in_array('zh-tw', $availableLanguages, true);
         $hasTraditionalChinese = in_array('zh-tw', $availableLanguages, true);
         foreach ($languages as $quality => $languageRanges) {
         foreach ($languages as $quality => $languageRanges) {
             foreach ($languageRanges as $index => $languageRange) {
             foreach ($languageRanges as $index => $languageRange) {
@@ -338,7 +339,7 @@ class I18n
     {
     {
         $file = self::_getPath('languages.json');
         $file = self::_getPath('languages.json');
         if (count(self::$_languageLabels) === 0 && is_readable($file)) {
         if (count(self::$_languageLabels) === 0 && is_readable($file)) {
-            $data                  = file_get_contents($file);
+            $data = file_get_contents($file);
             self::$_languageLabels = Json::decode($data);
             self::$_languageLabels = Json::decode($data);
         }
         }
         if (count($languages) === 0) {
         if (count($languages) === 0) {
@@ -466,7 +467,7 @@ class I18n
     protected static function _getMatchingLanguage($acceptedLanguages, $availableLanguages)
     protected static function _getMatchingLanguage($acceptedLanguages, $availableLanguages)
     {
     {
         $matches = [];
         $matches = [];
-        $any     = false;
+        $any = false;
         foreach ($acceptedLanguages as $acceptedQuality => $acceptedValues) {
         foreach ($acceptedLanguages as $acceptedQuality => $acceptedValues) {
             $acceptedQuality = floatval($acceptedQuality);
             $acceptedQuality = floatval($acceptedQuality);
             if ($acceptedQuality === 0.0) {
             if ($acceptedQuality === 0.0) {
@@ -478,7 +479,7 @@ class I18n
                 }
                 }
                 foreach ($availableLanguages as $availableValue) {
                 foreach ($availableLanguages as $availableValue) {
                     $availableQuality = 1.0;
                     $availableQuality = 1.0;
-                    $matchingGrade    = self::_matchLanguage($acceptedValue, $availableValue);
+                    $matchingGrade = self::_matchLanguage($acceptedValue, $availableValue);
                     if ($matchingGrade > 0) {
                     if ($matchingGrade > 0) {
                         $q = (string) ($acceptedQuality * $availableQuality * $matchingGrade);
                         $q = (string) ($acceptedQuality * $availableQuality * $matchingGrade);
                         if (!isset($matches[$q])) {
                         if (!isset($matches[$q])) {

+ 6 - 6
tst/I18nTest.php

@@ -44,7 +44,7 @@ class I18nTest extends TestCase
     public function testTranslationFallback()
     public function testTranslationFallback()
     {
     {
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'foobar';
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'foobar';
-        $messageId                       = 'It does not matter if the message ID exists';
+        $messageId = 'It does not matter if the message ID exists';
         I18n::loadTranslations();
         I18n::loadTranslations();
         $this->assertEquals($messageId, I18n::_($messageId), 'fallback to en');
         $this->assertEquals($messageId, I18n::_($messageId), 'fallback to en');
         I18n::getLanguageLabels();
         I18n::getLanguageLabels();
@@ -230,7 +230,7 @@ class I18nTest extends TestCase
     {
     {
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'foobar';
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'foobar';
         I18n::loadTranslations();
         I18n::loadTranslations();
-        $input  = '&<>"\'/`=';
+        $input = '&<>"\'/`=';
         $result = htmlspecialchars($input, ENT_QUOTES | ENT_HTML5 | ENT_DISALLOWED, 'UTF-8', false);
         $result = htmlspecialchars($input, ENT_QUOTES | ENT_HTML5 | ENT_DISALLOWED, 'UTF-8', false);
         $this->assertEquals($result, I18n::encode($input), 'encodes HTML entities');
         $this->assertEquals($result, I18n::encode($input), 'encodes HTML entities');
         $this->assertEquals('<a>some ' . $result . ' + 1</a>', I18n::_('<a>some %s + %d</a>', $input, 1), 'encodes parameters in translations');
         $this->assertEquals('<a>some ' . $result . ' + 1</a>', I18n::_('<a>some %s + %d</a>', $input, 1), 'encodes parameters in translations');
@@ -313,7 +313,7 @@ class I18nTest extends TestCase
     public function testMessageIdsExistInAllLanguages()
     public function testMessageIdsExistInAllLanguages()
     {
     {
         $messageIds = [];
         $messageIds = [];
-        $languages  = [];
+        $languages = [];
         foreach (new DirectoryIterator(PATH . 'i18n') as $file) {
         foreach (new DirectoryIterator(PATH . 'i18n') as $file) {
             $fileNameLength = strlen($file->getFilename());
             $fileNameLength = strlen($file->getFilename());
             if ($fileNameLength === 7) {       // xx.json
             if ($fileNameLength === 7) {       // xx.json
@@ -325,9 +325,9 @@ class I18nTest extends TestCase
             } else {
             } else {
                 continue;
                 continue;
             }
             }
-            $languageJson         = file_get_contents($file->getPathname());
-            $languageMessageIds   = array_keys(Json::decode($languageJson));
-            $messageIds           = array_unique(array_merge($messageIds, $languageMessageIds));
+            $languageJson = file_get_contents($file->getPathname());
+            $languageMessageIds = array_keys(Json::decode($languageJson));
+            $messageIds = array_unique(array_merge($messageIds, $languageMessageIds));
             $languages[$language] = $languageMessageIds;
             $languages[$language] = $languageMessageIds;
         }
         }
         foreach ($messageIds as $messageId) {
         foreach ($messageIds as $messageId) {