Mistralys / application-localization

src/Localization/Parser/Language.php

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         try
         {
             $this->content = FileHelper::readContents($path);
-        }
-        catch (FileHelper_Exception $e)
+        } catch (FileHelper_Exception $e)
         {
             throw new Localization_Exception(
                 sprintf('Source code file [%s] could not be read', basename($path)),

Indentation +79 added lines, -79 removed lines

@@ -23,49 +23,49 @@ 
      */
     protected $parser;
 
-   /**
-    * The function names that are included in the search.
-    * @var array
-    */
+    /**
+     * The function names that are included in the search.
+     * @var array
+     */
     protected $functionNames = array();
     
-   /**
-    * The tokens definitions.
-    * @var array
-    */
+    /**
+     * The tokens definitions.
+     * @var array
+     */
     protected $tokens = array();
     
-   /**
-    * The total amount of tokens found in the content.
-    * @var integer
-    */
+    /**
+     * The total amount of tokens found in the content.
+     * @var integer
+     */
     protected $totalTokens = 0;
     
-   /**
-    * All texts that have been collected.
-    * @var Text[]
-    */
+    /**
+     * All texts that have been collected.
+     * @var Text[]
+     */
     protected $texts = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $content = '';
 
-   /**
-    * @var string|NULL
-    */
+    /**
+     * @var string|NULL
+     */
     protected $id;
     
-   /**
-    * @var Localization_Parser_Warning[]
-    */
+    /**
+     * @var Localization_Parser_Warning[]
+     */
     protected $warnings = array();
     
-   /**
-    * The source file that was parsed (if any)
-    * @var string
-    */
+    /**
+     * The source file that was parsed (if any)
+     * @var string
+     */
     protected $sourceFile = '';
 
     /**
@@ -91,10 +91,10 @@ 
     
     abstract protected function getTokens() : array;
     
-   /**
-    * Retrieves the ID of the language.
-    * @return string E.g. "PHP", "Javascript"
-    */
+    /**
+     * Retrieves the ID of the language.
+     * @return string E.g. "PHP", "Javascript"
+     */
     public function getID() : string
     {
         if(!isset($this->id)) {
@@ -114,12 +114,12 @@ 
         return $this->sourceFile;
     }
     
-   /**
-    * Parses the code from a file.
-    * 
-    * @param string $path
-    * @throws Localization_Exception
-    */
+    /**
+     * Parses the code from a file.
+     * 
+     * @param string $path
+     * @throws Localization_Exception
+     */
     public function parseFile(string $path) : void
     {
         if(!file_exists($path)) 
@@ -156,10 +156,10 @@ 
         $this->parse();
     }
     
-   /**
-    * Parses a source code string.
-    * @param string $content
-    */
+    /**
+     * Parses a source code string.
+     * @param string $content
+     */
     public function parseString(string $content) : void
     {
         $this->content = $content;
@@ -214,11 +214,11 @@ 
         $this->texts[] = new Text($text, $line, $explanation);
     }
 
-   /**
-    * Retrieves a list of all the function names that are
-    * used as translation functions in the language.
-    * @return array
-    */
+    /**
+     * Retrieves a list of all the function names that are
+     * used as translation functions in the language.
+     * @return array
+     */
     public function getFunctionNames() : array
     {
         return $this->createToken('dummy')->getFunctionNames();
@@ -229,13 +229,13 @@ 
         Localization::log(sprintf('%1$s parser | %2$s', $this->getID(), $message));
     }
 
-   /**
-    * Adds a warning message when a text cannot be parsed correctly for some reason.
-    * 
-    * @param Localization_Parser_Token $token
-    * @param string $message
-    * @return Localization_Parser_Warning
-    */
+    /**
+     * Adds a warning message when a text cannot be parsed correctly for some reason.
+     * 
+     * @param Localization_Parser_Token $token
+     * @param string $message
+     * @return Localization_Parser_Warning
+     */
     protected function addWarning(Localization_Parser_Token $token, string $message) : Localization_Parser_Warning
     {
         $warning = new Localization_Parser_Warning($this, $token, $message);
@@ -245,34 +245,34 @@ 
         return $warning;
     }
     
-   /**
-    * Whether any warnings were generated during parsing.
-    * @return bool
-    */
+    /**
+     * Whether any warnings were generated during parsing.
+     * @return bool
+     */
     public function hasWarnings() : bool
     {
         return !empty($this->warnings);
     }
     
-   /**
-    * Retrieves all warnings that were generated during parsing,
-    * if any.
-    * 
-    * @return Localization_Parser_Warning[]
-    */
+    /**
+     * Retrieves all warnings that were generated during parsing,
+     * if any.
+     * 
+     * @return Localization_Parser_Warning[]
+     */
     public function getWarnings() : array
     {
         return $this->warnings;
     }
     
-   /**
-    * Creates a token instance: this retrieves information on
-    * the language token being parsed.
-    * 
-    * @param array|string $definition The token definition.
-    * @param Localization_Parser_Token|NULL $parentToken
-    * @return Localization_Parser_Token
-    */
+    /**
+     * Creates a token instance: this retrieves information on
+     * the language token being parsed.
+     * 
+     * @param array|string $definition The token definition.
+     * @param Localization_Parser_Token|NULL $parentToken
+     * @return Localization_Parser_Token
+     */
     protected function createToken($definition, Localization_Parser_Token $parentToken=null) : Localization_Parser_Token
     {
         $class = Localization_Parser_Token::class.'_'.$this->getID();
@@ -280,12 +280,12 @@ 
         return new $class($definition, $parentToken);
     }
 
-   /**
-    * Parses a translation function token.
-    * 
-    * @param int $number
-    * @param Localization_Parser_Token $token
-    */
+    /**
+     * Parses a translation function token.
+     * 
+     * @param int $number
+     * @param Localization_Parser_Token $token
+     */
     protected function parseToken(int $number, Localization_Parser_Token $token) : void
     {
         $textParts = array();

Spacing +25 added lines, -25 removed lines

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

src/Localization/Event/LocaleChanged.php

Indentation +15 added lines, -15 removed lines

@@ -25,9 +25,9 @@ 
     const ERROR_NO_CURRENT_LOCALE_SPECIFIED = 91401;
 
     /**
-    * The locale that was used before the change, if any.
-    * @return Localization_Locale|NULL
-    */
+     * The locale that was used before the change, if any.
+     * @return Localization_Locale|NULL
+     */
     public function getPrevious() : ?Localization_Locale
     {
         $arg = $this->getArgument(1);
@@ -59,28 +59,28 @@ 
         );
     }
     
-   /**
-    * The namespace in which the locale change occurred.
-    * @return string
-    */
+    /**
+     * The namespace in which the locale change occurred.
+     * @return string
+     */
     public function getNamespace() : string
     {
         return strval($this->getArgument(0));
     }
 
-   /**
-    * Whether the change occurred for an application locale.
-    * @return bool
-    */
+    /**
+     * Whether the change occurred for an application locale.
+     * @return bool
+     */
     public function isAppLocale() : bool
     {
         return $this->getNamespace() === Localization::NAMESPACE_APPLICATION;
     }
     
-   /**
-    * Whether the change occurred for a content locale.
-    * @return bool
-    */
+    /**
+     * Whether the change occurred for a content locale.
+     * @return bool
+     */
     public function isContentLocale() : bool
     {
         return $this->getNamespace() === Localization::NAMESPACE_CONTENT;

Spacing +2 added lines, -2 removed lines

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

src/Localization/Scanner.php

Indentation +18 added lines, -18 removed lines

@@ -24,24 +24,24 @@ 
  */
 class Localization_Scanner
 {
-   /**
-    * @var float
-    */
+    /**
+     * @var float
+     */
     protected $timeStart;
     
-   /**
-    * @var float
-    */
+    /**
+     * @var float
+     */
     protected $timeEnd;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $stringInfos = array();
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $storageFile;
 
     /**
@@ -172,12 +172,12 @@ 
         return $this->getCollection()->countWarnings();
     }
     
-   /**
-    * Retrieves all warnings that have been registered
-    * during the last search for translatable texts.
-    * 
-    * @return Localization_Scanner_StringsCollection_Warning[]
-    */
+    /**
+     * Retrieves all warnings that have been registered
+     * during the last search for translatable texts.
+     * 
+     * @return Localization_Scanner_StringsCollection_Warning[]
+     */
     public function getWarnings() : array
     {
         return $this->getCollection()->getWarnings();

Spacing +7 added lines, -7 removed lines

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

src/Localization/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/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/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.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);
             				    }

src/Localization.php

Indentation +227 added lines, -227 removed lines

@@ -53,11 +53,11 @@ 
     const EVENT_LOCALE_CHANGED = 'LocaleChanged';
 
     /**
-    * Collection of all locales by namespace (application, content, custom...). 
-    *
-    * @var array<string,array<string,Localization_Locale>>
-    * @see Localization::addLocale()
-    */
+     * Collection of all locales by namespace (application, content, custom...). 
+     *
+     * @var array<string,array<string,Localization_Locale>>
+     * @see Localization::addLocale()
+     */
     protected static $locales = array();
 
     /**
@@ -66,57 +66,57 @@ 
      */
     private static $initDone = false;
 
-   /**
-    * Path to the file in which the scanner results are stored.
-    * @var string
-    * @see Localization::configure()
-    */
+    /**
+     * Path to the file in which the scanner results are stored.
+     * @var string
+     * @see Localization::configure()
+     */
     protected static $storageFile = '';
     
-   /**
-    * Path to the folder into which the client libraries are written.
-    * @var string
-    * @see Localization::setClientLibrariesFolder()
-    */
+    /**
+     * Path to the folder into which the client libraries are written.
+     * @var string
+     * @see Localization::setClientLibrariesFolder()
+     */
     protected static $clientFolder = '';
     
-   /**
-    * If this key changes, client libraries are refreshed.
-    * @var string
-    * @see Localization::setClientLibrariesCacheKey()
-    */
+    /**
+     * If this key changes, client libraries are refreshed.
+     * @var string
+     * @see Localization::setClientLibrariesCacheKey()
+     */
     protected static $clientCacheKey = '';
     
-   /**
-    * Whether the configuration has been made.
-    * @var bool
-    * @see Localization::configure()
-    */
+    /**
+     * Whether the configuration has been made.
+     * @var bool
+     * @see Localization::configure()
+     */
     protected static $configured = false;
     
-   /**
-    * Stores event listener instances.
-    * @var array
-    */
+    /**
+     * Stores event listener instances.
+     * @var array
+     */
     protected static $listeners = array();
     
-   /**
-    * @var integer
-    * @see Localization::addEventListener()
-    */
+    /**
+     * @var integer
+     * @see Localization::addEventListener()
+     */
     protected static $listenersCounter = 0;
     
-   /**
-    * @var Localization_Translator|NULL
-    */
+    /**
+     * @var Localization_Translator|NULL
+     */
     protected static $translator;
     
-   /**
-    * Initializes the localization layer. This is done
-    * automatically, and only once per request.
-    * 
-    * (Called at the end of this file)
-    */
+    /**
+     * Initializes the localization layer. This is done
+     * automatically, and only once per request.
+     * 
+     * (Called at the end of this file)
+     */
     public static function init() : void
     {
         if(self::$initDone) {
@@ -155,12 +155,12 @@ 
         return self::getLocalesByNS(self::NAMESPACE_APPLICATION);
     }
     
-   /**
-    * Retrieves all locales in the specified namespace.
-    * 
-    * @param string $namespace
-    * @return Localization_Locale[]
-    */
+    /**
+     * Retrieves all locales in the specified namespace.
+     * 
+     * @param string $namespace
+     * @return Localization_Locale[]
+     */
     public static function getLocalesByNS(string $namespace)
     {
         if(isset(self::$locales[$namespace])) {
@@ -177,35 +177,35 @@ 
         );
     }
     
-   /**
-    * Adds an application locale to use in the application.
-    * 
-    * @param string $localeName
-    * @return Localization_Locale
-    */
+    /**
+     * Adds an application locale to use in the application.
+     * 
+     * @param string $localeName
+     * @return Localization_Locale
+     */
     public static function addAppLocale(string $localeName) : Localization_Locale
     {
         return self::addLocaleByNS($localeName, self::NAMESPACE_APPLICATION);
     }
     
-   /**
-    * Adds a content locale to use for content in the application.
-    * 
-    * @param string $localeName
-    * @return Localization_Locale
-    */
+    /**
+     * Adds a content locale to use for content in the application.
+     * 
+     * @param string $localeName
+     * @return Localization_Locale
+     */
     public static function addContentLocale(string $localeName) : Localization_Locale
     {
         return self::addLocaleByNS($localeName, self::NAMESPACE_CONTENT);
     }
     
-   /**
-    * Adds a locale to the specified namespace.
-    * 
-    * @param string $localeName
-    * @param string $namespace
-    * @return Localization_Locale
-    */
+    /**
+     * Adds a locale to the specified namespace.
+     * 
+     * @param string $localeName
+     * @param string $namespace
+     * @return Localization_Locale
+     */
     public static function addLocaleByNS(string $localeName, string $namespace) : Localization_Locale
     {
         if(!isset(self::$locales[$namespace])) {
@@ -343,45 +343,45 @@ 
         return self::getSelectedLocaleByNS(self::NAMESPACE_APPLICATION);
     }
     
-   /**
-    * Retrieves the name of the selected application locale.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the name of the selected application locale.
+     * 
+     * @return string
+     */
     public static function getAppLocaleName() : string
     {
         return self::getLocaleNameByNS(self::NAMESPACE_APPLICATION);
     }
     
-   /**
-    * Retrieves the names of the available application locales.
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of the available application locales.
+     * @return string[]
+     */
     public static function getAppLocaleNames() : array
     {
         return self::getLocaleNamesByNS(self::NAMESPACE_APPLICATION);
     }
     
-   /**
-    * Retrieves the selected locale name in the specified namespace.
-    * 
-    * @param string $namespace
-    * @throws Localization_Exception
-    * @return string
-    */
+    /**
+     * Retrieves the selected locale name in the specified namespace.
+     * 
+     * @param string $namespace
+     * @throws Localization_Exception
+     * @return string
+     */
     public static function getLocaleNameByNS(string $namespace) : string
     {
         return self::getSelectedLocaleByNS($namespace)->getName();
     }
     
-   /**
-    * Retrieves the selected locale instance for the specified namespace.
-    * 
-    * @param string $namespace
-    * @return Localization_Locale
-    * @throws Localization_Exception
-    * @see Localization::ERROR_NO_LOCALE_SELECTED_IN_NS
-    */
+    /**
+     * Retrieves the selected locale instance for the specified namespace.
+     * 
+     * @param string $namespace
+     * @return Localization_Locale
+     * @throws Localization_Exception
+     * @see Localization::ERROR_NO_LOCALE_SELECTED_IN_NS
+     */
     public static function getSelectedLocaleByNS(string $namespace) : Localization_Locale
     {
         self::requireNamespace($namespace);
@@ -400,24 +400,24 @@ 
         );
     }
     
-   /**
-    * Stores the selected locale names by namespace.
-    * @var array<string,Localization_Locale>
-    */
+    /**
+     * Stores the selected locale names by namespace.
+     * @var array<string,Localization_Locale>
+     */
     protected static $selected = array();
 
-   /**
-    * Selects the active locale for the specified namespace.
-    *
-    * NOTE: Triggers the "LocaleChanged" event.
-    * 
-    * @param string $localeName
-    * @param string $namespace
-    * @return Localization_Locale
-    * @throws Localization_Exception
-    *
-    * @see Localization_Event_LocaleChanged
-    */
+    /**
+     * Selects the active locale for the specified namespace.
+     *
+     * NOTE: Triggers the "LocaleChanged" event.
+     * 
+     * @param string $localeName
+     * @param string $namespace
+     * @return Localization_Locale
+     * @throws Localization_Exception
+     *
+     * @see Localization_Event_LocaleChanged
+     */
     public static function selectLocaleByNS(string $localeName, string $namespace) : Localization_Locale
     {
         self::requireNamespace($namespace);
@@ -548,15 +548,15 @@ 
         return self::selectLocaleByNS($localeName, self::NAMESPACE_APPLICATION);
     }
 
-   /**
-    * Retrieves an application locale by its name. 
-    * Note that the locale must have been added first.
-    * 
-    * @param string $localeName
-    * @throws Localization_Exception
-    * @return Localization_Locale
-    * @see Localization::appLocaleExists()
-    */
+    /**
+     * Retrieves an application locale by its name. 
+     * Note that the locale must have been added first.
+     * 
+     * @param string $localeName
+     * @throws Localization_Exception
+     * @return Localization_Locale
+     * @see Localization::appLocaleExists()
+     */
     public static function getAppLocaleByName(string $localeName) : Localization_Locale
     {
         return self::getLocaleByNameNS($localeName, self::NAMESPACE_APPLICATION);
@@ -591,10 +591,10 @@ 
         return self::getLocalesByNS(self::NAMESPACE_CONTENT);
     }
     
-   /**
-    * Retrieves the names of all content locales that have been added.
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of all content locales that have been added.
+     * @return string[]
+     */
     public static function getContentLocaleNames()
     {
         return self::getLocaleNamesByNS(self::NAMESPACE_CONTENT);
@@ -617,7 +617,7 @@ 
         sort($names);
         
         return $names;
-     }
+        }
     
     /**
      * Checks by the locale name if the specified locale is
@@ -646,14 +646,14 @@ 
         return self::getLocaleByNameNS($localeName, self::NAMESPACE_CONTENT);
     }
     
-   /**
-    * Retrieves a locale by its name in the specified namespace.
-    * 
-    * @param string $localeName
-    * @param string $namespace
-    * @throws Localization_Exception
-    * @return Localization_Locale
-    */
+    /**
+     * Retrieves a locale by its name in the specified namespace.
+     * 
+     * @param string $localeName
+     * @param string $namespace
+     * @throws Localization_Exception
+     * @return Localization_Locale
+     */
     public static function getLocaleByNameNS(string $localeName, string $namespace) : Localization_Locale
     {
         self::requireNamespace($namespace);
@@ -724,10 +724,10 @@ 
         return self::selectLocaleByNS($localeName, self::NAMESPACE_CONTENT);
     }
     
-   /**
-    * Checks whether the localization has been configured entirely.
-    * @return bool
-    */
+    /**
+     * Checks whether the localization has been configured entirely.
+     * @return bool
+     */
     public static function isConfigured() : bool
     {
         return self::$configured;
@@ -799,29 +799,29 @@ 
         );
     }
     
-   /**
-    * Injects a content locales selector element into the specified
-    * HTML QuickForm2 container.
-    * 
-    * @param string $elementName
-    * @param HTML_QuickForm2_Container $container
-    * @param string $label
-    * @return HTML_QuickForm2_Element_Select
-    */
+    /**
+     * Injects a content locales selector element into the specified
+     * HTML QuickForm2 container.
+     * 
+     * @param string $elementName
+     * @param HTML_QuickForm2_Container $container
+     * @param string $label
+     * @return HTML_QuickForm2_Element_Select
+     */
     public static function injectContentLocalesSelector(string $elementName, HTML_QuickForm2_Container $container, string $label='') : HTML_QuickForm2_Element_Select
     {
         return self::injectLocalesSelectorNS($elementName, self::NAMESPACE_CONTENT, $container, $label);
     }
     
-   /**
-    * Injects an app locales selector element into the specified
+    /**
+     * Injects an app locales selector element into the specified
      * HTML QuickForm2 container.
      * 
-    * @param string $elementName
-    * @param HTML_QuickForm2_Container $container
-    * @param string $label
-    * @return HTML_QuickForm2_Element_Select
-    */
+     * @param string $elementName
+     * @param HTML_QuickForm2_Container $container
+     * @param string $label
+     * @return HTML_QuickForm2_Element_Select
+     */
     public static function injectAppLocalesSelector(string $elementName, HTML_QuickForm2_Container $container, string $label='') : HTML_QuickForm2_Element_Select
     {
         return self::injectLocalesSelectorNS($elementName, self::NAMESPACE_APPLICATION, $container, $label);
@@ -857,26 +857,26 @@ 
         return $select;
     }
 
-   /**
-    * @var Localization_Source[]
-    */
+    /**
+     * @var Localization_Source[]
+     */
     protected static $sources = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $excludeFolders = array();
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected static $excludeFiles = array();
     
-   /**
-    * Retrieves all currently available sources.
-    * 
-    * @return Localization_Source[]
-    */
+    /**
+     * Retrieves all currently available sources.
+     * 
+     * @return Localization_Source[]
+     */
     public static function getSources() : array
     {
         return self::$sources;
@@ -908,10 +908,10 @@ 
         return $source;
     }
     
-   /**
-    * Retrieves all sources grouped by their group name.
-    * @return array
-    */
+    /**
+     * Retrieves all sources grouped by their group name.
+     * @return array
+     */
     public static function getSourcesGrouped()
     {
         $sources = self::getSources();
@@ -932,11 +932,11 @@ 
         return $grouped;
     }
     
-   /**
-    * Checks whether a specific source exists by its ID.
-    * @param string $sourceID
-    * @return boolean
-    */
+    /**
+     * Checks whether a specific source exists by its ID.
+     * @param string $sourceID
+     * @return boolean
+     */
     public static function sourceExists(string $sourceID) : bool
     {
         $sources = self::getSources();
@@ -949,11 +949,11 @@ 
         return false;
     }
     
-   /**
-    * Checks whether a specific source exists by its alias.
-    * @param string $sourceAlias
-    * @return boolean
-    */
+    /**
+     * Checks whether a specific source exists by its alias.
+     * @param string $sourceAlias
+     * @return boolean
+     */
     public static function sourceAliasExists(string $sourceAlias) : bool
     {
         $sources = self::getSources();
@@ -966,13 +966,13 @@ 
         return false;
     }
 
-   /**
-    * Retrieves a localization source by its ID.
-    * 
-    * @param string $sourceID
-    * @throws Localization_Exception
-    * @return Localization_Source
-    */
+    /**
+     * Retrieves a localization source by its ID.
+     * 
+     * @param string $sourceID
+     * @throws Localization_Exception
+     * @return Localization_Source
+     */
     public static function getSourceByID(string $sourceID) : Localization_Source
     {
         $sources = self::getSources();
@@ -1062,17 +1062,17 @@ 
         }
     }
     
-   /**
-    * Sets a key that is used to verify whether the client
-    * libraries have to be refreshed. A common use is to set
-    * this to the application's version number to guarantee
-    * new texts are automatically used with each release.
-    * 
-    * NOTE: Otherwise files are refreshed only when saving 
-    * them in the editor UI.
-    *  
-    * @param string $key
-    */
+    /**
+     * Sets a key that is used to verify whether the client
+     * libraries have to be refreshed. A common use is to set
+     * this to the application's version number to guarantee
+     * new texts are automatically used with each release.
+     * 
+     * NOTE: Otherwise files are refreshed only when saving 
+     * them in the editor UI.
+     *  
+     * @param string $key
+     */
     public static function setClientLibrariesCacheKey(string $key) : void
     {
         self::$clientCacheKey = $key;
@@ -1083,23 +1083,23 @@ 
         return self::$clientCacheKey;
     }
     
-   /**
-    * Sets the folder where client libraries are to be stored.
-    * @param string $folder
-    */
+    /**
+     * Sets the folder where client libraries are to be stored.
+     * @param string $folder
+     */
     public static function setClientLibrariesFolder(string $folder) : void
     {
         self::$clientFolder = $folder;
     }
     
-   /**
-    * Retrieves the path to the folder in which the client
-    * libraries should be stored.
-    * 
-    * NOTE: Can return an empty string, when this is disabled.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the path to the folder in which the client
+     * libraries should be stored.
+     * 
+     * NOTE: Can return an empty string, when this is disabled.
+     * 
+     * @return string
+     */
     public static function getClientLibrariesFolder() : string
     {
         return self::$clientFolder;
@@ -1119,13 +1119,13 @@ 
         self::createGenerator()->writeFiles($force);
     }
     
-   /**
-    * Creates a new instance of the client generator class
-    * that is used to write the localization files into the
-    * target folder on disk.
-    * 
-    * @return Localization_ClientGenerator
-    */
+    /**
+     * Creates a new instance of the client generator class
+     * that is used to write the localization files into the
+     * target folder on disk.
+     * 
+     * @return Localization_ClientGenerator
+     */
     public static function createGenerator() : Localization_ClientGenerator
     {
         return new Localization_ClientGenerator();
@@ -1190,10 +1190,10 @@ 
         return new Localization_Editor();
     }
     
-   /**
-    * Retrieves a list of all available source IDs.
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all available source IDs.
+     * @return string[]
+     */
     public static function getSourceIDs() : array
     {
         $ids = array();
@@ -1220,9 +1220,9 @@ 
         return $aliases;
     }
     
-   /**
-    * Resets all locales to the built-in locale.
-    */
+    /**
+     * Resets all locales to the built-in locale.
+     */
     public static function reset() : void
     {
         self::$locales = array();
@@ -1260,12 +1260,12 @@ 
         return self::$supportedLocales;
     }
     
-   /**
-    * Checks whether the specified locale is supported.
-    * 
-    * @param string $localeName
-    * @return bool
-    */
+    /**
+     * Checks whether the specified locale is supported.
+     * 
+     * @param string $localeName
+     * @return bool
+     */
     public static function isLocaleSupported(string $localeName) : bool
     {
         return file_exists(__DIR__.'/Localization/Locale/'.$localeName.'.php');

Spacing +47 added lines, -47 removed lines

@@ -119,7 +119,7 @@ 
     */
     public static function init() : void
     {
-        if(self::$initDone) {
+        if (self::$initDone) {
             return;
         }
 
@@ -163,7 +163,7 @@ 
     */
     public static function getLocalesByNS(string $namespace)
     {
-        if(isset(self::$locales[$namespace])) {
+        if (isset(self::$locales[$namespace])) {
             return array_values(self::$locales[$namespace]);
         }
         
@@ -208,11 +208,11 @@ 
     */
     public static function addLocaleByNS(string $localeName, string $namespace) : Localization_Locale
     {
-        if(!isset(self::$locales[$namespace])) {
+        if (!isset(self::$locales[$namespace])) {
             self::$locales[$namespace] = array();
         }
         
-        if(!isset(self::$locales[$namespace][$localeName])) 
+        if (!isset(self::$locales[$namespace][$localeName])) 
         {
             self::$locales[$namespace][$localeName] = self::createLocale($localeName);
             
@@ -274,11 +274,11 @@ 
      */
     public static function createCountry(string $id) : Localization_Country
     {
-        $className = Localization_Country::class.'_' . strtoupper($id);
+        $className = Localization_Country::class.'_'.strtoupper($id);
 
         $country = new $className();
 
-        if($country instanceof Localization_Country)
+        if ($country instanceof Localization_Country)
         {
             return $country;
         }
@@ -386,7 +386,7 @@ 
     {
         self::requireNamespace($namespace);
         
-        if(isset(self::$selected[$namespace])) {
+        if (isset(self::$selected[$namespace])) {
             return self::$selected[$namespace];
         }
         
@@ -425,9 +425,9 @@ 
         $locale = self::addLocaleByNS($localeName, $namespace);
         $previous = null;
         
-        if(isset(self::$selected[$namespace])) 
+        if (isset(self::$selected[$namespace])) 
         {
-            if(self::$selected[$namespace]->getName() === $localeName) {
+            if (self::$selected[$namespace]->getName() === $localeName) {
                 return $locale;
             }
             
@@ -463,11 +463,11 @@ 
         $class = Localization_Event::class.'_'.$name;
         $event = new $class($argsList);
         
-        if(!isset(self::$listeners[$name])) {
+        if (!isset(self::$listeners[$name])) {
             return $event;
         }
         
-        foreach(self::$listeners[$name] as $listener) 
+        foreach (self::$listeners[$name] as $listener) 
         {
             $callArgs = $listener['args'];
             array_unshift($callArgs, $event);
@@ -489,15 +489,15 @@ 
      * @throws Localization_Exception
      * @see Localization::ERROR_UNKNOWN_EVENT_NAME
      */
-    public static function addEventListener(string $eventName, $callback, array $args=array()) : int
+    public static function addEventListener(string $eventName, $callback, array $args = array()) : int
     {
-        if(!isset(self::$listeners[$eventName])) {
+        if (!isset(self::$listeners[$eventName])) {
             self::$listeners[$eventName] = array();
         }
         
         $className = Localization_Event::class.'_'.$eventName;
         
-        if(!class_exists($className)) 
+        if (!class_exists($className)) 
         {
             throw new Localization_Exception(
                 sprintf('Unknown localization event [%s].', $eventName),
@@ -531,7 +531,7 @@ 
      * @throws Localization_Exception
      * @see Localization_Event_LocaleChanged
      */
-    public static function onLocaleChanged($callback, array $args=array()) : int
+    public static function onLocaleChanged($callback, array $args = array()) : int
     {
         return self::addEventListener(self::EVENT_LOCALE_CHANGED, $callback, $args);
     }
@@ -658,7 +658,7 @@ 
     {
         self::requireNamespace($namespace);
         
-        if(isset(self::$locales[$namespace]) && isset(self::$locales[$namespace][$localeName])) {
+        if (isset(self::$locales[$namespace]) && isset(self::$locales[$namespace][$localeName])) {
             return self::$locales[$namespace][$localeName];
         }
         
@@ -737,9 +737,9 @@ 
      * @param Localization_Locale|null $locale
      * @return Localization_Translator
      */
-    public static function getTranslator(?Localization_Locale $locale=null) : Localization_Translator
+    public static function getTranslator(?Localization_Locale $locale = null) : Localization_Translator
     {
-        if($locale !== null)
+        if ($locale !== null)
         {
             $obj = new Localization_Translator();
             $obj->addSources(self::getSources());
@@ -747,7 +747,7 @@ 
             return $obj;
         }
             
-        if(!isset(self::$translator)) 
+        if (!isset(self::$translator)) 
         {
             $obj = new Localization_Translator();
             $obj->addSources(self::getSources());
@@ -772,7 +772,7 @@ 
     {
         self::requireNamespace($namespace);
         
-        if(isset(self::$locales[$namespace])) {
+        if (isset(self::$locales[$namespace])) {
             return count(self::$locales[$namespace]);
         }
         
@@ -785,7 +785,7 @@ 
      */
     protected static function requireNamespace(string $namespace) : void
     {
-        if(isset(self::$locales[$namespace])) {
+        if (isset(self::$locales[$namespace])) {
             return;
         }
         
@@ -808,7 +808,7 @@ 
     * @param string $label
     * @return HTML_QuickForm2_Element_Select
     */
-    public static function injectContentLocalesSelector(string $elementName, HTML_QuickForm2_Container $container, string $label='') : HTML_QuickForm2_Element_Select
+    public static function injectContentLocalesSelector(string $elementName, HTML_QuickForm2_Container $container, string $label = '') : HTML_QuickForm2_Element_Select
     {
         return self::injectLocalesSelectorNS($elementName, self::NAMESPACE_CONTENT, $container, $label);
     }
@@ -822,7 +822,7 @@ 
     * @param string $label
     * @return HTML_QuickForm2_Element_Select
     */
-    public static function injectAppLocalesSelector(string $elementName, HTML_QuickForm2_Container $container, string $label='') : HTML_QuickForm2_Element_Select
+    public static function injectAppLocalesSelector(string $elementName, HTML_QuickForm2_Container $container, string $label = '') : HTML_QuickForm2_Element_Select
     {
         return self::injectLocalesSelectorNS($elementName, self::NAMESPACE_APPLICATION, $container, $label);
     }
@@ -839,9 +839,9 @@ 
      * @return HTML_QuickForm2_Element_Select
      * @throws Localization_Exception
      */
-    public static function injectLocalesSelectorNS(string $elementName, string $namespace, HTML_QuickForm2_Container $container, string $label='') : HTML_QuickForm2_Element_Select
+    public static function injectLocalesSelectorNS(string $elementName, string $namespace, HTML_QuickForm2_Container $container, string $label = '') : HTML_QuickForm2_Element_Select
     {
-        if(empty($label)) {
+        if (empty($label)) {
             $label = t('Language');
         }
 
@@ -850,7 +850,7 @@ 
 
         $locales = self::getLocalesByNS($namespace);
         
-        foreach($locales as $locale) {
+        foreach ($locales as $locale) {
             $select->addOption($locale->getLabel(), $locale->getName());
         }
 
@@ -884,14 +884,14 @@ 
     
     public static function addExcludeFolder(string $folderName) : void
     { 
-        if(!in_array($folderName, self::$excludeFolders)) {
+        if (!in_array($folderName, self::$excludeFolders)) {
             self::$excludeFolders[] = $folderName;
         }
     }
     
     public static function addExcludeFile(string $fileName) : void
     {
-        if(!in_array($fileName, self::$excludeFiles)) {
+        if (!in_array($fileName, self::$excludeFiles)) {
             self::$excludeFiles[] = $fileName;
         }
     }
@@ -918,11 +918,11 @@ 
         
         $grouped = array();
         
-        foreach($sources as $source) 
+        foreach ($sources as $source) 
         {
             $group = $source->getGroup();
             
-            if(!isset($grouped[$group])) {
+            if (!isset($grouped[$group])) {
                 $grouped[$group] = array();
             }
             
@@ -940,8 +940,8 @@ 
     public static function sourceExists(string $sourceID) : bool
     {
         $sources = self::getSources();
-        foreach($sources as $source) {
-            if($source->getID() == $sourceID) {
+        foreach ($sources as $source) {
+            if ($source->getID() == $sourceID) {
                 return true;
             }
         }
@@ -957,8 +957,8 @@ 
     public static function sourceAliasExists(string $sourceAlias) : bool
     {
         $sources = self::getSources();
-        foreach($sources as $source) {
-            if($source->getAlias() == $sourceAlias) {
+        foreach ($sources as $source) {
+            if ($source->getAlias() == $sourceAlias) {
                 return true;
             }
         }
@@ -976,8 +976,8 @@ 
     public static function getSourceByID(string $sourceID) : Localization_Source
     {
         $sources = self::getSources();
-        foreach($sources as $source) {
-            if($source->getID() == $sourceID) {
+        foreach ($sources as $source) {
+            if ($source->getID() == $sourceID) {
                 return $source;
             }
         }
@@ -1002,8 +1002,8 @@ 
     public static function getSourceByAlias(string $sourceAlias) : Localization_Source
     {
         $sources = self::getSources();
-        foreach($sources as $source) {
-            if($source->getAlias() == $sourceAlias) {
+        foreach ($sources as $source) {
+            if ($source->getAlias() == $sourceAlias) {
                 return $source;
             }
         }
@@ -1047,7 +1047,7 @@ 
      * @throws FileHelper_Exception
      * @throws Localization_Exception
      */
-    public static function configure(string $storageFile, string $clientLibrariesFolder='') : void
+    public static function configure(string $storageFile, string $clientLibrariesFolder = '') : void
     {
         self::$configured = true;
         
@@ -1056,7 +1056,7 @@ 
 
         // only write the client libraries to disk if the folder
         // has been specified.
-        if(!empty($clientLibrariesFolder)) 
+        if (!empty($clientLibrariesFolder)) 
         {
             self::writeClientFiles();
         }
@@ -1114,7 +1114,7 @@ 
      * @throws Localization_Exception|FileHelper_Exception
      * @see Localization_ClientGenerator
      */
-    public static function writeClientFiles(bool $force=false) : void
+    public static function writeClientFiles(bool $force = false) : void
     {
         self::createGenerator()->writeFiles($force);
     }
@@ -1147,7 +1147,7 @@ 
      */
     protected static function requireConfiguration() : void
     {
-        if(!self::$configured) 
+        if (!self::$configured) 
         {
             throw new Localization_Exception(
                 'The localization configuration is incomplete.',
@@ -1156,7 +1156,7 @@ 
             );
         }
 
-        if(empty(self::$storageFile))
+        if (empty(self::$storageFile))
         {
             throw new Localization_Exception(
                 'No localization storage file set',
@@ -1165,7 +1165,7 @@ 
             );
         }
         
-        if(empty(self::$sources)) 
+        if (empty(self::$sources)) 
         {
             throw new Localization_Exception(
                 'No source folders have been defined.',
@@ -1198,7 +1198,7 @@ 
     {
         $ids = array();
         
-        foreach(self::$sources as $source) {
+        foreach (self::$sources as $source) {
             $ids[] = $source->getID();
         }
         
@@ -1213,7 +1213,7 @@ 
     {
         $aliases = array();
         
-        foreach(self::$sources as $source) {
+        foreach (self::$sources as $source) {
             $aliases[] = $source->getAlias();
         }
         
@@ -1251,7 +1251,7 @@ 
      */
     public static function getSupportedLocaleNames() : array
     {
-        if(empty(self::$supportedLocales))
+        if (empty(self::$supportedLocales))
         {
             self::$supportedLocales = FileHelper::createFileFinder(__DIR__.'/Localization/Locale')
                 ->getPHPClassNames();

Braces +1 added lines, -2 removed lines

@@ -246,8 +246,7 @@
             {
                 return $locale;
             }
-        }
-        catch (Throwable $e)
+        } catch (Throwable $e)
         {
 
         }

src/Localization/Locale.php

Indentation +25 added lines, -25 removed lines

@@ -32,14 +32,14 @@ 
      */
     protected $country;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $countryCode;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $languageCode;
 
     public function __construct()
@@ -53,11 +53,11 @@ 
         $this->languageCode = strtolower($tokens[0]);
     }
     
-   /**
-    * Retrieves the two-letter language code of the locale.
-    * 
-    * @return string Language code, e.g. "en", "de"
-    */
+    /**
+     * Retrieves the two-letter language code of the locale.
+     * 
+     * @return string Language code, e.g. "en", "de"
+     */
     public function getLanguageCode() : string
     {
         return $this->languageCode;
@@ -84,25 +84,25 @@ 
         return $this->localeName;
     }
     
-   /**
-    * Retrieves the shortened version of the locale name,
-    * e.g. "en" or "de".
-    *
-    * @return string
-    * @deprecated
-    * @see Localization_Locale::getLanguageCode()
-    */
+    /**
+     * Retrieves the shortened version of the locale name,
+     * e.g. "en" or "de".
+     *
+     * @return string
+     * @deprecated
+     * @see Localization_Locale::getLanguageCode()
+     */
     public function getShortName() : string
     {
         return $this->getLanguageCode();
     }
     
-   /**
-    * Retrieves the two-letter country code of
-    * the locale.
-    * 
-    * @return string Lowercase code, e.g. "uk"
-    */
+    /**
+     * Retrieves the two-letter country code of
+     * the locale.
+     * 
+     * @return string Lowercase code, e.g. "uk"
+     */
     public function getCountryCode() : string
     {
         return $this->countryCode;

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      */
     public function getCountry() : Localization_Country
     {
-        if(!isset($this->country)) {
+        if (!isset($this->country)) {
             $this->country = Localization::createCountry($this->countryCode);
         }