pradosoft / prado

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 {

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)

framework/I18N/core/CultureInfo.php

Doc Comments +1 added lines, -4 removed lines

@@ -205,7 +205,6 @@ 
 
 	/**
 	 * Load the ICU culture data for the specific culture identifier.
-	 * @param string $culture the culture identifier.
 	 */
 	protected function loadCultureData($key)
 	{
@@ -259,7 +258,6 @@ 
 	 * Search the array for a specific value using a path separated using
 	 * slash "/" separated path. e.g to find $info['hello']['world'],
 	 * the path "hello/world" will return the corresponding value.
-	 * @param array $info the array for search
 	 * @param string $path slash "/" separated array path.
 	 * @return mixed the value array using the path
 	 */
@@ -401,7 +399,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)
@@ -474,7 +471,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 +32 added lines, -32 removed lines

@@ -209,11 +209,11 @@ 
 	 */
 	protected function loadCultureData($key)
 	{
-		foreach(self::$bundleNames as $bundleKey => $bundleName)
+		foreach (self::$bundleNames as $bundleKey => $bundleName)
 		{
-			if($key == $bundleKey)
+			if ($key == $bundleKey)
 			{
-				if(!array_key_exists($this->culture, self::$data))
+				if (!array_key_exists($this->culture, self::$data))
 					self::$data[$this->culture] = [];
 
 				self::$data[$this->culture][$bundleKey] = \ResourceBundle::create($this->culture, $bundleName, true);
@@ -231,15 +231,15 @@ 
 	 * @param string $key bundle name.
 	 * @return mixed the specific ICU data.
 	 */
-	public function findInfo($path='/', $key = null)
+	public function findInfo($path = '/', $key = null)
 	{
-		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;
@@ -247,9 +247,9 @@ 
 			}
 		}
 
-		if(!array_key_exists($this->culture, self::$data))
+		if (!array_key_exists($this->culture, self::$data))
 			$this->loadCultureData($key);
-		if(!array_key_exists($this->culture, self::$data) || !array_key_exists($key, self::$data[$this->culture]))
+		if (!array_key_exists($this->culture, self::$data) || !array_key_exists($key, self::$data[$this->culture]))
 			return [];
 
 		return $this->searchResources(self::$data[$this->culture][$key], $path);
@@ -263,12 +263,12 @@ 
 	 * @param string $path slash "/" separated array path.
 	 * @return mixed the value array using the path
 	 */
-	private function searchResources($resource, $path='/')
+	private function searchResources($resource, $path = '/')
 	{
 		$index = explode('/', $path);
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for ($i = 0, $k = count($index); $i < $k; ++$i)
 		{
-			if(is_object($resource))
+			if (is_object($resource))
 				$resource = $resource->get($index[$i]);
 		}
 
@@ -306,8 +306,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;
 	}
@@ -330,8 +330,8 @@ 
 		}
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language.' ('.$region.')';
+		if ($region)
+			return $language . ' (' . $region . ')';
 		else
 			return $language;
 	}
@@ -372,25 +372,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;
@@ -406,17 +406,17 @@ 
 	 */
 	protected function simplify($obj)
 	{
-		if(is_scalar($obj)) {
+		if (is_scalar($obj)) {
 			return $obj;
-		} elseif($obj instanceof \ResourceBundle) {
+		} elseif ($obj instanceof \ResourceBundle) {
 			$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
@@ -445,10 +445,10 @@ 
 	public function getCurrencies()
 	{
 		static $arr;
-		if($arr === null)
+		if ($arr === null)
 		{
 			$arr = $this->findInfo('Currencies', 'Currencies');
-			foreach($arr as $k => $v)
+			foreach ($arr as $k => $v)
 				$arr[$k] = $this->simplify($v);
 		}
 		return $arr;
@@ -479,15 +479,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', '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;

Braces +6 added lines, -4 removed lines

@@ -410,8 +410,9 @@ 
 			return $obj;
 		} elseif($obj instanceof \ResourceBundle) {
 			$array = [];
-			foreach($obj as $k => $v)
-				$array[$k] = $v;
+			foreach($obj as $k => $v) {
+							$array[$k] = $v;
+			}
 		} else {
 			$array = $obj;
 		}
@@ -448,8 +449,9 @@ 
 		if($arr === null)
 		{
 			$arr = $this->findInfo('Currencies', 'Currencies');
-			foreach($arr as $k => $v)
-				$arr[$k] = $this->simplify($v);
+			foreach($arr as $k => $v) {
+							$arr[$k] = $this->simplify($v);
+			}
 		}
 		return $arr;
 	}