Mistralys / application-localization

localization/index.php

Spacing +1 added lines, -1 removed lines

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

example/index.php

Indentation +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
         die('<b>ERROR:</b> Autoloader not present. Run composer update first.');
     }
 
-   /**
-    * The composer autoloader
-    */
+    /**
+     * The composer autoloader
+     */
     require_once $autoload;
 
     // the folder in which the localization .ini files are stored

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.');
     }
 

example/sources/php/sources3.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@
     $text = t('This text is in the global scope.');
     
     $text2 = t(
-        'It is possible to write long texts ' .
-        'using text concatenation in the source ' .
+        'It is possible to write long texts '.
+        'using text concatenation in the source '.
         'code to keep it readable.'
     );
\ No newline at end of file

src/Localization/Source/Folder.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
     
     public function excludeFolder(string $folder) : Localization_Source_Folder
     {
-        if(!in_array($folder, $this->excludes['folders'])) {
+        if (!in_array($folder, $this->excludes['folders'])) {
             $this->excludes['folders'][] = $folder;
         }
         
@@ -58,7 +58,7 @@ 
     
     public function excludeFolders(array $folders) : Localization_Source_Folder
     {
-        foreach($folders as $folder) {
+        foreach ($folders as $folder) {
             $this->excludeFolder($folder);
         }
         

Indentation +14 added lines, -14 removed lines

@@ -23,24 +23,24 @@
  */
 class Localization_Source_Folder extends Localization_Source
 {
-   /**
-    * The folder under which all translatable files are kept.
-    * @var string
-    */
+    /**
+     * The folder under which all translatable files are kept.
+     * @var string
+     */
     protected $sourcesFolder;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $id;
 
-   /**
-    * @param string $alias An alias for this source, to recognize it by.
-    * @param string $label The human-readable label, used in the editor.
-    * @param string $group A human-readable group label to group several sources by. Used in the editor.
-    * @param string $storageFolder The folder in which to store the localization files.
-    * @param string $sourcesFolder The folder in which to analyze files to find translatable strings.
-    */
+    /**
+     * @param string $alias An alias for this source, to recognize it by.
+     * @param string $label The human-readable label, used in the editor.
+     * @param string $group A human-readable group label to group several sources by. Used in the editor.
+     * @param string $storageFolder The folder in which to store the localization files.
+     * @param string $sourcesFolder The folder in which to analyze files to find translatable strings.
+     */
     public function __construct(string $alias, string $label, string $group, string $storageFolder, string $sourcesFolder)
     {
         parent::__construct($alias, $label, $group, $storageFolder);

src/Localization/Event.php

Indentation +10 added lines, -10 removed lines

@@ -20,9 +20,9 @@ 
  */
 abstract class Localization_Event
 {
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $args;
     
     public function __construct(array $args)
@@ -30,13 +30,13 @@ 
         $this->args = $args;
     }
 
-   /**
-    * Fetches the argument at the specified index in the 
-    * event's arguments list, if it exists. 
-    * 
-    * @param int $index Zero-based index number.
-    * @return mixed|NULL
-    */ 
+    /**
+     * Fetches the argument at the specified index in the 
+     * event's arguments list, if it exists. 
+     * 
+     * @param int $index Zero-based index number.
+     * @return mixed|NULL
+     */ 
     public function getArgument(int $index)
     {
         if(isset($this->args[$index])) {

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     */ 
     public function getArgument(int $index)
     {
-        if(isset($this->args[$index])) {
+        if (isset($this->args[$index])) {
             return $this->args[$index];
         }
         

src/Localization/Generator.php

Braces +1 added lines, -2 removed lines

@@ -258,8 +258,7 @@
         if(empty($tokens))
         {
             $content = '/* No strings found. */';
-        }
-        else
+        } else
         {
             $content =
             '/**'.PHP_EOL.

Indentation +13 added lines, -13 removed lines

@@ -143,14 +143,14 @@ 
         $this->writeCacheKey();
     }
     
-   /**
-    * Retrieves a list of all localization client 
-    * files that are written to disk. This includes
-    * the locale files and the libraries required
-    * to make it work clientside.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all localization client 
+     * files that are written to disk. This includes
+     * the locale files and the libraries required
+     * to make it work clientside.
+     * 
+     * @return string[]
+     */
     public function getFilesList() : array
     {
         $files = array();
@@ -328,11 +328,11 @@ 
         return self::$systemKey;
     }
 
-   /**
-    * Generates the cache key file, which is used to determine
-    * automatically whether the client libraries need to be 
-    * refreshed.
-    */
+    /**
+     * Generates the cache key file, which is used to determine
+     * automatically whether the client libraries need to be 
+     * refreshed.
+     */
     protected function writeCacheKey() : void
     {
         $this->cacheKey = self::getSystemKey();

Spacing +23 added lines, -23 removed lines

@@ -24,15 +24,15 @@ 
     {
         $this->translator = Localization::getTranslator();
 
-        Localization::onLocaleChanged(function () {
+        Localization::onLocaleChanged(function() {
             $this->handleLocaleChanged();
         });
 
-        Localization::onCacheKeyChanged(function () {
+        Localization::onCacheKeyChanged(function() {
             $this->handleCacheKeyChanged();
         });
 
-        Localization::onClientFolderChanged(function () {
+        Localization::onClientFolderChanged(function() {
             $this->handleFolderChanged();
         });
     }
@@ -41,7 +41,7 @@ 
     {
         $folder = Localization::getClientFolder();
 
-        if(!empty($folder)) {
+        if (!empty($folder)) {
             return FolderInfo::factory($folder);
         }
 
@@ -52,7 +52,7 @@ 
     {
         $folder = $this->getTargetFolder();
 
-        if($folder !== null) {
+        if ($folder !== null) {
             return FileInfo::factory($folder.'/cachekey.txt');
         }
 
@@ -91,7 +91,7 @@ 
 
     private static function log(string $message, ...$args) : void
     {
-        if(self::$logging === false) {
+        if (self::$logging === false) {
             return;
         }
 
@@ -100,13 +100,13 @@ 
 
     public function getCacheKey() : ?string
     {
-        if(isset($this->cacheKey)) {
+        if (isset($this->cacheKey)) {
             return $this->cacheKey;
         }
 
         $file = $this->getCacheKeyFile();
 
-        if($file !== null && $file->exists()) {
+        if ($file !== null && $file->exists()) {
             $this->cacheKey = $file->getContents();
         }
 
@@ -121,7 +121,7 @@ 
     {
         self::log('Write Files');
 
-        if($this->getCacheKey() === self::getSystemKey()) {
+        if ($this->getCacheKey() === self::getSystemKey()) {
             self::log('Write Files | SKIP | Still up to date.');
             return;
         }
@@ -129,7 +129,7 @@ 
         $targetFolder = $this->getTargetFolder();
 
         // no client libraries folder set: ignore.
-        if($targetFolder === null) {
+        if ($targetFolder === null) {
             self::log('Write Files | SKIP | No folder set.');
             return;
         }
@@ -155,12 +155,12 @@ 
     {
         $files = array();
         
-        foreach($this->libraries as $fileName)
+        foreach ($this->libraries as $fileName)
         {
             $files[] = $this->getLibraryFilePath($fileName);
         }
         
-        foreach($this->getTargetLocales() as $locale)
+        foreach ($this->getTargetLocales() as $locale)
         {
             $files[] = $this->getLocaleFilePath($locale);
         }
@@ -172,7 +172,7 @@ 
     {
         self::log('Write Files | Writing locales.');
 
-        foreach(self::getTargetLocales() as $locale)
+        foreach (self::getTargetLocales() as $locale)
         {
             $this->writeLocaleFile($locale);
         }
@@ -194,7 +194,7 @@ 
     {
         $sourceFolder = FolderInfo::factory(__DIR__.'/../js');
 
-        if(!$sourceFolder->exists())
+        if (!$sourceFolder->exists())
         {
             throw new Localization_Exception(
                 'Unexpected folder structure encountered.',
@@ -206,7 +206,7 @@ 
             );
         }
         
-        foreach($this->libraries as $fileName)
+        foreach ($this->libraries as $fileName)
         {
             $targetFile = $this->getLibraryFilePath($fileName);
             $sourceFile = $sourceFolder.'/'.$fileName;
@@ -222,8 +222,8 @@ 
     {
         $result = array();
 
-        foreach(Localization::getAppLocales() as $locale) {
-            if($locale->isNative()) {
+        foreach (Localization::getAppLocales() as $locale) {
+            if ($locale->isNative()) {
                 continue;
             }
 
@@ -237,7 +237,7 @@ 
     {
         $result = array();
 
-        foreach(self::getTargetLocales() as $locale) {
+        foreach (self::getTargetLocales() as $locale) {
             $result[] = $locale->getName();
         }
 
@@ -281,9 +281,9 @@ 
         $strings = $this->translator->getClientStrings($locale);
         
         $tokens = array();
-        foreach($strings as $hash => $text)
+        foreach ($strings as $hash => $text)
         {
-            if(empty($text)) {
+            if (empty($text)) {
                 continue;
             }
             
@@ -294,7 +294,7 @@ 
             );
         }
         
-        if(empty($tokens))
+        if (empty($tokens))
         {
             $content = '/* No strings found. */';
         }
@@ -314,7 +314,7 @@ 
 
     public static function getSystemKey() : string
     {
-        if(!isset(self::$systemKey)) {
+        if (!isset(self::$systemKey)) {
             self::$systemKey = sprintf(
                 'Lib:%s|System:%s|Locales:%s',
                 Localization::getClientLibrariesCacheKey(),
@@ -339,7 +339,7 @@ 
 
         $file = $this->getCacheKeyFile();
 
-        if($file !== null) {
+        if ($file !== null) {
             $file->putContents($this->cacheKey);
         }
 

src/Localization/Parser/Token/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -9,12 +9,12 @@
     protected function parseDefinition() : void
     {
         // some entries are strings, like parenthesises, semicolons and the like.
-        if(is_string($this->definition))
+        if (is_string($this->definition))
         {
             $this->token = $this->definition;
             $this->value = null;
             
-            if(isset($this->parentToken)) {
+            if (isset($this->parentToken)) {
                 $this->line = $this->parentToken->getLine();
             }
         }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
             if(isset($this->parentToken)) {
                 $this->line = $this->parentToken->getLine();
             }
-        }
-        else
+        } else
         {
             $this->token = JTokenizer::getTokenName($this->definition[0]);
             $this->value = $this->definition[1];

src/Localization/Parser/Token/PHP.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
             if(isset($this->parentToken)) {
                 $this->line = $this->parentToken->getLine();
             }
-        }
-        else
+        } else
         {
             $this->token = token_name($this->definition[0]);
             $this->value = $this->definition[1];

Spacing +2 added lines, -2 removed lines

@@ -15,12 +15,12 @@
     protected function parseDefinition() : void
     {
         // some entries are strings, like parentheses, semicolons and the like.
-        if(is_string($this->definition))
+        if (is_string($this->definition))
         {
             $this->token = $this->definition;
             $this->value = null;
             
-            if(isset($this->parentToken)) {
+            if (isset($this->parentToken)) {
                 $this->line = $this->parentToken->getLine();
             }
         }

src/Localization/Editor/Filters.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
             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']));
             
@@ -72,8 +71,7 @@ 
                 ->setEnum('', 'client', 'server')
                 ->get('')
             );
-        }
-        else
+        } else
         {
             $this->parseSearchTerms($this->getValue($this->vars['search']));
         }

Indentation +55 added lines, -55 removed lines

@@ -23,25 +23,25 @@ 
  */
 class Localization_Editor_Filters
 {
-   /**
-    * @var Localization_Editor
-    */
+    /**
+     * @var Localization_Editor
+     */
     protected $editor;
     
-   /**
-    * @var Request
-    */
+    /**
+     * @var Request
+     */
     
     protected $request; 
      
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $sessionName = 'localize_filters';
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $vars = array(
         'resetfilter' => '',
         'filter' => '',
@@ -204,13 +204,13 @@ 
             <form class="form-inline">
             	<div class="form-hiddens">
             		<?php 
-    					$params = $this->editor->getRequestParams();
-    					foreach($params as $name => $value) {
-    					    ?>
+                        $params = $this->editor->getRequestParams();
+                        foreach($params as $name => $value) {
+                            ?>
     					    	<input type="hidden" name="<?php echo $name ?>" value="<?php echo $value ?>">
     					    <?php 
-    					}
-					?>
+                        }
+                    ?>
             	</div>
             	<div class="form-row">
             		<div class="col-auto">
@@ -218,42 +218,42 @@ 
     		        </div>
                     <div class="col-auto">
                     	<?php
-                    	    echo $this->renderSelect(
-                    	       $this->vars['status'],
-                    	       array(
-                        	       array(
-                        	            'value' => '',
-                        	            'label' => t('Status...')
-                        	       ),
-                        	       array(
-                        	           'value' => 'untranslated',
-                        	           'label' => t('Not translated')
-                        	       ),
-                        	       array(
-                        	           'value' => 'translated',
-                        	           'label' => t('Translated')
-                        	       )
-                    	       )
-                    	   );
+                            echo $this->renderSelect(
+                                $this->vars['status'],
+                                array(
+                                    array(
+                                        'value' => '',
+                                        'label' => t('Status...')
+                                    ),
+                                    array(
+                                        'value' => 'untranslated',
+                                        'label' => t('Not translated')
+                                    ),
+                                    array(
+                                        'value' => 'translated',
+                                        'label' => t('Translated')
+                                    )
+                                )
+                            );
                     	
-                    	   echo $this->renderSelect(
-                    	       $this->vars['location'],
-                    	       array(
-                    	           array(
-                    	               'value' => '',
-                    	               'label' => t('Location...')
-                    	           ),
-                    	           array(
-                    	               'value' => 'client',
-                    	               'label' => t('Clientside')
-                    	           ),
-                    	           array(
-                    	               'value' => 'server',
-                    	               'label' => t('Serverside')
-                    	           )
-                    	       )
-                	       );
-                    	?>
+                            echo $this->renderSelect(
+                                $this->vars['location'],
+                                array(
+                                    array(
+                                        'value' => '',
+                                        'label' => t('Location...')
+                                    ),
+                                    array(
+                                        'value' => 'client',
+                                        'label' => t('Clientside')
+                                    ),
+                                    array(
+                                        'value' => 'server',
+                                        'label' => t('Serverside')
+                                    )
+                                )
+                            );
+                        ?>
                     </div>
                     <div class="col-auto">
 	    				<button type="submit" name="<?php echo $this->vars['filter'] ?>" value="yes" class="btn btn-primary mb-2" title="<?php pt('Filter the list with the selected criteria.') ?>" data-toggle="tooltip">
@@ -268,9 +268,9 @@ 
             </form>
             <p>
             	<small class="text-muted"><?php 
-            	   pts('Hint:'); 
-            	   pt('Search works in translated and untranslated text, as well as the file name.') 
-        	   ?></small>
+                    pts('Hint:'); 
+                    pt('Search works in translated and untranslated text, as well as the file name.') 
+                ?></small>
             </p>
 			<br>
         <?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';
                         }