pradosoft / prado

framework/I18N/core/Gettext/TGettext.php

Doc Comments +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
      *
      * @static
      * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @return  boolean   Returns true on success or PEAR_Error on failure.
      * @param   string  $pofile path to GNU PO file
      * @param   string  $mofile path to GNU MO file
      */
@@ -260,7 +260,7 @@ 
      * toMO
      *
      * @access  protected
-     * @return  object  File_Gettext_MO
+     * @return  TGettext_MO  File_Gettext_MO
      */
     function toMO()
     {
@@ -274,7 +274,7 @@ 
      * toPO
      *
      * @access  protected
-     * @return  object      File_Gettext_PO
+     * @return  TGettext_PO      File_Gettext_PO
      */
     function toPO()
     {

Indentation +209 added lines, -209 removed lines

@@ -58,229 +58,229 @@
  */
 class TGettext
 {
-    /**
-     * strings
-     *
-     * associative array with all [msgid => msgstr] entries
-     *
-     * @access  protected
-     * @var     array
-    */
-    protected $strings = array();
+	/**
+	 * strings
+	 *
+	 * associative array with all [msgid => msgstr] entries
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $strings = array();
 
-    /**
-     * meta
-     *
-     * associative array containing meta
-     * information like project name or content type
-     *
-     * @access  protected
-     * @var     array
-     */
-    protected $meta = array();
+	/**
+	 * meta
+	 *
+	 * associative array containing meta
+	 * information like project name or content type
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $meta = array();
 
-    /**
-     * file path
-     *
-     * @access  protected
-     * @var     string
-     */
-    protected $file = '';
+	/**
+	 * file path
+	 *
+	 * @access  protected
+	 * @var     string
+	 */
+	protected $file = '';
 
-    /**
-     * Factory
-     *
-     * @static
-     * @access  public
-     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
-     *                  or PEAR_Error on failure.
-     * @param   string  $format MO or PO
-     * @param   string  $file   path to GNU gettext file
-     */
-    static function factory($format, $file = '')
-    {
-        $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+	/**
+	 * Factory
+	 *
+	 * @static
+	 * @access  public
+	 * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
+	 *                  or PEAR_Error on failure.
+	 * @param   string  $format MO or PO
+	 * @param   string  $file   path to GNU gettext file
+	 */
+	static function factory($format, $file = '')
+	{
+		$format = strToUpper($format);
+		$filename = dirname(__FILE__).'/'.$format.'.php';
+		if(is_file($filename) == false)
+			throw new Exception ("Class file $file not found");
 
-        include_once $filename;
-        $class = 'TGettext_' . $format;
+		include_once $filename;
+		$class = 'TGettext_' . $format;
 
-        return new $class($file);
-    }
+		return new $class($file);
+	}
 
-    /**
-     * poFile2moFile
-     *
-     * That's a simple fake of the 'msgfmt' console command.  It reads the
-     * contents of a GNU PO file and saves them to a GNU MO file.
-     *
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $pofile path to GNU PO file
-     * @param   string  $mofile path to GNU MO file
-     */
-    static function poFile2moFile($pofile, $mofile)
-    {
-        if (!is_file($pofile)) {
-            throw new Exception("File $pofile doesn't exist.");
-        }
+	/**
+	 * poFile2moFile
+	 *
+	 * That's a simple fake of the 'msgfmt' console command.  It reads the
+	 * contents of a GNU PO file and saves them to a GNU MO file.
+	 *
+	 * @static
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $pofile path to GNU PO file
+	 * @param   string  $mofile path to GNU MO file
+	 */
+	static function poFile2moFile($pofile, $mofile)
+	{
+		if (!is_file($pofile)) {
+			throw new Exception("File $pofile doesn't exist.");
+		}
 
-        include_once dirname(__FILE__).'/PO.php';
+		include_once dirname(__FILE__).'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
-        if (true !== ($e = $PO->load())) {
-            return $e;
-        }
+		$PO = new TGettext_PO($pofile);
+		if (true !== ($e = $PO->load())) {
+			return $e;
+		}
 
-        $MO = $PO->toMO();
-        if (true !== ($e = $MO->save($mofile))) {
-            return $e;
-        }
-        unset($PO, $MO);
+		$MO = $PO->toMO();
+		if (true !== ($e = $MO->save($mofile))) {
+			return $e;
+		}
+		unset($PO, $MO);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * prepare
-     *
-     * @static
-     * @access  protected
-     * @return  string
-     * @param   string  $string
-     * @param   bool    $reverse
-     */
-    static function prepare($string, $reverse = false)
-    {
-        if ($reverse) {
-            $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
-            return (string) str_replace($smap, $rmap, $string);
-        } else {
-        	$string = preg_replace('/"\s+"/', '', $string);
-            $smap = array('\\n', '\\r', '\\t', '\"');
-            $rmap = array("\n", "\r", "\t", '"');
-            return (string) str_replace($smap, $rmap, $string);
-        }
-    }
+	/**
+	 * prepare
+	 *
+	 * @static
+	 * @access  protected
+	 * @return  string
+	 * @param   string  $string
+	 * @param   bool    $reverse
+	 */
+	static function prepare($string, $reverse = false)
+	{
+		if ($reverse) {
+			$smap = array('"', "\n", "\t", "\r");
+			$rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
+			return (string) str_replace($smap, $rmap, $string);
+		} else {
+			$string = preg_replace('/"\s+"/', '', $string);
+			$smap = array('\\n', '\\r', '\\t', '\"');
+			$rmap = array("\n", "\r", "\t", '"');
+			return (string) str_replace($smap, $rmap, $string);
+		}
+	}
 
-    /**
-     * meta2array
-     *
-     * @static
-     * @access  public
-     * @return  array
-     * @param   string  $meta
-     */
-    static function meta2array($meta)
-    {
-        $array = array();
-        foreach (explode("\n", $meta) as $info) {
-            if ($info = trim($info)) {
-                list($key, $value) = explode(':', $info, 2);
-                $array[trim($key)] = trim($value);
-            }
-        }
-        return $array;
-    }
+	/**
+	 * meta2array
+	 *
+	 * @static
+	 * @access  public
+	 * @return  array
+	 * @param   string  $meta
+	 */
+	static function meta2array($meta)
+	{
+		$array = array();
+		foreach (explode("\n", $meta) as $info) {
+			if ($info = trim($info)) {
+				list($key, $value) = explode(':', $info, 2);
+				$array[trim($key)] = trim($value);
+			}
+		}
+		return $array;
+	}
 
-    /**
-     * toArray
-     *
-     * Returns meta info and strings as an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     fromArray()
-     * @access  protected
-     * @return  array
-     */
-    function toArray()
-    {
-    	return array('meta' => $this->meta, 'strings' => $this->strings);
-    }
+	/**
+	 * toArray
+	 *
+	 * Returns meta info and strings as an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     fromArray()
+	 * @access  protected
+	 * @return  array
+	 */
+	function toArray()
+	{
+		return array('meta' => $this->meta, 'strings' => $this->strings);
+	}
 
-    /**
-     * fromArray
-     *
-     * Assigns meta info and strings from an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     toArray()
-     * @access  protected
-     * @return  bool
-     * @param   array       $array
-     */
-    function fromArray($array)
-    {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
-                return false;
-    	    } else {
-    	        list($this->meta, $this->strings) = $array;
-            }
-    	} else {
-            $this->meta = @$array['meta'];
-            $this->strings = @$array['strings'];
-        }
-        return true;
-    }
+	/**
+	 * fromArray
+	 *
+	 * Assigns meta info and strings from an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     toArray()
+	 * @access  protected
+	 * @return  bool
+	 * @param   array       $array
+	 */
+	function fromArray($array)
+	{
+		if (!array_key_exists('strings', $array)) {
+			if (count($array) != 2) {
+				return false;
+			} else {
+				list($this->meta, $this->strings) = $array;
+			}
+		} else {
+			$this->meta = @$array['meta'];
+			$this->strings = @$array['strings'];
+		}
+		return true;
+	}
 
-    /**
-     * toMO
-     *
-     * @access  protected
-     * @return  object  File_Gettext_MO
-     */
-    function toMO()
-    {
-        include_once dirname(__FILE__).'/MO.php';
-        $MO = new TGettext_MO;
-        $MO->fromArray($this->toArray());
-        return $MO;
-    }
+	/**
+	 * toMO
+	 *
+	 * @access  protected
+	 * @return  object  File_Gettext_MO
+	 */
+	function toMO()
+	{
+		include_once dirname(__FILE__).'/MO.php';
+		$MO = new TGettext_MO;
+		$MO->fromArray($this->toArray());
+		return $MO;
+	}
 
-    /**
-     * toPO
-     *
-     * @access  protected
-     * @return  object      File_Gettext_PO
-     */
-    function toPO()
-    {
-        include_once dirname(__FILE__).'/PO.php';
-        $PO = new TGettext_PO;
-        $PO->fromArray($this->toArray());
-        return $PO;
-    }
+	/**
+	 * toPO
+	 *
+	 * @access  protected
+	 * @return  object      File_Gettext_PO
+	 */
+	function toPO()
+	{
+		include_once dirname(__FILE__).'/PO.php';
+		$PO = new TGettext_PO;
+		$PO->fromArray($this->toArray());
+		return $PO;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -100,9 +100,9 @@ 
     static function factory($format, $file = '')
     {
         $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+        $filename = dirname(__FILE__) . '/' . $format . '.php';
+        if (is_file($filename) == false)
+        	throw new Exception("Class file $file not found");
 
         include_once $filename;
         $class = 'TGettext_' . $format;
@@ -128,7 +128,7 @@ 
             throw new Exception("File $pofile doesn't exist.");
         }
 
-        include_once dirname(__FILE__).'/PO.php';
+        include_once dirname(__FILE__) . '/PO.php';
 
         $PO = new TGettext_PO($pofile);
         if (true !== ($e = $PO->load())) {
@@ -264,7 +264,7 @@ 
      */
     function toMO()
     {
-        include_once dirname(__FILE__).'/MO.php';
+        include_once dirname(__FILE__) . '/MO.php';
         $MO = new TGettext_MO;
         $MO->fromArray($this->toArray());
         return $MO;
@@ -278,7 +278,7 @@ 
      */
     function toPO()
     {
-        include_once dirname(__FILE__).'/PO.php';
+        include_once dirname(__FILE__) . '/PO.php';
         $PO = new TGettext_PO;
         $PO->fromArray($this->toArray());
         return $PO;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
     static function poFile2moFile($pofile, $mofile)
     {
         if (!is_file($pofile)) {
-            throw new Exception("File $pofile doesn't exist.");
+            throw new Exception("file $pofile doesn't exist.");
         }
 
         include_once dirname(__FILE__).'/PO.php';

framework/I18N/core/MessageCache.php

Doc Comments +1 added lines, -3 removed lines

@@ -99,9 +99,7 @@
 	 * Get the data from the cache.
 	 * @param string $catalogue The translation section.
 	 * @param string $culture The translation locale, e.g. "en_AU".
-	 * @param string $filename If the source is a file, this file's modified
-	 * time is newer than the cache's modified time, no cache hit.
-	 * @return mixed Boolean FALSE if no cache hit. Otherwise, translation
+	 * @return false|string Boolean FALSE if no cache hit. Otherwise, translation
 	 * table data for the specified section and locale.
 	 */
 	public function get($catalogue, $culture, $lastmodified=0)

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
 /**
  * Load the cache lite library.
  */
-require_once(dirname(__FILE__).'/TCache_Lite.php');
+require_once(dirname(__FILE__) . '/TCache_Lite.php');
 
 /**
  * Cache the translation table into the file system.
@@ -37,15 +37,15 @@ 
 	 */
 	public function __construct($cacheDir)
 	{
-		$cacheDir = $cacheDir.'/';
+		$cacheDir = $cacheDir . '/';
 
-		if(!is_dir($cacheDir))
+		if (!is_dir($cacheDir))
 			throw new Exception(
-				'The cache directory '.$cacheDir.' does not exists.'.
+				'The cache directory ' . $cacheDir . ' does not exists.' .
 				'The cache directory must be writable by the server.');
-		if(!is_writable($cacheDir))
+		if (!is_writable($cacheDir))
 			throw new Exception(
-				'The cache directory '.$cacheDir.' must be writable '.
+				'The cache directory ' . $cacheDir . ' must be writable ' .
 				'by the server.');
 
 		$options = array(
@@ -72,7 +72,7 @@ 
 	 */
 	public function setLifeTime($time)
 	{
-		$this->lifetime = (int)$time;
+		$this->lifetime = (int) $time;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	protected function getID($catalogue, $culture)
 	{
-		return $catalogue.':'.$culture;
+		return $catalogue . ':' . $culture;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	protected function getGroup($catalogue, $culture)
 	{
-		return $catalogue.':'.get_class($this);
+		return $catalogue . ':' . get_class($this);
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 * @return mixed Boolean FALSE if no cache hit. Otherwise, translation
 	 * table data for the specified section and locale.
 	 */
-	public function get($catalogue, $culture, $lastmodified=0)
+	public function get($catalogue, $culture, $lastmodified = 0)
 	{
 		$ID = $this->getID($catalogue, $culture);
 		$group = $this->getGroup($catalogue, $culture);
@@ -113,13 +113,13 @@ 
 
 		$cache = $this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
+		if (is_file($cache) == false)
 			return false;
 
 
-		$lastmodified = (int)$lastmodified;
+		$lastmodified = (int) $lastmodified;
 
-		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
+		if ($lastmodified <= 0 || $lastmodified > filemtime($cache))
 			return false;
 
 		//echo '@@ Cache hit: "'.$ID.'" : "'.$group.'"';

framework/I18N/core/MessageFormat.php

Doc Comments +3 added lines, -2 removed lines

@@ -111,6 +111,7 @@ 
 	/** 
 	 * Sets the charset for message output.
 	 * @param string charset, default is UTF-8
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -171,9 +172,9 @@ 
 
 	/**
 	 * Do string translation.
-	 * @param string the string to translate.
+	 * @param string string string to translate.
 	 * @param array a list of string to substitute.
-	 * @param string get the translation from a particular message
+	 * @param string string the translation from a particular message
 	 * catalogue.
 	 * @return string translated string.
 	 */

Spacing +24 added lines, -24 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Get the MessageSource classes.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * Get the encoding utilities
  */
-require_once(dirname(__FILE__).'/util.php');
+require_once(dirname(__FILE__) . '/util.php');
 
 /**
  * MessageFormat class.
@@ -81,7 +81,7 @@ 
 	 * The prefix and suffix to append to untranslated messages.
 	 * @var array 
 	 */
-	protected $postscript = array('','');
+	protected $postscript = array('', '');
 	
 	/**
 	 * Set the default catalogue.
@@ -102,7 +102,7 @@ 
 	 * @param MessageSource the source of translation messages.
 	 * @param string charset for the message output.
 	 */
-	function __construct(IMessageSource $source, $charset='UTF-8')
+	function __construct(IMessageSource $source, $charset = 'UTF-8')
 	{
 		$this->source = $source;	
 		$this->setCharset($charset);
@@ -135,10 +135,10 @@ 
 	 */
 	protected function loadCatalogue($catalogue)
 	{
-		if(in_array($catalogue,$this->catagloues))
+		if (in_array($catalogue, $this->catagloues))
 			return;
 			
-		if($this->source->load($catalogue))
+		if ($this->source->load($catalogue))
 		{
 			$this->messages[$catalogue] = $this->source->read();
 			$this->catagloues[] = $catalogue;						
@@ -158,14 +158,14 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	public function format($string,$args=array(), $catalogue=null, $charset=null) 
+	public function format($string, $args = array(), $catalogue = null, $charset = null) 
 	{
-		if(empty($charset)) $charset = $this->getCharset();
+		if (empty($charset)) $charset = $this->getCharset();
 		
 		//force args as UTF-8
-		foreach($args as $k => $v)
+		foreach ($args as $k => $v)
 			$args[$k] = I18N_toUTF8($v, $charset);
-		$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
+		$s = $this->formatString(I18N_toUTF8($string, $charset), $args, $catalogue);
 		return I18N_toEncoding($s, $charset);
 	}
 
@@ -177,11 +177,11 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	protected function formatString($string, $args=array(), $catalogue=null)
+	protected function formatString($string, $args = array(), $catalogue = null)
 	{		
-		if(empty($catalogue))
+		if (empty($catalogue))
 		{
-			if(empty($this->Catalogue))
+			if (empty($this->Catalogue))
 				$catalogue = 'messages';
 			else 
 				$catalogue = $this->Catalogue;
@@ -189,29 +189,29 @@ 
 				
 		$this->loadCatalogue($catalogue);
 		
-		if(empty($args))
+		if (empty($args))
 			$args = array();		
 		
-		foreach($this->messages[$catalogue] as $variant)
+		foreach ($this->messages[$catalogue] as $variant)
 		{
 			// foreach of the translation units
-			foreach($variant as $source => $result)
+			foreach ($variant as $source => $result)
 			{ 
 				// we found it, so return the target translation
-				if($source == $string)
+				if ($source == $string)
 				{
 					//check if it contains only strings.
-					if(is_string($result))
+					if (is_string($result))
 						$target = $result;
 					else
 					{
 						$target = $result[0];
 					}
 					//found, but untranslated
-					if(empty($target))
+					if (empty($target))
 					{
-						return 	$this->postscript[0].
-								strtr($string, $args).
+						return 	$this->postscript[0] .
+								strtr($string, $args) .
 								$this->postscript[1];		
 					}
 					else
@@ -223,8 +223,8 @@ 
 		// well we did not find the translation string.
 		$this->source->append($string);
 		
-		return 	$this->postscript[0].
-				strtr($string, $args).
+		return 	$this->postscript[0] .
+				strtr($string, $args) .
 				$this->postscript[1];
 	}
 	
@@ -245,7 +245,7 @@ 
 	 */
 	function setUntranslatedPS($postscript)
 	{
-		if(is_array($postscript) && count($postscript)>=2)
+		if (is_array($postscript) && count($postscript) >= 2)
 		{
 			$this->postscript[0] = $postscript[0];
 			$this->postscript[1] = $postscript[1];

Braces +4 added lines, -4 removed lines

@@ -163,8 +163,9 @@ 
 		if(empty($charset)) $charset = $this->getCharset();
 		
 		//force args as UTF-8
-		foreach($args as $k => $v)
-			$args[$k] = I18N_toUTF8($v, $charset);
+		foreach($args as $k => $v) {
+					$args[$k] = I18N_toUTF8($v, $charset);
+		}
 		$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
 		return I18N_toEncoding($s, $charset);
 	}
@@ -213,8 +214,7 @@ 
 						return 	$this->postscript[0].
 								strtr($string, $args).
 								$this->postscript[1];		
-					}
-					else
+					} else
 						return strtr($target, $args);
 				}
 			}

framework/I18N/core/MessageSource.php

Doc Comments +5 added lines

@@ -252,6 +252,7 @@ 
 	/**
 	 * Set the culture for this message source.
 	 * @param string culture name
+	 * @param string $culture
 	 */
 	public function setCulture($culture)
 	{
@@ -270,6 +271,7 @@ 
 	/**
 	 * Get the last modified unix-time for this particular catalogue+variant.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return int last modified in unix-time format.
 	 */
 	protected function getLastModified($source)
@@ -281,6 +283,7 @@ 
 	 * Load the message for a particular catalogue+variant.
 	 * This methods needs to implemented by subclasses.
 	 * @param string catalogue+variant.
+	 * @param string $variant
 	 * @return array of translation messages. 
 	 */
 	protected function &loadData($variant)
@@ -301,6 +304,7 @@ 
 	/**
 	 * Determine if the source is valid.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return boolean true if valid, false otherwise. 
 	 */
 	protected function isValidSource($source)
@@ -312,6 +316,7 @@ 
 	 * Get all the variants of a particular catalogue.
 	 * This method must be implemented by subclasses.
 	 * @param string catalogue name
+	 * @param string $catalogue
 	 * @return array list of all variants for this catalogue. 
 	 */	
 	protected function getCatalogueList($catalogue)

Indentation +8 added lines, -8 removed lines

@@ -109,15 +109,15 @@
 	/**
 	 * Factory method to instantiate a new MessageSource depending on the
 	 * source type. The allowed source types are 'XLIFF', 'gettext' and
-     * 'Database'. The source parameter depends on the source type. 
-     * For 'gettext' and 'XLIFF', 'source' should point to the directory 
-     * where the messages are stored. 
-     * For 'Database', 'source' must be a valid connection id.
-     * If a deprecated 'SQLite' type is used, 'source' must contain
-     * a valid DSN.
+	 * 'Database'. The source parameter depends on the source type. 
+	 * For 'gettext' and 'XLIFF', 'source' should point to the directory 
+	 * where the messages are stored. 
+	 * For 'Database', 'source' must be a valid connection id.
+	 * If a deprecated 'SQLite' type is used, 'source' must contain
+	 * a valid DSN.
 	 *
- 	 * Custom message source are possible by supplying the a filename parameter
- 	 * in the factory method.
+	 * Custom message source are possible by supplying the a filename parameter
+	 * in the factory method.
 	 * 
 	 * @param string the message source type.
 	 * @param string the location of the resource or the ConnectionID.

Spacing +20 added lines, -20 removed lines

@@ -20,12 +20,12 @@ 
  /**
   * Get the IMessageSource interface.
   */
-require_once(dirname(__FILE__).'/IMessageSource.php');
+require_once(dirname(__FILE__) . '/IMessageSource.php');
 
 /**
  * Get the MessageCache class file.
  */
-require_once(dirname(__FILE__).'/MessageCache.php');
+require_once(dirname(__FILE__) . '/MessageCache.php');
 
 /**
  * Abstract MessageSource class.
@@ -125,25 +125,25 @@ 
 	 * @return MessageSource a new message source of the specified type. 
 	 * @throws InvalidMessageSourceTypeException
 	 */
-	static function &factory($type, $source='.', $filename='')
+	static function &factory($type, $source = '.', $filename = '')
 	{
-		$types = array('XLIFF','gettext','Database','SQLite');
+		$types = array('XLIFF', 'gettext', 'Database', 'SQLite');
 
-		if(empty($filename) && !in_array($type, $types))
-			throw new Exception('Invalid type "'.$type.'", valid types are '.
+		if (empty($filename) && !in_array($type, $types))
+			throw new Exception('Invalid type "' . $type . '", valid types are ' .
 				implode(', ', $types));
 		
-		$class = 'MessageSource_'.$type;
+		$class = 'MessageSource_' . $type;
 		
-		if(empty($filename))
-			$filename = dirname(__FILE__).'/'.$class.'.php';
+		if (empty($filename))
+			$filename = dirname(__FILE__) . '/' . $class . '.php';
 						
-		if(is_file($filename) == false)
+		if (is_file($filename) == false)
 			throw new Exception("File $filename not found");
 						
 		include_once $filename;
         
-		$obj =  new $class($source);
+		$obj = new $class($source);
 		
 		return $obj;
 	}
@@ -167,39 +167,39 @@ 
 	 * @return boolean true if loaded, false otherwise.	 
 	 * @see read()
 	 */
-	function load($catalogue='messages')
+	function load($catalogue = 'messages')
 	{
 		$variants = $this->getCatalogueList($catalogue);
 		
 		$this->messages = array();
 		
-		foreach($variants as $variant)
+		foreach ($variants as $variant)
 		{
 			$source = $this->getSource($variant);
 			
-			if($this->isValidSource($source) == false) continue;
+			if ($this->isValidSource($source) == false) continue;
 
 			$loadData = true;
 			
-			if($this->cache)
+			if ($this->cache)
 			{
 				$data = $this->cache->get($variant, 
 					$this->culture, $this->getLastModified($source));
 				
-				if(is_array($data))
+				if (is_array($data))
 				{
 					$this->messages[$variant] = $data;
 					$loadData = false;
 				}
 				unset($data);
 			}
-			if($loadData)
+			if ($loadData)
 			{
 				$data = &$this->loadData($source);
-				if(is_array($data))
+				if (is_array($data))
 				{
 					$this->messages[$variant] = $data;
-					if($this->cache)
+					if ($this->cache)
 						$this->cache->save($data, $variant, $this->culture);
 				}	
 				unset($data);
@@ -244,7 +244,7 @@ 
 	 */	
 	public function append($message)
 	{
-		if(!in_array($message, $this->untranslated))
+		if (!in_array($message, $this->untranslated))
 			$this->untranslated[] = $message;
 	}
 	

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
 			$filename = dirname(__FILE__).'/'.$class.'.php';
 						
 		if(is_file($filename) == false)
-			throw new Exception("File $filename not found");
+			throw new Exception("file $filename not found");
 						
 		include_once $filename;
         

framework/I18N/core/MessageSource_Database.php

Doc Comments +2 added lines, -1 removed lines

@@ -60,6 +60,7 @@ 
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
+	 * @param string $connectionID
 	 * @return TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
@@ -185,7 +186,7 @@ 
 
 	/**
 	 * Update the catalogue last modified time.
-	 * @return boolean true if updated, false otherwise.
+	 * @return integer true if updated, false otherwise.
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{

Spacing +69 added lines, -69 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * MessageSource_Database class.
@@ -30,7 +30,7 @@ 
  */
 class MessageSource_Database extends MessageSource
 {
-	private $_connID='';
+	private $_connID = '';
 	private $_conn;
 
 	/**
@@ -41,7 +41,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->_connID= (string)$source;
+		$this->_connID = (string) $source;
 	}
 
 	/**
@@ -49,9 +49,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn===null)
+		if ($this->_conn === null)
 		{
-			$this->_conn=$this->createDbConnection($this->_connID);
+			$this->_conn = $this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
 		}
 		return $this->_conn;
@@ -65,13 +65,13 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID!=='')
+		if ($connectionID !== '')
 		{
-			$conn=Prado::getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
+			$conn = Prado::getApplication()->getModule($connectionID);
+			if ($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('messagesource_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('messagesource_connectionid_required');
@@ -85,19 +85,19 @@ 
 	 */
 	protected function &loadData($variant)
 	{
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT t.id, t.source, t.target, t.comments
 				FROM trans_unit t, catalogue c
 				WHERE c.cat_id =  t.cat_id
 					AND c.name = :variant
 				ORDER BY id ASC');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
-		$dataReader=$command->query();
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
+		$dataReader = $command->query();
 
 		$result = array();
 
 		foreach ($dataReader as $row)
-			$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+			$result[$row['source']] = array($row['target'], $row['id'], $row['comments']);
 
 		return $result;
 	}
@@ -110,10 +110,10 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT date_modified FROM catalogue WHERE name = :source');
-		$command->bindParameter(':source',$source,PDO::PARAM_STR);
-		$result=$command->queryScalar();
+		$command->bindParameter(':source', $source, PDO::PARAM_STR);
+		$result = $command->queryScalar();
 		return $result ? $result : 0;
 	}
 
@@ -126,10 +126,10 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT COUNT(*) FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
-		return $command->queryScalar()==1;
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
+		return $command->queryScalar() == 1;
 	}
 
 	/**
@@ -139,18 +139,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 
 		$catalogues = array($catalogue);
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . '.' . $variant;
 			}
 		}
 		return array_reverse($catalogues);
@@ -161,24 +161,24 @@ 
 	 * @param string catalogue
 	 * @return array catalogue details, array($cat_id, $variant, $count).
 	 */
-	private function getCatalogueDetails($catalogue='messages')
+	private function getCatalogueDetails($catalogue = 'messages')
 	{
-		if(empty($catalogue))
+		if (empty($catalogue))
 			$catalogue = 'messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant = $catalogue . '.' . $this->culture;
 
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT cat_id FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
-		$cat_id=$command->queryScalar();
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
+		$cat_id = $command->queryScalar();
 
-		if ($cat_id===null) return false;
+		if ($cat_id === null) return false;
 
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT COUNT(msg_id) FROM trans_unit WHERE cat_id = :catid ');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$count=$command->queryScalar();
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$count = $command->queryScalar();
 
 		return array($cat_id, $variant, $count);
 	}
@@ -190,13 +190,13 @@ 
 	private function updateCatalogueTime($cat_id, $variant)
 	{
 		$time = time();
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'UPDATE catalogue SET date_modified = :moddate WHERE cat_id = :catid');
-		$command->bindParameter(':moddate',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$result=$command->execute();
+		$command->bindParameter(':moddate', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$result = $command->execute();
 
-		if(!empty($this->cache))
+		if (!empty($this->cache))
 			$this->cache->clean($variant, $this->culture);
 
 		return $result;
@@ -209,37 +209,37 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if (count($messages) <= 0) return false;
 
 		$details = $this->getCatalogueDetails($catalogue);
 
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
-		if($cat_id <= 0) return false;
+		if ($cat_id <= 0) return false;
 		$inserted = 0;
 
 		$time = time();
 
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'INSERT INTO trans_unit (cat_id,id,source,date_added) VALUES (:catid,:id,:source,:dateadded)');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':id',$count,PDO::PARAM_INT);
-		$command->bindParameter(':source',$message,PDO::PARAM_STR);
-		$command->bindParameter(':dateadded',$time,PDO::PARAM_INT);
-		foreach($messages as $message)
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':id', $count, PDO::PARAM_INT);
+		$command->bindParameter(':source', $message, PDO::PARAM_STR);
+		$command->bindParameter(':dateadded', $time, PDO::PARAM_INT);
+		foreach ($messages as $message)
 		{
 			if (empty($message)) continue;
 			$count++; $inserted++;
 			$command->execute();
 		}
-		if($inserted > 0)
+		if ($inserted > 0)
 			$this->updateCatalogueTime($cat_id, $variant);
 
 		return $inserted > 0;
@@ -251,20 +251,20 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'DELETE FROM trans_unit WHERE cat_id = :catid AND source = :message');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':message',$message,PDO::PARAM_STR);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':message', $message, PDO::PARAM_STR);
 
-		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
+		return ($command->execute() == 1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 
 	}
 
@@ -276,25 +276,25 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
 		$time = time();
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'UPDATE trans_unit SET target = :target, comments = :comments, date_modified = :datemod
 					WHERE cat_id = :catid AND source = :source');
-		$command->bindParameter(':target',$target,PDO::PARAM_STR);
-		$command->bindParameter(':comments',$comments,PDO::PARAM_STR);
-		$command->bindParameter(':datemod',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':source',$text,PDO::PARAM_STR);
+		$command->bindParameter(':target', $target, PDO::PARAM_STR);
+		$command->bindParameter(':comments', $comments, PDO::PARAM_STR);
+		$command->bindParameter(':datemod', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':source', $text, PDO::PARAM_STR);
 
-		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
+		return ($command->execute() == 1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 	}
 
 	/**
@@ -303,15 +303,15 @@ 
 	 */
 	function catalogues()
 	{
-		$command=$this->getDBConnection()->createCommand( 'SELECT name FROM catalogue ORDER BY name');
-		$dataReader=$command->query();
+		$command = $this->getDBConnection()->createCommand('SELECT name FROM catalogue ORDER BY name');
+		$dataReader = $command->query();
 
 		$result = array();
 
 		foreach ($dataReader as $row)
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details = explode('.', $row[0]);
+			if (!isset($details[1])) $details[1] = null;
 
 			$result[] = $details;
 		}

Braces +4 added lines, -4 removed lines

@@ -72,8 +72,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('messagesource_connectionid_required');
 	}
 
@@ -96,8 +95,9 @@ 
 
 		$result = array();
 
-		foreach ($dataReader as $row)
-			$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+		foreach ($dataReader as $row) {
+					$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+		}
 
 		return $result;
 	}

framework/I18N/core/MessageSource_gettext.php

Doc Comments +6 added lines

@@ -200,6 +200,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $MOFile
+	 */
 	private function getPOFile($MOFile)
 	{
 		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
@@ -422,6 +425,9 @@ 
 		return $catalogue;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Spacing +76 added lines, -76 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * Get the Gettext class.
  */
-require_once(dirname(__FILE__).'/Gettext/TGettext.php');
+require_once(dirname(__FILE__) . '/Gettext/TGettext.php');
 
 /**
  * MessageSource_gettext class.
@@ -61,7 +61,7 @@ 
 
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 
@@ -72,13 +72,13 @@ 
 	 */
 	protected function &loadData($filename)
 	{
-		$mo = TGettext::factory('MO',$filename);
+		$mo = TGettext::factory('MO', $filename);
 		$mo->load();
 		$result = $mo->toArray();
 
 		$results = array();
-		$count=0;
-		foreach($result['strings'] as $source => $target)
+		$count = 0;
+		foreach ($result['strings'] as $source => $target)
 		{
 			$results[$source][] = $target; //target
 			$results[$source][] = $count++; //id
@@ -105,7 +105,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source.'/'.$variant;
+		return $this->source . '/' . $variant;
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		if(is_file($source))
+		if (is_file($source))
 			return filemtime($source);
 		else
 			return 0;
@@ -129,24 +129,24 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
+		$variants = explode('_', $this->culture);
+		$source = $catalogue . $this->dataExt;
 
 		$catalogues = array($source);
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.$this->dataSeparator.
-								$variant.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . $this->dataSeparator .
+								$variant . $this->dataExt;
 			}
 		}
 		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
+		$catalogues = array_merge($byDir, array_reverse($catalogues));
 		return $catalogues;
 	}
 
@@ -160,17 +160,17 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 		$catalogues = array();
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
 		}
 		return array_reverse($catalogues);
@@ -184,17 +184,17 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue='messages')
+	private function getVariants($catalogue = 'messages')
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach($this->getCatalogueList($catalogue) as $variant)
+		foreach ($this->getCatalogueList($catalogue) as $variant)
 		{
 			$file = $this->getSource($variant);
 			$po = $this->getPOFile($file);
-			if(is_file($file) || is_file($po))
+			if (is_file($file) || is_file($po))
 				return array($variant, $file, $po);
 		}
 		return false;
@@ -202,8 +202,8 @@ 
 
 	private function getPOFile($MOFile)
 	{
-		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
-		return $filebase.$this->poExt;
+		$filebase = substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
+		return $filebase . $this->poExt;
 	}
 
 	/**
@@ -213,51 +213,51 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if (count($messages) <= 0) return false;
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants)
+		if ($variants)
 			list($variant, $MOFile, $POFile) = $variants;
 		else
 			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
 
-		if(is_writable($MOFile) == false)
+		if (is_writable($MOFile) == false)
 			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if (is_writable($POFile) == false)
 			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
 
 		//set the strings as untranslated.
 		$strings = array();
-		foreach($messages as $message)
+		foreach ($messages as $message)
 			$strings[$message] = '';
 
 		//load the PO
-		$po = TGettext::factory('PO',$POFile);
+		$po = TGettext::factory('PO', $POFile);
 		$po->load();
 		$result = $po->toArray();
 
 		$existing = count($result['strings']);
 
 		//add to strings to the existing message list
-		$result['strings'] = array_merge($result['strings'],$strings);
+		$result['strings'] = array_merge($result['strings'], $strings);
 
 		$new = count($result['strings']);
 
-		if($new > $existing)
+		if ($new > $existing)
 		{
 			//change the date 2004-12-25 12:26
 			$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 
 			$po->fromArray($result);
 			$mo = $po->toMO();
-			if($po->save() && $mo->save($MOFile))
+			if ($po->save() && $mo->save($MOFile))
 			{
-				if(!empty($this->cache))
+				if (!empty($this->cache))
 					$this->cache->clean($variant, $this->culture);
 				return true;
 			}
@@ -273,35 +273,35 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants)
+		if ($variants)
 			list($variant, $MOFile, $POFile) = $variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if (is_writable($MOFile) == false)
 			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if (is_writable($POFile) == false)
 			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
 
-		$po = TGettext::factory('PO',$POFile);
+		$po = TGettext::factory('PO', $POFile);
 		$po->load();
 		$result = $po->toArray();
 
-		foreach($result['strings'] as $string => $value)
+		foreach ($result['strings'] as $string => $value)
 		{
-			if($string == $message)
+			if ($string == $message)
 			{
 				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 				unset($result['strings'][$string]);
 
 				$po->fromArray($result);
 				$mo = $po->toMO();
-				if($po->save() && $mo->save($MOFile))
+				if ($po->save() && $mo->save($MOFile))
 				{
-					if(!empty($this->cache))
+					if (!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
 				}
@@ -321,27 +321,27 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants)
+		if ($variants)
 			list($variant, $MOFile, $POFile) = $variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if (is_writable($MOFile) == false)
 			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if (is_writable($POFile) == false)
 			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
 
 
-		$po = TGettext::factory('PO',$POFile);
+		$po = TGettext::factory('PO', $POFile);
 		$po->load();
 		$result = $po->toArray();
 
-		foreach($result['strings'] as $string => $value)
+		foreach ($result['strings'] as $string => $value)
 		{
-			if($string == $text)
+			if ($string == $text)
 			{
 				$result['strings'][$string] = $target;
 				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
@@ -349,9 +349,9 @@ 
 				$po->fromArray($result);
 				$mo = $po->toMO();
 
-				if($po->save() && $mo->save($MOFile))
+				if ($po->save() && $mo->save($MOFile))
 				{
-					if(!empty($this->cache))
+					if (!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
 				}
@@ -379,36 +379,36 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 
 		$catalogue = array();
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(is_dir($dir.'/'.$file)
-				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file))
+			if (is_dir($dir . '/' . $file)
+				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
 			{
 
 				$catalogue = array_merge($catalogue,
-								$this->getCatalogues($dir.'/'.$file, $file));
+								$this->getCatalogues($dir . '/' . $file, $file));
 			}
 
-			$pos = strpos($file,$this->dataExt);
+			$pos = strpos($file, $this->dataExt);
 
-			if($pos >0
-				&& substr($file,-1*strlen($this->dataExt)) == $this->dataExt)
+			if ($pos > 0
+				&& substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
+				$name = substr($file, 0, $pos);
+				$dot = strrpos($name, $this->dataSeparator);
 				$culture = $variant;
 				$cat = $name;
-				if(is_int($dot))
+				if (is_int($dot))
 				{
-					$culture = substr($name, $dot+1,strlen($name));
-					$cat = substr($name,0,$dot);
+					$culture = substr($name, $dot + 1, strlen($name));
+					$cat = substr($name, 0, $dot);
 				}
 				$details[0] = $cat;
 				$details[1] = $culture;
@@ -424,7 +424,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 		$variants = $this->getCatalogueList($catalogue);
@@ -433,21 +433,21 @@ 
 		$po_file = $this->getPOFile($mo_file);
 
 		$dir = dirname($mo_file);
-		if(!is_dir($dir))
+		if (!is_dir($dir))
 		{
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
-		if(!is_dir($dir))
+		if (!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-		$po = TGettext::factory('PO',$po_file);
+		$po = TGettext::factory('PO', $po_file);
 		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 		$result['strings'] = array();
 
 		$po->fromArray($result);
 		$mo = $po->toMO();
-		if($po->save() && $mo->save($mo_file))
+		if ($po->save() && $mo->save($mo_file))
 			return array($variant, $mo_file, $po_file);
 		else
 			throw new TException("Unable to create file $po_file and $mo_file");

Braces +6 added lines, -8 removed lines

@@ -233,8 +233,9 @@ 
 
 		//set the strings as untranslated.
 		$strings = array();
-		foreach($messages as $message)
-			$strings[$message] = '';
+		foreach($messages as $message) {
+					$strings[$message] = '';
+		}
 
 		//load the PO
 		$po = TGettext::factory('PO',$POFile);
@@ -260,8 +261,7 @@ 
 				if(!empty($this->cache))
 					$this->cache->clean($variant, $this->culture);
 				return true;
-			}
-			else
+			} else
 				return false;
 		}
 		return false;
@@ -304,8 +304,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}
@@ -354,8 +353,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}

framework/I18N/core/MessageSource_SQLite.php

Doc Comments +3 added lines, -1 removed lines

@@ -198,7 +198,9 @@
 	
 	/**
 	 * Update the catalogue last modified time.
-	 * @return boolean true if updated, false otherwise. 
+	 * @param integer $cat_id
+	 * @param string $variant
+	 * @return SQLiteResult true if updated, false otherwise. 
 	 */
 	private function updateCatalogueTime($cat_id, $variant, $db)
 	{

Spacing +34 added lines, -34 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * Get the I18N utility file, contains the DSN parser.
  */
-require_once(dirname(__FILE__).'/util.php');
+require_once(dirname(__FILE__) . '/util.php');
 
 /**
  * MessageSource_SQLite class.
@@ -54,7 +54,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$dsn = parseDSN((string)$source);
+		$dsn = parseDSN((string) $source);
 		$this->source = $dsn['database'];
 	}
 	
@@ -80,7 +80,7 @@ 
 			
 		$result = array();
 		
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		while ($row = sqlite_fetch_array($rs, SQLITE_NUM))
 		{
 			$source = $row[1];
 			$result[$source][] = $row[2]; //target
@@ -109,7 +109,7 @@ 
 			"SELECT date_modified FROM catalogue WHERE name = '{$source}'",
 			$db);
 			
-		$result = $rs ? (int)sqlite_fetch_single($rs) : 0;
+		$result = $rs ? (int) sqlite_fetch_single($rs) : 0;
 		
 		sqlite_close($db);		
 	
@@ -129,7 +129,7 @@ 
 		$rs = sqlite_query(
 			"SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'",
 			$db);
-		$result = $rs && (int)sqlite_fetch_single($rs);	
+		$result = $rs && (int) sqlite_fetch_single($rs);	
 		sqlite_close($db);
 
 		return $result;
@@ -142,18 +142,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 		
 		$catalogues = array($catalogue);
 
 		$variant = null;
 				
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{						
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . '.' . $variant;
 			}
 		}
 		return array_reverse($catalogues);	
@@ -164,12 +164,12 @@ 
 	 * @param string catalogue
 	 * @return array catalogue details, array($cat_id, $variant, $count). 
 	 */
-	private function getCatalogueDetails($catalogue='messages')
+	private function getCatalogueDetails($catalogue = 'messages')
 	{
-		if(empty($catalogue))
+		if (empty($catalogue))
 			$catalogue = 'messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant = $catalogue . '.' . $this->culture;
 		
 		$name = sqlite_escape_string($this->getSource($variant));	
 			
@@ -178,10 +178,10 @@ 
 		$rs = sqlite_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $db);
 		
-		if(sqlite_num_rows($rs) != 1)
+		if (sqlite_num_rows($rs) != 1)
 			return false;
 		
-		$cat_id = (int)sqlite_fetch_single($rs);
+		$cat_id = (int) sqlite_fetch_single($rs);
 		
 		//first get the catalogue ID
 		$rs = sqlite_query(
@@ -189,7 +189,7 @@ 
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $db);
 
-		$count = (int)sqlite_fetch_single($rs);
+		$count = (int) sqlite_fetch_single($rs);
 
 		sqlite_close($db);	
 		
@@ -208,7 +208,7 @@ 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $db);
 
-		if(!empty($this->cache))		
+		if (!empty($this->cache))		
 			$this->cache->clean($variant, $this->culture);	
 		
 		return $result;
@@ -221,37 +221,37 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 		
-		if(count($messages) <= 0) return false;				
+		if (count($messages) <= 0) return false;				
 		
 		$details = $this->getCatalogueDetails($catalogue);	
 		
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 		
-		if($cat_id <= 0) return false;
+		if ($cat_id <= 0) return false;
 		$inserted = 0;
 		
 		$db = sqlite_open($this->source);
 		$time = time();
 
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$message = sqlite_escape_string($message);
 			$statement = "INSERT INTO trans_unit
 				(cat_id,id,source,date_added) VALUES
 				({$cat_id}, {$count},'{$message}',$time)";
-			if(sqlite_query($statement, $db))
+			if (sqlite_query($statement, $db))
 			{
 				$count++; $inserted++;			
 			}
 		}
-		if($inserted > 0)
+		if ($inserted > 0)
 			$this->updateCatalogueTime($cat_id, $variant, $db);
 	
 		sqlite_close($db);	
@@ -267,10 +267,10 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise. 
 	 */	
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
@@ -292,7 +292,7 @@ 
 		
 		$updated = false;
 		
-		if(sqlite_query($statement, $db))
+		if (sqlite_query($statement, $db))
 			$updated = $this->updateCatalogueTime($cat_id, $variant, $db);
 		
 		sqlite_close($db);			
@@ -306,10 +306,10 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise. 
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
@@ -321,7 +321,7 @@ 
 						cat_id = {$cat_id} AND source = '{$message}'";
 		$deleted = false;
 				
-		if(sqlite_query($statement, $db))
+		if (sqlite_query($statement, $db))
 			$deleted = $this->updateCatalogueTime($cat_id, $variant, $db);		
 			
 		sqlite_close($db);	
@@ -339,10 +339,10 @@ 
 		$statement = 'SELECT name FROM catalogue ORDER BY name';
 		$rs = sqlite_query($statement, $db);
 		$result = array();
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		while ($row = sqlite_fetch_array($rs, SQLITE_NUM))
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details = explode('.', $row[0]);
+			if (!isset($details[1])) $details[1] = null;
 			
 			$result[] = $details;
 		}

framework/I18N/core/MessageSource_XLIFF.php

Doc Comments +3 added lines

@@ -486,6 +486,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Indentation +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
 
 		//find the body element
 		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {

Spacing +74 added lines, -74 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * MessageSource_XLIFF class.
@@ -58,7 +58,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($XML = simplexml_load_file($filename))) {
+		if (false === ($XML = simplexml_load_file($filename))) {
 			return false;
 		}
 
@@ -77,12 +77,12 @@ 
 
 		$translations = array();
 
-		foreach($translationUnit as $unit)
+		foreach ($translationUnit as $unit)
 		{
-			$source = (string)$unit->source;
-			$translations[$source][] = (string)$unit->target;
-			$translations[$source][] = (string)$unit['id'];
-			$translations[$source][] = (string)$unit->note;
+			$source = (string) $unit->source;
+			$translations[$source][] = (string) $unit->target;
+			$translations[$source][] = (string) $unit['id'];
+			$translations[$source][] = (string) $unit->note;
 		}
 
 		return $translations;
@@ -107,7 +107,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source.'/'.$variant;
+		return $this->source . '/' . $variant;
 	}
 
 	/**
@@ -127,25 +127,25 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
+		$variants = explode('_', $this->culture);
+		$source = $catalogue . $this->dataExt;
 		$catalogues = array($source);
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
 			}
 		}
 
 		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
+		$catalogues = array_merge($byDir, array_reverse($catalogues));
 		$files = array();
 
-		foreach($catalogues as $file)
+		foreach ($catalogues as $file)
 		{
 			$files[] = $file;
 			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
@@ -163,16 +163,16 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 		$catalogues = array();
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
 		}
 
@@ -196,32 +196,32 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 		$catalogue = array();
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file)) {
+			if (is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
 				$catalogue = array_merge(
 					$catalogue,
-					$this->getCatalogues($dir.'/'.$file, $file)
+					$this->getCatalogues($dir . '/' . $file, $file)
 				);
 			}
 
-			$pos = strpos($file,$this->dataExt);
-			if($pos >0 && substr($file, -1*strlen($this->dataExt)) == $this->dataExt)
+			$pos = strpos($file, $this->dataExt);
+			if ($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
+				$name = substr($file, 0, $pos);
+				$dot = strrpos($name, $this->dataSeparator);
 				$culture = $variant;
 				$cat = $name;
 
-				if(is_int($dot))
+				if (is_int($dot))
 				{
-					$culture = substr($name, $dot+1, strlen($name));
+					$culture = substr($name, $dot + 1, strlen($name));
 					$cat = substr($name, 0, $dot);
 				}
 
@@ -242,16 +242,16 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue='messages')
+	private function getVariants($catalogue = 'messages')
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach($this->getCatalogueList($catalogue) as $variant)
+		foreach ($this->getCatalogueList($catalogue) as $variant)
 		{
 			$file = $this->getSource($variant);
-			if(is_file($file)) {
+			if (is_file($file)) {
 				return array($variant, $file);
 			}
 		}
@@ -265,22 +265,22 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue='messages')
+	public function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
-		if(count($messages) <= 0) {
+		if (count($messages) <= 0) {
 			return false;
 		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			list($variant, $filename) = $this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
@@ -293,17 +293,17 @@ 
     	$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
-		if(($last=$lastNodes->item(0))!==null) {
-			$count = (int)$last->getAttribute('id');
+		if (($last = $lastNodes->item(0)) !== null) {
+			$count = (int) $last->getAttribute('id');
 		} else {
 			$count = 0;
 		}
 
 		//for each message add it to the XML file using DOM
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$unit = $dom->createElement('trans-unit');
-			$unit->setAttribute('id',++$count);
+			$unit->setAttribute('id', ++$count);
 
 			$source = $dom->createElement('source');
 			$source->appendChild($dom->createCDATASection($message));
@@ -328,7 +328,7 @@ 
 
 		//save it and clear the cache for this variant
 		$dom->save($filename);
-		if(!empty($this->cache)) {
+		if (!empty($this->cache)) {
 			$this->cache->clean($variant, $this->culture);
 		}
 
@@ -343,17 +343,17 @@ 
 	 * @param string the catalogue to save to.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue='messages')
+	public function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
@@ -365,7 +365,7 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach($units as $unit)
+		foreach ($units as $unit)
 		{
 			$found = false;
 			$targetted = false;
@@ -373,25 +373,25 @@ 
 
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach($unit->childNodes as $node)
+			foreach ($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
+				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
 					$found = true;
 				}
 
 				//found source, get the target and notes
-				if($found)
+				if ($found)
 				{
 					//set the new translated string
-					if($node->nodeName == 'target')
+					if ($node->nodeName == 'target')
 					{
 						$node->nodeValue = $target;
 						$targetted = true;
 					}
 
 					//set the notes
-					if(!empty($comments) && $node->nodeName == 'note')
+					if (!empty($comments) && $node->nodeName == 'note')
 					{
 						$node->nodeValue = $comments;
 						$commented = true;
@@ -400,17 +400,17 @@ 
 			}
 
 			//append a target
-			if($found && !$targetted) {
-				$unit->appendChild($dom->createElement('target',$target));
+			if ($found && !$targetted) {
+				$unit->appendChild($dom->createElement('target', $target));
 			}
 
 			//append a note
-			if($found && !$commented && !empty($comments)) {
-				$unit->appendChild($dom->createElement('note',$comments));
+			if ($found && !$commented && !empty($comments)) {
+				$unit->appendChild($dom->createElement('note', $comments));
 			}
 
 			//finished searching
-			if($found) {
+			if ($found) {
 				break;
 			}
 		}
@@ -418,9 +418,9 @@ 
 		$fileNode = $xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-		if($dom->save($filename) >0)
+		if ($dom->save($filename) > 0)
 		{
-			if(!empty($this->cache)) {
+			if (!empty($this->cache)) {
 				$this->cache->clean($variant, $this->culture);
 			}
 
@@ -436,16 +436,16 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue='messages')
+	public function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
@@ -457,22 +457,22 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach($units as $unit)
+		foreach ($units as $unit)
 		{
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach($unit->childNodes as $node)
+			foreach ($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
+				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
 				{
 					//we found it, remove and save the xml file.
 					$unit->parentNode->removeChild($unit);
 					$fileNode = $xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if(false !== $dom->save($filename)) {
-						if(!empty($this->cache)) {
+					if (false !== $dom->save($filename)) {
+						if (!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
 						return true;
@@ -488,7 +488,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 		
@@ -497,12 +497,12 @@ 
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			throw new TException("Unable to create directory $dir");
 		}
 		

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -523,7 +523,7 @@
   </body>
  </file>
 </xliff>
-EOD;
+eod;
 		return $xml;
 	}
 }

framework/I18N/core/NumberFormatInfo.php

Doc Comments +1 added lines

@@ -170,6 +170,7 @@
      * @param int the number formatting type, it should be
      * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
      * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+     * @param integer $type
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      * @see getCurrencyInstance();

Indentation +368 added lines, -368 removed lines

@@ -122,7 +122,7 @@ 
 	/**
 	 * Set the pattern for a specific number pattern. The validate patterns
 	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
-     * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
 	 * @param int pattern type.
 	 */
 	public function setPattern($type=NumberFormatInfo::DECIMAL)
@@ -152,94 +152,94 @@ 
 	 * (invariant).
 	 * @return NumberFormatInfo default NumberFormatInfo.
 	 */
-    public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
-    {
-        static $invariant;
+	public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
+	{
+		static $invariant;
 		if($invariant === null)
-        {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->NumberFormat;
-            $invariant->setPattern($type);
-        }
+		{
+			$culture = CultureInfo::getInvariantCulture();
+			$invariant = $culture->NumberFormat;
+			$invariant->setPattern($type);
+		}
 		return $invariant;
-    }
-
-    /**
-     * Returns the NumberFormatInfo associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @param int the number formatting type, it should be
-     * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
-     * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     * @see getCurrencyInstance();
-     * @see getPercentageInstance();
-     * @see getScientificInstance();
-     */
-    public static function getInstance($culture=null,
-    								   $type=NumberFormatInfo::DECIMAL)
-    {
+	}
+
+	/**
+	 * Returns the NumberFormatInfo associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @param int the number formatting type, it should be
+	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
+	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 * @see getCurrencyInstance();
+	 * @see getPercentageInstance();
+	 * @see getScientificInstance();
+	 */
+	public static function getInstance($culture=null,
+									   $type=NumberFormatInfo::DECIMAL)
+	{
    		if ($culture instanceof CultureInfo)
    		{
-            $formatInfo = $culture->NumberFormat;
-            $formatInfo->setPattern($type);
-            return $formatInfo;
+			$formatInfo = $culture->NumberFormat;
+			$formatInfo->setPattern($type);
+			return $formatInfo;
    		}
-       	else if(is_string($culture))
-       	{
-       		$cultureInfo = new CultureInfo($culture);
-       		$formatInfo = $cultureInfo->NumberFormat;
-       		$formatInfo->setPattern($type);
-       		return $formatInfo;
-       	}
-       	else
-       	{
-            $cultureInfo = new CultureInfo();
-       		$formatInfo = $cultureInfo->NumberFormat;
-       		$formatInfo->setPattern($type);
-       		return $formatInfo;
-       	}
-    }
-
-    /**
-     * Returns the currency format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getCurrencyInstance($culture=null)
-    {
-        return self::getInstance($culture, self::CURRENCY);
-    }
-
-    /**
-     * Returns the percentage format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getPercentageInstance($culture=null)
-    {
-        return self::getInstance($culture, self::PERCENTAGE);
-    }
-
-    /**
-     * Returns the scientific format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getScientificInstance($culture=null)
-    {
-        return self::getInstance($culture, self::SCIENTIFIC);
-    }
-
-    /**
-     * Parse the given pattern and return a list of known properties.
-     * @param string a number pattern.
-     * @return array list of pattern properties.
-     */
-    protected function parsePattern($pattern)
+	   	else if(is_string($culture))
+	   	{
+	   		$cultureInfo = new CultureInfo($culture);
+	   		$formatInfo = $cultureInfo->NumberFormat;
+	   		$formatInfo->setPattern($type);
+	   		return $formatInfo;
+	   	}
+	   	else
+	   	{
+			$cultureInfo = new CultureInfo();
+	   		$formatInfo = $cultureInfo->NumberFormat;
+	   		$formatInfo->setPattern($type);
+	   		return $formatInfo;
+	   	}
+	}
+
+	/**
+	 * Returns the currency format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getCurrencyInstance($culture=null)
+	{
+		return self::getInstance($culture, self::CURRENCY);
+	}
+
+	/**
+	 * Returns the percentage format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getPercentageInstance($culture=null)
+	{
+		return self::getInstance($culture, self::PERCENTAGE);
+	}
+
+	/**
+	 * Returns the scientific format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getScientificInstance($culture=null)
+	{
+		return self::getInstance($culture, self::SCIENTIFIC);
+	}
+
+	/**
+	 * Parse the given pattern and return a list of known properties.
+	 * @param string a number pattern.
+	 * @return array list of pattern properties.
+	 */
+	protected function parsePattern($pattern)
 	{
 		$pattern = explode(';',$pattern);
 
@@ -355,296 +355,296 @@ 
 	}
 
 
-    /**
-     * Indicates the number of decimal places.
-     * @return int number of decimal places.
-     */
-    function getDecimalDigits()
-    {
-    	return $this->pattern['decimalPoints'];
-    }
-
-    /**
-     * Set the number of decimal places.
-     * @param int number of decimal places.
-     */
-    function setDecimalDigits($value)
-    {
-    	return $this->pattern['decimalPoints'] = $value;
-    }
-
-    function getDigitSize()
-    {
-    	return $this->pattern['digitSize'];
-    }
-
-    function setDigitSize($value)
-    {
-    	$this->pattern['digitSize'] = $value;
-    }
-
-    /**
-     * Gets the string to use as the decimal separator.
-     * @return string decimal separator.
-     */
-    function getDecimalSeparator()
-    {
-    	return $this->data['NumberElements'][0];
-    }
-
-    /**
-     * Set the string to use as the decimal separator.
-     * @param string the decimal point
-     */
-    function setDecimalSeparator($value)
-    {
-    	return $this->data['NumberElements'][0] = $value;
-    }
-
-    /**
-     * Gets the string that separates groups of digits to the left
-     * of the decimal in currency values.
-     * @param parameter
-     * @return string currency group separator.
-     */
-    function getGroupSeparator()
-    {
-    	return $this->data['NumberElements'][1];
-    }
-
-    /**
-     * Set the string to use as the group separator.
-     * @param string the group separator.
-     */
-    function setGroupSeparator($value)
-    {
-    	return $this->data['NumberElements'][1] = $value;
-    }
-
-    /**
-     * Gets the number of digits in each group to the left of the decimal
-     * There can be two grouping sizes, this fucntion
-     * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
-     * group2 will be false.
-     * @return array grouping size(s).
-     */
-    function getGroupSizes()
-    {
-    	$group1 = $this->pattern['groupSize1'];
-    	$group2 = $this->pattern['groupSize2'];
-
-    	return array($group1, $group2);
-    }
-
-    /**
-     * Set the number of digits in each group to the left of the decimal.
-     * There can be two grouping sizes, the value should
-     * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
-     * group2 should be false.
-     * @param array grouping size(s).
-     */
-    function setGroupSizes($groupSize)
-    {
+	/**
+	 * Indicates the number of decimal places.
+	 * @return int number of decimal places.
+	 */
+	function getDecimalDigits()
+	{
+		return $this->pattern['decimalPoints'];
+	}
+
+	/**
+	 * Set the number of decimal places.
+	 * @param int number of decimal places.
+	 */
+	function setDecimalDigits($value)
+	{
+		return $this->pattern['decimalPoints'] = $value;
+	}
+
+	function getDigitSize()
+	{
+		return $this->pattern['digitSize'];
+	}
+
+	function setDigitSize($value)
+	{
+		$this->pattern['digitSize'] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the decimal separator.
+	 * @return string decimal separator.
+	 */
+	function getDecimalSeparator()
+	{
+		return $this->data['NumberElements'][0];
+	}
+
+	/**
+	 * Set the string to use as the decimal separator.
+	 * @param string the decimal point
+	 */
+	function setDecimalSeparator($value)
+	{
+		return $this->data['NumberElements'][0] = $value;
+	}
+
+	/**
+	 * Gets the string that separates groups of digits to the left
+	 * of the decimal in currency values.
+	 * @param parameter
+	 * @return string currency group separator.
+	 */
+	function getGroupSeparator()
+	{
+		return $this->data['NumberElements'][1];
+	}
+
+	/**
+	 * Set the string to use as the group separator.
+	 * @param string the group separator.
+	 */
+	function setGroupSeparator($value)
+	{
+		return $this->data['NumberElements'][1] = $value;
+	}
+
+	/**
+	 * Gets the number of digits in each group to the left of the decimal
+	 * There can be two grouping sizes, this fucntion
+	 * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
+	 * group2 will be false.
+	 * @return array grouping size(s).
+	 */
+	function getGroupSizes()
+	{
+		$group1 = $this->pattern['groupSize1'];
+		$group2 = $this->pattern['groupSize2'];
+
+		return array($group1, $group2);
+	}
+
+	/**
+	 * Set the number of digits in each group to the left of the decimal.
+	 * There can be two grouping sizes, the value should
+	 * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
+	 * group2 should be false.
+	 * @param array grouping size(s).
+	 */
+	function setGroupSizes($groupSize)
+	{
    		$this->pattern['groupSize1'] = $groupSize[0];
    		$this->pattern['groupSize2'] = $groupSize[1];
-    }
-
-    /**
-     * Gets the format pattern for negative values.
-     * The negative pattern is composed of a prefix, and postfix.
-     * This function returns <b>array(prefix, postfix)</b>.
-     * @return arary negative pattern.
-     */
-    function getNegativePattern()
-    {
-    	$prefix = $this->pattern['negPref'];
-    	$postfix = $this->pattern['negPost'];
-    	return array($prefix, $postfix);
-    }
-
-    /**
-     * Set the format pattern for negative values.
-     * The negative pattern is composed of a prefix, and postfix in the form
-     * <b>array(prefix, postfix)</b>.
-     * @param arary negative pattern.
-     */
-    function setNegativePattern($pattern)
-    {
-    	$this->pattern['negPref'] = $pattern[0];
-    	$this->pattern['negPost'] = $pattern[1];
-    }
-
-    /**
-     * Gets the format pattern for positive values.
-     * The positive pattern is composed of a prefix, and postfix.
-     * This function returns <b>array(prefix, postfix)</b>.
-     * @return arary positive pattern.
-     */
-    function getPositivePattern()
-    {
-    	$prefix = $this->pattern['posPref'];
-    	$postfix = $this->pattern['posPost'];
-    	return array($prefix, $postfix);
-    }
-
-    /**
-     * Set the format pattern for positive values.
-     * The positive pattern is composed of a prefix, and postfix in the form
-     * <b>array(prefix, postfix)</b>.
-     * @param arary positive pattern.
-     */
-    function setPositivePattern($pattern)
-    {
-    	$this->pattern['posPref'] = $pattern[0];
-    	$this->pattern['posPost'] = $pattern[1];
-    }
-
-    /**
-     * Gets the string to use as the currency symbol.
-     * @return string currency symbol.
-     */
-    function getCurrencySymbol($currency='USD')
-    {
-    	if(isset($this->pattern['symbol']))
+	}
+
+	/**
+	 * Gets the format pattern for negative values.
+	 * The negative pattern is composed of a prefix, and postfix.
+	 * This function returns <b>array(prefix, postfix)</b>.
+	 * @return arary negative pattern.
+	 */
+	function getNegativePattern()
+	{
+		$prefix = $this->pattern['negPref'];
+		$postfix = $this->pattern['negPost'];
+		return array($prefix, $postfix);
+	}
+
+	/**
+	 * Set the format pattern for negative values.
+	 * The negative pattern is composed of a prefix, and postfix in the form
+	 * <b>array(prefix, postfix)</b>.
+	 * @param arary negative pattern.
+	 */
+	function setNegativePattern($pattern)
+	{
+		$this->pattern['negPref'] = $pattern[0];
+		$this->pattern['negPost'] = $pattern[1];
+	}
+
+	/**
+	 * Gets the format pattern for positive values.
+	 * The positive pattern is composed of a prefix, and postfix.
+	 * This function returns <b>array(prefix, postfix)</b>.
+	 * @return arary positive pattern.
+	 */
+	function getPositivePattern()
+	{
+		$prefix = $this->pattern['posPref'];
+		$postfix = $this->pattern['posPost'];
+		return array($prefix, $postfix);
+	}
+
+	/**
+	 * Set the format pattern for positive values.
+	 * The positive pattern is composed of a prefix, and postfix in the form
+	 * <b>array(prefix, postfix)</b>.
+	 * @param arary positive pattern.
+	 */
+	function setPositivePattern($pattern)
+	{
+		$this->pattern['posPref'] = $pattern[0];
+		$this->pattern['posPost'] = $pattern[1];
+	}
+
+	/**
+	 * Gets the string to use as the currency symbol.
+	 * @return string currency symbol.
+	 */
+	function getCurrencySymbol($currency='USD')
+	{
+		if(isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
-    	else
-    		return $this->data['Currencies'][$currency][0];
-    }
-
-
-    /**
-     * Set the string to use as the currency symbol.
-     * @param string currency symbol.
-     */
-    function setCurrencySymbol($symbol)
-    {
-    	$this->pattern['symbol'] = $symbol;
-    }
-
-    /**
-     * Gets the string that represents negative infinity.
-     * @return string negative infinity.
-     */
-    function getNegativeInfinitySymbol()
-    {
+		else
+			return $this->data['Currencies'][$currency][0];
+	}
+
+
+	/**
+	 * Set the string to use as the currency symbol.
+	 * @param string currency symbol.
+	 */
+	function setCurrencySymbol($symbol)
+	{
+		$this->pattern['symbol'] = $symbol;
+	}
+
+	/**
+	 * Gets the string that represents negative infinity.
+	 * @return string negative infinity.
+	 */
+	function getNegativeInfinitySymbol()
+	{
 		return $this->pattern['negInfty'];
-    }
-
-    /**
-     * Set the string that represents negative infinity.
-     * @param string negative infinity.
-     */
-    function setNegativeInfinitySymbol($value)
-    {
+	}
+
+	/**
+	 * Set the string that represents negative infinity.
+	 * @param string negative infinity.
+	 */
+	function setNegativeInfinitySymbol($value)
+	{
 		$this->pattern['negInfty'] = $value;
-    }
-
-    /**
-     * Gets the string that represents positive infinity.
-     * @return string positive infinity.
-     */
-    function getPositiveInfinitySymbol()
-    {
+	}
+
+	/**
+	 * Gets the string that represents positive infinity.
+	 * @return string positive infinity.
+	 */
+	function getPositiveInfinitySymbol()
+	{
 		return $this->pattern['posInfty'];
-    }
-
-    /**
-     * Set the string that represents positive infinity.
-     * @param string positive infinity.
-     */
-    function setPositiveInfinitySymbol($value)
-    {
+	}
+
+	/**
+	 * Set the string that represents positive infinity.
+	 * @param string positive infinity.
+	 */
+	function setPositiveInfinitySymbol($value)
+	{
 		$this->pattern['posInfty'] = $value;
-    }
-
-    /**
-     * Gets the string that denotes that the associated number is negative.
-     * @return string negative sign.
-     */
-    function getNegativeSign()
-    {
-    	return $this->data['NumberElements'][6];
-    }
-
-    /**
-     * Set the string that denotes that the associated number is negative.
-     * @param string negative sign.
-     */
-    function setNegativeSign($value)
-    {
-    	$this->data['NumberElements'][6] = $value;
-    }
-
-    /**
-     * Gets the string that denotes that the associated number is positive.
-     * @return string positive sign.
-     */
-    function getPositiveSign()
-    {
-    	return $this->data['NumberElements'][11];
-    }
-
-    /**
-     * Set the string that denotes that the associated number is positive.
-     * @param string positive sign.
-     */
-    function setPositiveSign($value)
-    {
-    	$this->data['NumberElements'][11] = $value;
-    }
-
-    /**
-     * Gets the string that represents the IEEE NaN (not a number) value.
-     * @return string NaN symbol.
-     */
-    function getNaNSymbol()
-    {
-    	return $this->data['NumberElements'][10];
-    }
-
-    /**
-     * Set the string that represents the IEEE NaN (not a number) value.
-     * @param string NaN symbol.
-     */
-    function setNaNSymbol($value)
-    {
-    	$this->data['NumberElements'][10] = $value;
-    }
-
-    /**
-     * Gets the string to use as the percent symbol.
-     * @return string percent symbol.
-     */
-    function getPercentSymbol()
-    {
-    	return $this->data['NumberElements'][3];
-    }
-
-    /**
-     * Set the string to use as the percent symbol.
-     * @param string percent symbol.
-     */
-    function setPercentSymbol($value)
-    {
-    	$this->data['NumberElements'][3] = $value;
-    }
-
-    /**
-     * Gets the string to use as the per mille symbol.
-     * @return string percent symbol.
-     */
-    function getPerMilleSymbol()
-    {
-    	return $this->data['NumberElements'][8];
-    }
-
-    /**
-     * Set the string to use as the per mille symbol.
-     * @param string percent symbol.
-     */
-    function setPerMilleSymbol($value)
-    {
-    	$this->data['NumberElements'][8] = $value;
-    }
+	}
+
+	/**
+	 * Gets the string that denotes that the associated number is negative.
+	 * @return string negative sign.
+	 */
+	function getNegativeSign()
+	{
+		return $this->data['NumberElements'][6];
+	}
+
+	/**
+	 * Set the string that denotes that the associated number is negative.
+	 * @param string negative sign.
+	 */
+	function setNegativeSign($value)
+	{
+		$this->data['NumberElements'][6] = $value;
+	}
+
+	/**
+	 * Gets the string that denotes that the associated number is positive.
+	 * @return string positive sign.
+	 */
+	function getPositiveSign()
+	{
+		return $this->data['NumberElements'][11];
+	}
+
+	/**
+	 * Set the string that denotes that the associated number is positive.
+	 * @param string positive sign.
+	 */
+	function setPositiveSign($value)
+	{
+		$this->data['NumberElements'][11] = $value;
+	}
+
+	/**
+	 * Gets the string that represents the IEEE NaN (not a number) value.
+	 * @return string NaN symbol.
+	 */
+	function getNaNSymbol()
+	{
+		return $this->data['NumberElements'][10];
+	}
+
+	/**
+	 * Set the string that represents the IEEE NaN (not a number) value.
+	 * @param string NaN symbol.
+	 */
+	function setNaNSymbol($value)
+	{
+		$this->data['NumberElements'][10] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the percent symbol.
+	 * @return string percent symbol.
+	 */
+	function getPercentSymbol()
+	{
+		return $this->data['NumberElements'][3];
+	}
+
+	/**
+	 * Set the string to use as the percent symbol.
+	 * @param string percent symbol.
+	 */
+	function setPercentSymbol($value)
+	{
+		$this->data['NumberElements'][3] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the per mille symbol.
+	 * @return string percent symbol.
+	 */
+	function getPerMilleSymbol()
+	{
+		return $this->data['NumberElements'][8];
+	}
+
+	/**
+	 * Set the string to use as the per mille symbol.
+	 * @param string percent symbol.
+	 */
+	function setPerMilleSymbol($value)
+	{
+		$this->data['NumberElements'][8] = $value;
+	}
 }
 

Spacing +46 added lines, -46 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Get the CultureInfo class file.
  */
-require_once(dirname(__FILE__).'/CultureInfo.php');
+require_once(dirname(__FILE__) . '/CultureInfo.php');
 
 /**
  * NumberFormatInfo class
@@ -78,11 +78,11 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
+		$getProperty = 'get' . $name;
+		if (in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property '.$name.' does not exists.');
+			throw new Exception('Property ' . $name . ' does not exists.');
 	}
 
 	/**
@@ -91,11 +91,11 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
+		$setProperty = 'set' . $name;
+		if (in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property '.$name.' can not be set.');
+			throw new Exception('Property ' . $name . ' can not be set.');
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 	 * @param array ICU data for date time formatting.
 	 * @see getInstance()
 	 */
-	public function __construct($data=array(), $type=NumberFormatInfo::DECIMAL)
+	public function __construct($data = array(), $type = NumberFormatInfo::DECIMAL)
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
+		if (empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
 		$this->data = $data;
@@ -125,20 +125,20 @@ 
      * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
 	 * @param int pattern type.
 	 */
-	public function setPattern($type=NumberFormatInfo::DECIMAL)
+	public function setPattern($type = NumberFormatInfo::DECIMAL)
 	{
-		if(is_int($type))
+		if (is_int($type))
 			$this->pattern =
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
 		else
 			$this->pattern = $this->parsePattern($type);
 
 		$this->pattern['negInfty'] =
-			$this->data['NumberElements'][6].
+			$this->data['NumberElements'][6] .
 			$this->data['NumberElements'][9];
 
 		$this->pattern['posInfty'] =
-			$this->data['NumberElements'][11].
+			$this->data['NumberElements'][11] .
 			$this->data['NumberElements'][9];
 	}
 
@@ -152,10 +152,10 @@ 
 	 * (invariant).
 	 * @return NumberFormatInfo default NumberFormatInfo.
 	 */
-    public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
+    public static function getInvariantInfo($type = NumberFormatInfo::DECIMAL)
     {
         static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
         {
             $culture = CultureInfo::getInvariantCulture();
             $invariant = $culture->NumberFormat;
@@ -176,8 +176,8 @@ 
      * @see getPercentageInstance();
      * @see getScientificInstance();
      */
-    public static function getInstance($culture=null,
-    								   $type=NumberFormatInfo::DECIMAL)
+    public static function getInstance($culture = null,
+    								   $type = NumberFormatInfo::DECIMAL)
     {
    		if ($culture instanceof CultureInfo)
    		{
@@ -185,7 +185,7 @@ 
             $formatInfo->setPattern($type);
             return $formatInfo;
    		}
-       	else if(is_string($culture))
+       	else if (is_string($culture))
        	{
        		$cultureInfo = new CultureInfo($culture);
        		$formatInfo = $cultureInfo->NumberFormat;
@@ -207,7 +207,7 @@ 
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      */
-    public static function getCurrencyInstance($culture=null)
+    public static function getCurrencyInstance($culture = null)
     {
         return self::getInstance($culture, self::CURRENCY);
     }
@@ -218,7 +218,7 @@ 
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      */
-    public static function getPercentageInstance($culture=null)
+    public static function getPercentageInstance($culture = null)
     {
         return self::getInstance($culture, self::PERCENTAGE);
     }
@@ -229,7 +229,7 @@ 
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      */
-    public static function getScientificInstance($culture=null)
+    public static function getScientificInstance($culture = null)
     {
         return self::getInstance($culture, self::SCIENTIFIC);
     }
@@ -241,10 +241,10 @@ 
      */
     protected function parsePattern($pattern)
 	{
-		$pattern = explode(';',$pattern);
+		$pattern = explode(';', $pattern);
 
 		$negative = null;
-		if(count($pattern) > 1)
+		if (count($pattern) > 1)
 			$negative = $pattern[1];
 		$pattern = $pattern[0];
 
@@ -254,13 +254,13 @@ 
 		$hash = '#';
 
 		//find the first group point, and decimal point
-		$groupPos1 = strrpos($pattern,$comma);
-		$decimalPos = strrpos($pattern,$dot);
+		$groupPos1 = strrpos($pattern, $comma);
+		$decimalPos = strrpos($pattern, $dot);
 
 		$groupPos2 = false;
 		$groupSize1 = false;
 		$groupSize2 = false;
-		$decimalPoints = is_int($decimalPos)?-1:false;
+		$decimalPoints = is_int($decimalPos) ?-1 : false;
 
 		$info['negPref'] = $this->data['NumberElements'][6];
 		$info['negPost'] = '';
@@ -269,7 +269,7 @@ 
 		$info['positive'] = $pattern;
 
 		//find the negative prefix and postfix
-		if($negative)
+		if ($negative)
 		{
 			$prefixPostfix = $this->getPrePostfix($negative);
 			$info['negPref'] = $prefixPostfix[0];
@@ -282,24 +282,24 @@ 
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
-		if(is_int($groupPos1))
+		if (is_int($groupPos1))
 		{
 			//get the second group
-			$groupPos2 = strrpos(substr($pattern,0,$groupPos1),$comma);
+			$groupPos2 = strrpos(substr($pattern, 0, $groupPos1), $comma);
 
 			//get the number of decimal digits
-			if(is_int($decimalPos))
+			if (is_int($decimalPos))
 			{
-				$groupSize1 = $decimalPos - $groupPos1-1;
+				$groupSize1 = $decimalPos - $groupPos1 - 1;
 
 			}
 			else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
-				for($i=strlen($pattern)-1; $i>=0; $i--)
+				for ($i = strlen($pattern) - 1; $i >= 0; $i--)
 				{
-					if($pattern{$i} == $digit || $pattern{$i}==$hash)
+					if ($pattern{$i} == $digit || $pattern{$i} == $hash)
 					{
 						$groupSize1 = $i - $groupPos1;
 						break;
@@ -308,16 +308,16 @@ 
 			}
 
 			//get the second group size
-			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2-1;
+			if (is_int($groupPos2))
+				$groupSize2 = $groupPos1 - $groupPos2 - 1;
 		}
 
-		if(is_int($decimalPos))
+		if (is_int($decimalPos))
 		{
-			for($i=strlen($pattern)-1; $i>=0; $i--)
+			for ($i = strlen($pattern) - 1; $i >= 0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
-				if($pattern{$i} == $digit)
+				if ($pattern{$i} == $dot) break;
+				if ($pattern{$i} == $digit)
 				{
 					$decimalPoints = $i - $decimalPos;
 					break;
@@ -325,12 +325,12 @@ 
 			}
 		}
 
-		if(is_int($decimalPos))
-			$digitPattern = substr($pattern,0,$decimalPos);
+		if (is_int($decimalPos))
+			$digitPattern = substr($pattern, 0, $decimalPos);
 		else
-			$digitPattern  = $pattern;
+			$digitPattern = $pattern;
 
-		$digitPattern  = preg_replace('/[^0]/','',$digitPattern);
+		$digitPattern = preg_replace('/[^0]/', '', $digitPattern);
 
 		$info['groupPos1'] = $groupPos1;
 		$info['groupSize1'] = $groupSize1;
@@ -351,7 +351,7 @@ 
 	{
 		$regexp = '/[#,\.0]+/';
 		$result = preg_split($regexp, $pattern);
-		return array($result[0],$result[1]);
+		return array($result[0], $result[1]);
 	}
 
 
@@ -503,9 +503,9 @@ 
      * Gets the string to use as the currency symbol.
      * @return string currency symbol.
      */
-    function getCurrencySymbol($currency='USD')
+    function getCurrencySymbol($currency = 'USD')
     {
-    	if(isset($this->pattern['symbol']))
+    	if (isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
     	else
     		return $this->data['Currencies'][$currency][0];

Braces +3 added lines, -6 removed lines

@@ -184,15 +184,13 @@ 
             $formatInfo = $culture->NumberFormat;
             $formatInfo->setPattern($type);
             return $formatInfo;
-   		}
-       	else if(is_string($culture))
+   		} else if(is_string($culture))
        	{
        		$cultureInfo = new CultureInfo($culture);
        		$formatInfo = $cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
-       	}
-       	else
+       	} else
        	{
             $cultureInfo = new CultureInfo();
        		$formatInfo = $cultureInfo->NumberFormat;
@@ -292,8 +290,7 @@ 
 			{
 				$groupSize1 = $decimalPos - $groupPos1-1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.