pradosoft / prado

framework/I18N/core/ChoiceFormat.php

Doc Comments +3 added lines

@@ -165,6 +165,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function isValidSetNotation($number, $set)
 	{
 		$str = '$result = '.str_replace('n', '$number', $set).';';

Spacing +24 added lines, -24 removed lines

@@ -114,27 +114,27 @@ 
 	 */
 	function isValid($number, $set)
 	{
-		$n = preg_match_all($this->validate,$set,$matches,PREG_SET_ORDER);
+		$n = preg_match_all($this->validate, $set, $matches, PREG_SET_ORDER);
 
-		if($n < 3) throw new Exception("Invalid set \"{$set}\"");
+		if ($n < 3) throw new Exception("Invalid set \"{$set}\"");
 
-		if(preg_match('/\{\s*n:([^\}]+)\}/', $set, $def))
+		if (preg_match('/\{\s*n:([^\}]+)\}/', $set, $def))
 		{
 			return $this->isValidSetNotation($number, $def[1]);
 		}
 
 		$leftBracket = $matches[0][0];
-		$rightBracket = $matches[$n-1][0];
+		$rightBracket = $matches[$n - 1][0];
 
 		$i = 0;
 		$elements = array();
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$string = $match[0];
-			if($i != 0 && $i != $n-1 && $string !== ',')
+			if ($i != 0 && $i != $n - 1 && $string !== ',')
 			{
-				if($string == '-Inf')
-					$elements[] = -1*$this->inf;
+				if ($string == '-Inf')
+					$elements[] = -1 * $this->inf;
 				else if ($string == '+Inf' || $string == 'Inf')
 					$elements[] = $this->inf;
 				else
@@ -145,35 +145,35 @@ 
 		$total = count($elements);
 		$number = floatval($number);
 
-		if($leftBracket == '{' && $rightBracket == '}')
+		if ($leftBracket == '{' && $rightBracket == '}')
 			return in_array($number, $elements);
 
 		$left = false;
-		if($leftBracket == '[')
+		if ($leftBracket == '[')
 			$left = $number >= $elements[0];
 		else if ($leftBracket == '(')
 			$left = $number > $elements[0];
 
 		$right = false;
-		if($rightBracket==']')
-			$right = $number <= $elements[$total-1];
-		else if($rightBracket == ')')
-			$right = $number < $elements[$total-1];
+		if ($rightBracket == ']')
+			$right = $number <= $elements[$total - 1];
+		else if ($rightBracket == ')')
+			$right = $number < $elements[$total - 1];
 
-		if($left && $right) return true;
+		if ($left && $right) return true;
 
 		return false;
 	}
 
 	protected function isValidSetNotation($number, $set)
 	{
-		$str = '$result = '.str_replace('n', '$number', $set).';';
+		$str = '$result = ' . str_replace('n', '$number', $set) . ';';
 		try
 		{
 			eval($str);
 			return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return false;
 		}
@@ -187,17 +187,17 @@ 
 	 */
 	function parse($string)
 	{
-		$n = preg_match_all($this->parse,$string,$matches, PREG_OFFSET_CAPTURE);
+		$n = preg_match_all($this->parse, $string, $matches, PREG_OFFSET_CAPTURE);
 		$sets = array();
-		foreach($matches[1] as $match)
+		foreach ($matches[1] as $match)
 			$sets[] = $match[0];
 		$offset = $matches[0];
 		$strings = array();
-		for($i = 0; $i < $n; $i++)
+		for ($i = 0; $i < $n; $i++)
 		{
 			$len = strlen($offset[$i][0]);
-			$begin = $i == 0? $len : $offset[$i][1] + $len;
-			$end = $i == $n-1 ? strlen($string) : $offset[$i+1][1];
+			$begin = $i == 0 ? $len : $offset[$i][1] + $len;
+			$end = $i == $n - 1 ? strlen($string) : $offset[$i + 1][1];
 			$strings[] = substr($string, $begin, $end - $begin);
 		}
 		return array($sets, $strings);
@@ -214,9 +214,9 @@ 
 	{
 		list($sets, $strings) = $this->parse($string);
 		$total = count($sets);
-		for($i = 0; $i < $total; $i++)
+		for ($i = 0; $i < $total; $i++)
 		{
-			if($this->isValid($number, $sets[$i]))
+			if ($this->isValid($number, $sets[$i]))
 				return $strings[$i];
 		}
 		return false;

Braces +33 added lines, -24 removed lines

@@ -116,7 +116,9 @@ 
 	{
 		$n = preg_match_all($this->validate,$set,$matches,PREG_SET_ORDER);
 
-		if($n < 3) throw new Exception("Invalid set \"{$set}\"");
+		if($n < 3) {
+			throw new Exception("Invalid set \"{$set}\"");
+		}
 
 		if(preg_match('/\{\s*n:([^\}]+)\}/', $set, $def))
 		{
@@ -133,34 +135,40 @@ 
 			$string = $match[0];
 			if($i != 0 && $i != $n-1 && $string !== ',')
 			{
-				if($string == '-Inf')
-					$elements[] = -1*$this->inf;
-				else if ($string == '+Inf' || $string == 'Inf')
-					$elements[] = $this->inf;
-				else
-					$elements[] = floatval($string);
+				if($string == '-Inf') {
+									$elements[] = -1*$this->inf;
+				} else if ($string == '+Inf' || $string == 'Inf') {
+									$elements[] = $this->inf;
+				} else {
+									$elements[] = floatval($string);
+				}
 			}
 			$i++;
 		}
 		$total = count($elements);
 		$number = floatval($number);
 
-		if($leftBracket == '{' && $rightBracket == '}')
-			return in_array($number, $elements);
+		if($leftBracket == '{' && $rightBracket == '}') {
+					return in_array($number, $elements);
+		}
 
 		$left = false;
-		if($leftBracket == '[')
-			$left = $number >= $elements[0];
-		else if ($leftBracket == '(')
-			$left = $number > $elements[0];
+		if($leftBracket == '[') {
+					$left = $number >= $elements[0];
+		} else if ($leftBracket == '(') {
+					$left = $number > $elements[0];
+		}
 
 		$right = false;
-		if($rightBracket==']')
-			$right = $number <= $elements[$total-1];
-		else if($rightBracket == ')')
-			$right = $number < $elements[$total-1];
+		if($rightBracket==']') {
+					$right = $number <= $elements[$total-1];
+		} else if($rightBracket == ')') {
+					$right = $number < $elements[$total-1];
+		}
 
-		if($left && $right) return true;
+		if($left && $right) {
+			return true;
+		}
 
 		return false;
 	}
@@ -172,8 +180,7 @@ 
 		{
 			eval($str);
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return false;
 		}
@@ -189,8 +196,9 @@ 
 	{
 		$n = preg_match_all($this->parse,$string,$matches, PREG_OFFSET_CAPTURE);
 		$sets = array();
-		foreach($matches[1] as $match)
-			$sets[] = $match[0];
+		foreach($matches[1] as $match) {
+					$sets[] = $match[0];
+		}
 		$offset = $matches[0];
 		$strings = array();
 		for($i = 0; $i < $n; $i++)
@@ -216,8 +224,9 @@ 
 		$total = count($sets);
 		for($i = 0; $i < $total; $i++)
 		{
-			if($this->isValid($number, $sets[$i]))
-				return $strings[$i];
+			if($this->isValid($number, $sets[$i])) {
+							return $strings[$i];
+			}
 		}
 		return false;
 	}

framework/I18N/core/CultureInfo.php

Doc Comments +6 added lines

@@ -200,6 +200,7 @@ 
 
 	/**
 	* Gets the CultureInfo that for this culture string
+	* @param string $culture
 	* @return CultureInfo invariant culture info is "en".
 	*/
 	public static function getInstance($culture)
@@ -228,6 +229,7 @@ 
 	 * Set the culture for the current instance. The culture indentifier
 	 * must be of the form "<language>_(country/region)".
 	 * @param string culture identifier, e.g. "fr_FR_EURO".
+	 * @param string $culture
 	 */
 	protected function setCulture($culture)
 	{
@@ -243,6 +245,7 @@ 
 	/**
 	 * Load the ICU culture data for the specific culture identifier.
 	 * @param string the culture identifier.
+	 * @param string $culture
 	 */
 	protected function loadCultureData($culture)
 	{
@@ -283,6 +286,7 @@ 
 	 * The data files are cached in a static variable inside
 	 * this function.
 	 * @param string the ICU data filename
+	 * @param string $filename
 	 * @return array ICU data
 	 */
 	protected function &getData($filename)
@@ -386,6 +390,7 @@ 
 	/**
 	 * Set the date time format information.
 	 * @param DateTimeFormatInfo the new date time format info.
+	 * @param DateTimeFormatInfo $dateTimeFormat
 	 */
 	function setDateTimeFormat($dateTimeFormat)
 	{
@@ -493,6 +498,7 @@ 
 	/**
 	 * Set the number format information.
 	 * @param NumberFormatInfo the new number format info.
+	 * @param NumberFormatInfo $numberFormat
 	 */
 	function setNumberFormat($numberFormat)
 	{

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();

Spacing +63 added lines, -63 removed lines

@@ -134,11 +134,11 @@ 
 	 */
 	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.');
 	}
 
 	/**
@@ -147,11 +147,11 @@ 
 	 */
 	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.');
 	}
 
 
@@ -163,11 +163,11 @@ 
 	 * @param string a culture name, e.g. "en_AU".
 	 * @return return new CultureInfo.
 	 */
-	function __construct($culture='en')
+	function __construct($culture = 'en')
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($culture))
+		if (empty($culture))
 			$culture = 'en';
 
 		$this->dataDir = $this->dataDir();
@@ -186,7 +186,7 @@ 
 	 */
 	protected static function dataDir()
 	{
-		return dirname(__FILE__).'/data/';
+		return dirname(__FILE__) . '/data/';
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	public static function getInstance($culture)
 	{
 		static $instances = array();
-		if(!isset($instances[$culture]))
+		if (!isset($instances[$culture]))
 			$instances[$culture] = new CultureInfo($culture);
 		return $instances[$culture];
 	}
@@ -218,8 +218,8 @@ 
 	 */
 	public static function validCulture($culture)
 	{
-		if(preg_match('/^[_\\w]+$/', $culture))
-			return is_file(self::dataDir().$culture.self::fileExt());
+		if (preg_match('/^[_\\w]+$/', $culture))
+			return is_file(self::dataDir() . $culture . self::fileExt());
 
 		return false;
 	}
@@ -231,7 +231,7 @@ 
 	 */
 	protected function setCulture($culture)
 	{
-		if(!empty($culture))
+		if (!empty($culture))
 		{
 			if (!preg_match('/^[_\\w]+$/', $culture))
 				throw new Exception('Invalid culture supplied: ' . $culture);
@@ -246,32 +246,32 @@ 
 	 */
 	protected function loadCultureData($culture)
 	{
-		$file_parts = explode('_',$culture);
+		$file_parts = explode('_', $culture);
 		$current_part = $file_parts[0];
 
 		$files = array($current_part);
 
-		for($i = 1, $k = count($file_parts); $i < $k; ++$i)
+		for ($i = 1, $k = count($file_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$file_parts[$i];
+			$current_part .= '_' . $file_parts[$i];
 			$files[] = $current_part;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			$filename = $this->dataDir.$file.$this->dataFileExt;
+			$filename = $this->dataDir . $file . $this->dataFileExt;
 
-			if(is_file($filename) == false)
-				throw new Exception('Data file for "'.$file.'" was not found.');
+			if (is_file($filename) == false)
+				throw new Exception('Data file for "' . $file . '" was not found.');
 
-			if(in_array($filename, $this->dataFiles) === false)
+			if (in_array($filename, $this->dataFiles) === false)
 			{
 				array_unshift($this->dataFiles, $file);
 
 				$data = &$this->getData($filename);
 				$this->data[$file] = &$data;
 
-				if(isset($data['__ALIAS']))
+				if (isset($data['__ALIAS']))
 					$this->loadCultureData($data['__ALIAS'][0]);
 				unset($data);
 			}
@@ -290,7 +290,7 @@ 
 		static $data = array();
 		static $files = array();
 
-		if(!in_array($filename, $files))
+		if (!in_array($filename, $files))
 		{
 			$data[$filename] = unserialize(file_get_contents($filename));
 			$files[] = $filename;
@@ -313,17 +313,17 @@ 
 	 * @param boolean merge the data from its parents.
 	 * @return mixed the specific ICU data.
 	 */
-	protected function findInfo($path='/', $merge=false)
+	protected function findInfo($path = '/', $merge = false)
 	{
 		$result = array();
-		foreach($this->dataFiles as $section)
+		foreach ($this->dataFiles as $section)
 		{
 			$info = $this->searchArray($this->data[$section], $path);
 
-			if($info)
+			if ($info)
 			{
-				if($merge)
-					$result = array_merge($info,$result);
+				if ($merge)
+					$result = array_merge($info, $result);
 				else
 					return $info;
 			}
@@ -340,18 +340,18 @@ 
 	 * @param string slash "/" separated array path.
 	 * @return mixed the value array using the path
 	 */
-	private function searchArray($info, $path='/')
+	private function searchArray($info, $path = '/')
 	{
-		$index = explode('/',$path);
+		$index = explode('/', $path);
 
 		$array = $info;
 
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for ($i = 0, $k = count($index); $i < $k; ++$i)
 		{
 			$value = $index[$i];
-			if($i < $k-1 && isset($array[$value]))
+			if ($i < $k - 1 && isset($array[$value]))
 				$array = $array[$value];
-			else if ($i == $k-1 && isset($array[$value]))
+			else if ($i == $k - 1 && isset($array[$value]))
 				return $array[$value];
 		}
 	}
@@ -373,7 +373,7 @@ 
 	 */
 	function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if ($this->dateTimeFormat === null)
 		{
 			$calendar = $this->getCalendar();
 			$info = $this->findInfo("calendar/{$calendar}", true);
@@ -410,12 +410,12 @@ 
 	 */
 	function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
+		$lang = substr($this->culture, 0, 2);
+		$reg = substr($this->culture, 3, 2);
 		$language = $this->findInfo("Languages/{$lang}");
 		$region = $this->findInfo("Countries/{$reg}");
-		if($region)
-			return $language[0].' ('.$region[0].')';
+		if ($region)
+			return $language[0] . ' (' . $region[0] . ')';
 		else
 			return $language[0];
 	}
@@ -428,17 +428,17 @@ 
 	 */
 	function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
+		$lang = substr($this->culture, 0, 2);
+		$reg = substr($this->culture, 3, 2);
 		$culture = $this->getInvariantCulture();
 
 		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		if (count($language) == 0)
 			return $this->culture;
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language[0].' ('.$region[0].')';
+		if ($region)
+			return $language[0] . ' (' . $region[0] . ')';
 		else
 			return $language[0];
 	}
@@ -453,7 +453,7 @@ 
 	static function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
 			$invariant = new CultureInfo();
 		return $invariant;
 	}
@@ -476,12 +476,12 @@ 
 	 */
 	function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if ($this->numberFormat === null)
 		{
 			$elements = $this->findInfo('NumberElements');
 			$patterns = $this->findInfo('NumberPatterns');
 			$currencies = $this->getCurrencies();
-			$data = array(	'NumberElements'=>$elements,
+			$data = array('NumberElements'=>$elements,
 							'NumberPatterns'=>$patterns,
 							'Currencies' => $currencies);
 
@@ -506,10 +506,10 @@ 
 	 */
 	function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if (strlen($this->culture) == 2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture,0,2);
+		$lang = substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -522,7 +522,7 @@ 
 	 * or CultureInfo::SPECIFIC.
 	 * @return array list of culture information available.
 	 */
-	static function getCultures($type=CultureInfo::ALL)
+	static function getCultures($type = CultureInfo::ALL)
 	{
 		$dataDir = CultureInfo::dataDir();
 		$dataExt = CultureInfo::fileExt();
@@ -533,12 +533,12 @@ 
 
 		while (false !== ($entry = $dir->read()))
 		{
-			if(is_file($dataDir.$entry)
-				&& substr($entry,-4) == $dataExt
-				&& $entry != 'root'.$dataExt)
+			if (is_file($dataDir . $entry)
+				&& substr($entry, -4) == $dataExt
+				&& $entry != 'root' . $dataExt)
 			{
-				$culture = substr($entry,0,-4);
-				if(strlen($culture) == 2)
+				$culture = substr($entry, 0, -4);
+				if (strlen($culture) == 2)
 					$neutral[] = $culture;
 				else
 					$specific[] = $culture;
@@ -546,10 +546,10 @@ 
 		}
 		$dir->close();
 
-		switch($type)
+		switch ($type)
 		{
 			case CultureInfo::ALL :
-				$all = 	array_merge($neutral, $specific);
+				$all = array_merge($neutral, $specific);
 				sort($all);
 				return $all;
 				break;
@@ -571,10 +571,10 @@ 
 	 */
 	private function simplify($array)
 	{
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for ($i = 0, $k = count($array); $i < $k; ++$i)
 		{
 			$key = key($array);
-			if(is_array($array[$key])
+			if (is_array($array[$key])
 				&& count($array[$key]) == 1)
 				$array[$key] = $array[$key][0];
 			next($array);
@@ -588,7 +588,7 @@ 
 	 */
 	function getCountries()
 	{
-		return $this->simplify($this->findInfo('Countries',true));
+		return $this->simplify($this->findInfo('Countries', true));
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 */
 	function getCurrencies()
 	{
-		return $this->findInfo('Currencies',true);
+		return $this->findInfo('Currencies', true);
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	function getLanguages()
 	{
-		return $this->simplify($this->findInfo('Languages',true));
+		return $this->simplify($this->findInfo('Languages', true));
 	}
 
 	/**
@@ -615,7 +615,7 @@ 
 	 */
 	function getScripts()
 	{
-		return $this->simplify($this->findInfo('Scripts',true));
+		return $this->simplify($this->findInfo('Scripts', true));
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	function getTimeZones()
 	{
-		return $this->simplify($this->findInfo('zoneStrings',true));
+		return $this->simplify($this->findInfo('zoneStrings', true));
 	}
 }
 

Braces +65 added lines, -48 removed lines

@@ -135,10 +135,11 @@ 
 	function __get($name)
 	{
 		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
-			return $this->$getProperty();
-		else
-			throw new Exception('Property '.$name.' does not exists.');
+		if(in_array($getProperty, $this->properties)) {
+					return $this->$getProperty();
+		} else {
+					throw new Exception('Property '.$name.' does not exists.');
+		}
 	}
 
 	/**
@@ -148,10 +149,11 @@ 
 	function __set($name, $value)
 	{
 		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
-			$this->$setProperty($value);
-		else
-			throw new Exception('Property '.$name.' can not be set.');
+		if(in_array($setProperty, $this->properties)) {
+					$this->$setProperty($value);
+		} else {
+					throw new Exception('Property '.$name.' can not be set.');
+		}
 	}
 
 
@@ -167,8 +169,9 @@ 
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($culture))
-			$culture = 'en';
+		if(empty($culture)) {
+					$culture = 'en';
+		}
 
 		$this->dataDir = $this->dataDir();
 		$this->dataFileExt = $this->fileExt();
@@ -205,8 +208,9 @@ 
 	public static function getInstance($culture)
 	{
 		static $instances = array();
-		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+		if(!isset($instances[$culture])) {
+					$instances[$culture] = new CultureInfo($culture);
+		}
 		return $instances[$culture];
 	}
 
@@ -218,8 +222,9 @@ 
 	 */
 	public static function validCulture($culture)
 	{
-		if(preg_match('/^[_\\w]+$/', $culture))
-			return is_file(self::dataDir().$culture.self::fileExt());
+		if(preg_match('/^[_\\w]+$/', $culture)) {
+					return is_file(self::dataDir().$culture.self::fileExt());
+		}
 
 		return false;
 	}
@@ -233,8 +238,9 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
-				throw new Exception('Invalid culture supplied: ' . $culture);
+			if (!preg_match('/^[_\\w]+$/', $culture)) {
+							throw new Exception('Invalid culture supplied: ' . $culture);
+			}
 		}
 
 		$this->culture = $culture;
@@ -261,8 +267,9 @@ 
 		{
 			$filename = $this->dataDir.$file.$this->dataFileExt;
 
-			if(is_file($filename) == false)
-				throw new Exception('Data file for "'.$file.'" was not found.');
+			if(is_file($filename) == false) {
+							throw new Exception('Data file for "'.$file.'" was not found.');
+			}
 
 			if(in_array($filename, $this->dataFiles) === false)
 			{
@@ -271,8 +278,9 @@ 
 				$data = &$this->getData($filename);
 				$this->data[$file] = &$data;
 
-				if(isset($data['__ALIAS']))
-					$this->loadCultureData($data['__ALIAS'][0]);
+				if(isset($data['__ALIAS'])) {
+									$this->loadCultureData($data['__ALIAS'][0]);
+				}
 				unset($data);
 			}
 		}
@@ -322,10 +330,11 @@ 
 
 			if($info)
 			{
-				if($merge)
-					$result = array_merge($info,$result);
-				else
-					return $info;
+				if($merge) {
+									$result = array_merge($info,$result);
+				} else {
+									return $info;
+				}
 			}
 		}
 
@@ -349,10 +358,11 @@ 
 		for($i = 0, $k = count($index); $i < $k; ++$i)
 		{
 			$value = $index[$i];
-			if($i < $k-1 && isset($array[$value]))
-				$array = $array[$value];
-			else if ($i == $k-1 && isset($array[$value]))
-				return $array[$value];
+			if($i < $k-1 && isset($array[$value])) {
+							$array = $array[$value];
+			} else if ($i == $k-1 && isset($array[$value])) {
+							return $array[$value];
+			}
 		}
 	}
 
@@ -414,10 +424,11 @@ 
 		$reg = substr($this->culture,3,2);
 		$language = $this->findInfo("Languages/{$lang}");
 		$region = $this->findInfo("Countries/{$reg}");
-		if($region)
-			return $language[0].' ('.$region[0].')';
-		else
-			return $language[0];
+		if($region) {
+					return $language[0].' ('.$region[0].')';
+		} else {
+					return $language[0];
+		}
 	}
 
 	/**
@@ -433,14 +444,16 @@ 
 		$culture = $this->getInvariantCulture();
 
 		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
-			return $this->culture;
+		if(count($language) == 0) {
+					return $this->culture;
+		}
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language[0].' ('.$region[0].')';
-		else
-			return $language[0];
+		if($region) {
+					return $language[0].' ('.$region[0].')';
+		} else {
+					return $language[0];
+		}
 	}
 
 	/**
@@ -453,8 +466,9 @@ 
 	static function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant === null) {
+					$invariant = new CultureInfo();
+		}
 		return $invariant;
 	}
 
@@ -506,8 +520,9 @@ 
 	 */
 	function getParent()
 	{
-		if(strlen($this->culture) == 2)
-			return $this->getInvariantCulture();
+		if(strlen($this->culture) == 2) {
+					return $this->getInvariantCulture();
+		}
 
 		$lang = substr($this->culture,0,2);
 			return new CultureInfo($lang);
@@ -538,10 +553,11 @@ 
 				&& $entry != 'root'.$dataExt)
 			{
 				$culture = substr($entry,0,-4);
-				if(strlen($culture) == 2)
-					$neutral[] = $culture;
-				else
-					$specific[] = $culture;
+				if(strlen($culture) == 2) {
+									$neutral[] = $culture;
+				} else {
+									$specific[] = $culture;
+				}
 			}
 		}
 		$dir->close();
@@ -575,8 +591,9 @@ 
 		{
 			$key = key($array);
 			if(is_array($array[$key])
-				&& count($array[$key]) == 1)
-				$array[$key] = $array[$key][0];
+				&& count($array[$key]) == 1) {
+							$array[$key] = $array[$key][0];
+			}
 			next($array);
 		}
 		return $array;

framework/I18N/core/DateFormat.php

Doc Comments +3 added lines

@@ -87,6 +87,7 @@ 
 	 * Initialize a new DateFormat.
 	 * @param mixed either, null, a CultureInfo instance,
 	 * a DateTimeFormatInfo instance, or a locale.
+	 * @param string $formatInfo
 	 * @return DateFormat instance
 	 */
 	function __construct($formatInfo=null)
@@ -179,6 +180,7 @@ 
 	 * DateTimeFormatInfo::formatDateTime
 	 * See the tutorial documentation for futher details on the patterns.
 	 * @param mixed a pattern.
+	 * @param string $pattern
 	 * @return string a pattern.
 	 * @see DateTimeFormatInfo::formatDateTime()
 	 */
@@ -269,6 +271,7 @@ 
 	 * Any substrings, starting and ending with a single quote (')
 	 * will be treated as a single token.
 	 * @param string pattern.
+	 * @param string $pattern
 	 * @return array string tokens in an array.
 	 */
 	protected function getTokens($pattern)

Indentation +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -308,8 +308,8 @@ 
 
 	/**
 	 * Get the year.
- 	 * "yy" will return the last two digits of year.
- 	 * "yyyy" will return the full integer year.
+	 * "yy" will return the last two digits of year.
+	 * "yyyy" will return the full integer year.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string year
@@ -330,10 +330,10 @@ 
 
 	/**
 	 * Get the month.
- 	 * "M" will return integer 1 through 12
- 	 * "MM" will return the narrow month name, e.g. "J"
- 	 * "MMM" will return the abrreviated month name, e.g. "Jan"
- 	 * "MMMM" will return the month name, e.g. "January"
+	 * "M" will return integer 1 through 12
+	 * "MM" will return the narrow month name, e.g. "J"
+	 * "MMM" will return the abrreviated month name, e.g. "Jan"
+	 * "MMMM" will return the month name, e.g. "January"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string month name
@@ -361,10 +361,10 @@ 
 
 	/**
 	 * Get the day of the week.
- 	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
- 	 * "EE" will return the narrow day of the week, e.g. "M"
- 	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
- 	 * "EEEE" will return the day of the week, e.g. "Monday"
+	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+	 * "EE" will return the narrow day of the week, e.g. "M"
+	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+	 * "EEEE" will return the day of the week, e.g. "Monday"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the week.
@@ -394,7 +394,7 @@ 
 
 	/**
 	 * Get the day of the month.
- 	 * "d" for non-padding, "dd" will always return 2 characters.
+	 * "d" for non-padding, "dd" will always return 2 characters.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the month
@@ -581,14 +581,14 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    case 'FF':
-		      return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    default:
-		      throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+			  return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			case 'FF':
+			  return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			default:
+			  throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

Spacing +81 added lines, -81 removed lines

@@ -19,12 +19,12 @@ 
 /**
  * Get the DateTimeFormatInfo class.
  */
-require_once(dirname(__FILE__).'/DateTimeFormatInfo.php');
+require_once(dirname(__FILE__) . '/DateTimeFormatInfo.php');
 
 /**
  * Get the encoding utilities
  */
-require_once(dirname(__FILE__).'/util.php');
+require_once(dirname(__FILE__) . '/util.php');
 
 /**
  * DateFormat class.
@@ -89,13 +89,13 @@ 
 	 * a DateTimeFormatInfo instance, or a locale.
 	 * @return DateFormat instance
 	 */
-	function __construct($formatInfo=null)
+	function __construct($formatInfo = null)
 	{
-		if($formatInfo === null)
+		if ($formatInfo === null)
 			$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
-		else if($formatInfo instanceof CultureInfo)
+		else if ($formatInfo instanceof CultureInfo)
 			$this->formatInfo = $formatInfo->DateTimeFormat;
-		else if($formatInfo instanceof DateTimeFormatInfo)
+		else if ($formatInfo instanceof DateTimeFormatInfo)
 			$this->formatInfo = $formatInfo;
 		else
 			$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
@@ -108,14 +108,14 @@ 
 	 * @param mixed the time as integer or string in strtotime format.
 	 * @return string formatted date time.
 	 */
-	public function format($time, $pattern='F', $charset='UTF-8')
+	public function format($time, $pattern = 'F', $charset = 'UTF-8')
 	{
 		if (is_numeric($time)) //assumes unix epoch
 			$time = floatval($time);
-		else if(is_string($time))
+		else if (is_string($time))
 			$time = @strtotime($time);
 
-		if($pattern === null)
+		if ($pattern === null)
 			$pattern = 'F';
 
 		$s = Prado::createComponent('System.Util.TDateTimeStamp');
@@ -126,38 +126,38 @@ 
 
 		$tokens = $this->getTokens($pattern);
 
-		for($i = 0, $k = count($tokens); $i<$k; ++$i)
+		for ($i = 0, $k = count($tokens); $i < $k; ++$i)
 		{
 			$pattern = $tokens[$i];
-			if($pattern{0} == "'"
-				&& $pattern{strlen($pattern)-1} == "'")
+			if ($pattern{0} == "'"
+				&& $pattern{strlen($pattern) - 1} == "'")
 			{
-				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
-				$tokens[$i] =  str_replace('``````','\'',$sub);
+				$sub = preg_replace('/(^\')|(\'$)/', '', $pattern);
+				$tokens[$i] = str_replace('``````', '\'', $sub);
 			}
-			else if($pattern == '``````')
+			else if ($pattern == '``````')
 			{
 				$tokens[$i] = '\'';
 			}
 			else
 			{
 				$function = $this->getFunctionName($pattern);
-				if($function != null)
+				if ($function != null)
 				{
-					$fName = 'get'.$function;
-					if(in_array($fName, $this->methods))
+					$fName = 'get' . $function;
+					if (in_array($fName, $this->methods))
 					{
 						$rs = $this->$fName($date, $pattern);
 						$tokens[$i] = $rs;
 					}
 					else
 						throw new
-						Exception('function '.$function.' not found.');
+						Exception('function ' . $function . ' not found.');
 				}
 			}			
 		}
 
-		return I18N_toEncoding(implode('',$tokens), $charset);
+		return I18N_toEncoding(implode('', $tokens), $charset);
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	protected function getFunctionName($token)
 	{
-		if(isset($this->tokens[$token{0}]))
+		if (isset($this->tokens[$token{0}]))
 			return $this->tokens[$token{0}];
 	}
 
@@ -184,14 +184,14 @@ 
 	 */
 	protected function getPattern($pattern)
 	{
-		if(is_array($pattern) && count($pattern) == 2)
+		if (is_array($pattern) && count($pattern) == 2)
 		{
 			return $this->formatInfo->formatDateTime(
 							$this->getPattern($pattern[0]),
 							$this->getPattern($pattern[1]));
 		}
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'd':
 				return $this->formatInfo->ShortDatePattern;
@@ -280,23 +280,23 @@ 
 		$text = false;
 		$pattern = preg_replace("/''/", '``````', $pattern);
 
-		for($i = 0; $i < strlen($pattern); $i++)
+		for ($i = 0; $i < strlen($pattern); $i++)
 		{
-			if($char==null || $pattern{$i} == $char || $text)
+			if ($char == null || $pattern{$i} == $char || $text)
 			{
 				$token .= $pattern{$i};
 			}
 			else
 			{
-				$tokens[] = str_replace("","'",$token);
+				$tokens[] = str_replace("", "'", $token);
 				$token = $pattern{$i};
 			}
 
-			if($pattern{$i} == "'" && $text == false)
+			if ($pattern{$i} == "'" && $text == false)
 				$text = true;
-			else if($text && $pattern{$i} == "'" && $char == "'")
+			else if ($text && $pattern{$i} == "'" && $char == "'")
 				$text = true;
-			else if($text && $char != "'" && $pattern{$i} == "'")
+			else if ($text && $char != "'" && $pattern{$i} == "'")
 				$text = false;
 
 			$char = $pattern{$i};
@@ -314,13 +314,13 @@ 
 	 * @param string a pattern.
 	 * @return string year
 	 */
-	protected function getYear($date, $pattern='yyyy')
+	protected function getYear($date, $pattern = 'yyyy')
 	{
 		$year = $date['year'];
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'yy':
-				return substr($year,2);
+				return substr($year, 2);
 			case 'yyyy':
 				return $year;
 			default:
@@ -338,23 +338,23 @@ 
 	 * @param string a pattern.
 	 * @return string month name
 	 */
-	protected function getMonth($date, $pattern='M')
+	protected function getMonth($date, $pattern = 'M')
 	{
 		$month = $date['mon'];
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'M':
 				return $month;
 			case 'MM':
-				return str_pad($month, 2,'0',STR_PAD_LEFT);
+				return str_pad($month, 2, '0', STR_PAD_LEFT);
 			case 'MMM':
-				return $this->formatInfo->AbbreviatedMonthNames[$month-1];
+				return $this->formatInfo->AbbreviatedMonthNames[$month - 1];
 				break;
 			case 'MMMM':
-				return $this->formatInfo->MonthNames[$month-1];
+				return $this->formatInfo->MonthNames[$month - 1];
 			default:
-				throw new Exception('The pattern for month '.
+				throw new Exception('The pattern for month ' .
 						'is "M", "MM", "MMM", or "MMMM".');
 		}
 	}
@@ -369,11 +369,11 @@ 
 	 * @param string a pattern.
 	 * @return string day of the week.
 	 */
-	protected function getDayInWeek($date, $pattern='EEEE')
+	protected function getDayInWeek($date, $pattern = 'EEEE')
 	{
 		$day = $date['wday'];
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'E':
 				return $day;
@@ -387,7 +387,7 @@ 
 				return $this->formatInfo->DayNames[$day];
 				break;
 			default:
-				throw new Exception('The pattern for day of the week '.
+				throw new Exception('The pattern for day of the week ' .
 						'is "E", "EE", "EEE", or "EEEE".');
 		}
 	}
@@ -399,18 +399,18 @@ 
 	 * @param string a pattern.
 	 * @return string day of the month
 	 */
-	protected function getDay($date, $pattern='d')
+	protected function getDay($date, $pattern = 'd')
 	{
 		$day = $date['mday'];
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'd':
 				return $day;
 			case 'dd':
-				return str_pad($day, 2,'0',STR_PAD_LEFT);
+				return str_pad($day, 2, '0', STR_PAD_LEFT);
 			default:
-				throw new Exception('The pattern for day of '.
+				throw new Exception('The pattern for day of ' .
 						'the month is "d" or "dd".');
 		}
 	}
@@ -423,14 +423,14 @@ 
 	 * @param string a pattern.
 	 * @return string era
 	 */
-	protected function getEra($date, $pattern='G')
+	protected function getEra($date, $pattern = 'G')
 	{
 
-		if($pattern != 'G')
+		if ($pattern != 'G')
 			throw new Exception('The pattern for era is "G".');
 
 		$year = $date['year'];
-		if($year > 0)
+		if ($year > 0)
 			return $this->formatInfo->getEra(1);
 		else
 			return $this->formatInfo->getEra(0);
@@ -443,18 +443,18 @@ 
 	 * @param string a pattern.
 	 * @return string hours in 24 hour format.
 	 */
-	protected function getHour24($date, $pattern='H')
+	protected function getHour24($date, $pattern = 'H')
 	{
 		$hour = $date['hours'];
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'H':
 				return $hour;
 			case 'HH':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
-				throw new Exception('The pattern for 24 hour '.
+				throw new Exception('The pattern for 24 hour ' .
 						'format is "H" or "HH".');
 		}
 	}
@@ -465,13 +465,13 @@ 
 	 * @param string a pattern.
 	 * @return string AM or PM designator
 	 */
-	protected function getAMPM($date, $pattern='a')
+	protected function getAMPM($date, $pattern = 'a')
 	{
-		if($pattern != 'a')
+		if ($pattern != 'a')
 			throw new Exception('The pattern for AM/PM marker is "a".');
 
 		$hour = $date['hours'];
-		$ampm = (int)($hour/12);
+		$ampm = (int) ($hour / 12);
 		return $this->formatInfo->AMPMMarkers[$ampm];
 	}
 
@@ -482,19 +482,19 @@ 
 	 * @param string a pattern.
 	 * @return string hours in 12 hour format.
 	 */
-	protected function getHour12($date, $pattern='h')
+	protected function getHour12($date, $pattern = 'h')
 	{
 		$hour = $date['hours'];
-		$hour = ($hour==12|$hour==0)?12:($hour)%12;
+		$hour = ($hour == 12 | $hour == 0) ? 12 : ($hour) % 12;
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'h':
 				return $hour;
 			case 'hh':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
-				throw new Exception('The pattern for 24 hour '.
+				throw new Exception('The pattern for 24 hour ' .
 						'format is "H" or "HH".');
 		}
 	}
@@ -506,16 +506,16 @@ 
 	 * @param string a pattern.
 	 * @return string minutes.
 	 */
-	protected function getMinutes($date, $pattern='m')
+	protected function getMinutes($date, $pattern = 'm')
 	{
 		$minutes = $date['minutes'];
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'm':
 				return $minutes;
 			case 'mm':
-				return str_pad($minutes, 2,'0',STR_PAD_LEFT);
+				return str_pad($minutes, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for minutes is "m" or "mm".');
 		}
@@ -528,16 +528,16 @@ 
 	 * @param string a pattern.
 	 * @return string seconds
 	 */
-	protected function getSeconds($date, $pattern='s')
+	protected function getSeconds($date, $pattern = 's')
 	{
 		$seconds = $date['seconds'];
 
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 's':
 				return $seconds;
 			case 'ss':
-				return str_pad($seconds, 2,'0',STR_PAD_LEFT);
+				return str_pad($seconds, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for seconds is "s" or "ss".');
 		}
@@ -550,9 +550,9 @@ 
 	 * @param string a pattern.
 	 * @return string time zone
 	 */
-	protected function getTimeZone($date, $pattern='z')
+	protected function getTimeZone($date, $pattern = 'z')
 	{
-		if($pattern != 'z')
+		if ($pattern != 'z')
 			throw new Exception('The pattern for time zone is "z".');
 
 		return @date('T', @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
@@ -564,9 +564,9 @@ 
 	 * @param string a pattern.
 	 * @return int hours in AM/PM format.
 	 */
-	protected function getDayInYear($date, $pattern='D')
+	protected function getDayInYear($date, $pattern = 'D')
 	{
-		if($pattern != 'D')
+		if ($pattern != 'D')
 			throw new Exception('The pattern for day in year is "D".');
 
 		return $date['yday'];
@@ -578,7 +578,7 @@ 
 	 * @param string a pattern.
 	 * @return int day in month
 	 */
-	protected function getDayInMonth($date, $pattern='FF')
+	protected function getDayInMonth($date, $pattern = 'FF')
 	{
 		switch ($pattern) {
 		    case 'F':
@@ -598,9 +598,9 @@ 
 	 * @param string a pattern.
 	 * @return int week in year
 	 */
-	protected function getWeekInYear($date, $pattern='w')
+	protected function getWeekInYear($date, $pattern = 'w')
 	{
-		if($pattern != 'w')
+		if ($pattern != 'w')
 			throw new Exception('The pattern for week in year is "w".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
@@ -611,9 +611,9 @@ 
 	 * @param array getdate format.
 	 * @return int week in month
 	 */
-	protected function getWeekInMonth($date, $pattern='W')
+	protected function getWeekInMonth($date, $pattern = 'W')
 	{
-		if($pattern != 'W')
+		if ($pattern != 'W')
 			throw new Exception('The pattern for week in month is "W".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
@@ -625,12 +625,12 @@ 
 	 * @param string a pattern.
 	 * @return int hours [1-24]
 	 */
-	protected function getHourInDay($date, $pattern='k')
+	protected function getHourInDay($date, $pattern = 'k')
 	{
-		if($pattern != 'k')
+		if ($pattern != 'k')
 			throw new Exception('The pattern for hour in day is "k".');
 
-		return $date['hours']+1;
+		return $date['hours'] + 1;
 	}
 
 	/**
@@ -639,12 +639,12 @@ 
 	 * @param string a pattern.
 	 * @return int hours in AM/PM format.
 	 */
-	protected function getHourInAMPM($date, $pattern='K')
+	protected function getHourInAMPM($date, $pattern = 'K')
 	{
-		if($pattern != 'K')
+		if ($pattern != 'K')
 			throw new Exception('The pattern for hour in AM/PM is "K".');
 
-		return ($date['hours']+1)%12;
+		return ($date['hours'] + 1) % 12;
 	}
 
 }

Braces +62 added lines, -50 removed lines

@@ -91,14 +91,15 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
-		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->DateTimeFormat;
-		else if($formatInfo instanceof DateTimeFormatInfo)
-			$this->formatInfo = $formatInfo;
-		else
-			$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
+		if($formatInfo === null) {
+					$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
+		} else if($formatInfo instanceof CultureInfo) {
+					$this->formatInfo = $formatInfo->DateTimeFormat;
+		} else if($formatInfo instanceof DateTimeFormatInfo) {
+					$this->formatInfo = $formatInfo;
+		} else {
+					$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
+		}
 
 		$this->methods = get_class_methods($this);
 	}
@@ -110,13 +111,16 @@ 
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
 	{
-		if (is_numeric($time)) //assumes unix epoch
+		if (is_numeric($time)) {
+			//assumes unix epoch
 			$time = floatval($time);
-		else if(is_string($time))
-			$time = @strtotime($time);
+		} else if(is_string($time)) {
+					$time = @strtotime($time);
+		}
 
-		if($pattern === null)
-			$pattern = 'F';
+		if($pattern === null) {
+					$pattern = 'F';
+		}
 
 		$s = Prado::createComponent('System.Util.TDateTimeStamp');
 
@@ -134,12 +138,10 @@ 
 			{
 				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
 				$tokens[$i] =  str_replace('``````','\'',$sub);
-			}
-			else if($pattern == '``````')
+			} else if($pattern == '``````')
 			{
 				$tokens[$i] = '\'';
-			}
-			else
+			} else
 			{
 				$function = $this->getFunctionName($pattern);
 				if($function != null)
@@ -149,10 +151,10 @@ 
 					{
 						$rs = $this->$fName($date, $pattern);
 						$tokens[$i] = $rs;
-					}
-					else
-						throw new
+					} else {
+											throw new
 						Exception('function '.$function.' not found.');
+					}
 				}
 			}			
 		}
@@ -167,8 +169,9 @@ 
 	 */
 	protected function getFunctionName($token)
 	{
-		if(isset($this->tokens[$token{0}]))
-			return $this->tokens[$token{0}];
+		if(isset($this->tokens[$token{0}])) {
+					return $this->tokens[$token{0}];
+		}
 	}
 
 	/**
@@ -285,19 +288,19 @@ 
 			if($char==null || $pattern{$i} == $char || $text)
 			{
 				$token .= $pattern{$i};
-			}
-			else
+			} else
 			{
 				$tokens[] = str_replace("","'",$token);
 				$token = $pattern{$i};
 			}
 
-			if($pattern{$i} == "'" && $text == false)
-				$text = true;
-			else if($text && $pattern{$i} == "'" && $char == "'")
-				$text = true;
-			else if($text && $char != "'" && $pattern{$i} == "'")
-				$text = false;
+			if($pattern{$i} == "'" && $text == false) {
+							$text = true;
+			} else if($text && $pattern{$i} == "'" && $char == "'") {
+							$text = true;
+			} else if($text && $char != "'" && $pattern{$i} == "'") {
+							$text = false;
+			}
 
 			$char = $pattern{$i};
 
@@ -426,14 +429,16 @@ 
 	protected function getEra($date, $pattern='G')
 	{
 
-		if($pattern != 'G')
-			throw new Exception('The pattern for era is "G".');
+		if($pattern != 'G') {
+					throw new Exception('The pattern for era is "G".');
+		}
 
 		$year = $date['year'];
-		if($year > 0)
-			return $this->formatInfo->getEra(1);
-		else
-			return $this->formatInfo->getEra(0);
+		if($year > 0) {
+					return $this->formatInfo->getEra(1);
+		} else {
+					return $this->formatInfo->getEra(0);
+		}
 	}
 
 	/**
@@ -467,8 +472,9 @@ 
 	 */
 	protected function getAMPM($date, $pattern='a')
 	{
-		if($pattern != 'a')
-			throw new Exception('The pattern for AM/PM marker is "a".');
+		if($pattern != 'a') {
+					throw new Exception('The pattern for AM/PM marker is "a".');
+		}
 
 		$hour = $date['hours'];
 		$ampm = (int)($hour/12);
@@ -552,8 +558,9 @@ 
 	 */
 	protected function getTimeZone($date, $pattern='z')
 	{
-		if($pattern != 'z')
-			throw new Exception('The pattern for time zone is "z".');
+		if($pattern != 'z') {
+					throw new Exception('The pattern for time zone is "z".');
+		}
 
 		return @date('T', @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
 	}
@@ -566,8 +573,9 @@ 
 	 */
 	protected function getDayInYear($date, $pattern='D')
 	{
-		if($pattern != 'D')
-			throw new Exception('The pattern for day in year is "D".');
+		if($pattern != 'D') {
+					throw new Exception('The pattern for day in year is "D".');
+		}
 
 		return $date['yday'];
 	}
@@ -600,8 +608,9 @@ 
 	 */
 	protected function getWeekInYear($date, $pattern='w')
 	{
-		if($pattern != 'w')
-			throw new Exception('The pattern for week in year is "w".');
+		if($pattern != 'w') {
+					throw new Exception('The pattern for week in year is "w".');
+		}
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
 	}
@@ -613,8 +622,9 @@ 
 	 */
 	protected function getWeekInMonth($date, $pattern='W')
 	{
-		if($pattern != 'W')
-			throw new Exception('The pattern for week in month is "W".');
+		if($pattern != 'W') {
+					throw new Exception('The pattern for week in month is "W".');
+		}
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
 	}
@@ -627,8 +637,9 @@ 
 	 */
 	protected function getHourInDay($date, $pattern='k')
 	{
-		if($pattern != 'k')
-			throw new Exception('The pattern for hour in day is "k".');
+		if($pattern != 'k') {
+					throw new Exception('The pattern for hour in day is "k".');
+		}
 
 		return $date['hours']+1;
 	}
@@ -641,8 +652,9 @@ 
 	 */
 	protected function getHourInAMPM($date, $pattern='K')
 	{
-		if($pattern != 'K')
-			throw new Exception('The pattern for hour in AM/PM is "K".');
+		if($pattern != 'K') {
+					throw new Exception('The pattern for hour in AM/PM is "K".');
+		}
 
 		return ($date['hours']+1)%12;
 	}

framework/I18N/core/DateTimeFormatInfo.php

Doc Comments +1 added lines

@@ -340,6 +340,7 @@
 	/**
 	 * A string containing the name of the era.
 	 * @param int era The integer representing the era.
+	 * @param integer $era
 	 * @return string the era name.
 	 */
 	function getEra($era)

Indentation +157 added lines, -157 removed lines

@@ -149,46 +149,46 @@ 
 	 * (invariant).
 	 * @return DateTimeFormatInfo default DateTimeFormatInfo.
 	 */
-    static function getInvariantInfo()
-    {
-        static $invariant;
+	static function getInvariantInfo()
+	{
+		static $invariant;
 		if($invariant === null)
-        {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->getDateTimeFormat();
-        }
+		{
+			$culture = CultureInfo::getInvariantCulture();
+			$invariant = $culture->getDateTimeFormat();
+		}
 		return $invariant;
-    }
-
-    /**
-     * Returns the DateTimeFormatInfo associated with the specified culture.
-     * @param CultureInfo the culture that gets the DateTimeFormat property.
-     * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
-     * culture.
-     */
-    static function getInstance($culture=null)
-    {
-
-        if ($culture instanceof CultureInfo)
-            return $culture->getDateTimeFormat();
-       	else if(is_string($culture))
-       	{
-       		$cultureInfo = CultureInfo::getInstance($culture);
-       		return $cultureInfo->getDateTimeFormat();
-       	}
-       	else
-       	{
+	}
+
+	/**
+	 * Returns the DateTimeFormatInfo associated with the specified culture.
+	 * @param CultureInfo the culture that gets the DateTimeFormat property.
+	 * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
+	 * culture.
+	 */
+	static function getInstance($culture=null)
+	{
+
+		if ($culture instanceof CultureInfo)
+			return $culture->getDateTimeFormat();
+	   	else if(is_string($culture))
+	   	{
+	   		$cultureInfo = CultureInfo::getInstance($culture);
+	   		return $cultureInfo->getDateTimeFormat();
+	   	}
+	   	else
+	   	{
 			$cultureInfo = CultureInfo::getInvariantCulture();
-            return $cultureInfo->getDateTimeFormat();
-       	}
-    }
+			return $cultureInfo->getDateTimeFormat();
+	   	}
+	}
 
 	/**
 	 * A one-dimensional array of type String containing
 	 * the culture-specific abbreviated names of the days
 	 * of the week. The array for InvariantInfo contains
 	 * "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", and "Sat".
-     * @return array abbreviated day names
+	 * @return array abbreviated day names
 	 */
 	function getAbbreviatedDayNames()
 	{
@@ -196,37 +196,37 @@ 
 		//return $this->data['dayNames/format/abbreviated'];
 	}
 
-    /**
-     * Set the abbreviated day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
-     * @param array abbreviated day names.
-     */
-    function setAbbreviatedDayNames($value)
-    {
-    	$this->data['dayNames']['format']['abbreviated'] = $value;
-    }
+	/**
+	 * Set the abbreviated day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
+	 * @param array abbreviated day names.
+	 */
+	function setAbbreviatedDayNames($value)
+	{
+		$this->data['dayNames']['format']['abbreviated'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing
 	 * the culture-specific narrow names of the days
 	 * of the week. The array for InvariantInfo contains
 	 * "S", "M", "T", "W", "T", "F", and "S".
-     * @return array narrow day names
+	 * @return array narrow day names
 	 */
 	function getNarrowDayNames()
 	{
 		return $this->data['dayNames']['format']['narrow'];
 	}
 
-    /**
-     * Set the narrow day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
-     * @param array narrow day names.
-     */
+	/**
+	 * Set the narrow day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
+	 * @param array narrow day names.
+	 */
 	function setNarrowDayNames($value)
 	{
 		$this->data['dayNames']['format']['narrow'] = $value;
@@ -237,7 +237,7 @@ 
 	 * culture-specific full names of the days of the week.
 	 * The array for InvariantInfo contains "Sunday", "Monday",
 	 * "Tuesday", "Wednesday", "Thursday", "Friday", and "Saturday".
-     * @return array day names
+	 * @return array day names
 	 */
 	function getDayNames()
 	{
@@ -245,14 +245,14 @@ 
 	}
 
 
-    /**
-     * Set the day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-     * "Friday", "Saturday".);</code>
-     * @param array day names.
-     */
+	/**
+	 * Set the day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+	 * "Friday", "Saturday".);</code>
+	 * @param array day names.
+	 */
 	function setDayNames($value)
 	{
 		$this->data['dayNames']['format']['wide'] = $value;
@@ -270,17 +270,17 @@ 
 		return $this->data['monthNames']['format']['narrow'];
 	}
 
-    /**
-     * Set the narrow month names. The value should be
-     * an array of string starting with J and ends in D.
-     * For example,
-     * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
-     * @param array month names.
-     */
-    function setNarrowMonthNames($value)
-    {
-        $this->data['monthNames']['format']['narrow'] = $value;
-    }
+	/**
+	 * Set the narrow month names. The value should be
+	 * an array of string starting with J and ends in D.
+	 * For example,
+	 * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
+	 * @param array month names.
+	 */
+	function setNarrowMonthNames($value)
+	{
+		$this->data['monthNames']['format']['narrow'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing the
@@ -298,18 +298,18 @@ 
 			return $this->data['monthNames']['format']['wide'];
 	}
 
-    /**
-     * Set the abbreviated month names. The value should be
-     * an array of string starting with Jan and ends in Dec.
-     * For example,
-     * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
-     * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
-     * @param array month names.
-     */
-    function setAbbreviatedMonthNames($value)
-    {
-        $this->data['monthNames']['format']['abbreviated'] = $value;
-    }
+	/**
+	 * Set the abbreviated month names. The value should be
+	 * an array of string starting with Jan and ends in Dec.
+	 * For example,
+	 * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	 * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
+	 * @param array month names.
+	 */
+	function setAbbreviatedMonthNames($value)
+	{
+		$this->data['monthNames']['format']['abbreviated'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing the
@@ -324,18 +324,18 @@ 
 		return $this->data['monthNames']['format']['wide'];
 	}
 
-    /**
-     * Set the month names. The value should be
-     * an array of string starting with Janurary and ends in December.
-     * For example,
-     * <code>array("January", "February", "March", "April", "May", "June",
-     * "July", "August", "September","October","November","December");</code>
-     * @param array month names.
-     */
-    function setMonthNames($value)
-    {
-    	$this->data['monthNames']['format']['wide'] = $value;
-    }
+	/**
+	 * Set the month names. The value should be
+	 * an array of string starting with Janurary and ends in December.
+	 * For example,
+	 * <code>array("January", "February", "March", "April", "May", "June",
+	 * "July", "August", "September","October","November","December");</code>
+	 * @param array month names.
+	 */
+	function setMonthNames($value)
+	{
+		$this->data['monthNames']['format']['wide'] = $value;
+	}
 
 	/**
 	 * A string containing the name of the era.
@@ -359,16 +359,16 @@ 
 		return $result[0];
 	}
 
-    /**
-     * Set the AM Designator. For example, 'AM'.
-     * @param string AM designator.
-     */
-    function setAMDesignator($value)
-    {
-        $markers = $this->getAMPMMarkers();
-        $markers[0] = $value;
-        $this->setAMPMMarkers($markers);
-    }
+	/**
+	 * Set the AM Designator. For example, 'AM'.
+	 * @param string AM designator.
+	 */
+	function setAMDesignator($value)
+	{
+		$markers = $this->getAMPMMarkers();
+		$markers[0] = $value;
+		$this->setAMPMMarkers($markers);
+	}
 
 	/**
 	 * The string designator for hours that are "post meridiem" (after noon).
@@ -381,41 +381,41 @@ 
 		return $result[1];
 	}
 
-    /**
-     * Set the PM Designator. For example, 'PM'.
-     * @param string PM designator.
-     */
-    function setPMDesignator($value)
-    {
-        $markers = $this->getAMPMMarkers();
-        $markers[1] = $value;
-        $this->setAMPMMarkers($markers);
-    }
-
-    /**
-     * Get the AM and PM markers array.
-     * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
-     * @return array AM and PM markers
-     */
-    function getAMPMMarkers()
+	/**
+	 * Set the PM Designator. For example, 'PM'.
+	 * @param string PM designator.
+	 */
+	function setPMDesignator($value)
+	{
+		$markers = $this->getAMPMMarkers();
+		$markers[1] = $value;
+		$this->setAMPMMarkers($markers);
+	}
+
+	/**
+	 * Get the AM and PM markers array.
+	 * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
+	 * @return array AM and PM markers
+	 */
+	function getAMPMMarkers()
 	{
 		return $this->data['AmPmMarkers'];
 	}
 
-    /**
-     * Set the AM and PM markers array.
-     * For example <code>array('AM','PM');</code>
-     * @param array AM and PM markers
-     */
-    function setAMPMMarkers($value)
-    {
-        $this->data['AmPmMarkers'] = $value;
-    }
+	/**
+	 * Set the AM and PM markers array.
+	 * For example <code>array('AM','PM');</code>
+	 * @param array AM and PM markers
+	 */
+	function setAMPMMarkers($value)
+	{
+		$this->data['AmPmMarkers'] = $value;
+	}
 
 	/**
 	 * Returns the full time pattern "HH:mm:ss z" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss z".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss z".
 	 */
 	function getFullTimePattern()
 	{
@@ -424,8 +424,8 @@ 
 
 	/**
 	 * Returns the long time pattern "HH:mm:ss z" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss z".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss z".
 	 */
 	function getLongTimePattern()
 	{
@@ -434,8 +434,8 @@ 
 
 	/**
 	 * Returns the medium time pattern "HH:mm:ss" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss".
 	 */
 	function getMediumTimePattern()
 	{
@@ -444,8 +444,8 @@ 
 
 	/**
 	 * Returns the short time pattern "HH:mm" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm".
 	 */
 	function getShortTimePattern()
 	{
@@ -454,8 +454,8 @@ 
 
 	/**
 	 * Returns the full date pattern "EEEE, yyyy MMMM dd" (default).
-     * This is culture sensitive.
-     * @return string pattern "EEEE, yyyy MMMM dd".
+	 * This is culture sensitive.
+	 * @return string pattern "EEEE, yyyy MMMM dd".
 	 */
 	function getFullDatePattern()
 	{
@@ -464,8 +464,8 @@ 
 
 	/**
 	 * Returns the long date pattern "yyyy MMMM d" (default).
-     * This is culture sensitive.
-     * @return string pattern "yyyy MMMM d".
+	 * This is culture sensitive.
+	 * @return string pattern "yyyy MMMM d".
 	 */
 	function getLongDatePattern()
 	{
@@ -474,8 +474,8 @@ 
 
 	/**
 	 * Returns the medium date pattern "yyyy MMMM d" (default).
-     * This is culture sensitive.
-     * @return string pattern "yyyy MMM d".
+	 * This is culture sensitive.
+	 * @return string pattern "yyyy MMM d".
 	 */
 	function getMediumDatePattern()
 	{
@@ -484,28 +484,28 @@ 
 
 	/**
 	 * Returns the short date pattern "yy/MM/dd" (default).
-     * This is culture sensitive.
-     * @return string pattern "yy/MM/dd".
+	 * This is culture sensitive.
+	 * @return string pattern "yy/MM/dd".
 	 */
 	function getShortDatePattern()
 	{
 		return $this->data['DateTimePatterns'][7];
 	}
 
-    /**
-     * Returns the date time order pattern, "{1} {0}" (default).
-     * This is culture sensitive.
-     * @return string pattern "{1} {0}".
-     */
-    function getDateTimeOrderPattern()
-    {
-        return $this->data['DateTimePatterns'][8];
-    }
+	/**
+	 * Returns the date time order pattern, "{1} {0}" (default).
+	 * This is culture sensitive.
+	 * @return string pattern "{1} {0}".
+	 */
+	function getDateTimeOrderPattern()
+	{
+		return $this->data['DateTimePatterns'][8];
+	}
 
 	/**
 	 * Formats the date and time in a culture sensitive paterrn.
-     * The default is "Date Time".
-     * @return string date and time formated
+	 * The default is "Date Time".
+	 * @return string date and time formated
 	 */
 	function formatDateTime($date, $time)
 	{

Spacing +13 added lines, -13 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Get the CultureInfo class.
  */
-require_once(dirname(__FILE__).'/CultureInfo.php');
+require_once(dirname(__FILE__) . '/CultureInfo.php');
 
 
 /**
@@ -96,11 +96,11 @@ 
 	 */
 	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.');
 	}
 
 	/**
@@ -109,11 +109,11 @@ 
 	 */
 	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.');
 	}
 
 	/**
@@ -125,11 +125,11 @@ 
 	 * @param array ICU data for date time formatting.
 	 * @see getInstance()
 	 */
-	function __construct($data=array())
+	function __construct($data = array())
 	{
 		$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;
@@ -152,7 +152,7 @@ 
     static function getInvariantInfo()
     {
         static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
         {
             $culture = CultureInfo::getInvariantCulture();
             $invariant = $culture->getDateTimeFormat();
@@ -166,12 +166,12 @@ 
      * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
      * culture.
      */
-    static function getInstance($culture=null)
+    static function getInstance($culture = null)
     {
 
         if ($culture instanceof CultureInfo)
             return $culture->getDateTimeFormat();
-       	else if(is_string($culture))
+       	else if (is_string($culture))
        	{
        		$cultureInfo = CultureInfo::getInstance($culture);
        		return $cultureInfo->getDateTimeFormat();
@@ -510,7 +510,7 @@ 
 	function formatDateTime($date, $time)
 	{
 		$pattern = $this->getDateTimeOrderPattern();
-		return str_replace(array('{0}','{1}'), array($time, $date), $pattern);
+		return str_replace(array('{0}', '{1}'), array($time, $date), $pattern);
 	}
 
 }

Braces +22 added lines, -19 removed lines

@@ -97,10 +97,11 @@ 
 	function __get($name)
 	{
 		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
-			return $this->$getProperty();
-		else
-			throw new Exception('Property '.$name.' does not exists.');
+		if(in_array($getProperty, $this->properties)) {
+					return $this->$getProperty();
+		} else {
+					throw new Exception('Property '.$name.' does not exists.');
+		}
 	}
 
 	/**
@@ -110,10 +111,11 @@ 
 	function __set($name, $value)
 	{
 		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
-			$this->$setProperty($value);
-		else
-			throw new Exception('Property '.$name.' can not be set.');
+		if(in_array($setProperty, $this->properties)) {
+					$this->$setProperty($value);
+		} else {
+					throw new Exception('Property '.$name.' can not be set.');
+		}
 	}
 
 	/**
@@ -129,8 +131,9 @@ 
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
-			throw new Exception('Please provide the ICU data to initialize.');
+		if(empty($data)) {
+					throw new Exception('Please provide the ICU data to initialize.');
+		}
 
 		$this->data = $data;
 	}
@@ -169,14 +172,13 @@ 
     static function getInstance($culture=null)
     {
 
-        if ($culture instanceof CultureInfo)
-            return $culture->getDateTimeFormat();
-       	else if(is_string($culture))
+        if ($culture instanceof CultureInfo) {
+                    return $culture->getDateTimeFormat();
+        } else if(is_string($culture))
        	{
        		$cultureInfo = CultureInfo::getInstance($culture);
        		return $cultureInfo->getDateTimeFormat();
-       	}
-       	else
+       	} else
        	{
 			$cultureInfo = CultureInfo::getInvariantCulture();
             return $cultureInfo->getDateTimeFormat();
@@ -292,10 +294,11 @@ 
 	 */
 	function getAbbreviatedMonthNames()
 	{
-		if (isset($this->data['monthNames']['format']['abbreviated']))
-			return $this->data['monthNames']['format']['abbreviated'];
-		else
-			return $this->data['monthNames']['format']['wide'];
+		if (isset($this->data['monthNames']['format']['abbreviated'])) {
+					return $this->data['monthNames']['format']['abbreviated'];
+		} else {
+					return $this->data['monthNames']['format']['wide'];
+		}
 	}
 
     /**

framework/I18N/core/Gettext/MO.php

Doc Comments +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
      * _read
      *
      * @access  private
-     * @return  mixed
+     * @return  string|null
      * @param   int     $bytes
      */
     function _read($bytes = 1)
@@ -165,7 +165,7 @@ 
      * Load MO file
      *
      * @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  $file
      */
     function load($file = null)
@@ -261,7 +261,7 @@ 
      * Save MO file
      *
      * @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  $file
      */
     function save($file = null)

Indentation +310 added lines, -310 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * TGettext_MO class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Revision: 1.3 $  $Date: 2005/08/27 03:21:12 $
- * @package System.I18N.core
- */
+	 * TGettext_MO class file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2004 by Qiang Xue. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
+	 * The latest version of PRADO can be obtained from:
+	 * {@link http://prado.sourceforge.net/}
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @version $Revision: 1.3 $  $Date: 2005/08/27 03:21:12 $
+	 * @package System.I18N.core
+	 */
 
 
 // +----------------------------------------------------------------------+
@@ -52,304 +52,304 @@ 
  */
 class TGettext_MO extends TGettext
 {
-    /**
-     * file handle
-     *
-     * @access  private
-     * @var     resource
-     */
-    protected $_handle = null;
-
-    /**
-     * big endianess
-     *
-     * Whether to write with big endian byte order.
-     *
-     * @access  public
-     * @var     bool
-     */
-    protected $writeBigEndian = false;
-
-    /**
-     * Constructor
-     *
-     * @access  public
-     * @return  object      File_Gettext_MO
-     * @param   string      $file   path to GNU MO file
-     */
-    function TGettext_MO($file = '')
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * _read
-     *
-     * @access  private
-     * @return  mixed
-     * @param   int     $bytes
-     */
-    function _read($bytes = 1)
-    {
-        if (0 < $bytes = abs($bytes)) {
-            return fread($this->_handle, $bytes);
-        }
-        return null;
-    }
-
-    /**
-     * _readInt
-     *
-     * @access  private
-     * @return  int
-     * @param   bool    $bigendian
-     */
-    function _readInt($bigendian = false)
-    {
+	/**
+	 * file handle
+	 *
+	 * @access  private
+	 * @var     resource
+	 */
+	protected $_handle = null;
+
+	/**
+	 * big endianess
+	 *
+	 * Whether to write with big endian byte order.
+	 *
+	 * @access  public
+	 * @var     bool
+	 */
+	protected $writeBigEndian = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_MO
+	 * @param   string      $file   path to GNU MO file
+	 */
+	function TGettext_MO($file = '')
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * _read
+	 *
+	 * @access  private
+	 * @return  mixed
+	 * @param   int     $bytes
+	 */
+	function _read($bytes = 1)
+	{
+		if (0 < $bytes = abs($bytes)) {
+			return fread($this->_handle, $bytes);
+		}
+		return null;
+	}
+
+	/**
+	 * _readInt
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   bool    $bigendian
+	 */
+	function _readInt($bigendian = false)
+	{
 		//unpack returns a reference????
 		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
-        return array_shift($unpacked);
-    }
-
-    /**
-     * _writeInt
-     *
-     * @access  private
-     * @return  int
-     * @param   int     $int
-     */
-    function _writeInt($int)
-    {
-        return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
-    }
-
-    /**
-     * _write
-     *
-     * @access  private
-     * @return  int
-     * @param   string  $data
-     */
-    function _write($data)
-    {
-        return fwrite($this->_handle, $data);
-    }
-
-    /**
-     * _writeStr
-     *
-     * @access  private
-     * @return  int
-     * @param   string  $string
-     */
-    function _writeStr($string)
-    {
-        return $this->_write($string . "\0");
-    }
-
-    /**
-     * _readStr
-     *
-     * @access  private
-     * @return  string
-     * @param   array   $params     associative array with offset and length
-     *                              of the string
-     */
-    function _readStr($params)
-    {
-        fseek($this->_handle, $params['offset']);
-        return $this->_read($params['length']);
-    }
-
-    /**
-     * Load MO file
-     *
-     * @access   public
-     * @return   mixed   Returns true on success or PEAR_Error on failure.
-     * @param    string  $file
-     */
-    function load($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
-
-        // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
-            return false;
-        }
-        // lock MO file shared
-        if (!@flock($this->_handle, LOCK_SH)) {
-            @fclose($this->_handle);
-            return false;
-        }
-
-        // read (part of) magic number from MO file header and define endianess
+		return array_shift($unpacked);
+	}
+
+	/**
+	 * _writeInt
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   int     $int
+	 */
+	function _writeInt($int)
+	{
+		return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
+	}
+
+	/**
+	 * _write
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   string  $data
+	 */
+	function _write($data)
+	{
+		return fwrite($this->_handle, $data);
+	}
+
+	/**
+	 * _writeStr
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   string  $string
+	 */
+	function _writeStr($string)
+	{
+		return $this->_write($string . "\0");
+	}
+
+	/**
+	 * _readStr
+	 *
+	 * @access  private
+	 * @return  string
+	 * @param   array   $params     associative array with offset and length
+	 *                              of the string
+	 */
+	function _readStr($params)
+	{
+		fseek($this->_handle, $params['offset']);
+		return $this->_read($params['length']);
+	}
+
+	/**
+	 * Load MO file
+	 *
+	 * @access   public
+	 * @return   mixed   Returns true on success or PEAR_Error on failure.
+	 * @param    string  $file
+	 */
+	function load($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
+
+		// open MO file
+		if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
+			return false;
+		}
+		// lock MO file shared
+		if (!@flock($this->_handle, LOCK_SH)) {
+			@fclose($this->_handle);
+			return false;
+		}
+
+		// read (part of) magic number from MO file header and define endianess
 
 		//unpack returns a reference????
 		$unpacked = unpack('c', $this->_read(4));
-        switch ($magic = array_shift($unpacked))
-        {
-            case -34:
-                $be = false;
-            break;
-
-            case -107:
-                $be = true;
-            break;
-
-            default:
-                return false;
-        }
-
-        // check file format revision - we currently only support 0
-        if (0 !== ($_rev = $this->_readInt($be))) {
-            return false;
-        }
-
-        // count of strings in this file
-        $count = $this->_readInt($be);
-
-        // offset of hashing table of the msgids
-        $offset_original = $this->_readInt($be);
-        // offset of hashing table of the msgstrs
-        $offset_translat = $this->_readInt($be);
-
-        // move to msgid hash table
-        fseek($this->_handle, $offset_original);
-        // read lengths and offsets of msgids
-        $original = array();
-        for ($i = 0; $i < $count; $i++) {
-            $original[$i] = array(
-                'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
-            );
-        }
-
-        // move to msgstr hash table
-        fseek($this->_handle, $offset_translat);
-        // read lengths and offsets of msgstrs
-        $translat = array();
-        for ($i = 0; $i < $count; $i++) {
-            $translat[$i] = array(
-                'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
-            );
-        }
-
-        // read all
-        for ($i = 0; $i < $count; $i++) {
-            $this->strings[$this->_readStr($original[$i])] =
-                $this->_readStr($translat[$i]);
-        }
-
-        // done
-        @flock($this->_handle, LOCK_UN);
-        @fclose($this->_handle);
-        $this->_handle = null;
-
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
-
-        return true;
-    }
-
-    /**
-     * Save MO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function save($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
-
-        // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
-            return false;
-        }
-        // lock MO file exclusively
-        if (!@flock($this->_handle, LOCK_EX)) {
-            @fclose($this->_handle);
-            return false;
-        }
-
-        // write magic number
-        if ($this->writeBigEndian) {
-            $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
-        } else {
-            $this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
-        }
-
-        // write file format revision
-        $this->_writeInt(0);
-
-        $count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
-        // write count of strings
-        $this->_writeInt($count);
-
-        $offset = 28;
-        // write offset of orig. strings hash table
-        $this->_writeInt($offset);
-
-        $offset += ($count * 8);
-        // write offset transl. strings hash table
-        $this->_writeInt($offset);
-
-        // write size of hash table (we currently ommit the hash table)
-        $this->_writeInt(0);
-
-        $offset += ($count * 8);
-        // write offset of hash table
-        $this->_writeInt($offset);
-
-        // unshift meta info
-        if ($this->meta) {
-            $meta = '';
-            foreach ($this->meta as $key => $val) {
-                $meta .= $key . ': ' . $val . "\n";
-            }
-            $strings = array('' => $meta) + $this->strings;
-        } else {
-            $strings = $this->strings;
-        }
-
-        // write offsets for original strings
-        foreach (array_keys($strings) as $o) {
-            $len = strlen($o);
-            $this->_writeInt($len);
-            $this->_writeInt($offset);
-            $offset += $len + 1;
-        }
-
-        // write offsets for translated strings
-        foreach ($strings as $t) {
-            $len = strlen($t);
-            $this->_writeInt($len);
-            $this->_writeInt($offset);
-            $offset += $len + 1;
-        }
-
-        // write original strings
-        foreach (array_keys($strings) as $o) {
-            $this->_writeStr($o);
-        }
-
-        // write translated strings
-        foreach ($strings as $t) {
-            $this->_writeStr($t);
-        }
-
-        // done
-        @flock($this->_handle, LOCK_UN);
-        @fclose($this->_handle);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+		switch ($magic = array_shift($unpacked))
+		{
+			case -34:
+				$be = false;
+			break;
+
+			case -107:
+				$be = true;
+			break;
+
+			default:
+				return false;
+		}
+
+		// check file format revision - we currently only support 0
+		if (0 !== ($_rev = $this->_readInt($be))) {
+			return false;
+		}
+
+		// count of strings in this file
+		$count = $this->_readInt($be);
+
+		// offset of hashing table of the msgids
+		$offset_original = $this->_readInt($be);
+		// offset of hashing table of the msgstrs
+		$offset_translat = $this->_readInt($be);
+
+		// move to msgid hash table
+		fseek($this->_handle, $offset_original);
+		// read lengths and offsets of msgids
+		$original = array();
+		for ($i = 0; $i < $count; $i++) {
+			$original[$i] = array(
+				'length' => $this->_readInt($be),
+				'offset' => $this->_readInt($be)
+			);
+		}
+
+		// move to msgstr hash table
+		fseek($this->_handle, $offset_translat);
+		// read lengths and offsets of msgstrs
+		$translat = array();
+		for ($i = 0; $i < $count; $i++) {
+			$translat[$i] = array(
+				'length' => $this->_readInt($be),
+				'offset' => $this->_readInt($be)
+			);
+		}
+
+		// read all
+		for ($i = 0; $i < $count; $i++) {
+			$this->strings[$this->_readStr($original[$i])] =
+				$this->_readStr($translat[$i]);
+		}
+
+		// done
+		@flock($this->_handle, LOCK_UN);
+		@fclose($this->_handle);
+		$this->_handle = null;
+
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Save MO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function save($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
+
+		// open MO file
+		if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
+			return false;
+		}
+		// lock MO file exclusively
+		if (!@flock($this->_handle, LOCK_EX)) {
+			@fclose($this->_handle);
+			return false;
+		}
+
+		// write magic number
+		if ($this->writeBigEndian) {
+			$this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
+		} else {
+			$this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
+		}
+
+		// write file format revision
+		$this->_writeInt(0);
+
+		$count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
+		// write count of strings
+		$this->_writeInt($count);
+
+		$offset = 28;
+		// write offset of orig. strings hash table
+		$this->_writeInt($offset);
+
+		$offset += ($count * 8);
+		// write offset transl. strings hash table
+		$this->_writeInt($offset);
+
+		// write size of hash table (we currently ommit the hash table)
+		$this->_writeInt(0);
+
+		$offset += ($count * 8);
+		// write offset of hash table
+		$this->_writeInt($offset);
+
+		// unshift meta info
+		if ($this->meta) {
+			$meta = '';
+			foreach ($this->meta as $key => $val) {
+				$meta .= $key . ': ' . $val . "\n";
+			}
+			$strings = array('' => $meta) + $this->strings;
+		} else {
+			$strings = $this->strings;
+		}
+
+		// write offsets for original strings
+		foreach (array_keys($strings) as $o) {
+			$len = strlen($o);
+			$this->_writeInt($len);
+			$this->_writeInt($offset);
+			$offset += $len + 1;
+		}
+
+		// write offsets for translated strings
+		foreach ($strings as $t) {
+			$len = strlen($t);
+			$this->_writeInt($len);
+			$this->_writeInt($offset);
+			$offset += $len + 1;
+		}
+
+		// write original strings
+		foreach (array_keys($strings) as $o) {
+			$this->_writeStr($o);
+		}
+
+		// write translated strings
+		foreach ($strings as $t) {
+			$this->_writeStr($t);
+		}
+
+		// done
+		@flock($this->_handle, LOCK_UN);
+		@fclose($this->_handle);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
  * @license     PHP License
  */
 
-require_once dirname(__FILE__).'/TGettext.php';
+require_once dirname(__FILE__) . '/TGettext.php';
 
 /**
  * File_Gettext_MO
@@ -349,7 +349,7 @@ 
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
-        chmod($file,PRADO_CHMOD);
+        chmod($file, PRADO_CHMOD);
         return true;
     }
 }

framework/I18N/core/Gettext/PO.php

Doc Comments +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
      * Load PO file
      *
      * @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  $file
      */
     function load($file = null)
@@ -116,7 +116,7 @@ 
      * Save PO file
      *
      * @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  $file
      */
     function save($file = null)

Indentation +110 added lines, -110 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * TGettext_PO class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
- * @package System.I18N.core
- */
+	 * TGettext_PO class file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2004 by Qiang Xue. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
+	 * The latest version of PRADO can be obtained from:
+	 * {@link http://prado.sourceforge.net/}
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
+	 * @package System.I18N.core
+	 */
 
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext :: PO                                        |
@@ -51,110 +51,110 @@ 
  */
 class TGettext_PO extends TGettext
 {
-    /**
-     * Constructor
-     *
-     * @access  public
-     * @return  object      File_Gettext_PO
-     * @param   string      path to GNU PO file
-     */
-    function TGettext_PO($file = '')
-    {
-        $this->file = $file;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_PO
+	 * @param   string      path to GNU PO file
+	 */
+	function TGettext_PO($file = '')
+	{
+		$this->file = $file;
+	}
 
-    /**
-     * Load PO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function load($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
+	/**
+	 * Load PO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function load($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
 
-        // load file
-        if (!$contents = @file($file)) {
-            return false;
-        }
-        $contents = implode('', $contents);
+		// load file
+		if (!$contents = @file($file)) {
+			return false;
+		}
+		$contents = implode('', $contents);
 
-        // match all msgid/msgstr entries
-        $matched = preg_match_all(
-            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
-            '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
-            $contents, $matches
-        );
-        unset($contents);
+		// match all msgid/msgstr entries
+		$matched = preg_match_all(
+			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+			'(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
+			$contents, $matches
+		);
+		unset($contents);
 
-        if (!$matched) {
-            return false;
-        }
+		if (!$matched) {
+			return false;
+		}
 
-        // get all msgids and msgtrs
-        for ($i = 0; $i < $matched; $i++) {
-            $msgid = preg_replace(
-                '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-            $msgstr= preg_replace(
-                '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
-            $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
-        }
+		// get all msgids and msgtrs
+		for ($i = 0; $i < $matched; $i++) {
+			$msgid = preg_replace(
+				'/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
+			$msgstr= preg_replace(
+				'/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
+			$this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
+		}
 
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Save PO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function save($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
+	/**
+	 * Save PO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function save($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
 
-        // open PO file
-        if (!is_resource($fh = @fopen($file, 'w'))) {
-            return false;
-        }
+		// open PO file
+		if (!is_resource($fh = @fopen($file, 'w'))) {
+			return false;
+		}
 
-        // lock PO file exclusively
-        if (!flock($fh, LOCK_EX)) {
-            fclose($fh);
-            return false;
-        }
-        // write meta info
-        if (count($this->meta)) {
-            $meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
-            foreach ($this->meta as $k => $v) {
-                $meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
-            }
-            fwrite($fh, $meta . "\n");
-        }
-        // write strings
-        foreach ($this->strings as $o => $t) {
-            fwrite($fh,
-                'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
-                'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
-            );
-        }
+		// lock PO file exclusively
+		if (!flock($fh, LOCK_EX)) {
+			fclose($fh);
+			return false;
+		}
+		// write meta info
+		if (count($this->meta)) {
+			$meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
+			foreach ($this->meta as $k => $v) {
+				$meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+			}
+			fwrite($fh, $meta . "\n");
+		}
+		// write strings
+		foreach ($this->strings as $o => $t) {
+			fwrite($fh,
+				'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
+				'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+			);
+		}
 
-        //done
-        @flock($fh, LOCK_UN);
-        @fclose($fh);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+		//done
+		@flock($fh, LOCK_UN);
+		@fclose($fh);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
  * @license     PHP License
  */
 
-require_once dirname(__FILE__).'/TGettext.php';
+require_once dirname(__FILE__) . '/TGettext.php';
 
 /**
  * File_Gettext_PO
@@ -98,7 +98,7 @@ 
         for ($i = 0; $i < $matched; $i++) {
             $msgid = preg_replace(
                 '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-            $msgstr= preg_replace(
+            $msgstr = preg_replace(
                 '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
             $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
         }
@@ -146,7 +146,7 @@ 
         // write strings
         foreach ($this->strings as $o => $t) {
             fwrite($fh,
-                'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
+                'msgid "' . parent::prepare($o, true) . '"' . "\n" .
                 'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
             );
         }
@@ -154,7 +154,7 @@ 
         //done
         @flock($fh, LOCK_UN);
         @fclose($fh);
-        chmod($file,PRADO_CHMOD);
+        chmod($file, PRADO_CHMOD);
         return true;
     }
 }

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;

Braces +3 added lines, -2 removed lines

@@ -101,8 +101,9 @@
     {
         $format = strToUpper($format);
         $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+        if(is_file($filename) == false) {
+                	throw new Exception ("Class file $file not found");
+        }
 
         include_once $filename;
         $class = 'TGettext_' . $format;

framework/I18N/core/IMessageSource.php

Doc Comments +1 added lines

@@ -109,6 +109,7 @@
 	/**
 	 * Set the culture for this particular message source.
 	 * @param string the Culture name.
+	 * @return void
 	 */
 	function setCulture($culture);
 	

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages');	
+	function save($catalogue = 'messages');	
 	
 	/**
 	 * Add a untranslated message to the source. Need to call save()
@@ -88,7 +88,7 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise. 
 	 */
-	function delete($message, $catalogue='messages');
+	function delete($message, $catalogue = 'messages');
 		
 	/**
 	 * Update the translation.
@@ -98,7 +98,7 @@ 
 	 * @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');
 	
 	/**
 	 * Returns a list of catalogue as key and all it variants as value.

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.'"';

Braces +12 added lines, -8 removed lines

@@ -39,14 +39,16 @@ 
 	{
 		$cacheDir = $cacheDir.'/';
 
-		if(!is_dir($cacheDir))
-			throw new Exception(
+		if(!is_dir($cacheDir)) {
+					throw new Exception(
 				'The cache directory '.$cacheDir.' does not exists.'.
 				'The cache directory must be writable by the server.');
-		if(!is_writable($cacheDir))
-			throw new Exception(
+		}
+		if(!is_writable($cacheDir)) {
+					throw new Exception(
 				'The cache directory '.$cacheDir.' must be writable '.
 				'by the server.');
+		}
 
 		$options = array(
 			'cacheDir' => $cacheDir,
@@ -113,14 +115,16 @@ 
 
 		$cache = $this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
-			return false;
+		if(is_file($cache) == false) {
+					return false;
+		}
 
 
 		$lastmodified = (int)$lastmodified;
 
-		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
-			return false;
+		if($lastmodified <= 0 || $lastmodified > filemtime($cache)) {
+					return false;
+		}
 
 		//echo '@@ Cache hit: "'.$ID.'" : "'.$group.'"';
 		//echo "<br>\n";