pradosoft / prado

framework/I18N/core/CultureInfo.php

Doc Comments +7 added lines, -1 removed lines

@@ -183,6 +183,7 @@ 
 
 	/**
 	* Gets the CultureInfo that for this culture string
+	* @param string $culture
 	* @return CultureInfo invariant culture info is "en".
 	*/
 	public static function getInstance($culture)
@@ -208,6 +209,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".
+	 * @param string $culture
 	 */
 	protected function setCulture($culture)
 	{
@@ -223,6 +225,7 @@ 
 	/**
 	 * Load the ICU culture data resource bundles for the specific culture identifier.
 	 * @param string the culture identifier.
+	 * @param string $cultureName
 	 */
 	protected function loadCultureData($cultureName)
 	{
@@ -266,6 +269,7 @@ 
 	 * currency for "en_AU", you need to use findInfo("Currencies,true);.
 	 * @param string the data you want to find.
 	 * @param boolean merge the data from its parents.
+	 * @param string $key
 	 * @return mixed the specific ICU data.
 	 */
 	public function findInfo($path='/', $merge=false, $key = null)
@@ -358,6 +362,7 @@ 
 	/**
 	 * Set the date time format information.
 	 * @param DateTimeFormatInfo the new date time format info.
+	 * @param DateTimeFormatInfo $dateTimeFormat
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
@@ -457,6 +462,7 @@ 
 	/**
 	 * Set the number format information.
 	 * @param NumberFormatInfo the new number format info.
+	 * @param NumberFormatInfo $numberFormat
 	 */
 	public function setNumberFormat($numberFormat)
 	{
@@ -595,7 +601,7 @@ 
 
 	/**
 	 * Get a list of timezones in the language of the localized version.
-	 * @return array list of localized timezones.
+	 * @return string[] list of localized timezones.
 	 */
 	public function getTimeZones()
 	{

Spacing +76 added lines, -76 removed lines

@@ -56,7 +56,7 @@ 
 	 * The ICU data array.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * The current culture.
@@ -68,13 +68,13 @@ 
 	 * A list of CLDR resource bundles loaded
 	 * @var array
 	 */
-	private $resourceBundles = array();
+	private $resourceBundles=array();
 
 	/**
 	 * A list of resource bundles keys
 	 * @var array
 	 */
-	protected static $bundleNames = array(
+	protected static $bundleNames=array(
 		'Core' => null,
 		'Currencies' => 'ICUDATA-curr',
 		'Languages' => 'ICUDATA-lang',
@@ -98,28 +98,28 @@ 
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Culture type, all.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const ALL = 0;
+	const ALL=0;
 
 	/**
 	 * Culture type, neutral.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const NEUTRAL = 1;
+	const NEUTRAL=1;
 
 	/**
 	 * Culture type, specific.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const SPECIFIC = 2;
+	const SPECIFIC=2;
 
 	/**
 	 * Display the culture name.
@@ -139,7 +139,7 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -152,7 +152,7 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -170,10 +170,10 @@ 
 	 */
 	function __construct($culture='en')
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($culture))
-			$culture = 'en';
+			$culture='en';
 
 		$this->setCulture($culture);
 
@@ -187,9 +187,9 @@ 
 	*/
 	public static function getInstance($culture)
 	{
-		static $instances = array();
+		static $instances=array();
 		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+			$instances[$culture]=new CultureInfo($culture);
 		return $instances[$culture];
 	}
 
@@ -213,11 +213,11 @@ 
 	{
 		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;
+		$this->culture=$culture;
 	}
 
 	/**
@@ -226,20 +226,20 @@ 
 	 */
 	protected function loadCultureData($cultureName)
 	{
-		$culture_parts = explode('_', $cultureName);
-		$current_part = $culture_parts[0];
+		$culture_parts=explode('_', $cultureName);
+		$current_part=$culture_parts[0];
 
-		$culturesToLoad = array($current_part);
-		for($i = 1, $k = count($culture_parts); $i < $k; ++$i)
+		$culturesToLoad=array($current_part);
+		for($i=1, $k=count($culture_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$culture_parts[$i];
-			$culturesToLoad[] = $current_part;
+			$current_part.='_'.$culture_parts[$i];
+			$culturesToLoad[]=$current_part;
 		}
 
 		foreach(self::$bundleNames as $key => $bundleName)
 		{
 			if(!array_key_exists($key, $this->data))
-				$this->data[$key] = array();
+				$this->data[$key]=array();
 		}
 		foreach($culturesToLoad as $culture)
 		{
@@ -249,7 +249,7 @@ 
 			array_unshift($this->resourceBundles, $culture);
 			foreach(self::$bundleNames as $key => $bundleName)
 			{
-				$this->data[$key][$culture] = \ResourceBundle::create($culture, $bundleName, false);
+				$this->data[$key][$culture]=\ResourceBundle::create($culture, $bundleName, false);
 			}
 		}
 	}
@@ -268,19 +268,19 @@ 
 	 * @param boolean merge the data from its parents.
 	 * @return mixed the specific ICU data.
 	 */
-	public function findInfo($path='/', $merge=false, $key = null)
+	public function findInfo($path='/', $merge=false, $key=null)
 	{
-		$result = array();
+		$result=array();
 
-		if($key === null)
+		if($key===null)
 		{
 			// try to guess the bundle from the path. Always defaults to "Core".
-			$key = 'Core';
+			$key='Core';
 			foreach(self::$bundleNames as $bundleName => $icuBundleName)
 			{
-				if(strpos($path, $bundleName) === 0)
+				if(strpos($path, $bundleName)===0)
 				{
-					$key = $bundleName;
+					$key=$bundleName;
 					break;
 				}
 			}
@@ -290,14 +290,14 @@ 
 			return $result;
 		foreach($this->resourceBundles as $culture)
 		{
-			$res = $this->data[$key][$culture];
-			if($res === null)
+			$res=$this->data[$key][$culture];
+			if($res===null)
 				continue;
-			$info = $this->searchResources($res, $path);
+			$info=$this->searchResources($res, $path);
 			if($info)
 			{
 				if($merge)
-					$result = array_merge($result, $info);
+					$result=array_merge($result, $info);
 				else
 					return $info;
 			}
@@ -316,14 +316,14 @@ 
 	 */
 	private function searchResources($info, $path='/')
 	{
-		$index = explode('/',$path);
+		$index=explode('/', $path);
 
-		$resource = $info;
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		$resource=$info;
+		for($i=0, $k=count($index); $i < $k; ++$i)
 		{
 
-			$resource = $resource->get($index[$i], false);
-			if($resource === null)
+			$resource=$resource->get($index[$i], false);
+			if($resource===null)
 				return null;
 		}
 
@@ -347,7 +347,7 @@ 
 	 */
 	public function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if($this->dateTimeFormat===null)
 		{
 			$this->setDateTimeFormat(new DateTimeFormatInfo($this));
 		}
@@ -361,7 +361,7 @@ 
 	 */
 	public function setDateTimeFormat($dateTimeFormat)
 	{
-		$this->dateTimeFormat = $dateTimeFormat;
+		$this->dateTimeFormat=$dateTimeFormat;
 	}
 
 	/**
@@ -381,10 +381,10 @@ 
 	 */
 	public function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$language = $this->findInfo("Languages/{$lang}");
-		$region = $this->findInfo("Countries/{$reg}");
+		$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.' ('.$region.')';
 		else
@@ -399,15 +399,15 @@ 
 	 */
 	public function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$culture = $this->getInvariantCulture();
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$culture=$this->getInvariantCulture();
 
-		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		$language=$culture->findInfo("Languages/{$lang}");
+		if(count($language)==0)
 			return $this->culture;
 
-		$region = $culture->findInfo("Countries/{$reg}");
+		$region=$culture->findInfo("Countries/{$reg}");
 		if($region)
 			return $language.' ('.$region.')';
 		else
@@ -424,8 +424,8 @@ 
 	static public function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant===null)
+			$invariant=new CultureInfo();
 		return $invariant;
 	}
 
@@ -437,7 +437,7 @@ 
 	 */
 	public function getIsNeutralCulture()
 	{
-		return strlen($this->culture) == 2;
+		return strlen($this->culture)==2;
 	}
 
 	/**
@@ -447,7 +447,7 @@ 
 	 */
 	public function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if($this->numberFormat===null)
 		{
 			$this->setNumberFormat(new NumberFormatInfo($this));
 		}
@@ -460,7 +460,7 @@ 
 	 */
 	public function setNumberFormat($numberFormat)
 	{
-		$this->numberFormat = $numberFormat;
+		$this->numberFormat=$numberFormat;
 	}
 
 	/**
@@ -479,10 +479,10 @@ 
 	 */
 	public 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);
 	}
 
@@ -497,7 +497,7 @@ 
 	 */
 	static public function getCultures($type=CultureInfo::ALL)
 	{
-		$all = \ResourceBundle::getLocales('');
+		$all=\ResourceBundle::getLocales('');
 
 		switch($type)
 		{
@@ -506,14 +506,14 @@ 
 			case CultureInfo::NEUTRAL :
 				foreach($all as $key => $culture)
 				{
-					if(strlen($culture) != 2)
+					if(strlen($culture)!=2)
 						unset($all[$key]);
 				}
 				return $all;
 			case CultureInfo::SPECIFIC :
 				foreach($all as $key => $culture)
 				{
-					if(strlen($culture) == 2)
+					if(strlen($culture)==2)
 						unset($all[$key]);
 				}
 				return $all;
@@ -532,19 +532,19 @@ 
 		if(is_scalar($obj)) {
 			return $obj;
 		} elseif($obj instanceof \ResourceBundle) {
-			$array = array();
+			$array=array();
 			foreach($obj as $k => $v)
-				$array[$k] = $v;
+				$array[$k]=$v;
 		} else {
-			$array = $obj;
+			$array=$obj;
 		}
 
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for($i=0, $k=count($array); $i < $k; ++$i)
 		{
-			$key = key($array);
+			$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;
@@ -566,11 +566,11 @@ 
 	public function getCurrencies()
 	{
 		static $arr;
-		if($arr === null)
+		if($arr===null)
 		{
-			$arr = $this->findInfo('Currencies', true, 'Currencies');
+			$arr=$this->findInfo('Currencies', true, 'Currencies');
 			foreach($arr as $k => $v)
-				$arr[$k] = $this->simplify($v);
+				$arr[$k]=$this->simplify($v);
 		}
 		return $arr;
 	}
@@ -600,17 +600,17 @@ 
 	public function getTimeZones()
 	{
 		static $arr;
-		if($arr === null)
+		if($arr===null)
 		{
-			$validPrefixes = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Etc', 'Europe', 'Indian', 'Pacific');
-			$tmp = $this->findInfo('zoneStrings', true, 'zoneStrings');
+			$validPrefixes=array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Etc', 'Europe', 'Indian', 'Pacific');
+			$tmp=$this->findInfo('zoneStrings', true, 'zoneStrings');
 			foreach($tmp as $k => $v)
 			{
 				foreach($validPrefixes as $prefix)
 				{
-					if(strpos($k, $prefix) === 0)
+					if(strpos($k, $prefix)===0)
 					{
-						$arr[] = str_replace(':', '/', $k);
+						$arr[]=str_replace(':', '/', $k);
 						break;
 					}
 				}

framework/I18N/core/DateTimeFormatInfo.php

Doc Comments +5 added lines

@@ -121,6 +121,7 @@ 
 	 * unless you know what you are doing. Please use use
 	 * DateTimeFormatInfo::getInstance() to create an instance.
 	 * @param array ICU data for date time formatting.
+	 * @param CultureInfo $cultureInfo
 	 * @see getInstance()
 	 */
 	public function __construct($cultureInfo)
@@ -170,6 +171,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function getInfoByPath($path)
 	{
 		static $basePath = null;
@@ -262,6 +266,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.
 	 */
 	public function getEra($era)

Spacing +23 added lines, -23 removed lines

@@ -79,13 +79,13 @@ 
 	 * Parent instance containing data
 	 * @var CultureInfo
 	 */
-	private $cultureInfo = array();
+	private $cultureInfo=array();
 
 	/**
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Allow functions that begins with 'set' to be called directly
@@ -94,7 +94,7 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -107,7 +107,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -125,12 +125,12 @@ 
 	 */
 	public function __construct($cultureInfo)
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(!($cultureInfo instanceof CultureInfo))
 			throw new Exception('Please provide a CultureInfo instance.');
 
-		$this->cultureInfo = $cultureInfo;
+		$this->cultureInfo=$cultureInfo;
 	}
 
 	/**
@@ -141,10 +141,10 @@ 
 	static public function getInvariantInfo()
 	{
 		static $invariant;
-		if($invariant === null)
+		if($invariant===null)
 		{
-			$culture = CultureInfo::getInvariantCulture();
-			$invariant = $culture->getDateTimeFormat();
+			$culture=CultureInfo::getInvariantCulture();
+			$invariant=$culture->getDateTimeFormat();
 		}
 		return $invariant;
 	}
@@ -158,27 +158,27 @@ 
 	static public function getInstance($culture=null)
 	{
 
-		if ($culture instanceof CultureInfo)
+		if($culture instanceof CultureInfo)
 		{
 			return $culture->getDateTimeFormat();
 		} elseif(is_string($culture)) {
-			$cultureInfo = CultureInfo::getInstance($culture);
+			$cultureInfo=CultureInfo::getInstance($culture);
 			return $cultureInfo->getDateTimeFormat();
 		} else {
-			$cultureInfo = CultureInfo::getInvariantCulture();
+			$cultureInfo=CultureInfo::getInvariantCulture();
 			return $cultureInfo->getDateTimeFormat();
 		}
 	}
 
 	public function getInfoByPath($path)
 	{
-		static $basePath = null;
-		if($basePath === null)
+		static $basePath=null;
+		if($basePath===null)
 		{
-			$basePath = 'calendar/' . $this->cultureInfo->getCalendar() . '/';
+			$basePath='calendar/'.$this->cultureInfo->getCalendar().'/';
 		}
 
-		return $this->cultureInfo->findInfo($basePath . $path);
+		return $this->cultureInfo->findInfo($basePath.$path);
 	}
 
 	/**
@@ -239,8 +239,8 @@ 
 	 */
 	public function getAbbreviatedMonthNames()
 	{
-		$info = $this->getInfoByPath('monthNames/format/abbreviated');
-		if ($info)
+		$info=$this->getInfoByPath('monthNames/format/abbreviated');
+		if($info)
 			return $info;
 		else
 			return $this->getMonthNames();
@@ -266,7 +266,7 @@ 
 	 */
 	public function getEra($era)
 	{
-		$eraName = $this->getInfoByPath('eras/abbreviated');
+		$eraName=$this->getInfoByPath('eras/abbreviated');
 		return $eraName[$era];
 	}
 
@@ -277,7 +277,7 @@ 
 	 */
 	public function getAMDesignator()
 	{
-		$result = $this->getAMPMMarkers();
+		$result=$this->getAMPMMarkers();
 		return $result[0];
 	}
 
@@ -288,7 +288,7 @@ 
 	 */
 	public function getPMDesignator()
 	{
-		$result = $this->getAMPMMarkers();
+		$result=$this->getAMPMMarkers();
 		return $result[1];
 	}
 
@@ -399,8 +399,8 @@ 
 	 */
 	public function formatDateTime($date, $time)
 	{
-		$pattern = $this->getDateTimeOrderPattern();
-		return str_replace(array('{0}','{1}'), array($time, $date), $pattern);
+		$pattern=$this->getDateTimeOrderPattern();
+		return str_replace(array('{0}', '{1}'), array($time, $date), $pattern);
 	}
 
 }

framework/I18N/core/NumberFormatInfo.php

Doc Comments +5 added lines

@@ -109,6 +109,7 @@ 
 	 * class directly unless you know what you are doing. Please use use
 	 * NumberFormatInfo::getInstance() to create an instance.
 	 * @param array ICU data for date time formatting.
+	 * @param CultureInfo $cultureInfo
 	 * @see getInstance()
 	 */
 	public function __construct($cultureInfo, $type = NumberFormatInfo::DECIMAL)
@@ -123,6 +124,9 @@ 
 		$this->setPattern($type);
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function getInfoByPath($path)
 	{
 		static $basePath = null;
@@ -175,6 +179,7 @@ 
 	 * @param int the number formatting type, it should be
 	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
 	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * @param string $type
 	 * @return NumberFormatInfo NumberFormatInfo for the specified
 	 * culture.
 	 * @see getCurrencyInstance();

Spacing +86 added lines, -86 removed lines

@@ -49,31 +49,31 @@ 
 	 * Parent instance containing data
 	 * @var CultureInfo
 	 */
-	private $cultureInfo = array();
+	private $cultureInfo=array();
 
 	/**
 	 * ICU number formatting data.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * The number pattern.
 	 * @var array
 	 */
-	protected $pattern = array();
+	protected $pattern=array();
 
-	const DECIMAL = 'decimalFormat';
-	const CURRENCY = 'currencyFormat';
-	const PERCENTAGE = 'percentFormat';
-	const SCIENTIFIC = 'scientificFormat';
-	const ACCOUNTING = 'accountingFormat';
+	const DECIMAL='decimalFormat';
+	const CURRENCY='currencyFormat';
+	const PERCENTAGE='percentFormat';
+	const SCIENTIFIC='scientificFormat';
+	const ACCOUNTING='accountingFormat';
 
 	/**
 	 * Allow functions that begins with 'set' to be called directly
@@ -82,7 +82,7 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -95,7 +95,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -111,27 +111,27 @@ 
 	 * @param array ICU data for date time formatting.
 	 * @see getInstance()
 	 */
-	public function __construct($cultureInfo, $type = NumberFormatInfo::DECIMAL)
+	public function __construct($cultureInfo, $type=NumberFormatInfo::DECIMAL)
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(!($cultureInfo instanceof CultureInfo))
 			throw new Exception('Please provide a CultureInfo instance.');
 
-		$this->cultureInfo = $cultureInfo;
+		$this->cultureInfo=$cultureInfo;
 
 		$this->setPattern($type);
 	}
 
 	public function getInfoByPath($path)
 	{
-		static $basePath = null;
-		if($basePath === null)
+		static $basePath=null;
+		if($basePath===null)
 		{
-			$basePath = 'NumberElements/' . $this->cultureInfo->getDefaultNumberFormat() . '/';
+			$basePath='NumberElements/'.$this->cultureInfo->getDefaultNumberFormat().'/';
 		}
 
-		return $this->cultureInfo->findInfo($basePath . $path);
+		return $this->cultureInfo->findInfo($basePath.$path);
 	}
 
 	/**
@@ -141,10 +141,10 @@ 
 	 * NumberFormatInfo::ACCOUNTING
 	 * @param int pattern type.
 	 */
-	public function setPattern($type = NumberFormatInfo::DECIMAL)
+	public function setPattern($type=NumberFormatInfo::DECIMAL)
 	{
-		$info = $this->getInfoByPath('patterns/'.$type);
-		$this->pattern = $this->parsePattern($info);
+		$info=$this->getInfoByPath('patterns/'.$type);
+		$this->pattern=$this->parsePattern($info);
 	}
 
 	public function getPattern()
@@ -160,10 +160,10 @@ 
 	public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
 	{
 		static $invariant;
-		if($invariant === null)
+		if($invariant===null)
 		{
-			$culture = CultureInfo::getInvariantCulture();
-			$invariant = $culture->NumberFormat;
+			$culture=CultureInfo::getInvariantCulture();
+			$invariant=$culture->NumberFormat;
 			$invariant->setPattern($type);
 		}
 		return $invariant;
@@ -183,19 +183,19 @@ 
 	 */
 	public static function getInstance($culture=null, $type=NumberFormatInfo::DECIMAL)
 	{
-		if ($culture instanceof CultureInfo)
+		if($culture instanceof CultureInfo)
 		{
-			$formatInfo = $culture->NumberFormat;
+			$formatInfo=$culture->NumberFormat;
 			$formatInfo->setPattern($type);
 			return $formatInfo;
 		} elseif(is_string($culture)) {
-			$cultureInfo = new CultureInfo($culture);
-			$formatInfo = $cultureInfo->NumberFormat;
+			$cultureInfo=new CultureInfo($culture);
+			$formatInfo=$cultureInfo->NumberFormat;
 			$formatInfo->setPattern($type);
 			return $formatInfo;
 		} else {
-			$cultureInfo = new CultureInfo();
-			$formatInfo = $cultureInfo->NumberFormat;
+			$cultureInfo=new CultureInfo();
+			$formatInfo=$cultureInfo->NumberFormat;
 			$formatInfo->setPattern($type);
 			return $formatInfo;
 		}
@@ -241,67 +241,67 @@ 
 	 */
 	protected function parsePattern($pattern)
 	{
-		$pattern = explode(';',$pattern);
+		$pattern=explode(';', $pattern);
 
-		$negative = null;
+		$negative=null;
 		if(count($pattern) > 1)
-			$negative = $pattern[1];
-		$pattern = $pattern[0];
+			$negative=$pattern[1];
+		$pattern=$pattern[0];
 
-		$comma = ',';
-		$dot = '.';
-		$digit = '0';
-		$hash = '#';
+		$comma=',';
+		$dot='.';
+		$digit='0';
+		$hash='#';
 
 		//find the first group point, and decimal point
-		$groupPos1 = strrpos($pattern,$comma);
-		$decimalPos = strrpos($pattern,$dot);
+		$groupPos1=strrpos($pattern, $comma);
+		$decimalPos=strrpos($pattern, $dot);
 
-		$groupPos2 = false;
-		$groupSize1 = false;
-		$groupSize2 = false;
-		$decimalPoints = is_int($decimalPos)?-1:false;
+		$groupPos2=false;
+		$groupSize1=false;
+		$groupSize2=false;
+		$decimalPoints=is_int($decimalPos) ?-1 : false;
 
-		$info['negPref'] = $this->getNegativeSign();
-		$info['negPost'] = '';
+		$info['negPref']=$this->getNegativeSign();
+		$info['negPost']='';
 
-		$info['negative'] = $negative;
-		$info['positive'] = $pattern;
+		$info['negative']=$negative;
+		$info['positive']=$pattern;
 
 		//find the negative prefix and postfix
 		if($negative)
 		{
-			$prefixPostfix = $this->getPrePostfix($negative);
-			$info['negPref'] = $prefixPostfix[0];
-			$info['negPost'] = $prefixPostfix[1];
+			$prefixPostfix=$this->getPrePostfix($negative);
+			$info['negPref']=$prefixPostfix[0];
+			$info['negPost']=$prefixPostfix[1];
 		}
 
-		$posfix = $this->getPrePostfix($pattern);
-		$info['posPref'] = $posfix[0];
-		$info['posPost'] = $posfix[1];
+		$posfix=$this->getPrePostfix($pattern);
+		$info['posPref']=$posfix[0];
+		$info['posPost']=$posfix[1];
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
 		if(is_int($groupPos1))
 		{
 			//get the second group
-			$groupPos2 = strrpos(substr($pattern,0,$groupPos1),$comma);
+			$groupPos2=strrpos(substr($pattern, 0, $groupPos1), $comma);
 
 			//get the number of decimal digits
 			if(is_int($decimalPos))
 			{
-				$groupSize1 = $decimalPos - $groupPos1-1;
+				$groupSize1=$decimalPos - $groupPos1 - 1;
 
 			}
 			else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
-				for($i=strlen($pattern)-1; $i>=0; $i--)
+				for($i=strlen($pattern) - 1; $i >= 0; $i--)
 				{
-					if($pattern{$i} == $digit || $pattern{$i}==$hash)
+					if($pattern{$i}==$digit || $pattern{$i}==$hash)
 					{
-						$groupSize1 = $i - $groupPos1;
+						$groupSize1=$i - $groupPos1;
 						break;
 					}
 				}
@@ -309,36 +309,36 @@ 
 
 			//get the second group size
 			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2-1;
+				$groupSize2=$groupPos1 - $groupPos2 - 1;
 		}
 
 		if(is_int($decimalPos))
 		{
-			for($i=strlen($pattern)-1; $i>=0; $i--)
+			for($i=strlen($pattern) - 1; $i >= 0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
-				if($pattern{$i} == $digit)
+				if($pattern{$i}==$dot) break;
+				if($pattern{$i}==$digit)
 				{
-					$decimalPoints = $i - $decimalPos;
+					$decimalPoints=$i - $decimalPos;
 					break;
 				}
 			}
 		}
 
 		if(is_int($decimalPos))
-			$digitPattern = substr($pattern,0,$decimalPos);
+			$digitPattern=substr($pattern, 0, $decimalPos);
 		else
-			$digitPattern  = $pattern;
+			$digitPattern=$pattern;
 
-		$digitPattern  = preg_replace('/[^0]/','',$digitPattern);
+		$digitPattern=preg_replace('/[^0]/', '', $digitPattern);
 
-		$info['groupPos1'] = $groupPos1;
-		$info['groupSize1'] = $groupSize1;
-		$info['groupPos2'] = $groupPos2;
-		$info['groupSize2'] = $groupSize2;
-		$info['decimalPos'] = $decimalPos;
-		$info['decimalPoints'] = $decimalPoints;
-		$info['digitSize'] = strlen($digitPattern);
+		$info['groupPos1']=$groupPos1;
+		$info['groupSize1']=$groupSize1;
+		$info['groupPos2']=$groupPos2;
+		$info['groupSize2']=$groupSize2;
+		$info['decimalPos']=$decimalPos;
+		$info['decimalPoints']=$decimalPoints;
+		$info['digitSize']=strlen($digitPattern);
 
 		return $info;
 	}
@@ -350,9 +350,9 @@ 
 	 */
 	protected function getPrePostfix($pattern)
 	{
-		$regexp = '/[#,\.0]+/';
-		$result = preg_split($regexp, $pattern);
-		return array($result[0],$result[1]);
+		$regexp='/[#,\.0]+/';
+		$result=preg_split($regexp, $pattern);
+		return array($result[0], $result[1]);
 	}
 
 	/**
@@ -398,8 +398,8 @@ 
 	 */
 	public function getGroupSizes()
 	{
-		$group1 = $this->pattern['groupSize1'];
-		$group2 = $this->pattern['groupSize2'];
+		$group1=$this->pattern['groupSize1'];
+		$group2=$this->pattern['groupSize2'];
 
 		return array($group1, $group2);
 	}
@@ -412,8 +412,8 @@ 
 	 */
 	public function getNegativePattern()
 	{
-		$prefix = $this->pattern['negPref'];
-		$postfix = $this->pattern['negPost'];
+		$prefix=$this->pattern['negPref'];
+		$postfix=$this->pattern['negPost'];
 		return array($prefix, $postfix);
 	}
 
@@ -425,8 +425,8 @@ 
 	 */
 	public function getPositivePattern()
 	{
-		$prefix = $this->pattern['posPref'];
-		$postfix = $this->pattern['posPost'];
+		$prefix=$this->pattern['posPref'];
+		$postfix=$this->pattern['posPost'];
 		return array($prefix, $postfix);
 	}
 
@@ -436,7 +436,7 @@ 
 	 */
 	public function getNegativeInfinitySymbol()
 	{
-		return $this->getNegativeSign() . $this->getInfoByPath('symbols/infinity');
+		return $this->getNegativeSign().$this->getInfoByPath('symbols/infinity');
 	}
 
 	/**
@@ -445,7 +445,7 @@ 
 	 */
 	public function getPositiveInfinitySymbol()
 	{
-		return $this->getPositiveSign() . $this->getInfoByPath('symbols/infinity');
+		return $this->getPositiveSign().$this->getInfoByPath('symbols/infinity');
 	}
 
 	/**
@@ -499,7 +499,7 @@ 
 	 */
 	public function getCurrencySymbol($currency='USD')
 	{
-		$fmt = new \NumberFormatter( $this->cultureInfo->getName()."@currency=$currency", \NumberFormatter::CURRENCY );
+		$fmt=new \NumberFormatter($this->cultureInfo->getName()."@currency=$currency", \NumberFormatter::CURRENCY);
 		return $fmt->getSymbol(\NumberFormatter::CURRENCY_SYMBOL);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -292,8 +292,7 @@
 			{
 				$groupSize1 = $decimalPos - $groupPos1-1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.

framework/I18N/core/HTTPNegotiator.php

Indentation +14 added lines, -14 removed lines

@@ -53,24 +53,24 @@ 
 		$this->languages = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-            return $this->languages;
+			return $this->languages;
 
 		$info = new CultureInfo();
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
-            // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+			// Cut off any q-value that might come after a semi-colon
+			if ($pos = strpos($lang, ';'))
+				$lang = trim(substr($lang, 0, $pos));
 
 			if (strstr($lang, '-'))
 			{
 				$codes = explode('-',$lang);
 				if($codes[0] == 'i')
 				{
-                    // Language not listed in ISO 639 that are not variants
-                    // of any listed language, which can be registerd with the
-                    // i-prefix, such as i-cherokee
+					// Language not listed in ISO 639 that are not variants
+					// of any listed language, which can be registerd with the
+					// i-prefix, such as i-cherokee
 					if(count($codes)>1)
 						$lang = $codes[1];
 				}
@@ -84,13 +84,13 @@ 
 							$lang .= '_'.strtoupper($codes[$i]);
 					}
 				}
-            }
+			}
 
 
 
 			if($info->validCulture($lang))
 				$this->languages[] = $lang;
-        }
+		}
 
 		return $this->languages;
 	}
@@ -101,20 +101,20 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+		if($this->charsets !== null) {
 			return $this->charsets;
 		}
 
 		$this->charsets = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
-            return $this->charsets;
+			return $this->charsets;
 
 		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
-        }
+			if (!empty($charset))
+				$this->charsets[] = preg_replace('/;.*/', '', $charset);
+		}
 
 		return $this->charsets;
 	}

Spacing +22 added lines, -22 removed lines

@@ -46,42 +46,42 @@ 
 	 */
 	function getLanguages()
 	{
-		if($this->languages !== null) {
+		if($this->languages!==null) {
 			return $this->languages;
 		}
 
-		$this->languages = array();
+		$this->languages=array();
 
-		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
             return $this->languages;
 
-		$info = new CultureInfo();
+		$info=new CultureInfo();
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
             // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+            if($pos=strpos($lang, ';'))
+                $lang=trim(substr($lang, 0, $pos));
 
-			if (strstr($lang, '-'))
+			if(strstr($lang, '-'))
 			{
-				$codes = explode('-',$lang);
-				if($codes[0] == 'i')
+				$codes=explode('-', $lang);
+				if($codes[0]=='i')
 				{
                     // Language not listed in ISO 639 that are not variants
                     // of any listed language, which can be registerd with the
                     // i-prefix, such as i-cherokee
-					if(count($codes)>1)
-						$lang = $codes[1];
+					if(count($codes) > 1)
+						$lang=$codes[1];
 				}
 				else
 				{
-					for($i = 0, $k = count($codes); $i<$k; ++$i)
+					for($i=0, $k=count($codes); $i < $k; ++$i)
 					{
-						if($i == 0)
-							$lang = strtolower($codes[0]);
+						if($i==0)
+							$lang=strtolower($codes[0]);
 						else
-							$lang .= '_'.strtoupper($codes[$i]);
+							$lang.='_'.strtoupper($codes[$i]);
 					}
 				}
             }
@@ -89,7 +89,7 @@ 
 
 
 			if($info->validCulture($lang))
-				$this->languages[] = $lang;
+				$this->languages[]=$lang;
         }
 
 		return $this->languages;
@@ -101,19 +101,19 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+        if($this->charsets!==null) {
 			return $this->charsets;
 		}
 
-		$this->charsets = array();
+		$this->charsets=array();
 
-		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
+		if(!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
             return $this->charsets;
 
-		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
+		foreach(explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
+            if(!empty($charset))
+                $this->charsets[]=preg_replace('/;.*/', '', $charset);
         }
 
 		return $this->charsets;