Mistralys / application-localization

src/Localization/Currency.php

Spacing +7 added lines, -7 removed lines

@@ -73,11 +73,11 @@ 
             return self::$instances[$id];
         }
 
-        $className = Localization_Currency::class.'_' . $id;
+        $className = Localization_Currency::class.'_'.$id;
 
         $country = new $className($country);
 
-        if($country instanceof Localization_Currency)
+        if ($country instanceof Localization_Currency)
         {
             return $country;
         }
@@ -138,7 +138,7 @@ 
      */
     public static function isCurrencyKnown(string $currencyName) : bool
     {
-        return file_exists(__DIR__ . '/Currency/' . $currencyName . '.php');
+        return file_exists(__DIR__.'/Currency/'.$currencyName.'.php');
     }
 
     /**
@@ -350,7 +350,7 @@ 
      * @return string
      * @throws Localization_Exception
      */
-    public function makeReadable($number, int $decimalPositions = 2, bool $addSymbol=true) : string
+    public function makeReadable($number, int $decimalPositions = 2, bool $addSymbol = true) : string
     {
         if ($number === null || $number === '') {
             return '';
@@ -360,14 +360,14 @@ 
 
         $number = $this->formatNumber($parsed->getFloat(), $decimalPositions);
 
-        if(!$addSymbol) {
+        if (!$addSymbol) {
             return $number;
         }
         
         if ($this->isSymbolOnFront()) {
-            return $this->getSymbol() . ' ' . $number;
+            return $this->getSymbol().' '.$number;
         }
 
-        return $number . ' ' . $this->getSymbol();
+        return $number.' '.$this->getSymbol();
     }
 }

Braces +1 added lines, -2 removed lines

@@ -245,8 +245,7 @@
             if ($decimals == '-') {
                 $decimals = 0;
             }
-        } 
-        else 
+        } else 
         {
             $decimals = 0;
             $thousands = implode('', $parts);

src/Localization/Writer.php

Indentation +25 added lines, -25 removed lines

@@ -20,29 +20,29 @@ 
  */
 class Localization_Writer
 {
-   /**
-    * @var boolean
-    */
+    /**
+     * @var boolean
+     */
     private $editable = false;
     
-   /**
-    * @var array<string,string>
-    */
+    /**
+     * @var array<string,string>
+     */
     private $hashes = array();
     
-   /**
-    * @var Localization_Locale
-    */
+    /**
+     * @var Localization_Locale
+     */
     private $locale;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $fileType;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     private $filePath;
     
     public function __construct(Localization_Locale $locale, string $fileType, string $filePath)
@@ -150,16 +150,16 @@ 
         return $hashes;
     }
     
-   /**
-    * Sort the strings to ensure they always appear in the same order:
-    * first by text, and same strings by their hashes. This is important
-    * for strings that have the same translation to avoid them changing
-    * order between sorts.
-    *
-    * @param array $a
-    * @param array $b
-    * @return int
-    */
+    /**
+     * Sort the strings to ensure they always appear in the same order:
+     * first by text, and same strings by their hashes. This is important
+     * for strings that have the same translation to avoid them changing
+     * order between sorts.
+     *
+     * @param array $a
+     * @param array $b
+     * @return int
+     */
     public function callback_sortStrings(array $a, array $b) : int
     {
         $result = strnatcasecmp($a['text'], $b['text']);

src/Localization/Scanner/StringsCollection.php

Indentation +49 added lines, -49 removed lines

@@ -12,19 +12,19 @@ 
     
     const STORAGE_FORMAT_VERSION = 2;
     
-   /**
-    * @var Localization_Scanner
-    */
+    /**
+     * @var Localization_Scanner
+     */
     protected $scanner;
     
-   /**
-    * @var Localization_Scanner_StringHash[]
-    */
+    /**
+     * @var Localization_Scanner_StringHash[]
+     */
     protected $hashes = array();
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $warnings = array();
     
     public function __construct(Localization_Scanner $scanner)
@@ -52,12 +52,12 @@ 
         return new Localization_Scanner_StringInfo($this, $sourceID, $sourceType, $text);
     }
     
-   /**
-    * Adds a single translatable string.
-    * 
-    * @param Localization_Scanner_StringInfo $string
-    * @return Localization_Scanner_StringsCollection
-    */
+    /**
+     * Adds a single translatable string.
+     * 
+     * @param Localization_Scanner_StringInfo $string
+     * @return Localization_Scanner_StringsCollection
+     */
     protected function add(Localization_Scanner_StringInfo $string) : Localization_Scanner_StringsCollection
     {
         $hash = $string->getHash();
@@ -70,12 +70,12 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves all available translatable strings,
-    * grouped by their hash to identify unique strings.
-    * 
-    * @return Localization_Scanner_StringHash[]
-    */
+    /**
+     * Retrieves all available translatable strings,
+     * grouped by their hash to identify unique strings.
+     * 
+     * @return Localization_Scanner_StringHash[]
+     */
     public function getHashes() : array
     {
         return array_values($this->hashes);
@@ -146,32 +146,32 @@ 
         return true;
     }
     
-   /**
-    * Whether the parser reported warnings during the
-    * search for translatable texts.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the parser reported warnings during the
+     * search for translatable texts.
+     * 
+     * @return bool
+     */
     public function hasWarnings() : bool
     {
         return !empty($this->warnings);
     }
     
-   /**
-    * Retrieves the amount of warnings.
-    * @return int
-    */
+    /**
+     * Retrieves the amount of warnings.
+     * @return int
+     */
     public function countWarnings() : int
     {
         return count($this->warnings);
     }
     
-   /**
-    * Retrieves all warning messages that were added
-    * during the search for translatable texts, if any.
-    * 
-    * @return Localization_Scanner_StringsCollection_Warning[]
-    */
+    /**
+     * Retrieves all warning messages that were added
+     * during the search for translatable texts, if any.
+     * 
+     * @return Localization_Scanner_StringsCollection_Warning[]
+     */
     public function getWarnings() : array
     {
         $result = array();
@@ -198,12 +198,12 @@ 
         return $amount;
     }
     
-   /**
-    * Retrieves all string hashed for the specified source.
-    * 
-    * @param string $id
-    * @return Localization_Scanner_StringHash[]
-    */
+    /**
+     * Retrieves all string hashed for the specified source.
+     * 
+     * @param string $id
+     * @return Localization_Scanner_StringHash[]
+     */
     public function getHashesBySourceID(string $id) : array
     {
         $hashes = array();
@@ -217,12 +217,12 @@ 
         return $hashes;
     }
     
-   /**
-    * Retrieves all hashes for the specified language ID.
-    * 
-    * @param string $languageID The language ID, e.g. "PHP"
-    * @return Localization_Scanner_StringHash[]
-    */
+    /**
+     * Retrieves all hashes for the specified language ID.
+     * 
+     * @param string $languageID The language ID, e.g. "PHP"
+     * @return Localization_Scanner_StringHash[]
+     */
     public function getHashesByLanguageID(string $languageID) : array
     {
         $hashes = array();

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/Scanner/StringHash.php

Indentation +32 added lines, -32 removed lines

@@ -15,19 +15,19 @@ 
  */
 class Localization_Scanner_StringHash
 {
-   /**
-    * @var Localization_Scanner_StringsCollection
-    */
+    /**
+     * @var Localization_Scanner_StringsCollection
+     */
     protected $collection;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $hash;
     
-   /**
-    * @var Localization_Scanner_StringInfo[]
-    */
+    /**
+     * @var Localization_Scanner_StringInfo[]
+     */
     protected $strings = array();
 
     /**
@@ -60,10 +60,10 @@ 
         return $entries;
     }
     
-   /**
-    * Retrieves all individual string locations where this text was found.
-    * @return Localization_Scanner_StringInfo[]
-    */
+    /**
+     * Retrieves all individual string locations where this text was found.
+     * @return Localization_Scanner_StringInfo[]
+     */
     public function getStrings() : array
     {
         return $this->strings;
@@ -123,10 +123,10 @@ 
         return count($this->strings);
     }
     
-   /**
-    * Retrieves the translated text, if any.
-    * @return string
-    */
+    /**
+     * Retrieves the translated text, if any.
+     * @return string
+     */
     public function getTranslatedText() : string
     {
         $translator = Localization::getTranslator();
@@ -139,10 +139,10 @@ 
         return '';
     }
     
-   /**
-    * Retrieves a list of all file names, with relative paths.
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all file names, with relative paths.
+     * @return string[]
+     */
     public function getFiles() : array
     {
         $files = array();
@@ -164,10 +164,10 @@ 
         return $files;
     }
     
-   /**
-    * Retrieves a list of all file names this string is used in.
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all file names this string is used in.
+     * @return string[]
+     */
     public function getFileNames() : array
     {
         $files = $this->getFiles();
@@ -184,13 +184,13 @@ 
         return $result;
     }
     
-   /**
-    * Retrieves a text comprised of all strings that are relevant
-    * for a full text search, imploded together. Used in the search
-    * function to find matching strings.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a text comprised of all strings that are relevant
+     * for a full text search, imploded together. Used in the search
+     * function to find matching strings.
+     * 
+     * @return string
+     */
     public function getSearchString() : string
     {
         $parts = array($this->getTranslatedText(), $this->getText());

src/Localization/Generator.php

Indentation +25 added lines, -25 removed lines

@@ -17,24 +17,24 @@ 
     const FILES_LOCALES = 'locales';
     const FILES_CACHE_KEY = 'cachekey';
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $force = false;
     
-   /**
-    * @var Localization_Translator
-    */
+    /**
+     * @var Localization_Translator
+     */
     protected $translator;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $targetFolder;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $cacheKeyFile;
 
     /**
@@ -119,14 +119,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();
@@ -279,11 +279,11 @@ 
         $this->written[self::FILES_LOCALES] = true;
     }
     
-   /**
-    * 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
     {
         if(file_exists($this->cacheKeyFile) && !$this->force) {

Spacing +20 added lines, -20 removed lines

@@ -66,7 +66,7 @@ 
     protected function initCache() : void
     {
         // ignore it if it does not exist.
-        if(!file_exists($this->cacheKeyFile)) {
+        if (!file_exists($this->cacheKeyFile)) {
             return;
         }
         
@@ -78,22 +78,22 @@ 
      * @throws Localization_Exception
      * @throws FileHelper_Exception
      */
-    public function writeFiles(bool $force=false) : void
+    public function writeFiles(bool $force = false) : void
     {
         // reset the write states for all files
         $fileIDs = array_keys($this->written);
-        foreach($fileIDs as $fileID) {
+        foreach ($fileIDs as $fileID) {
             $this->written[$fileID] = false;
         }
         
         // no client libraries folder set: ignore.
-        if(empty($this->targetFolder)) {
+        if (empty($this->targetFolder)) {
             return;
         }
         
         FileHelper::createFolder($this->targetFolder);
         
-        if(!is_writable($this->targetFolder)) 
+        if (!is_writable($this->targetFolder)) 
         {
             throw new Localization_Exception(
                 sprintf(
@@ -108,7 +108,7 @@ 
             );
         }
         
-        if($this->cacheKey !== Localization::getClientLibrariesCacheKey()) {
+        if ($this->cacheKey !== Localization::getClientLibrariesCacheKey()) {
             $force = true;
         }
         
@@ -131,16 +131,16 @@ 
     {
         $files = array();
         
-        foreach($this->libraries as $fileName)
+        foreach ($this->libraries as $fileName)
         {
             $files[] = $this->getLibraryFilePath($fileName);
         }
         
         $locales = Localization::getAppLocales();
         
-        foreach($locales as $locale)
+        foreach ($locales as $locale)
         {
-            if($locale->isNative()) {
+            if ($locale->isNative()) {
                 continue;
             }
             
@@ -154,9 +154,9 @@ 
     {
         $locales = Localization::getAppLocales();
         
-        foreach($locales as $locale)
+        foreach ($locales as $locale)
         {
-            if($locale->isNative()) {
+            if ($locale->isNative()) {
                 continue;
             }
             
@@ -180,7 +180,7 @@ 
     {
         $sourceFolder = realpath(__DIR__.'/../js');
         
-        if($sourceFolder === false) 
+        if ($sourceFolder === false) 
         {
             throw new Localization_Exception(
                 'Unexpected folder structure encountered.',
@@ -192,11 +192,11 @@ 
             );
         }
         
-        foreach($this->libraries as $fileName)
+        foreach ($this->libraries as $fileName)
         {
             $targetFile = $this->getLibraryFilePath($fileName);
             
-            if(file_exists($targetFile) && !$this->force) {
+            if (file_exists($targetFile) && !$this->force) {
                 continue;
             }
             
@@ -241,16 +241,16 @@ 
     {
         $path = $this->getLocaleFilePath($locale);
         
-        if(file_exists($path) && !$this->force) {
+        if (file_exists($path) && !$this->force) {
             return;
         }
         
         $strings = $this->translator->getClientStrings($locale);
         
         $tokens = array();
-        foreach($strings as $hash => $text)
+        foreach ($strings as $hash => $text)
         {
-            if(empty($text)) {
+            if (empty($text)) {
                 continue;
             }
             
@@ -261,7 +261,7 @@ 
             );
         }
         
-        if(empty($tokens))
+        if (empty($tokens))
         {
             $content = '/* No strings found. */';
         }
@@ -286,7 +286,7 @@ 
     */
     protected function writeCacheKey() : void
     {
-        if(file_exists($this->cacheKeyFile) && !$this->force) {
+        if (file_exists($this->cacheKeyFile) && !$this->force) {
             return;
         }
         
@@ -311,7 +311,7 @@ 
      */
     public function areFilesWritten(string $filesID) : bool
     {
-        if(isset($this->written[$filesID])) {
+        if (isset($this->written[$filesID])) {
             return $this->written[$filesID];
         }
         

src/Localization/Editor/OutputBuffering.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     {
         $html = ob_get_clean();
 
-        if($html !== false)
+        if ($html !== false)
         {
             return $html;
         }

src/Localization/Editor/Filters.php

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

src/Localization/Editor.php

Indentation +180 added lines, -180 removed lines

@@ -37,54 +37,54 @@ 
     const ERROR_NO_SOURCES_AVAILABLE = 40001;
     const ERROR_LOCAL_PATH_NOT_FOUND = 40002;
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $installPath;
     
-   /**
-    * @var Localization_Source[]
-    */
+    /**
+     * @var Localization_Source[]
+     */
     protected $sources;
     
-   /**
-    * @var Request
-    */
+    /**
+     * @var Request
+     */
     protected $request;
     
-   /**
-    * @var Localization_Source
-    */
+    /**
+     * @var Localization_Source
+     */
     protected $activeSource;
     
-   /**
-    * @var Localization_Scanner
-    */
+    /**
+     * @var Localization_Scanner
+     */
     protected $scanner;
     
-   /**
-    * @var Localization_Locale[]
-    */
+    /**
+     * @var Localization_Locale[]
+     */
     protected $appLocales = array();
     
-   /**
-    * @var Localization_Locale
-    */
+    /**
+     * @var Localization_Locale
+     */
     protected $activeAppLocale;
     
-   /**
-    * @var Localization_Editor_Filters
-    */
+    /**
+     * @var Localization_Editor_Filters
+     */
     protected $filters;
 
-   /**
-    * @var array<string,string>
-    */
+    /**
+     * @var array<string,string>
+     */
     protected $requestParams = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $varPrefix = 'applocalize_';
 
     /**
@@ -125,15 +125,15 @@ 
         return $this->request;
     }
     
-   /**
-    * Adds a request parameter that will be persisted in all URLs
-    * within the editor. This can be used when integrating the
-    * editor in an existing page that needs specific request params.
-    * 
-    * @param string $name
-    * @param string $value
-    * @return Localization_Editor
-    */
+    /**
+     * Adds a request parameter that will be persisted in all URLs
+     * within the editor. This can be used when integrating the
+     * editor in an existing page that needs specific request params.
+     * 
+     * @param string $name
+     * @param string $value
+     * @return Localization_Editor
+     */
     public function addRequestParam(string $name, string $value) : Localization_Editor
     {
         $this->requestParams[$name] = $value;
@@ -295,34 +295,34 @@ 
                                 	</a>
                                     <div class="dropdown-menu" aria-labelledby="dropdown01">
                                     	<?php 
-                                    	    foreach($this->sources as $source)
-                                    	    {
-                                    	       ?>
+                                            foreach($this->sources as $source)
+                                            {
+                                                ?>
                                         			<a class="dropdown-item" href="<?php echo $this->getSourceURL($source) ?>">
                                         				<?php 
-                                            				if($source->getID() === $this->activeSource->getID()) 
-                                            				{
-                                            				    ?>
+                                                            if($source->getID() === $this->activeSource->getID()) 
+                                                            {
+                                                                ?>
                                             				    	<b><?php echo $source->getLabel() ?></b>
                                         				    	<?php 
-                                            				}
-                                            				else
-                                            				{
-                                            				    echo $source->getLabel();
-                                            				}
-                                        				?>
+                                                            }
+                                                            else
+                                                            {
+                                                                echo $source->getLabel();
+                                                            }
+                                                        ?>
                                         				<?php
-                                        				    $untranslated = $source->countUntranslated($this->scanner);
-                                        				    if($untranslated > 0) {
-                                        				        ?>
+                                                            $untranslated = $source->countUntranslated($this->scanner);
+                                                            if($untranslated > 0) {
+                                                                ?>
                                         				        	(<span class="text-danger" title="<?php ptex('%1$s texts have not been translated in this text source.', 'Amount of texts', $untranslated) ?>"><?php echo $untranslated ?></span>)
                                 				            	<?php 
-                                        				    }
-                                    				    ?>
+                                                            }
+                                                        ?>
                                     				</a>
                                     			<?php 
-                                    	    }
-                                	    ?>
+                                            }
+                                        ?>
                                     </div>
                                 </li>
                                 <li class="nav-item dropdown">
@@ -331,15 +331,15 @@ 
                                 	</a>
                                     <div class="dropdown-menu" aria-labelledby="dropdown01">
                                     	<?php 
-                                    	    foreach($this->appLocales as $locale)
-                                    	    {
-                                    	       ?>
+                                            foreach($this->appLocales as $locale)
+                                            {
+                                                ?>
                                         			<a class="dropdown-item" href="<?php echo $this->getLocaleURL($locale) ?>">
                                         				<?php echo $locale->getLabel() ?>
                                     				</a>
                                     			<?php 
-                                    	    }
-                                	    ?>
+                                            }
+                                        ?>
                                     </div>
                                 </li>
                                 <li class="nav-item">
@@ -349,8 +349,8 @@ 
                                     </a>
                     			</li>
                     			<?php 
-                        			if($this->scanner->hasWarnings()) {
-                        			    ?>
+                                    if($this->scanner->hasWarnings()) {
+                                        ?>
                         			    	<li class="nav-item">
                         			    		<a href="<?php echo $this->getWarningsURL() ?>">
                             			    		<span class="badge badge-warning" title="<?php pts('The last scan for translatable texts reported warnings.'); pts('Click for details.'); ?>" data-toggle="tooltip">
@@ -360,8 +360,8 @@ 
                         			    		</a>
                         			    	</li>
                         			    <?php 
-                        			}
-                    			?>
+                                    }
+                                ?>
                             </ul>
                         <?php 
                     }
@@ -377,36 +377,36 @@ 
                         	</a>
                     	<?php 
                     }
-            	?>
+                ?>
     		</div>
 		</nav>
 		<main role="main" class="container">
 			<div>
     			<?php 
-    			    if(empty($this->appLocales))
-    			    {
-    			        ?>
+                    if(empty($this->appLocales))
+                    {
+                        ?>
     			        	<div class="alert alert-danger">
     			        		<i class="fa fa-exclamation-triangle"></i>
     			        		<b><?php pt('Nothing to translate:') ?></b>
     			        		<?php pt('No application locales were added to translate to.') ?>
     			        	</div>
     			        <?php 
-    			    }
-    			    else if($this->request->getBool($this->getVarName('warnings')))
-    			    {
-    			        echo $this->renderWarnings();
-    			    }
-    			    else
-    			    {
-    			        ?>
+                    }
+                    else if($this->request->getBool($this->getVarName('warnings')))
+                    {
+                        echo $this->renderWarnings();
+                    }
+                    else
+                    {
+                        ?>
             				<h1><?php echo $this->activeSource->getLabel() ?></h1>
             				<?php 
-                				if(!empty($_SESSION['localization_messages'])) 
-                				{
-                				    foreach($_SESSION['localization_messages'] as $def)
-                				    {
-                				        ?>
+                                if(!empty($_SESSION['localization_messages'])) 
+                                {
+                                    foreach($_SESSION['localization_messages'] as $def)
+                                    {
+                                        ?>
                 				        	<div class="alert alert-<?php echo $def['type'] ?>" role="alert">
                                         		<?php echo $def['text'] ?>
                                         		<button type="button" class="close" data-dismiss="alert" aria-label="<?php pt('Close') ?>" title="<?php pt('Dismiss this message.') ?>" data-toggle="tooltip">
@@ -414,28 +414,28 @@ 
             									</button>
                                         	</div>
             				        	<?php 
-                				    }
+                                    }
                 				    
-                				    // reset the messages after having displayed them
-                				    $_SESSION['localization_messages'] = array();
-                				}
-            				?>
+                                    // reset the messages after having displayed them
+                                    $_SESSION['localization_messages'] = array();
+                                }
+                            ?>
             				<p>
             					<?php 
-            				        pt(
-                					    'You are translating to %1$s', 
-                					    '<span class="badge badge-info">'.
-                					       $this->activeAppLocale->getLabel().
-                				        '</span>'
+                                    pt(
+                                        'You are translating to %1$s', 
+                                        '<span class="badge badge-info">'.
+                                            $this->activeAppLocale->getLabel().
+                                        '</span>'
                                     );
-            				    ?><br>
+                                ?><br>
             					<?php pt('Found %1$s texts to translate.', $this->activeSource->countUntranslated($this->scanner)) ?>
             				</p>
             				<br>
             				<?php
-                				if(!$this->scanner->isScanAvailable()) 
-                				{
-                				    ?>
+                                if(!$this->scanner->isScanAvailable()) 
+                                {
+                                    ?>
                 				    	<div class="alert alert-primary" role="alert">
                                         	<b><?php pt('No texts found:') ?></b> 
                                         	<?php pt('The source folders have not been scanned yet.') ?>
@@ -447,15 +447,15 @@ 
                                             </a>
                                         </p>
                 				    <?php 
-                				}
-                				else
-                				{
-                				    echo $this->filters->renderForm();
+                                }
+                                else
+                                {
+                                    echo $this->filters->renderForm();
 
-                				    $this->displayList();
-                				}
-        				}
-    				?>
+                                    $this->displayList();
+                                }
+                        }
+                    ?>
 			</div>
 		</main>
 	</body>
@@ -473,22 +473,22 @@ 
         	<h1><?php pt('Warnings') ?></h1>
         	<p class="abstract">
         		<?php 
-        		    pts('The following shows all texts where the system decided that they cannot be translated.');
-       		    ?>
+                    pts('The following shows all texts where the system decided that they cannot be translated.');
+                    ?>
         	</p>
         	<dl>
         		<?php 
-        		    $warnings = $this->scanner->getWarnings();
+                    $warnings = $this->scanner->getWarnings();
         		    
-        		    foreach($warnings as $warning)
-        		    {
-        		        ?>
+                    foreach($warnings as $warning)
+                    {
+                        ?>
         		        	<dt><?php echo FileHelper::relativizePathByDepth($warning->getFile(), 3) ?>:<?php echo $warning->getLine() ?></dt>
         		        	<dd><?php echo $warning->getMessage() ?></dd>
         		        <?php 
-        		    }
+                    }
         		        
-        		?>
+                ?>
         	</dl>
     	<?php 
 
@@ -558,13 +558,13 @@ 
 			<form method="post">
 				<div class="form-hiddens">
 					<?php 
-    					$params = $this->getRequestParams();
-    					foreach($params as $name => $value) {
-    					    ?>
+                        $params = $this->getRequestParams();
+                        foreach($params as $name => $value) {
+                            ?>
     					    	<input type="hidden" name="<?php echo $name ?>" value="<?php echo $value ?>">
     					    <?php 
-    					}
-					?>
+                        }
+                    ?>
 				</div>
             	<table class="table table-hover">
     				<thead>
@@ -577,20 +577,20 @@ 
     				</thead>
     				<tbody>
     					<?php 
-    					    foreach($keep as $string)
-    					    {
-    					        $this->renderListEntry($string);
-    					    }
-    					?>
+                            foreach($keep as $string)
+                            {
+                                $this->renderListEntry($string);
+                            }
+                        ?>
     				</tbody>
     			</table>
     			<?php 
-        			if($pager->hasPages()) 
-        			{
-        			    $prevUrl = $this->getPaginationURL($pager->getPreviousPage());
-        			    $nextUrl = $this->getPaginationURL($pager->getNextPage());
+                    if($pager->hasPages()) 
+                    {
+                        $prevUrl = $this->getPaginationURL($pager->getPreviousPage());
+                        $nextUrl = $this->getPaginationURL($pager->getNextPage());
         			    
-        			    ?>
+                        ?>
         			    	<nav aria-label="<?php pt('Navigate available pages of texts.') ?>">
                                 <ul class="pagination">
                                     <li class="page-item">
@@ -599,20 +599,20 @@ 
                                 		</a>
                             		</li>
                             		<?php 
-                            		    $numbers = $pager->getPageNumbers();
-                            		    foreach($numbers as $number) 
-                            		    {
-                            		        $url = $this->getPaginationURL($number);
+                                        $numbers = $pager->getPageNumbers();
+                                        foreach($numbers as $number) 
+                                        {
+                                            $url = $this->getPaginationURL($number);
                             		        
-                            		        ?>
+                                            ?>
                             		        	<li class="page-item <?php if($pager->isCurrentPage($number)) { echo 'active'; } ?>">
                             		        		<a class="page-link" href="<?php echo $url ?>">
                             		        			<?php echo $number ?>
                         		        			</a>
                         		        		</li>
                             		        <?php 
-                            		    }
-                            		?>
+                                        }
+                                    ?>
                                     <li class="page-item">
                                     	<a class="page-link" href="<?php echo $nextUrl ?>">
                                     		<i class="fa fa-arrow-right"></i>
@@ -621,8 +621,8 @@ 
                                 </ul>
                             </nav>
         			    <?php 
-        			}
-    			?>
+                    }
+                ?>
 				<br>
 				<p>
 					<button type="submit" name="<?php echo $this->getVarName('save') ?>" value="yes" class="btn btn-primary">
@@ -693,46 +693,46 @@ 
         			<div class="files-list">
             			<p>
             				<?php 
-            				    $totalFiles = count($files);
+                                $totalFiles = count($files);
             				    
-            				    if($totalFiles == 1)
-            				    {
-            				        pt('Found in a single file:');
-            				    }
-            				    else
-            				    {
-            				        pt('Found in %1$s files:', $totalFiles);
-            				    }
-    				        ?>
+                                if($totalFiles == 1)
+                                {
+                                    pt('Found in a single file:');
+                                }
+                                else
+                                {
+                                    pt('Found in %1$s files:', $totalFiles);
+                                }
+                            ?>
             			</p>
         				<div class="files-scroller">
                 			<ul>
                 				<?php 
-                				    $locations = $string->getStrings();
+                                    $locations = $string->getStrings();
                 				    
-                    				foreach($locations as $location) 
-                    				{
-                    				    $file = $location->getSourceFile();
-                    				    $line = $location->getLine();
+                                    foreach($locations as $location) 
+                                    {
+                                        $file = $location->getSourceFile();
+                                        $line = $location->getLine();
                     				    
-                    				    $ext = FileHelper::getExtension($file);
+                                        $ext = FileHelper::getExtension($file);
                     				    
-                    				    if($ext == 'php') {
-                    				        $icon = 'fab fa-php';
-                    				    } else if($ext == 'js') {
-                    				        $icon = 'fab fa-js-square';
-                    				    } else {
-                    				        $icon = 'fas fa-file-code';
-                    				    }
+                                        if($ext == 'php') {
+                                            $icon = 'fab fa-php';
+                                        } else if($ext == 'js') {
+                                            $icon = 'fab fa-js-square';
+                                        } else {
+                                            $icon = 'fas fa-file-code';
+                                        }
                     				    
-                    				    ?>
+                                        ?>
                     				    	<li>
                     				    		<i class="<?php echo $icon ?>"></i>
                     				    		<?php echo $file ?><span class="line-number">:<?php echo $line ?></span>
                     				    	</li>
                     				    <?php 
-                    				}
-                				?>
+                                    }
+                                ?>
                 			</ul>
             			</div>
         			</div>
@@ -949,13 +949,13 @@ 
         );
     }
     
-   /**
-    * Sets the application name shown in the main navigation
-    * in the user interface.
-    * 
-    * @param string $name
-    * @return Localization_Editor
-    */
+    /**
+     * Sets the application name shown in the main navigation
+     * in the user interface.
+     * 
+     * @param string $name
+     * @return Localization_Editor
+     */
     public function setAppName(string $name) : Localization_Editor
     {
         $this->setOption('appname', $name);
@@ -985,15 +985,15 @@ 
         return $this;
     }
     
-   /**
-    * Sets an URL that the translators can use to go back to
-    * the main application, for example if it is integrated into
-    * an existing application.
-    * 
-    * @param string $url The URL to use for the link
-    * @param string $label Label of the link
-    * @return Localization_Editor
-    */
+    /**
+     * Sets an URL that the translators can use to go back to
+     * the main application, for example if it is integrated into
+     * an existing application.
+     * 
+     * @param string $url The URL to use for the link
+     * @param string $label Label of the link
+     * @return Localization_Editor
+     */
     public function setBackURL(string $url, string $label) : Localization_Editor
     {
         $this->setOption('back-url', $url);

Spacing +61 added lines, -61 removed lines

@@ -11,7 +11,7 @@ 
 
 namespace AppLocalize;
 
-use AppLocalize\Editor\OutputBuffering;use AppUtils\ConvertHelper;
+use AppLocalize\Editor\OutputBuffering; use AppUtils\ConvertHelper;
 use AppUtils\PaginationHelper;
 use AppUtils\Traits_Optionable;
 use AppUtils\Interface_Optionable;
@@ -99,7 +99,7 @@ 
     public function __construct()
     {
         $path = realpath(__DIR__.'/../');
-        if($path === false)
+        if ($path === false)
         {
             throw new Localization_Exception(
                 'Local path not found',
@@ -152,11 +152,11 @@ 
     
     protected function initSession() : void
     {
-        if(session_status() != PHP_SESSION_ACTIVE) {
+        if (session_status() != PHP_SESSION_ACTIVE) {
             session_start();
         }
         
-        if(!isset($_SESSION['localization_messages'])) {
+        if (!isset($_SESSION['localization_messages'])) {
             $_SESSION['localization_messages'] = array();
         }
     }
@@ -173,7 +173,7 @@ 
     {
         $this->sources = Localization::getSources();
         
-        if(empty($this->sources)) 
+        if (empty($this->sources)) 
         {
             throw new Localization_Exception(
                 'Cannot start editor: no sources defined.',
@@ -183,7 +183,7 @@ 
         }
         
         $activeID = $this->request->registerParam($this->getVarName('source'))->setEnum(Localization::getSourceIDs())->get();
-        if(empty($activeID)) {
+        if (empty($activeID)) {
             $activeID = $this->getDefaultSourceID();
         }
         
@@ -193,7 +193,7 @@ 
     protected function getDefaultSourceID() : string
     {
         $default = $this->getOption('default-source');
-        if(!empty($default) && Localization::sourceAliasExists($default)) {
+        if (!empty($default) && Localization::sourceAliasExists($default)) {
             return Localization::getSourceByAlias($default)->getID();
         }
         
@@ -205,21 +205,21 @@ 
         $names = array();
         
         $locales = Localization::getAppLocales();
-        foreach($locales as $locale) {
-            if(!$locale->isNative()) {
+        foreach ($locales as $locale) {
+            if (!$locale->isNative()) {
                 $this->appLocales[] = $locale;
                 $names[] = $locale->getName();
             }
         }
         
         // use the default locale if no other is available.
-        if(empty($names)) {
+        if (empty($names)) {
             $this->activeAppLocale = Localization::getAppLocale();
             return;
         }
        
         $activeID = $this->request->registerParam($this->getVarName('locale'))->setEnum($names)->get();
-        if(empty($activeID)) {
+        if (empty($activeID)) {
             $activeID = $this->appLocales[0]->getName();
         }
         
@@ -234,11 +234,11 @@ 
         
         $this->filters = new Localization_Editor_Filters($this);
         
-        if($this->request->getBool($this->getVarName('scan'))) 
+        if ($this->request->getBool($this->getVarName('scan'))) 
         {
             $this->executeScan();
         } 
-        else if($this->request->getBool($this->getVarName('save'))) 
+        else if ($this->request->getBool($this->getVarName('save'))) 
         {
             $this->executeSave();
         }
@@ -285,7 +285,7 @@ 
             </button>
             <div class="collapse navbar-collapse" id="navbarsExampleDefault">
                 <?php 
-                    if(!empty($this->appLocales))
+                    if (!empty($this->appLocales))
                     {
                         ?>
                             <ul class="navbar-nav mr-auto">
@@ -295,12 +295,12 @@ 
                                 	</a>
                                     <div class="dropdown-menu" aria-labelledby="dropdown01">
                                     	<?php 
-                                    	    foreach($this->sources as $source)
+                                    	    foreach ($this->sources as $source)
                                     	    {
                                     	       ?>
                                         			<a class="dropdown-item" href="<?php echo $this->getSourceURL($source) ?>">
                                         				<?php 
-                                            				if($source->getID() === $this->activeSource->getID()) 
+                                            				if ($source->getID() === $this->activeSource->getID()) 
                                             				{
                                             				    ?>
                                             				    	<b><?php echo $source->getLabel() ?></b>
@@ -313,7 +313,7 @@ 
                                         				?>
                                         				<?php
                                         				    $untranslated = $source->countUntranslated($this->scanner);
-                                        				    if($untranslated > 0) {
+                                        				    if ($untranslated > 0) {
                                         				        ?>
                                         				        	(<span class="text-danger" title="<?php ptex('%1$s texts have not been translated in this text source.', 'Amount of texts', $untranslated) ?>"><?php echo $untranslated ?></span>)
                                 				            	<?php 
@@ -331,7 +331,7 @@ 
                                 	</a>
                                     <div class="dropdown-menu" aria-labelledby="dropdown01">
                                     	<?php 
-                                    	    foreach($this->appLocales as $locale)
+                                    	    foreach ($this->appLocales as $locale)
                                     	    {
                                     	       ?>
                                         			<a class="dropdown-item" href="<?php echo $this->getLocaleURL($locale) ?>">
@@ -349,7 +349,7 @@ 
                                     </a>
                     			</li>
                     			<?php 
-                        			if($this->scanner->hasWarnings()) {
+                        			if ($this->scanner->hasWarnings()) {
                         			    ?>
                         			    	<li class="nav-item">
                         			    		<a href="<?php echo $this->getWarningsURL() ?>">
@@ -368,7 +368,7 @@ 
                 ?>
                 <?php 
                     $backURL = $this->getOption('back-url');
-                    if(!empty($backURL)) 
+                    if (!empty($backURL)) 
                     {
                         ?>
                             <a href="<?php echo $backURL ?>" class="btn btn-light btn-sm">
@@ -383,7 +383,7 @@ 
 		<main role="main" class="container">
 			<div>
     			<?php 
-    			    if(empty($this->appLocales))
+    			    if (empty($this->appLocales))
     			    {
     			        ?>
     			        	<div class="alert alert-danger">
@@ -393,7 +393,7 @@ 
     			        	</div>
     			        <?php 
     			    }
-    			    else if($this->request->getBool($this->getVarName('warnings')))
+    			    else if ($this->request->getBool($this->getVarName('warnings')))
     			    {
     			        echo $this->renderWarnings();
     			    }
@@ -402,9 +402,9 @@ 
     			        ?>
             				<h1><?php echo $this->activeSource->getLabel() ?></h1>
             				<?php 
-                				if(!empty($_SESSION['localization_messages'])) 
+                				if (!empty($_SESSION['localization_messages'])) 
                 				{
-                				    foreach($_SESSION['localization_messages'] as $def)
+                				    foreach ($_SESSION['localization_messages'] as $def)
                 				    {
                 				        ?>
                 				        	<div class="alert alert-<?php echo $def['type'] ?>" role="alert">
@@ -433,7 +433,7 @@ 
             				</p>
             				<br>
             				<?php
-                				if(!$this->scanner->isScanAvailable()) 
+                				if (!$this->scanner->isScanAvailable()) 
                 				{
                 				    ?>
                 				    	<div class="alert alert-primary" role="alert">
@@ -480,7 +480,7 @@ 
         		<?php 
         		    $warnings = $this->scanner->getWarnings();
         		    
-        		    foreach($warnings as $warning)
+        		    foreach ($warnings as $warning)
         		    {
         		        ?>
         		        	<dt><?php echo FileHelper::relativizePathByDepth($warning->getFile(), 3) ?>:<?php echo $warning->getLine() ?></dt>
@@ -504,9 +504,9 @@ 
         
         $result = array();
         
-        foreach($strings as $string)
+        foreach ($strings as $string)
         {
-            if($this->filters->isStringMatch($string)) {
+            if ($this->filters->isStringMatch($string)) {
                 $result[] = $string;
             }
         }
@@ -537,7 +537,7 @@ 
     {
         $strings = $this->getFilteredStrings();
         
-        if(empty($strings))
+        if (empty($strings))
         {
             ?>
             	<div class="alert alert-info">
@@ -559,7 +559,7 @@ 
 				<div class="form-hiddens">
 					<?php 
     					$params = $this->getRequestParams();
-    					foreach($params as $name => $value) {
+    					foreach ($params as $name => $value) {
     					    ?>
     					    	<input type="hidden" name="<?php echo $name ?>" value="<?php echo $value ?>">
     					    <?php 
@@ -577,7 +577,7 @@ 
     				</thead>
     				<tbody>
     					<?php 
-    					    foreach($keep as $string)
+    					    foreach ($keep as $string)
     					    {
     					        $this->renderListEntry($string);
     					    }
@@ -585,7 +585,7 @@ 
     				</tbody>
     			</table>
     			<?php 
-        			if($pager->hasPages()) 
+        			if ($pager->hasPages()) 
         			{
         			    $prevUrl = $this->getPaginationURL($pager->getPreviousPage());
         			    $nextUrl = $this->getPaginationURL($pager->getNextPage());
@@ -600,12 +600,12 @@ 
                             		</li>
                             		<?php 
                             		    $numbers = $pager->getPageNumbers();
-                            		    foreach($numbers as $number) 
+                            		    foreach ($numbers as $number) 
                             		    {
                             		        $url = $this->getPaginationURL($number);
                             		        
                             		        ?>
-                            		        	<li class="page-item <?php if($pager->isCurrentPage($number)) { echo 'active'; } ?>">
+                            		        	<li class="page-item <?php if ($pager->isCurrentPage($number)) { echo 'active'; } ?>">
                             		        		<a class="page-link" href="<?php echo $url ?>">
                             		        			<?php echo $number ?>
                         		        			</a>
@@ -635,7 +635,7 @@ 
         <?php 
     }
     
-    protected function getPaginationURL(int $page, array $params=array()) : string
+    protected function getPaginationURL(int $page, array $params = array()) : string
     {
         $params[$this->getVarName('page')] = $page;
         
@@ -648,11 +648,11 @@ 
         $text = $string->getText();
         
         $previewText = $string->getTranslatedText();
-        if(empty($previewText)) {
+        if (empty($previewText)) {
             $previewText = $text->getText();
         }
         
-        $shortText =  $this->renderText($previewText, 50);
+        $shortText = $this->renderText($previewText, 50);
         
         $files = $string->getFiles();
         
@@ -672,7 +672,7 @@ 
         			</p>
                     <?php
                         $explanation = $text->getExplanation();
-                        if(!empty($explanation))
+                        if (!empty($explanation))
                         {
                             ?>
                             <p>
@@ -695,7 +695,7 @@ 
             				<?php 
             				    $totalFiles = count($files);
             				    
-            				    if($totalFiles == 1)
+            				    if ($totalFiles == 1)
             				    {
             				        pt('Found in a single file:');
             				    }
@@ -710,16 +710,16 @@ 
                 				<?php 
                 				    $locations = $string->getStrings();
                 				    
-                    				foreach($locations as $location) 
+                    				foreach ($locations as $location) 
                     				{
                     				    $file = $location->getSourceFile();
                     				    $line = $location->getLine();
                     				    
                     				    $ext = FileHelper::getExtension($file);
                     				    
-                    				    if($ext == 'php') {
+                    				    if ($ext == 'php') {
                     				        $icon = 'fab fa-php';
-                    				    } else if($ext == 'js') {
+                    				    } else if ($ext == 'js') {
                     				        $icon = 'fab fa-js-square';
                     				    } else {
                     				        $icon = 'fas fa-file-code';
@@ -741,13 +741,13 @@ 
         <?php 
     }
     
-    protected function renderText(string $text, int $cutAt=0) : string
+    protected function renderText(string $text, int $cutAt = 0) : string
     {
-        if(empty($text)) {
+        if (empty($text)) {
             return '';
         }
 
-        if($cutAt > 0) {
+        if ($cutAt > 0) {
             $text = ConvertHelper::text_cut($text, $cutAt);
         }
 
@@ -755,7 +755,7 @@ 
         
         $vars = $this->detectVariables($text);
         
-        foreach($vars as $var) {
+        foreach ($vars as $var) {
             $text = str_replace($var, '<span class="placeholder">'.$var.'</span>', $text);
         }
         
@@ -767,7 +767,7 @@ 
         $result = array();
         preg_match_all('/%[0-9]+d|%s|%[0-9]+\$s/i', $string, $result, PREG_PATTERN_ORDER);
 
-        if(isset($result[0]) && !empty($result[0])) {
+        if (isset($result[0]) && !empty($result[0])) {
             return $result[0];
         }
         
@@ -783,10 +783,10 @@ 
         
         // add a counter of the additional files if the total
         // is higher than the maximum to show
-        if($total > $max) 
+        if ($total > $max) 
         {
             $length = $max;
-            if($length > $keepTotal) {
+            if ($length > $keepTotal) {
                 $length = $keepTotal; 
             }
             
@@ -814,14 +814,14 @@ 
         return FileHelper::readContents($this->installPath.'/css/editor.css');
     }
     
-    public function getSourceURL(Localization_Source $source, array $params=array()) : string
+    public function getSourceURL(Localization_Source $source, array $params = array()) : string
     {
         $params[$this->getVarName('source')] = $source->getID();
         
         return $this->getURL($params);
     }
     
-    public function getLocaleURL(Localization_Locale $locale, array $params=array()) : string
+    public function getLocaleURL(Localization_Locale $locale, array $params = array()) : string
     {
         $params[$this->getVarName('locale')] = $locale->getName();
         
@@ -838,12 +838,12 @@ 
         return $this->getSourceURL($this->activeSource, array($this->getVarName('warnings') => 'yes'));
     }
     
-    public function getURL(array $params=array()) : string
+    public function getURL(array $params = array()) : string
     {
         $persist = $this->getRequestParams();
         
-        foreach($persist as $name => $value) {
-            if(!isset($params[$name])) {
+        foreach ($persist as $name => $value) {
+            if (!isset($params[$name])) {
                 $params[$name] = $value;
             }
         }
@@ -880,11 +880,11 @@ 
         $translator = Localization::getTranslator($this->activeAppLocale);
         
         $strings = $data[$this->getVarName('strings')];
-        foreach($strings as $hash => $text) 
+        foreach ($strings as $hash => $text) 
         {
             $text = trim($text);
             
-            if(empty($text)) {
+            if (empty($text)) {
                 continue;
             } 
             
@@ -906,7 +906,7 @@ 
     
     protected function renderStatus(Localization_Scanner_StringHash $hash) : string
     {
-        if($hash->isTranslated()) {
+        if ($hash->isTranslated()) {
             return '<i class="fa fa-check text-success"></i>';
         }        
         
@@ -917,18 +917,18 @@ 
     {
         $types = array();
         
-        if($hash->hasLanguageType('PHP')) {
+        if ($hash->hasLanguageType('PHP')) {
             $types[] = t('Server');
         }
         
-        if($hash->hasLanguageType('Javascript')) {
+        if ($hash->hasLanguageType('Javascript')) {
             $types[] = t('Client');
         }
         
         return implode(', ', $types);
     }
     
-    protected function addMessage(string $message, string $type=self::MESSAGE_INFO) : void
+    protected function addMessage(string $message, string $type = self::MESSAGE_INFO) : void
     {
         $_SESSION['localization_messages'][] = array(
             'text' => $message,
@@ -965,7 +965,7 @@ 
     public function getAppName() : string
     {
         $name = $this->getOption('appname');
-        if(!empty($name)) {
+        if (!empty($name)) {
             return $name;
         }
         

Braces +6 added lines, -12 removed lines

@@ -237,8 +237,7 @@ 
         if($this->request->getBool($this->getVarName('scan'))) 
         {
             $this->executeScan();
-        } 
-        else if($this->request->getBool($this->getVarName('save'))) 
+        } else if($this->request->getBool($this->getVarName('save'))) 
         {
             $this->executeSave();
         }
@@ -305,8 +304,7 @@ 
                                             				    ?>
                                             				    	<b><?php echo $source->getLabel() ?></b>
                                         				    	<?php 
-                                            				}
-                                            				else
+                                            				} else
                                             				{
                                             				    echo $source->getLabel();
                                             				}
@@ -392,12 +390,10 @@ 
     			        		<?php pt('No application locales were added to translate to.') ?>
     			        	</div>
     			        <?php 
-    			    }
-    			    else if($this->request->getBool($this->getVarName('warnings')))
+    			    } else if($this->request->getBool($this->getVarName('warnings')))
     			    {
     			        echo $this->renderWarnings();
-    			    }
-    			    else
+    			    } else
     			    {
     			        ?>
             				<h1><?php echo $this->activeSource->getLabel() ?></h1>
@@ -447,8 +443,7 @@ 
                                             </a>
                                         </p>
                 				    <?php 
-                				}
-                				else
+                				} else
                 				{
                 				    echo $this->filters->renderForm();
 
@@ -698,8 +693,7 @@ 
             				    if($totalFiles == 1)
             				    {
             				        pt('Found in a single file:');
-            				    }
-            				    else
+            				    } else
             				    {
             				        pt('Found in %1$s files:', $totalFiles);
             				    }