pradosoft / prado

framework/I18N/core/CultureInfo.php

Doc Comments +3 added lines, -3 removed lines

@@ -238,7 +238,7 @@ 
 
 	/**
 	 * Load the ICU culture data for the specific culture identifier.
-	 * @param string $culture the culture identifier.
+	 * @param string $cultureName the culture identifier.
 	 */
 	protected function loadCultureData($cultureName)
 	{
@@ -282,6 +282,7 @@ 
 	 * currency for "en_AU", you need to use findInfo("Currencies,true);.
 	 * @param string $path the data you want to find.
 	 * @param bool $merge merge the data from its parents.
+	 * @param string $key
 	 * @return mixed the specific ICU data.
 	 */
 	public function findInfo($path='/', $merge=false, $key = null)
@@ -487,7 +488,6 @@ 
 	 * Simplify a single element array into its own value.
 	 * E.g. <code>array(0 => array('hello'), 1 => 'world');</code>
 	 * becomes <code>array(0 => 'hello', 1 => 'world');</code>
-	 * @param array $array with single elements arrays
 	 * @return array simplified array.
 	 */
 	protected function simplify($obj)
@@ -559,7 +559,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 +39 added lines, -39 removed lines

@@ -246,24 +246,24 @@ 
 		$current_part = $culture_parts[0];
 
 		$culturesToLoad = [$current_part];
-		for($i = 1, $k = count($culture_parts); $i < $k; ++$i)
+		for ($i = 1, $k = count($culture_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$culture_parts[$i];
+			$current_part .= '_' . $culture_parts[$i];
 			$culturesToLoad[] = $current_part;
 		}
 
-		foreach(self::$bundleNames as $key => $bundleName)
+		foreach (self::$bundleNames as $key => $bundleName)
 		{
-			if(!array_key_exists($key, $this->data))
+			if (!array_key_exists($key, $this->data))
 				$this->data[$key] = [];
 		}
-		foreach($culturesToLoad as $culture)
+		foreach ($culturesToLoad as $culture)
 		{
-			if(in_array($culture, $this->resourceBundles))
+			if (in_array($culture, $this->resourceBundles))
 				continue;
 
 			array_unshift($this->resourceBundles, $culture);
-			foreach(self::$bundleNames as $key => $bundleName)
+			foreach (self::$bundleNames as $key => $bundleName)
 			{
 				$this->data[$key][$culture] = \ResourceBundle::create($culture, $bundleName, false);
 			}
@@ -284,17 +284,17 @@ 
 	 * @param bool $merge 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 = [];
 
-		if($key === null)
+		if ($key === null)
 		{
 			// try to guess the bundle from the path. Always defaults to "Core".
 			$key = 'Core';
-			foreach(self::$bundleNames as $bundleName => $icuBundleName)
+			foreach (self::$bundleNames as $bundleName => $icuBundleName)
 			{
-				if(strpos($path, $bundleName) === 0)
+				if (strpos($path, $bundleName) === 0)
 				{
 					$key = $bundleName;
 					break;
@@ -302,17 +302,17 @@ 
 			}
 		}
 
-		if(!array_key_exists($key, $this->data))
+		if (!array_key_exists($key, $this->data))
 			return $result;
-		foreach($this->resourceBundles as $culture)
+		foreach ($this->resourceBundles as $culture)
 		{
 			$res = $this->data[$key][$culture];
-			if($res === null)
+			if ($res === null)
 				continue;
 			$info = $this->searchResources($res, $path);
-			if($info)
+			if ($info)
 			{
-				if($merge)
+				if ($merge)
 					$result = array_merge($result, $info);
 				else
 					return $info;
@@ -330,16 +330,16 @@ 
 	 * @param string $path slash "/" separated array path.
 	 * @return mixed the value array using the path
 	 */
-	private function searchResources($info, $path='/')
+	private function searchResources($info, $path = '/')
 	{
 		$index = explode('/', $path);
 
 		$resource = $info;
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for ($i = 0, $k = count($index); $i < $k; ++$i)
 		{
 
 			$resource = $resource->get($index[$i], false);
-			if($resource === null)
+			if ($resource === null)
 				return null;
 		}
 
@@ -377,8 +377,8 @@ 
 		$reg = substr($this->culture, 3, 2);
 		$language = $this->findInfo("Languages/{$lang}");
 		$region = $this->findInfo("Countries/{$reg}");
-		if($region)
-			return $language.' ('.$region.')';
+		if ($region)
+			return $language . ' (' . $region . ')';
 		else
 			return $language;
 	}
@@ -401,8 +401,8 @@ 
 		}
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language.' ('.$region.')';
+		if ($region)
+			return $language . ' (' . $region . ')';
 		else
 			return $language;
 	}
@@ -458,25 +458,25 @@ 
 	 * or CultureInfo::SPECIFIC.
 	 * @return array list of culture information available.
 	 */
-	public static function getCultures($type=CultureInfo::ALL)
+	public static function getCultures($type = CultureInfo::ALL)
 	{
 		$all = \ResourceBundle::getLocales('');
 
-		switch($type)
+		switch ($type)
 		{
 			case CultureInfo::ALL :
 				return $all;
 			case CultureInfo::NEUTRAL :
-				foreach($all as $key => $culture)
+				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)
+				foreach ($all as $key => $culture)
 				{
-					if(strlen($culture) == 2)
+					if (strlen($culture) == 2)
 						unset($all[$key]);
 				}
 				return $all;
@@ -492,17 +492,17 @@ 
 	 */
 	protected function simplify($obj)
 	{
-		if(is_scalar($obj)) {
+		if (is_scalar($obj)) {
 			return $obj;
-		} elseif($obj instanceof \ResourceBundle) {
+		} elseif ($obj instanceof \ResourceBundle) {
 			$array = array();
-			foreach($obj as $k => $v)
+			foreach ($obj as $k => $v)
 				$array[$k] = $v;
 		} else {
 			$array = $obj;
 		}
 
-		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])
@@ -530,10 +530,10 @@ 
 	public function getCurrencies()
 	{
 		static $arr;
-		if($arr === null)
+		if ($arr === null)
 		{
 			$arr = $this->findInfo('Currencies', true, 'Currencies');
-			foreach($arr as $k => $v)
+			foreach ($arr as $k => $v)
 				$arr[$k] = $this->simplify($v);
 		}
 		return $arr;
@@ -564,15 +564,15 @@ 
 	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');
-			foreach($tmp as $k => $v)
+			foreach ($tmp as $k => $v)
 			{
-				foreach($validPrefixes as $prefix)
+				foreach ($validPrefixes as $prefix)
 				{
-					if(strpos($k, $prefix) === 0)
+					if (strpos($k, $prefix) === 0)
 					{
 						$arr[] = str_replace(':', '/', $k);
 						break;

framework/I18N/TDateFormat.php

Spacing +8 added lines, -8 removed lines

@@ -190,11 +190,11 @@ 
 	 */
 	protected function getFormatter($culture, $datetype, $timetype)
 	{
-		if(!isset(self::$formatters[$culture]))
+		if (!isset(self::$formatters[$culture]))
 			self::$formatters[$culture] = [];
-		if(!isset(self::$formatters[$culture][$datetype]))
+		if (!isset(self::$formatters[$culture][$datetype]))
 			self::$formatters[$culture][$datetype] = [];
-		if(!isset(self::$formatters[$culture][$datetype][$timetype]))
+		if (!isset(self::$formatters[$culture][$datetype][$timetype]))
 			self::$formatters[$culture][$datetype][$timetype] = new \IntlDateFormatter($culture, $datetype, $timetype);
 
 		return self::$formatters[$culture][$datetype][$timetype];
@@ -230,14 +230,14 @@ 
 		$timetype = \IntlDateFormatter::LONG;
 
 		// try the "date time" pattern format
-		if(!empty($pattern))
+		if (!empty($pattern))
 		{
 			$subs = explode(' ', $pattern, 2);
 			if (count($subs) == 2) {
 				$sub0 = $this->getPreset($subs[0]);
 				$sub1 = $this->getPreset($subs[1]);
 
-				if($sub0 !== null && $sub1 !== null)
+				if ($sub0 !== null && $sub1 !== null)
 				{
 					$datetype = $sub0;
 					$timetype = $sub1;
@@ -247,10 +247,10 @@ 
 		}
 
 		// try the "date" pattern format
-		if(!empty($pattern))
+		if (!empty($pattern))
 		{
 			$sub = $this->getPreset($pattern);
-			if($sub !== null)
+			if ($sub !== null)
 			{
 				$datetype = $sub;
 				$timetype = $sub;
@@ -258,7 +258,7 @@ 
 			}
 		}
 
-		if(empty($pattern))
+		if (empty($pattern))
 		{
 			$formatter = $this->getFormatter($culture, $datetype, $timetype);
 		} else {

framework/I18N/TGlobalizationAutoDetect.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	protected function getIsValidLocale($locale)
 	{
 		static $allLocales;
-		if($allLocales === null)
+		if ($allLocales === null)
 		{
 			$all = \ResourceBundle::getLocales('');
 		}

framework/I18N/TNumberFormat.php

Spacing +4 added lines, -4 removed lines

@@ -195,9 +195,9 @@ 
 	 */
 	protected function getFormatter($culture, $type)
 	{
-		if(!isset(self::$formatters[$culture]))
+		if (!isset(self::$formatters[$culture]))
 			self::$formatters[$culture] = [];
-		if(!isset(self::$formatters[$culture][$type]))
+		if (!isset(self::$formatters[$culture][$type]))
 			self::$formatters[$culture][$type] = new \NumberFormatter($culture, $type);
 
 		return self::$formatters[$culture][$type];
@@ -221,7 +221,7 @@ 
 		$type = $this->getType();
 		$pattern = $this->getPattern();
 
-		if(empty($pattern))
+		if (empty($pattern))
 		{
 			$formatter = $this->getFormatter($culture, $type);
 		} else {
@@ -229,7 +229,7 @@ 
 			$formatter->setPattern($pattern);
 		}
 
-		if($type === \NumberFormatter::CURRENCY)
+		if ($type === \NumberFormatter::CURRENCY)
 		{
 			$result = $formatter->formatCurrency($value, $this->getCurrency());
 		} else {