pradosoft / prado

framework/Exceptions/TErrorHandler.php

Doc Comments +13 added lines, -1 removed lines

@@ -118,7 +118,7 @@ 
 	 * raised in {@link TApplication}.
 	 * The method mainly uses appropriate template to display the error/exception.
 	 * It terminates the application immediately after the error is displayed.
-	 * @param mixed $sender sender of the event
+	 * @param null|\Prado\TApplication $sender sender of the event
 	 * @param mixed $param event parameter (if the event is raised by TApplication, it refers to the exception instance)
 	 */
 	public function handleError($sender, $param)
@@ -244,6 +244,9 @@ 
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function hidePrivatePathParts($value)
 	{
 		static $aRpl;
@@ -401,6 +404,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getExactTraceAsString($exception)
 	{
 		if ($exception instanceof TPhpFatalErrorException &&
@@ -427,6 +433,9 @@ 
 		return $this->hidePrivatePathParts($exception->getTraceAsString());
 	}
 
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result = null;
@@ -457,6 +466,9 @@ 
 		return $source;
 	}
 
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		if (null !== ($class = $this->getErrorClassNameSpace($message))) {

Spacing +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 	protected function hidePrivatePathParts($value)
 	{
 		static $aRpl;
-		if($aRpl === null)
+		if ($aRpl === null)
 		{
 			$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
 			$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';

framework/Web/UI/WebControls/TCaptchaValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 	/**
 	 * @param string $token
-	 * @return string hash
+	 * @return integer hash
 	 */
 	private function generateTokenHash($token)
 	{

framework/Web/UI/WebControls/TCustomValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	}
 
 	/**
-	 * @return TControl|null control to be validated. Null if no control is found.
+	 * @return \Prado\Web\UI\TControl|null control to be validated. Null if no control is found.
 	 */
 	public function getValidationTarget()
 	{

framework/Web/UI/WebControls/TRepeater.php

Doc Comments +4 added lines, -4 removed lines

@@ -286,7 +286,7 @@ 
 	}
 
 	/**
-	 * @param ITemplate $value the template for repeater items
+	 * @param \Prado\Web\UI\TTemplate $value the template for repeater items
 	 * @throws TInvalidDataTypeException if the input is not an {@link ITemplate} or not null.
 	 */
 	public function setItemTemplate($value)
@@ -463,7 +463,7 @@ 
 	 * This method invokes {@link createItem} to create a new repeater item.
 	 * @param int $itemIndex zero-based item index.
 	 * @param TListItemType $itemType item type
-	 * @return TControl the created item, null if item is not created
+	 * @return \Prado\TComponent|null the created item, null if item is not created
 	 */
 	private function createItemInternal($itemIndex, $itemType)
 	{
@@ -483,7 +483,7 @@ 
 	 * @param int $itemIndex zero-based item index.
 	 * @param TListItemType $itemType item type
 	 * @param mixed $dataItem data to be associated with the item
-	 * @return TControl the created item, null if item is not created
+	 * @return \Prado\TComponent|null the created item, null if item is not created
 	 */
 	private function createItemWithDataInternal($itemIndex, $itemType, $dataItem)
 	{
@@ -506,7 +506,7 @@ 
 	 * Creates a repeater item instance based on the item type and index.
 	 * @param int $itemIndex zero-based item index
 	 * @param TListItemType $itemType item type
-	 * @return TControl created repeater item
+	 * @return null|\Prado\TComponent created repeater item
 	 */
 	protected function createItem($itemIndex, $itemType)
 	{

framework/Web/UI/ActiveControls/TCallbackErrorHandler.php

Spacing +4 added lines, -4 removed lines

@@ -78,15 +78,15 @@
 		$data['file'] = $this->hidePrivatePathParts($exception->getFile());
 		$data['line'] = $exception->getLine();
 		$data['trace'] = $exception->getTrace();
-		foreach($data['trace'] as $k => $v)
+		foreach ($data['trace'] as $k => $v)
 		{
-			if(isset($v['file']))
+			if (isset($v['file']))
 				$data['trace'][$k]['file'] = $this->hidePrivatePathParts($v['file']);
 
-			if(isset($v['args']))
+			if (isset($v['args']))
 			{
 				$argsout = [];
-				foreach($v['args'] as $kArg => $vArg)
+				foreach ($v['args'] as $kArg => $vArg)
 				{
 					$data['trace'][$k]['args'][$kArg] = TVarDumper::dump($vArg, 0, false);
 				}

framework/Util/TFirebugLogRoute.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		$first = $logs[0][3];
 		$even = true;
 
-		$blocks = [ [ 'info', 'Tot Time', 'Time    ', '[Level] [Category] [Message]' ] ];
+		$blocks = [['info', 'Tot Time', 'Time    ', '[Level] [Category] [Message]']];
 		for ($i = 0, $n = count($logs); $i < $n; ++$i) {
 			if ($i < $n - 1) {
 				$timing['delta'] = $logs[$i + 1][3] - $logs[$i][3];

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 
 	console.log ("[Tot Time] [Time    ] [Level] [Category] [Message]");
 
-EOD;
+eod;
 
 		return $string;
 	}
@@ -122,7 +122,7 @@ 
 }
 </script>
 
-EOD;
+eod;
 
 		return $string;
 	}

framework/I18N/core/CultureInfo.php

Braces +6 added lines, -4 removed lines

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

Doc Comments +4 added lines, -4 removed lines

@@ -210,7 +210,7 @@ 
 
 	/**
 	 * Gets the CultureInfo that for this culture string
-	 * @param mixed $culture
+	 * @param string $culture
 	 * @return CultureInfo invariant culture info is "en".
 	 */
 	public static function getInstance($culture)
@@ -251,7 +251,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)
 	{
@@ -295,6 +295,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)
@@ -556,7 +557,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)
@@ -628,7 +628,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 +40 added lines, -40 removed lines

@@ -253,24 +253,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);
 			}
@@ -291,17 +291,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;
@@ -309,17 +309,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;
@@ -337,16 +337,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;
 		}
 
@@ -370,7 +370,7 @@ 
 	 */
 	public function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if ($this->dateTimeFormat === null)
 		{
 			$this->setDateTimeFormat(new DateTimeFormatInfo($this));
 		}
@@ -408,8 +408,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;
 	}
@@ -432,8 +432,8 @@ 
 		}
 
 		$region = $culture->findInfo("Countries/{$reg}");
-		if($region)
-			return $language.' ('.$region.')';
+		if ($region)
+			return $language . ' (' . $region . ')';
 		else
 			return $language;
 	}
@@ -489,25 +489,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;
@@ -523,17 +523,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])
@@ -561,10 +561,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;
@@ -595,15 +595,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/core/DateTimeFormatInfo.php

Doc Comments +4 added lines, -1 removed lines

@@ -157,7 +157,7 @@ 
 
 	/**
 	 * Returns the DateTimeFormatInfo associated with the specified culture.
-	 * @param null|CultureInfo|string $culture the culture that gets the DateTimeFormat property.
+	 * @param string $culture the culture that gets the DateTimeFormat property.
 	 * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
 	 * culture.
 	 */
@@ -174,6 +174,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function getInfoByPath($path)
 	{
 		static $basePath = null;

framework/I18N/TNumberFormat.php

Spacing +4 added lines, -4 removed lines

@@ -198,9 +198,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];
@@ -224,7 +224,7 @@ 
 		$type = $this->getType();
 		$pattern = $this->getPattern();
 
-		if(empty($pattern))
+		if (empty($pattern))
 		{
 			$formatter = $this->getFormatter($culture, $type);
 		} else {
@@ -232,7 +232,7 @@ 
 			$formatter->setPattern($pattern);
 		}
 
-		if($type === \NumberFormatter::CURRENCY)
+		if ($type === \NumberFormatter::CURRENCY)
 		{
 			$result = $formatter->formatCurrency($this->getValue(), $this->getCurrency());
 		} else {