Mistralys / application-localization

src/Localization/Editor/Filters.php

Spacing +20 added lines, -20 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
             foreach($defaults as $name => $val) {
                 $this->setValue($name, $val);
             }
-        }
-        else if($this->request->getBool($this->vars['filter'])) 
+        } else if($this->request->getBool($this->vars['filter'])) 
         {
             $this->parseSearchTerms($this->request->getParam($this->vars['search']));
             
@@ -72,8 +71,7 @@ 
                 ->setEnum('', 'client', 'server')
                 ->get('')
             );
-        }
-        else
+        } else
         {
             $this->parseSearchTerms($this->getValue($this->vars['search']));
         }

Indentation +55 added lines, -55 removed lines

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

src/Localization/Scanner.php

Spacing +7 added lines, -7 removed lines

@@ -24,14 +24,14 @@ 
     
     public function scan()
     {
-        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);
         }
@@ -45,11 +45,11 @@ 
     
     public function load()
     {
-        if(!$this->isScanAvailable()) {
+        if (!$this->isScanAvailable()) {
             return;
         }
         
-        if($this->loaded) {
+        if ($this->loaded) {
             return;
         }
         
@@ -57,7 +57,7 @@ 
         
         $data = \AppUtils\FileHelper::parseJSONFile($this->storageFile);
         
-        if($this->getCollection()->fromArray($data) === true) {
+        if ($this->getCollection()->fromArray($data) === true) {
             return;
         }
         
@@ -80,7 +80,7 @@ 
 
     public function getParser()
     {
-        if(!isset($this->parser)) {
+        if (!isset($this->parser)) {
             $this->parser = new Localization_Parser($this);
         }
         
@@ -94,7 +94,7 @@ 
     
     public function getCollection() : Localization_Scanner_StringsCollection
     {
-        if(!isset($this->collection)) {
+        if (!isset($this->collection)) {
             $this->collection = new Localization_Scanner_StringsCollection($this);
         }
         

Indentation +21 added lines, -21 removed lines

@@ -4,24 +4,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;
     
     /**
@@ -91,9 +91,9 @@ 
         \AppUtils\FileHelper::saveAsJSON($data, $this->storageFile);
     }
     
-   /**
-    * @var Localization_Parser
-    */
+    /**
+     * @var Localization_Parser
+     */
     protected $parser;
 
     public function getParser()
@@ -149,12 +149,12 @@ 
         return $this->getCollection()->countWarnings();
     }
     
-   /**
-    * Retrieves all warnings that have been registered
-    * during the last search for translateable texts.
-    * 
-    * @return \AppLocalize\Localization_Scanner_StringsCollection_Warning[]
-    */
+    /**
+     * Retrieves all warnings that have been registered
+     * during the last search for translateable texts.
+     * 
+     * @return \AppLocalize\Localization_Scanner_StringsCollection_Warning[]
+     */
     public function getWarnings()
     {
         return $this->getCollection()->getWarnings();

src/Localization/Currency.php

Braces +1 added lines, -2 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
             return self::$instances[$id];
         }
 
-        $className = '\AppLocalize\Localization_Currency_' . $id;
+        $className = '\AppLocalize\Localization_Currency_'.$id;
 
         return new $className($country);
     }
@@ -91,7 +91,7 @@ 
      */
     public static function isCurrencyKnown($currencyName)
     {
-        return file_exists(__DIR__ . '/Currency/' . $currencyName . '.php');
+        return file_exists(__DIR__.'/Currency/'.$currencyName.'.php');
     }
 
     /**
@@ -291,7 +291,7 @@ 
         return $this->country->getNumberDecimalsSeparator();
     }
 
-    public function makeReadable($number, $decimalPositions = 2, $addSymbol=true)
+    public function makeReadable($number, $decimalPositions = 2, $addSymbol = true)
     {
         if ($number === null || $number === '') {
             return null;
@@ -301,14 +301,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();
     }
 }
\ No newline at end of file

src/Localization/Currency/Number.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     public function getFloat()
     {
         if ($this->decimals) {
-            return floatval($this->number . '.' . $this->decimals);
+            return floatval($this->number.'.'.$this->decimals);
         }
 
         return $this->number;

src/Localization/Scanner/StringsCollection/Warning.php

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 
 class Localization_Scanner_StringsCollection_Warning
 {
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $data;
     
     public function __construct(array $data)

src/jtokenizer.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
     function __construct($i = null)
     {
         if (!is_null($i)) {
-            $this->i = (int)$i;
+            $this->i = (int) $i;
         }
     }
 
@@ -84,7 +84,7 @@ 
     {
         if (is_int($i)) {
             if (!isset($this->names[$i])) {
-                trigger_error("symbol " . var_export($i, true) . " is unknown in " . get_class($this), E_USER_NOTICE);
+                trigger_error("symbol ".var_export($i, true)." is unknown in ".get_class($this), E_USER_NOTICE);
 
                 return 'UNKNOWN';
             } else {
@@ -92,7 +92,7 @@ 
             }
         } else {
             if (!isset($this->literals[$i])) {
-                trigger_error("literal symbol " . var_export($i, true) . " is unknown in " . get_class($this), E_USER_NOTICE);
+                trigger_error("literal symbol ".var_export($i, true)." is unknown in ".get_class($this), E_USER_NOTICE);
             }
         }
 
@@ -112,7 +112,7 @@ 
     function dump()
     {
         asort($this->names, SORT_STRING);
-        $t = max(2, strlen((string)$this->i));
+        $t = max(2, strlen((string) $this->i));
         foreach ($this->names as $i => $n) {
             $i = str_pad($i, $t, ' ', STR_PAD_LEFT);
             echo "$i => $n \n";

src/Localization.php

Indentation +302 added lines, -302 removed lines

@@ -52,12 +52,12 @@ 
     
     const NAMESPACE_CONTENT = '__content';
     
-   /**
-    * Collection of all locales by namespace (application, content, custom...). 
-    *
-    * @var array
-    * @see Localization::addLocale()
-    */
+    /**
+     * Collection of all locales by namespace (application, content, custom...). 
+     *
+     * @var array
+     * @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])) {
@@ -247,11 +247,11 @@ 
         return new $className();
     }
     
-   /**
-    * Retrieves the currency of the selected app locale.
-    * 
-    * @return Localization_Currency
-    */
+    /**
+     * Retrieves the currency of the selected app locale.
+     * 
+     * @return Localization_Currency
+     */
     public static function getAppCurrency() : Localization_Currency
     {
         return self::getCurrencyNS(self::NAMESPACE_APPLICATION);
@@ -288,44 +288,44 @@ 
         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::getSelectedKeyByNS('name', $namespace);
     }
     
-   /**
-    * Retrieves the selected locale instance for the specified namespace.
-    * 
-    * @param string $namespace
-    * @return Localization_Locale
-    * @throws Localization_Exception
-    */
+    /**
+     * Retrieves the selected locale instance for the specified namespace.
+     * 
+     * @param string $namespace
+     * @return Localization_Locale
+     * @throws Localization_Exception
+     */
     public static function getSelectedLocaleByNS(string $namespace) : Localization_Locale
     {
         return self::getSelectedKeyByNS('locale', $namespace);
@@ -350,20 +350,20 @@ 
         );
     }
     
-   /**
-    * Stores the selected locale names by namespace.
-    * @var array
-    */
+    /**
+     * Stores the selected locale names by namespace.
+     * @var array
+     */
     protected static $selected = array();
 
-   /**
-    * Selects the active locale for the specified namespace.
-    * 
-    * @param string $localeName
-    * @param string $namespace
-    * @return Localization_Locale
-    * @throws Localization_Exception
-    */
+    /**
+     * Selects the active locale for the specified namespace.
+     * 
+     * @param string $localeName
+     * @param string $namespace
+     * @return Localization_Locale
+     * @throws Localization_Exception
+     */
     public static function selectLocaleByNS(string $localeName, string $namespace) : Localization_Locale
     {
         self::requireNamespace($namespace);
@@ -399,13 +399,13 @@ 
         return $locale;
     }
     
-   /**
-    * Triggers the specified event, with the provided arguments.
-    * 
-    * @param string $name The event name.
-    * @param array $argsList
-    * @see Localization_Event
-    */
+    /**
+     * Triggers the specified event, with the provided arguments.
+     * 
+     * @param string $name The event name.
+     * @param array $argsList
+     * @see Localization_Event
+     */
     protected static function triggerEvent(string $name, array $argsList) : Localization_Event
     {
         $class = '\AppLocalize\Localization_Event_'.$name;
@@ -426,14 +426,14 @@ 
         return $event;
     }
     
-   /**
-    * Adds a listener to the specified event name.
-    * 
-    * @param string $eventName
-    * @param callable $callback
-    * @param array $args Additional arguments to add to the event
-    * @return int The listener number.
-    */
+    /**
+     * Adds a listener to the specified event name.
+     * 
+     * @param string $eventName
+     * @param callable $callback
+     * @param array $args Additional arguments to add to the event
+     * @return int The listener number.
+     */
     public static function addEventListener(string $eventName, $callback, array $args=array()) : int
     {
         if(!isset(self::$listeners[$eventName])) {
@@ -463,43 +463,43 @@ 
         return self::$listenersCounter;
     }
     
-   /**
-    * Adds an event listener for the <code>LocaleChanged</code> event,
-    * which is triggered every time a locale is changed in any of the
-    * available namespaces.
-    * 
-    * The first parameter of the callback is always the event instance.
-    * 
-    * @param callable $callback The listener function to call.
-    * @param array $args Optional indexed array with additional arguments to pass on to the callback function.
-    * @return int
-    * @see Localization_Event_LocaleChanged
-    */
+    /**
+     * Adds an event listener for the <code>LocaleChanged</code> event,
+     * which is triggered every time a locale is changed in any of the
+     * available namespaces.
+     * 
+     * The first parameter of the callback is always the event instance.
+     * 
+     * @param callable $callback The listener function to call.
+     * @param array $args Optional indexed array with additional arguments to pass on to the callback function.
+     * @return int
+     * @see Localization_Event_LocaleChanged
+     */
     public static function onLocaleChanged($callback, array $args=array()) : int
     {
         return self::addEventListener('LocaleChanged', $callback, $args);
     }
     
-   /**
-    * Selects the application locale to use.
-    * 
-    * @param string $localeName
-    * @return Localization_Locale
-    */
+    /**
+     * Selects the application locale to use.
+     * 
+     * @param string $localeName
+     * @return Localization_Locale
+     */
     public static function selectAppLocale(string $localeName) : Localization_Locale
     {
         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);
@@ -533,22 +533,22 @@ 
         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);
     }
     
-   /**
-    * Retrieves all locale names available in the specified namespace.
-    * The names are sorted alphabetically.
-    * 
-    * @param string $namespace
-    * @return array|array
-    */
+    /**
+     * Retrieves all locale names available in the specified namespace.
+     * The names are sorted alphabetically.
+     * 
+     * @param string $namespace
+     * @return array|array
+     */
     public static function getLocaleNamesByNS(string $namespace)
     {
         self::requireNamespace($namespace);
@@ -558,7 +558,7 @@ 
         sort($names);
         
         return $names;
-     }
+        }
     
     /**
      * Checks by the locale name if the specified locale is
@@ -587,14 +587,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);
@@ -654,10 +654,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;
@@ -724,29 +724,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);
@@ -781,26 +781,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 \AppLocalize\Localization_Source[]
-    */
+    /**
+     * Retrieves all currently available sources.
+     * 
+     * @return \AppLocalize\Localization_Source[]
+     */
     public static function getSources()
     {
         return self::$sources;
@@ -832,10 +832,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();
@@ -856,11 +856,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();
@@ -873,11 +873,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();
@@ -890,13 +890,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();
@@ -942,12 +942,12 @@ 
         );
     }
     
-   /**
-    * Creates the scanner instance that is used to find
-    * all translateable strings in the application.
-    * 
-    * @return Localization_Scanner
-    */
+    /**
+     * Creates the scanner instance that is used to find
+     * all translateable strings in the application.
+     * 
+     * @return Localization_Scanner
+     */
     public static function createScanner() : Localization_Scanner
     {
         self::requireConfiguration();
@@ -960,14 +960,14 @@ 
         // FIXME: TODO: Add this
     }
     
-   /**
-    * Configures the localization for the application:
-    * sets the location of the required files and folders.
-    * Also updated the client library files as needed.
-    * 
-    * @param string $storageFile Where to store the file analysis storage file.
-    * @param string $clientLibrariesFolder Where to put the client libraries and translation files. Will be created if it does not exist. Optional: if not set, client libraries will not be created.
-    */
+    /**
+     * Configures the localization for the application:
+     * sets the location of the required files and folders.
+     * Also updated the client library files as needed.
+     * 
+     * @param string $storageFile Where to store the file analysis storage file.
+     * @param string $clientLibrariesFolder Where to put the client libraries and translation files. Will be created if it does not exist. Optional: if not set, client libraries will not be created.
+     */
     public static function configure(string $storageFile, string $clientLibrariesFolder='')
     {
         self::$configured = true;
@@ -983,17 +983,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)
     {
         self::$clientCacheKey = $key;
@@ -1004,48 +1004,48 @@ 
         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)
     {
         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;
     }
     
-   /**
-    * Writes / updates the client library files on disk,
-    * at the location specified in the {@link Localization::configure()}
-    * method.
-    * 
-    * @see Localization_ClientGenerator
-    * @param bool $force Whether to refresh the files, even if they exist.
-    */
+    /**
+     * Writes / updates the client library files on disk,
+     * at the location specified in the {@link Localization::configure()}
+     * method.
+     * 
+     * @see Localization_ClientGenerator
+     * @param bool $force Whether to refresh the files, even if they exist.
+     */
     public static function writeClientFiles(bool $force=false) : void
     {
         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();
@@ -1088,13 +1088,13 @@ 
         }
     }
     
-   /**
-    * Creates the editor instance that can be used to 
-    * display the localization UI to edit translateable
-    * strings in the browser.
-    * 
-    * @return \AppLocalize\Localization_Editor
-    */
+    /**
+     * Creates the editor instance that can be used to 
+     * display the localization UI to edit translateable
+     * strings in the browser.
+     * 
+     * @return \AppLocalize\Localization_Editor
+     */
     public static function createEditor() : Localization_Editor
     {
         self::requireConfiguration();
@@ -1102,10 +1102,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()
     {
         $ids = array();
@@ -1132,9 +1132,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();
@@ -1166,22 +1166,22 @@ 
         'de_CH'
     );
     
-   /**
-    * Retrieves a list of all supported locales.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves a list of all supported locales.
+     * 
+     * @return array
+     */
     public static function getSupportedLocaleNames() : array
     {
         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 in_array($localeName, self::$supportedLocales);

Spacing +45 added lines, -45 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);
             
@@ -243,7 +243,7 @@ 
      */
     public static function createCountry(string $id)
     {
-        $className = '\AppLocalize\Localization_Country_' . strtoupper($id);
+        $className = '\AppLocalize\Localization_Country_'.strtoupper($id);
         return new $className();
     }
     
@@ -335,7 +335,7 @@ 
     {
         self::requireNamespace($namespace);
         
-        if(isset(self::$selected[$namespace])) {
+        if (isset(self::$selected[$namespace])) {
             return self::$selected[$namespace][$key];
         }
         
@@ -371,9 +371,9 @@ 
         $locale = self::addLocaleByNS($localeName, $namespace);
         $previous = null;
         
-        if(isset(self::$selected[$namespace])) 
+        if (isset(self::$selected[$namespace])) 
         {
-            if(self::$selected[$namespace]['name'] === $localeName) {
+            if (self::$selected[$namespace]['name'] === $localeName) {
                 return $locale;
             }
             
@@ -411,11 +411,11 @@ 
         $class = '\AppLocalize\Localization_Event_'.$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);
@@ -434,15 +434,15 @@ 
     * @param array $args Additional arguments to add to the event
     * @return int The listener number.
     */
-    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 = '\AppLocalize\Localization_Event_'.$eventName;
         
-        if(!class_exists($className)) 
+        if (!class_exists($className)) 
         {
             throw new Localization_Exception(
                 sprintf('Unknown localization event [%s].', $eventName),
@@ -475,7 +475,7 @@ 
     * @return int
     * @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('LocaleChanged', $callback, $args);
     }
@@ -599,7 +599,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];
         }
         
@@ -666,9 +666,9 @@ 
     /**
      * @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());
@@ -676,7 +676,7 @@ 
             return $obj;
         }
             
-        if(!isset(self::$translator)) 
+        if (!isset(self::$translator)) 
         {
             $obj = new Localization_Translator();
             $obj->addSources(self::getSources());
@@ -701,7 +701,7 @@ 
     {
         self::requireNamespace($namespace);
         
-        if(isset(self::$locales[$namespace])) {
+        if (isset(self::$locales[$namespace])) {
             return count(self::$locales[$namespace]);
         }
         
@@ -710,7 +710,7 @@ 
     
     protected static function requireNamespace(string $namespace)
     {
-        if(isset(self::$locales[$namespace])) {
+        if (isset(self::$locales[$namespace])) {
             return;
         }
         
@@ -733,7 +733,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);
     }
@@ -747,7 +747,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);
     }
@@ -762,9 +762,9 @@ 
      * @param \HTML_QuickForm2_Container $container
      * @return \HTML_QuickForm2_Element_Select
      */
-    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');
         }
 
@@ -774,7 +774,7 @@ 
 
         $locales = self::getLocalesByNS($namespace);
         
-        foreach($locales as $locale) {
+        foreach ($locales as $locale) {
             $select->addOption($locale->getLabel(), $locale->getName());
         }
 
@@ -808,14 +808,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;
         }
     }
@@ -842,11 +842,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();
             }
             
@@ -864,8 +864,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;
             }
         }
@@ -881,8 +881,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;
             }
         }
@@ -900,8 +900,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;
             }
         }
@@ -926,8 +926,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;
             }
         }
@@ -968,7 +968,7 @@ 
     * @param string $storageFile Where to store the file analysis storage file.
     * @param string $clientLibrariesFolder Where to put the client libraries and translation files. Will be created if it does not exist. Optional: if not set, client libraries will not be created.
     */
-    public static function configure(string $storageFile, string $clientLibrariesFolder='')
+    public static function configure(string $storageFile, string $clientLibrariesFolder = '')
     {
         self::$configured = true;
         
@@ -977,7 +977,7 @@ 
 
         // only write the client libraries to disk if the folder
         // has been specified.
-        if(!empty($clientLibrariesFolder)) 
+        if (!empty($clientLibrariesFolder)) 
         {
             self::writeClientFiles();
         }
@@ -1034,7 +1034,7 @@ 
     * @see Localization_ClientGenerator
     * @param bool $force Whether to refresh the files, even if they exist.
     */
-    public static function writeClientFiles(bool $force=false) : void
+    public static function writeClientFiles(bool $force = false) : void
     {
         self::createGenerator()->writeFiles($force);
     }
@@ -1060,7 +1060,7 @@ 
     
     protected static function requireConfiguration()
     {
-        if(!self::$configured) 
+        if (!self::$configured) 
         {
             throw new Localization_Exception(
                 'The localization configuration is incomplete.',
@@ -1069,7 +1069,7 @@ 
             );
         }
 
-        if(empty(self::$storageFile))
+        if (empty(self::$storageFile))
         {
             throw new Localization_Exception(
                 'No localization storage file set',
@@ -1078,7 +1078,7 @@ 
             );
         }
         
-        if(empty(self::$sources)) 
+        if (empty(self::$sources)) 
         {
             throw new Localization_Exception(
                 'No source folders have been defined.',
@@ -1110,7 +1110,7 @@ 
     {
         $ids = array();
         
-        foreach(self::$sources as $source) {
+        foreach (self::$sources as $source) {
             $ids[] = $source->getID();
         }
         
@@ -1125,7 +1125,7 @@ 
     {
         $aliases = array();
         
-        foreach(self::$sources as $source) {
+        foreach (self::$sources as $source) {
             $aliases[] = $source->getAlias();
         }
         

src/Localization/Writer.php

Indentation +25 added lines, -25 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -68,7 +68,7 @@ 
     
     public function addHashes(array $hashes) : Localization_Writer
     {
-        foreach($hashes as $hash => $text)
+        foreach ($hashes as $hash => $text)
         {
             $this->addHash($hash, $text);
         }
@@ -90,7 +90,7 @@ 
         $hashes = $this->compileHashes();
         $lines = array();
         
-        foreach($hashes as $entry)
+        foreach ($hashes as $entry)
         {
             $lines[] = sprintf(
                 '%s= "%s"',
@@ -106,16 +106,16 @@ 
     
     private function renderHead() : string
     {
-        $title = strtoupper($this->fileType).' TRANSLATION FILE FOR ' . strtoupper($this->locale->getLabel());
+        $title = strtoupper($this->fileType).' TRANSLATION FILE FOR '.strtoupper($this->locale->getLabel());
         
         $lines = array();
         
         $lines[] = '; -------------------------------------------------------';
-        $lines[] = '; '. $title;
+        $lines[] = '; '.$title;
         $lines[] = '; -------------------------------------------------------';
         $lines[] = '; ';
         
-        if($this->editable) 
+        if ($this->editable) 
         {
             $lines[] = '; You may edit text directly in this file under the following conditions:';
             $lines[] = '; ';
@@ -137,7 +137,7 @@ 
     {
         $hashes = array();
         
-        foreach($this->hashes as $hash => $text)
+        foreach ($this->hashes as $hash => $text)
         {
             $hashes[] = array(
                 'hash' => $hash,
@@ -164,7 +164,7 @@ 
     {
         $result = strnatcasecmp($a['text'], $b['text']);
         
-        if($result === 0) 
+        if ($result === 0) 
         {
             return strnatcmp($a['hash'], $b['hash']);
         }

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
             $lines[] = '; ';
             $lines[] = '; 1) Do not to modify the keys (left hand side of the = sign)';
             $lines[] = '; 2) Save the file as UTF-8 without BOM';
-        } 
-        else 
+        } else 
         {
             $lines[] = '; Do NOT edit this file directly! It depends on the main translation file';
             $lines[] = '; and any changes will be lost. Edit the main file instead.';

src/Localization/Translator.php

Indentation +32 added lines, -32 removed lines

@@ -45,9 +45,9 @@ 
     
     private $targetLocaleName = null;
     
-   /**
-    * @var Localization_Source[]
-    */
+    /**
+     * @var Localization_Source[]
+     */
     private $sources = array();
 
     public function addSource(Localization_Source $source)
@@ -175,14 +175,14 @@ 
         );
     }
     
-   /**
-    * Retrieves all available strings for the specified locale,
-    * as hash => text value pairs.
-    * 
-    * @param Localization_Locale $locale
-    * @throws Localization_Exception
-    * @return string[]
-    */
+    /**
+     * Retrieves all available strings for the specified locale,
+     * as hash => text value pairs.
+     * 
+     * @param Localization_Locale $locale
+     * @throws Localization_Exception
+     * @return string[]
+     */
     public function getStrings(Localization_Locale $locale)
     {
         $this->load($locale);
@@ -211,14 +211,14 @@ 
         return !empty($this->strings[$locale->getName()]);
     }
     
-   /**
-    * @param string $type
-    * @param Localization_Scanner_StringHash[] $hashes
-    * @param string $file
-    * @param Localization_Locale $locale
-    * @param boolean $editable
-    * @throws Localization_Exception
-    */
+    /**
+     * @param string $type
+     * @param Localization_Scanner_StringHash[] $hashes
+     * @param string $file
+     * @param Localization_Locale $locale
+     * @param boolean $editable
+     * @throws Localization_Exception
+     */
     protected function renderStringsFile($type, Localization_Source $source, $hashes, $file, Localization_Locale $locale, $editable=true)
     {
         $writer = new Localization_Writer($locale, $type, $file);
@@ -265,13 +265,13 @@ 
         );
     }
     
-   /**
-    * Retrieves the full path to the strings storage ini file 
-    * for the clientside strings.
-    * 
-    * @param Localization_Locale $locale
-    * @return string
-    */
+    /**
+     * Retrieves the full path to the strings storage ini file 
+     * for the clientside strings.
+     * 
+     * @param Localization_Locale $locale
+     * @return string
+     */
     protected function getClientStorageFile(Localization_Locale $locale, Localization_Source $source)
     {
         return sprintf(
@@ -393,12 +393,12 @@ 
         return null;
     }
 
-   /**
-    * Retrieves only the strings that are available clientside.
-    * 
-    * @param Localization_Locale $locale
-    * @return array
-    */
+    /**
+     * Retrieves only the strings that are available clientside.
+     * 
+     * @param Localization_Locale $locale
+     * @return array
+     */
     public function getClientStrings(Localization_Locale $locale)
     {
         $result = array();

Spacing +14 added lines, -14 removed lines

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