Mistralys / application-localization

src/Localization/Translator.php

Spacing +14 added lines, -14 removed lines

@@ -79,7 +79,7 @@ 
      */
     public function addSources(array $sources) : void
     {
-        foreach($sources as $source) {
+        foreach ($sources as $source) {
             $this->addSource($source);
         }
     }
@@ -124,7 +124,7 @@ 
             $this->strings[$localeName] = array();
         }
 
-        foreach($this->sources as $source)
+        foreach ($this->sources as $source)
         {
             $file = $this->resolveStorageFile($locale, $source);
             if (!file_exists($file)) {
@@ -133,7 +133,7 @@ 
             
             $data = parse_ini_file($file, false);
             
-            if($data === false) 
+            if ($data === false) 
             {
                 throw new Localization_Exception(
                     'Malformatted localization file',
@@ -205,7 +205,7 @@ 
         
         $name = $locale->getName();
         
-        if(isset($this->strings[$name])) {
+        if (isset($this->strings[$name])) {
             return $this->strings[$name];
         }
         
@@ -240,11 +240,11 @@ 
      * @param Localization_Locale $locale
      * @param boolean $editable
      */
-    protected function renderStringsFile(string $type, Localization_Source $source, array $hashes, string $file, Localization_Locale $locale, bool $editable=true) : void
+    protected function renderStringsFile(string $type, Localization_Source $source, array $hashes, string $file, Localization_Locale $locale, bool $editable = true) : void
     {
         $writer = new Localization_Writer($locale, $type, $file);
 
-        if($editable)
+        if ($editable)
         {
             $writer->makeEditable();
         }
@@ -253,14 +253,14 @@ 
         
         foreach ($hashes as $hash) 
         {
-            if(!$hash->hasSourceID($sourceID)) {
+            if (!$hash->hasSourceID($sourceID)) {
                 continue;
             }
             
             $text = $this->getHashTranslation($hash->getHash(), $locale);
 
             // skip any empty strings
-            if($text === null || trim($text) == '') {
+            if ($text === null || trim($text) == '') {
                 continue;
             }
             
@@ -338,7 +338,7 @@ 
     {
         // to avoid re-creating the hash for the same texts over and over,
         // we keep track of the hashes we created, and re-use them.
-        if(isset($this->reverseStrings[$text])) {
+        if (isset($this->reverseStrings[$text])) {
             $hash = $this->reverseStrings[$text];
         } else {
             $hash = md5($text);
@@ -403,15 +403,15 @@ 
      * @param Localization_Locale|null $locale
      * @return string|NULL
      */
-    public function getHashTranslation(string $hash, ?Localization_Locale $locale=null) : ?string
+    public function getHashTranslation(string $hash, ?Localization_Locale $locale = null) : ?string
     {
-        if(!$locale) {
+        if (!$locale) {
             $locale = $this->targetLocale;
         }
         
         $localeName = $locale->getName();
         
-        if(isset($this->strings[$localeName]) && isset($this->strings[$localeName][$hash])) {
+        if (isset($this->strings[$localeName]) && isset($this->strings[$localeName][$hash])) {
             return $this->strings[$localeName][$hash];
         }
 
@@ -429,10 +429,10 @@ 
     {
         $result = array();
         
-        foreach($this->sources as $source) 
+        foreach ($this->sources as $source) 
         {
             $localeFile = self::getClientStorageFile($locale, $source);
-            if(!file_exists($localeFile)) {
+            if (!file_exists($localeFile)) {
                 continue;
             }
 

src/Localization/Parser/Token.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
      * @param array|string $definition
      * @param Localization_Parser_Token|null $parentToken
      */
-    public function __construct($definition, ?Localization_Parser_Token $parentToken=null)
+    public function __construct($definition, ?Localization_Parser_Token $parentToken = null)
     {
         $this->definition = $definition;
         $this->parentToken = $parentToken;
 
         $names = $this->getFunctionNames();
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->nameLookup[$name] = true;
         }
 

src/Localization/Event/LocaleChanged.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     public function getPrevious() : ?Localization_Locale
     {
         $arg = $this->getArgument(1);
-        if($arg instanceof Localization_Locale) {
+        if ($arg instanceof Localization_Locale) {
             return $arg;
         }
         
@@ -48,7 +48,7 @@ 
     {
         $arg = $this->getArgument(2);
 
-        if($arg instanceof Localization_Locale) {
+        if ($arg instanceof Localization_Locale) {
             return $arg;
         }
 

src/Localization/Scanner.php

Spacing +7 added lines, -7 removed lines

@@ -72,14 +72,14 @@ 
     
     public function scan() : void
     {
-        if(isset($this->collection)) {
+        if (isset($this->collection)) {
             $this->collection = null;
         }
         
         $this->timeStart = microtime(true);
         
         $sources = Localization::getSources();
-        foreach($sources as $source) 
+        foreach ($sources as $source) 
         {
             $source->scan($this);
         }
@@ -91,11 +91,11 @@ 
 
     public function load() : void
     {
-        if(!$this->isScanAvailable()) {
+        if (!$this->isScanAvailable()) {
             return;
         }
         
-        if($this->loaded) {
+        if ($this->loaded) {
             return;
         }
         
@@ -103,7 +103,7 @@ 
         
         $data = FileHelper::parseJSONFile($this->storageFile);
         
-        if($this->getCollection()->fromArray($data) === true) {
+        if ($this->getCollection()->fromArray($data) === true) {
             return;
         }
         
@@ -121,7 +121,7 @@ 
     
     public function getParser() : Localization_Parser
     {
-        if(!isset($this->parser)) {
+        if (!isset($this->parser)) {
             $this->parser = new Localization_Parser($this);
         }
         
@@ -130,7 +130,7 @@ 
     
     public function getCollection() : Localization_Scanner_StringsCollection
     {
-        if(!isset($this->collection)) {
+        if (!isset($this->collection)) {
             $this->collection = new Localization_Scanner_StringsCollection($this);
         }
         

src/Localization/Scanner/StringsCollection.php

Spacing +11 added lines, -11 removed lines

@@ -62,7 +62,7 @@ 
     {
         $hash = $string->getHash();
         
-        if(!isset($this->hashes[$hash])) {
+        if (!isset($this->hashes[$hash])) {
             $this->hashes[$hash] = new Localization_Scanner_StringHash($this, $hash);
         }
         
@@ -93,7 +93,7 @@ 
      */
     public function getHash(string $hash) : Localization_Scanner_StringHash
     {
-        if(isset($this->hashes[$hash])) {
+        if (isset($this->hashes[$hash])) {
             return $this->hashes[$hash];
         }
         
@@ -115,7 +115,7 @@ 
             'warnings' => array()
         );
         
-        foreach($this->hashes as $hash)
+        foreach ($this->hashes as $hash)
         {
             $data['hashes'] = array_merge($data['hashes'], $hash->toArray());
         }
@@ -131,11 +131,11 @@ 
      */
     public function fromArray(array $array) : bool
     {
-        if(!isset($array['formatVersion']) || $array['formatVersion'] != self::STORAGE_FORMAT_VERSION) {
+        if (!isset($array['formatVersion']) || $array['formatVersion'] != self::STORAGE_FORMAT_VERSION) {
             return false;
         }
         
-        foreach($array['hashes'] as $entry) 
+        foreach ($array['hashes'] as $entry) 
         {
             $string = Localization_Scanner_StringInfo::fromArray($this, $entry);
             $this->add($string);
@@ -176,7 +176,7 @@ 
     {
         $result = array();
         
-        foreach($this->warnings as $def) {
+        foreach ($this->warnings as $def) {
             $result[] = new Localization_Scanner_StringsCollection_Warning($def);
         }
         
@@ -191,7 +191,7 @@ 
     public function countFiles() : int
     {
         $amount = 0;
-        foreach($this->hashes as $hash) {
+        foreach ($this->hashes as $hash) {
             $amount = $amount + $hash->countFiles();
         }
         
@@ -208,8 +208,8 @@ 
     {
         $hashes = array();
         
-        foreach($this->hashes as $hash) {
-            if($hash->hasSourceID($id)) {
+        foreach ($this->hashes as $hash) {
+            if ($hash->hasSourceID($id)) {
                 $hashes[] = $hash;
             }
         }
@@ -227,8 +227,8 @@ 
     {
         $hashes = array();
         
-        foreach($this->hashes as $hash) {
-            if($hash->hasLanguageType($languageID)) {
+        foreach ($this->hashes as $hash) {
+            if ($hash->hasLanguageType($languageID)) {
                 $hashes[] = $hash;
             }
         }

src/Localization/Editor/Filters.php

Spacing +20 added lines, -20 removed lines

@@ -55,23 +55,23 @@ 
         $this->editor = $editor;
         $this->request = $editor->getRequest();
         
-        foreach($this->vars as $var => $name) {
+        foreach ($this->vars as $var => $name) {
             $this->vars[$var] = $this->editor->getVarName($var);
         }
 
-        if(!isset($_SESSION[$this->sessionName])) {
+        if (!isset($_SESSION[$this->sessionName])) {
             $_SESSION[$this->sessionName] = array();
         }
 
-        if($this->request->getBool($this->vars['resetfilter']))
+        if ($this->request->getBool($this->vars['resetfilter']))
         {
             $defaults = $this->getDefaultValues();
             
-            foreach($defaults as $name => $val) {
+            foreach ($defaults as $name => $val) {
                 $this->setValue($name, $val);
             }
         }
-        else if($this->request->getBool($this->vars['filter'])) 
+        else if ($this->request->getBool($this->vars['filter'])) 
         {
             $this->parseSearchTerms($this->request->getParam($this->vars['search']));
             
@@ -106,12 +106,12 @@ 
     
     protected function getValue(string $filterName) : string
     {
-        if(isset($_SESSION[$this->sessionName][$filterName])) {
+        if (isset($_SESSION[$this->sessionName][$filterName])) {
             return $_SESSION[$this->sessionName][$filterName];
         }
         
         $defaults = $this->getDefaultValues();
-        if(isset($defaults[$filterName])) {
+        if (isset($defaults[$filterName])) {
             return $defaults[$filterName];
         }
         
@@ -130,7 +130,7 @@ 
     
     protected function parseSearchTerms(string $searchString) : void
     {
-        if(empty($searchString)) 
+        if (empty($searchString)) 
         {
             $this->searchTerms = array();
             $this->searchString = '';
@@ -144,8 +144,8 @@ 
         $terms = array_map('trim', $terms);
         
         $keep = array();
-        foreach($terms as $term) {
-            if(!empty($term)) {
+        foreach ($terms as $term) {
+            if (!empty($term)) {
                 $keep[] = $term;
             }
         }
@@ -156,28 +156,28 @@ 
     
     public function isStringMatch(Localization_Scanner_StringHash $string) : bool
     {
-        if(!empty($this->searchTerms)) 
+        if (!empty($this->searchTerms)) 
         {
             $haystack = $string->getSearchString();
             
-            foreach($this->searchTerms as $term) {
-                if(!mb_stristr($haystack, $term)) {
+            foreach ($this->searchTerms as $term) {
+                if (!mb_stristr($haystack, $term)) {
                     return false;
                 }
             }
         }
         
         $status = $this->getValue($this->vars['status']);
-        if($status === 'untranslated' && $string->isTranslated()) {
+        if ($status === 'untranslated' && $string->isTranslated()) {
             return false;
-        } else if($status === 'translated' && !$string->isTranslated()) {
+        } else if ($status === 'translated' && !$string->isTranslated()) {
             return false;
         }
         
         $location = $this->getValue($this->vars['location']);
-        if($location === 'client' && !$string->hasLanguageType('Javascript')) {
+        if ($location === 'client' && !$string->hasLanguageType('Javascript')) {
             return false;
-        } else if($location === 'server' && !$string->hasLanguageType('PHP')) {
+        } else if ($location === 'server' && !$string->hasLanguageType('PHP')) {
             return false;
         }
         
@@ -205,7 +205,7 @@ 
             	<div class="form-hiddens">
             		<?php 
     					$params = $this->editor->getRequestParams();
-    					foreach($params as $name => $value) {
+    					foreach ($params as $name => $value) {
     					    ?>
     					    	<input type="hidden" name="<?php echo $name ?>" value="<?php echo $value ?>">
     					    <?php 
@@ -293,10 +293,10 @@ 
         ?>
         	<select class="form-control" name="<?php echo $filterName ?>">
         		<?php 
-                    foreach($entries as $entry) 
+                    foreach ($entries as $entry) 
                     {
                         $selected = '';
-                        if($entry['value'] === $value) {
+                        if ($entry['value'] === $value) {
                             $selected = ' selected';
                         }
                         

src/Localization/Parser/Language.php

Spacing +25 added lines, -25 removed lines

@@ -97,7 +97,7 @@ 
     */
     public function getID() : string
     {
-        if(!isset($this->id)) {
+        if (!isset($this->id)) {
             $this->id = str_replace(Localization_Parser_Language::class.'_', '', get_class($this));
         }
         
@@ -122,7 +122,7 @@ 
     */
     public function parseFile(string $path) : void
     {
-        if(!file_exists($path)) 
+        if (!file_exists($path)) 
         {
             throw new Localization_Exception(
                 sprintf('Source code file [%s] not found', basename($path)),
@@ -175,12 +175,12 @@ 
         $this->tokens = $this->getTokens();
         $this->totalTokens = count($this->tokens);
         
-        for($i = 0; $i < $this->totalTokens; $i++)
+        for ($i = 0; $i < $this->totalTokens; $i++)
         {
             $token = $this->createToken($this->tokens[$i]);
             
-            if($token->isTranslationFunction()) {
-                $this->parseToken($i+1, $token);
+            if ($token->isTranslationFunction()) {
+                $this->parseToken($i + 1, $token);
             }
         }
     }
@@ -204,7 +204,7 @@ 
         return self::$allowedContextTags;
     }
 
-    protected function addResult(string $text, int $line=0, string $explanation='') : void
+    protected function addResult(string $text, int $line = 0, string $explanation = '') : void
     {
         $this->log(sprintf('Line [%1$s] | Found string [%2$s]', $line, $text));
 
@@ -273,7 +273,7 @@ 
     * @param Localization_Parser_Token|NULL $parentToken
     * @return Localization_Parser_Token
     */
-    protected function createToken($definition, Localization_Parser_Token $parentToken=null) : Localization_Parser_Token
+    protected function createToken($definition, Localization_Parser_Token $parentToken = null) : Localization_Parser_Token
     {
         $class = Localization_Parser_Token::class.'_'.$this->getID();
         
@@ -293,48 +293,48 @@ 
         $open = false;
         $explanation = '';
         
-        for($i = $number; $i < $max; $i++)
+        for ($i = $number; $i < $max; $i++)
         {
-            if(!isset($this->tokens[$i])) {
+            if (!isset($this->tokens[$i])) {
                 break;
             }
             
             $subToken = $this->createToken($this->tokens[$i], $token);
             
-            if(!$open && $subToken->isOpeningFuncParams())
+            if (!$open && $subToken->isOpeningFuncParams())
             {
                 $open = true;
                 continue;
             }
             
-            if($open && $subToken->isClosingFuncParams()) {
+            if ($open && $subToken->isClosingFuncParams()) {
                 break;
             }
             
             // additional parameters in the translation function, we don't want to capture these now.
-            if($open && $subToken->isArgumentSeparator())
+            if ($open && $subToken->isArgumentSeparator())
             {
-                if($token->isExplanationFunction()) {
-                    $leftover = array_slice($this->tokens, $i+1);
+                if ($token->isExplanationFunction()) {
+                    $leftover = array_slice($this->tokens, $i + 1);
                     $explanation = $this->parseExplanation($token, $leftover);
                 }
                 break;
             }
             
-            if($open && $subToken->isEncapsedString())
+            if ($open && $subToken->isEncapsedString())
             {
                 $textParts[] = $this->trimText(strval($subToken->getValue()));
                 continue;
             }
             
-            if($open && $subToken->isVariableOrFunction()) {
+            if ($open && $subToken->isVariableOrFunction()) {
                 $textParts = null;
                 $this->addWarning($subToken, t('Variables or functions are not supported in translation functions.'));
                 break;
             }
         }
         
-        if(empty($textParts)) {
+        if (empty($textParts)) {
             return;
         }
         
@@ -348,38 +348,38 @@ 
         $textParts = array();
         $max = 200;
 
-        for($i = 0; $i < $max; $i++)
+        for ($i = 0; $i < $max; $i++)
         {
-            if(!isset($tokens[$i])) {
+            if (!isset($tokens[$i])) {
                 break;
             }
 
             $subToken = $this->createToken($tokens[$i], $token);
 
-            if($subToken->isClosingFuncParams()) {
+            if ($subToken->isClosingFuncParams()) {
                 break;
             }
 
             // additional parameters in the translation function, we don't want to capture these now.
-            if($subToken->isArgumentSeparator())
+            if ($subToken->isArgumentSeparator())
             {
                 break;
             }
 
-            if($subToken->isEncapsedString())
+            if ($subToken->isEncapsedString())
             {
                 $textParts[] = $this->trimText(strval($subToken->getValue()));
                 continue;
             }
 
-            if($subToken->isVariableOrFunction()) {
+            if ($subToken->isVariableOrFunction()) {
                 $textParts = null;
                 $this->addWarning($subToken, t('Variables or functions are not supported in translation functions.'));
                 break;
             }
         }
 
-        if(empty($textParts)) {
+        if (empty($textParts)) {
             return '';
         }
 
@@ -388,7 +388,7 @@ 
 
     protected function debug(string $text) : void
     {
-        if($this->debug) {
+        if ($this->debug) {
             echo $text;
         }
     }

example/index.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     $autoload = realpath($root.'/../vendor/autoload.php');
     
     // we need the autoloader to be present
-    if($autoload === false) {
+    if ($autoload === false) {
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }
 

src/Localization/Scanner/StringHash.php

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
     {
         $entries = array();
        
-        foreach($this->strings as $string) {
+        foreach ($this->strings as $string) {
             $entries[] = $string->toArray();
         }
         
@@ -73,8 +73,8 @@ 
     {
         $amount = 0;
         
-        foreach($this->strings as $string) {
-            if($string->isFile()) {
+        foreach ($this->strings as $string) {
+            if ($string->isFile()) {
                 $amount++;
             }
         }
@@ -89,8 +89,8 @@ 
     
     public function hasLanguageType(string $type) : bool
     {
-        foreach($this->strings as $string) {
-            if($string->getLanguageType() == $type) {
+        foreach ($this->strings as $string) {
+            if ($string->getLanguageType() == $type) {
                 return true;
             }
         }
@@ -100,7 +100,7 @@ 
     
     public function getText() : ?Text
     {
-        if(isset($this->strings[0])) {
+        if (isset($this->strings[0])) {
             return $this->strings[0]->getText();
         }
         
@@ -132,7 +132,7 @@ 
         $translator = Localization::getTranslator();
         $text = $translator->getHashTranslation($this->getHash());
         
-        if($text !== null) {
+        if ($text !== null) {
             return $text;
         }
         
@@ -147,14 +147,14 @@ 
     {
         $files = array();
         
-        foreach($this->strings as $string) 
+        foreach ($this->strings as $string) 
         {
-            if(!$string->isFile()) {
+            if (!$string->isFile()) {
                 continue;
             }
             
             $file = $string->getSourceFile();
-            if(!in_array($file, $files)) {
+            if (!in_array($file, $files)) {
                 $files[] = $file;
             }
         }
@@ -173,7 +173,7 @@ 
         $files = $this->getFiles();
         $result = array();
         
-        foreach($files as $path) {
+        foreach ($files as $path) {
             $result[] = basename($path);
         }
         
@@ -202,7 +202,7 @@ 
     {
         $text = $this->getText();
 
-        if($text !== null)
+        if ($text !== null)
         {
             return $text->getText();
         }