pradosoft / prado

framework/I18N/core/CultureInfo.php

Doc Comments +2 added lines, -3 removed lines

@@ -216,7 +216,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)
 	{
@@ -468,7 +468,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)
@@ -541,7 +540,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 +41 added lines, -41 removed lines

@@ -224,24 +224,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);
 			}
@@ -263,17 +263,17 @@ 
 	 * @param string $key bundle name.
 	 * @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;
@@ -281,17 +281,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;
@@ -309,18 +309,18 @@ 
 	 * @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)
 		{
-			if($resource === null)
+			if ($resource === null)
 				return null;
-			elseif(is_string($resource))
+			elseif (is_string($resource))
 				return [$resource];
-			elseif(is_object($resource))
+			elseif (is_object($resource))
 				$resource = $resource->get($index[$i], false);
 		}
 
@@ -358,8 +358,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;
 	}
@@ -382,8 +382,8 @@ 
 		}
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language.' ('.$region.')';
+		if ($region)
+			return $language . ' (' . $region . ')';
 		else
 			return $language;
 	}
@@ -439,25 +439,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;
@@ -473,17 +473,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 ($key !== null
@@ -512,10 +512,10 @@ 
 	public function getCurrencies()
 	{
 		static $arr;
-		if($arr === null)
+		if ($arr === null)
 		{
 			$arr = $this->findInfo('Currencies', false, 'Currencies');
-			foreach($arr as $k => $v)
+			foreach ($arr as $k => $v)
 				$arr[$k] = $this->simplify($v);
 		}
 		return $arr;
@@ -546,15 +546,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', false, '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/Web/UI/WebControls/TDatePicker.php

Doc Comments +4 added lines, -4 removed lines

@@ -483,7 +483,7 @@ 
 	 * Loads date from drop down list data.
 	 * @param string $key the key that can be used to retrieve data from the input data collection
 	 * @param array $values the input data collection
-	 * @return array the date selected
+	 * @return string the date selected
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
@@ -595,7 +595,7 @@ 
 	}
 
 	/**
-	 * @return DateTimeFormatInfo date time format information for the current culture.
+	 * @return CultureInfo date time format information for the current culture.
 	 */
 	protected function getLocalizedCalendarInfo()
 	{
@@ -647,7 +647,7 @@ 
 	/**
 	 * Renders the calendar drop down list depending on the DateFormat pattern.
 	 * @param THtmlWriter $writer the Html writer to render the drop down lists.
-	 * @param array $date the current selected date
+	 * @param \DateTime $date the current selected date
 	 */
 	protected function renderCalendarSelections($writer, $date)
 	{
@@ -755,7 +755,7 @@ 
 	 * Returns the localized month names that depends on the month format pattern.
 	 * "MMMM" will return the month names, "MM" or "MMM" return abbr. month names
 	 * and "M" return month digits.
-	 * @param DateTimeFormatInfo $info localized date format information.
+	 * @param CultureInfo $info localized date format information.
 	 * @return array localized month names.
 	 */
 	protected function getLocalizedMonthNames($info)