pradosoft / prado

framework/Web/TUrlMapping.php

Doc Comments +3 added lines, -1 removed lines

@@ -606,6 +606,7 @@ 
 
 	/**
 	 * @param string full regular expression mapping pattern.
+	 * @param string $value
 	 */
 	public function setRegularExpression($value)
 	{
@@ -715,6 +716,7 @@ 
 	 * Uses URL pattern (or full regular expression if available) to
 	 * match the given url path.
 	 * @param THttpRequest the request module
+	 * @param THttpRequest $request
 	 * @return array matched parameters, empty if no matches.
 	 */
 	public function getPatternMatches($request)
@@ -785,7 +787,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{

Spacing +68 added lines, -68 removed lines

@@ -116,7 +116,7 @@ 
 				$this->_urlPrefix=$request->getApplicationUrl();
 			}
 		}
-		$this->_urlPrefix=rtrim($this->_urlPrefix,'/');
+		$this->_urlPrefix=rtrim($this->_urlPrefix, '/');
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$config = include $this->_configFile;
+				$config=include $this->_configFile;
 				$this->loadUrlMappings($dom);
 			}
 			else
@@ -140,7 +140,7 @@ 
 			}
 		}
 		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
+			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,$this->getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('urlmapping_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	protected function loadUrlMappings($config)
 	{
-		$defaultClass = $this->getDefaultMappingClass();
+		$defaultClass=$this->getDefaultMappingClass();
 
 		if(is_array($config))
 		{
@@ -241,9 +241,9 @@ 
 			{
 				foreach($config['urls'] as $url)
 				{
-					$class=isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:array();
-					$this->buildUrlMapping($class,$properties,$url);
+					$class=isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties=isset($url['properties']) ? $url['properties'] : array();
+					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
 		}
@@ -254,24 +254,24 @@ 
 				$properties=$url->getAttributes();
 				if(($class=$properties->remove('class'))===null)
 					$class=$defaultClass;
-				$this->buildUrlMapping($class,$properties,$url);
+				$this->buildUrlMapping($class, $properties, $url);
 			}
 		}
 	}
 
 	private function buildUrlMapping($class, $properties, $url)
 	{
-		$pattern=Prado::createComponent($class,$this);
+		$pattern=Prado::createComponent($class, $this);
 		if(!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
 		foreach($properties as $name=>$value)
-			$pattern->setSubproperty($name,$value);
+			$pattern->setSubproperty($name, $value);
 
 		if($url instanceof TXmlElement) {
-			$text = $url -> getValue();
+			$text=$url -> getValue();
 			if($text) {
-				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
+				$text=preg_replace('/(\s+)/S', '', $text);
+				if(($regExp=$pattern->getRegularExpression())!=='')
 				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
@@ -304,7 +304,7 @@ 
 		foreach($this->_patterns as $pattern)
 		{
 			$matches=$pattern->getPatternMatches($request);
-			if(count($matches)>0)
+			if(count($matches) > 0)
 			{
 				$this->_matched=$pattern;
 				$params=array();
@@ -313,7 +313,7 @@ 
 					if(is_string($key))
 						$params[$key]=$value;
 				}
-				if (!$pattern->getIsWildCardPattern())
+				if(!$pattern->getIsWildCardPattern())
 					$params[$pattern->getServiceID()]=$pattern->getServiceParameter();
 				return $params;
 			}
@@ -345,21 +345,21 @@ 
 	 * @see parseUrl
 	 * @since 3.1.1
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		if($this->_customUrl)
 		{
 			if(!(is_array($getItems) || ($getItems instanceof Traversable)))
 				$getItems=array();
 			$key=$serviceID.':'.$serviceParam;
-			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
-				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
+			$wildCardKey=($pos=strrpos($serviceParam, '.'))!==false ?
+				$serviceID.':'.substr($serviceParam, 0, $pos).'.*' : $serviceID.':*';
 			if(isset($this->_constructRules[$key]))
 			{
 				foreach($this->_constructRules[$key] as $rule)
 				{
 					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 				}
 			}
 			elseif(isset($this->_constructRules[$wildCardKey]))
@@ -368,13 +368,13 @@ 
 				{
 					if($rule->supportCustomUrl($getItems))
 					{
-						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;
-						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
+						$getItems['*']=$pos ? substr($serviceParam, $pos + 1) : $serviceParam;
+						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 					}
 				}
 			}
 		}
-		return parent::constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
+		return parent::constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -528,7 +528,7 @@ 
 	 * @var TUrlMappingPatternSecureConnection
 	 * @since 3.2
 	 */
-	private $_secureConnection = TUrlMappingPatternSecureConnection::Automatic;
+	private $_secureConnection=TUrlMappingPatternSecureConnection::Automatic;
 
 	/**
 	 * Constructor.
@@ -556,7 +556,7 @@ 
 	{
 		if($this->_serviceParameter===null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter,'*')!==false)
+		if(strpos($this->_serviceParameter, '*')!==false)
 				$this->_isWildCardPattern=true;
 	}
 
@@ -569,7 +569,7 @@ 
 	{
 		$params=array();
 		$values=array();
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -577,7 +577,7 @@ 
 				$values[]='(?P<'.$key.'>'.$value.')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
 				$params[]='{*}';
 				// service parameter must not contain '=' and '/'
@@ -585,8 +585,8 @@ 
 		}
 		$params[]='/';
 		$values[]='\\/';
-		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');
-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
+		$regexp=str_replace($params, $values, trim($this->getPattern(), '/').'/');
+		if($this->_urlFormat===THttpRequestUrlFormat::Get)
 				$regexp='/^'.$regexp.'$/u';
 		else
 				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
@@ -673,7 +673,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->_pattern = $value;
+		$this->_pattern=$value;
 	}
 
 	/**
@@ -681,7 +681,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
 			$this->_parameters=new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
@@ -703,9 +703,9 @@ 
 	 */
 	public function getConstants()
 	{
-		if (!$this->_constants)
+		if(!$this->_constants)
 		{
-			$this->_constants = new TAttributeCollection;
+			$this->_constants=new TAttributeCollection;
 			$this->_constants->setCaseSensitive(true);
 		}
 		return $this->_constants;
@@ -721,17 +721,17 @@ 
 	{
 		$matches=array();
 		if(($pattern=$this->getRegularExpression())!=='')
-			preg_match($pattern,$request->getPathInfo(),$matches);
+			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/').'/', $matches);
 
 		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+			$matches[$this->_serviceID]=str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
-		if (isset($matches['urlparams']))
+		if(isset($matches['urlparams']))
 		{
-			$params=explode('/',$matches['urlparams']);
-			if ($this->_separator==='/')
+			$params=explode('/', $matches['urlparams']);
+			if($this->_separator==='/')
 			{
 				while($key=array_shift($params))
 					$matches[$key]=($value=array_shift($params)) ? $value : '';
@@ -741,7 +741,7 @@ 
 				array_pop($params);
 				foreach($params as $param)
 				{
-					list($key,$value)=explode($this->_separator,$param,2);
+					list($key, $value)=explode($this->_separator, $param, 2);
 					$matches[$key]=$value;
 				}
 			}
@@ -751,7 +751,7 @@ 
 		if(count($matches) > 0 && $this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
-				$matches[$key] = $value;
+				$matches[$key]=$value;
 		}
 
 		return $matches;
@@ -805,7 +805,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -843,7 +843,7 @@ 
 	 */
 	public function setSecureConnection($value)
 	{
-		$this->_secureConnection = TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
+		$this->_secureConnection=TPropertyValue::ensureEnum($value, 'TUrlMappingPatternSecureConnection');
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 	{
 		if(!$this->_customUrl || $this->getPattern()===null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key=>$value)
 			{
@@ -864,13 +864,13 @@ 
 			}
 		}
 
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
-				if (!isset($getItems[$key]))
+				if(!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key]!=$value)
+				if($getItems[$key]!=$value)
 					return false;
 			}
 		}
@@ -885,9 +885,9 @@ 
 	 * @return string the constructed URL
 	 * @since 3.1.1
 	 */
-	public function constructUrl($getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key=>$value)
 			{
@@ -906,19 +906,19 @@ 
 				$extra[$key]=$value;
 		}
 
-		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(),$replace),'/');
+		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
-		if(count($extra)>0)
+		if(count($extra) > 0)
 		{
-			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name=>$value)
-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+			if($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach($extra as $name=>$value)
+					$url.='/'.$name.$this->_separator.($encodeGetItems ? rawurlencode($value) : $value);
 				return $url;
 			}
 
 			$url2='';
-			$amp=$encodeAmpersand?'&amp;':'&';
+			$amp=$encodeAmpersand ? '&amp;' : '&';
 			if($encodeGetItems)
 			{
 				foreach($extra as $name=>$value)
@@ -946,7 +946,7 @@ 
 						$url2.=$amp.$name.'='.$value;
 				}
 			}
-			$url=$url.'?'.substr($url2,strlen($amp));
+			$url=$url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -962,26 +962,26 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request===null) $request=Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection===null) $isSecureConnection=$request -> getIsSecureConnection();
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
 				if($isSecureConnection) return $url;
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
 				if(!$isSecureConnection) return $url;
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Disable:
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Automatic:
 			default:
@@ -1007,29 +1007,29 @@ 
 	 * Keep current SecureConnection status
 	 * means no prefixing
 	 */
-	const Automatic = 'Automatic';
+	const Automatic='Automatic';
 
 	/**
 	 * Force use secured connection
 	 * always prefixing with https://example.com/path/to/app
 	 */
-	const Enable = 'Enable';
+	const Enable='Enable';
 
 	/**
 	 * Force use unsecured connection
 	 * always prefixing with http://example.com/path/to/app
 	 */
-	const Disable = 'Disable';
+	const Disable='Disable';
 
 	/**
 	 * Force use secured connection, if in unsecured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const EnableIfNotSecure = 'EnableIfNotSecure';
+	const EnableIfNotSecure='EnableIfNotSecure';
 
 	/**
 	 * Force use unsecured connection, if in secured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const DisableIfSecure = 'DisableIfSecure';
+	const DisableIfSecure='DisableIfSecure';
 }

Braces +11 added lines, -18 removed lines

@@ -131,15 +131,13 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 	}
 
@@ -246,8 +244,7 @@ 
 					$this->buildUrlMapping($class,$properties,$url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
@@ -361,8 +358,7 @@ 
 					if($rule->supportCustomUrl($getItems))
 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{
@@ -733,10 +729,10 @@ 
 			$params=explode('/',$matches['urlparams']);
 			if ($this->_separator==='/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
-			}
-			else
+				while($key=array_shift($params)) {
+									$matches[$key]=($value=array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -928,12 +924,10 @@ 
 						$name=rawurlencode($name.'[]');
 						foreach($value as $v)
 							$url2.=$amp.$name.'='.rawurlencode($v);
-					}
-					else
+					} else
 						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name=>$value)
 				{
@@ -941,8 +935,7 @@ 
 					{
 						foreach($value as $v)
 							$url2.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url2.=$amp.$name.'='.$value;
 				}
 			}

framework/Web/UI/TControl.php

Doc Comments +36 added lines

@@ -261,6 +261,7 @@ 
 	 * Sets the page for a control.
 	 * Only framework developers should use this method.
 	 * @param TPage the page that contains this control
+	 * @param TPage $page
 	 */
 	public function setPage($page)
 	{
@@ -542,6 +543,7 @@ 
 
 	/**
 	 * @param boolean whether the control is visible
+	 * @param boolean $value
 	 */
 	public function setVisible($value)
 	{
@@ -609,6 +611,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return boolean whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -620,6 +623,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -634,6 +638,7 @@ 
 	 * Sets a custom control attribute.
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{
@@ -671,6 +676,7 @@ 
 
 	/**
 	 * @param boolean set whether to enable viewstate
+	 * @param boolean $value
 	 */
 	public function setEnableViewState($value)
 	{
@@ -687,6 +693,8 @@ 
 	 * that must be kept in controlstate.
 	 * @param string the name of the controlstate value to be returned
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
+	 * @param string $key
+	 * @param integer $defaultValue
 	 * @return mixed the controlstate value corresponding to $key
 	 */
 	protected function getControlState($key,$defaultValue=null)
@@ -703,6 +711,8 @@ 
 	 * @param string the name of the controlstate value
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
+	 * @param string $key
+	 * @param integer $defaultValue
 	 */
 	protected function setControlState($key,$value,$defaultValue=null)
 	{
@@ -726,6 +736,7 @@ 
 	 * When it is false, data saved via setViewState() will not be persisted.
 	 * By default, it is true, meaning data will be persisted across postbacks.
 	 * @param boolean whether data should be persisted
+	 * @param boolean $enabled
 	 */
 	public function trackViewState($enabled)
 	{
@@ -764,6 +775,7 @@ 
 	 * @param string the name of the viewstate value
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
+	 * @param string $key
 	 */
 	public function setViewState($key,$value,$defaultValue=null)
 	{
@@ -788,6 +800,7 @@ 
 	/**
 	 * Clears a viewstate value.
 	 * @param string the name of the viewstate value to be cleared
+	 * @param string $key
 	 */
 	public function clearViewState($key)
 	{
@@ -893,6 +906,7 @@ 
 	 * Sets a value indicating whether child controls are created.
 	 * If false, any existing child controls will be cleared up.
 	 * @param boolean whether child controls are created
+	 * @param boolean $value
 	 */
 	final protected function setChildControlsCreated($value)
 	{
@@ -983,6 +997,7 @@ 
 	 * Finds all child and grand-child controls that are of the specified type.
 	 * @param string the class name
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
+	 * @param string $type
 	 * @return array list of controls found
 	 */
 	public function findControlsByType($type,$strict=true)
@@ -1117,6 +1132,7 @@ 
 	 * A component with explicit ID on a template will be registered to
 	 * the template owner. This method allows you to obtain this component
 	 * with the ID.
+	 * @param string $name
 	 * @return mixed the named registered object. Null if object is not found.
 	 */
 	public function getRegisteredObject($name)
@@ -1174,6 +1190,7 @@ 
 	 * Control lifecycles will be caught up during the addition.
 	 * Only framework developers should use this method.
 	 * @param TControl the new child control
+	 * @param TControl $control
 	 */
 	public function addedControl($control)
 	{
@@ -1219,6 +1236,7 @@ 
 	 * Removes a control from the child collection of the control.
 	 * Only framework developers should use this method.
 	 * @param TControl the child control removed
+	 * @param TControl $control
 	 */
 	public function removedControl($control)
 	{
@@ -1470,6 +1488,7 @@ 
 	 * @param string name of the broadcast event
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
+	 * @param TBroadcastEventParameter $param
 	 */
 	private function broadcastEventInternal($name,$sender,$param)
 	{
@@ -1694,6 +1713,7 @@ 
 	 * Clears the cached UniqueID.
 	 * If $recursive=true, all children's cached UniqueID will be cleared as well.
 	 * @param boolean whether the clearing is recursive.
+	 * @param boolean $recursive
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
@@ -1731,6 +1751,7 @@ 
 	 * Updates the list of the controls whose IDs are managed by the specified naming container.
 	 * @param TControl the naming container
 	 * @param TControlCollection list of controls
+	 * @param TControl $container
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
 	private function fillNameTable($container,$controls)
@@ -1900,6 +1921,7 @@ 
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnClick, OnCommand)
 	 * indicating the component is responsible for the postback event.
 	 * @param string the parameter associated with the postback event
+	 * @return void
 	 */
 	public function raisePostBackEvent($param);
 }
@@ -1928,6 +1950,7 @@ 
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
 	 * indicating the control data is changed.
+	 * @return void
 	 */
 	public function raisePostDataChangedEvent();
 	/**
@@ -1961,6 +1984,7 @@ 
 	public function getIsValid();
 	/**
 	 * @param boolean whether the validator validates successfully
+	 * @return void
 	 */
 	public function setIsValid($value);
 	/**
@@ -1969,6 +1993,7 @@ 
 	public function getErrorMessage();
 	/**
 	 * @param string error message for the validation
+	 * @return void
 	 */
 	public function setErrorMessage($value);
 }
@@ -2036,6 +2061,7 @@ 
 	/**
 	 * Applies this theme to the specified control.
 	 * @param TControl the control to be applied with this theme
+	 * @return boolean
 	 */
 	public function applySkin($control);
 }
@@ -2057,6 +2083,7 @@ 
 	 * Content in the template will be instantiated as components and text strings
 	 * and passed to the specified parent control.
 	 * @param TControl the parent control
+	 * @return void
 	 */
 	public function instantiateIn($parent);
 }
@@ -2081,6 +2108,8 @@ 
 
 	/**
 	 * @param string caption of the button
+	 * @param string $value
+	 * @return void
 	 */
 	public function setText($value);
 
@@ -2091,6 +2120,7 @@ 
 
 	/**
 	 * @param boolean whether postback event trigger by this button will cause input validation
+	 * @return void
 	 */
 	public function setCausesValidation($value);
 
@@ -2101,6 +2131,7 @@ 
 
 	/**
 	 * @param string the command name associated with the {@link onCommand OnCommand} event.
+	 * @return void
 	 */
 	public function setCommandName($value);
 
@@ -2111,6 +2142,7 @@ 
 
 	/**
 	 * @param string the parameter associated with the {@link onCommand OnCommand} event.
+	 * @return void
 	 */
 	public function setCommandParameter($value);
 
@@ -2121,23 +2153,27 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @return void
 	 */
 	public function setValidationGroup($value);
 
 	/**
 	 * Raises <b>OnClick</b> event.
 	 * @param TEventParameter event parameter to be passed to the event handlers
+	 * @return void
 	 */
 	public function onClick($param);
 
 	/**
 	 * Raises <b>OnCommand</b> event.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @return void
 	 */
 	public function onCommand($param);
 
 	/**
 	 * @param boolean set by a panel to register this button as the default button for the panel.
+	 * @return void
 	 */
 	public function setIsDefaultButton($value);
 

Spacing +136 added lines, -136 removed lines

@@ -110,17 +110,17 @@ 
 	 * Indexes for the rare fields.
 	 * In order to save memory, rare fields will only be created if they are needed.
 	 */
-	const RF_CONTROLS=0;			// child controls
-	const RF_CHILD_STATE=1;			// child state field
-	const RF_NAMED_CONTROLS=2;		// list of controls whose namingcontainer is this control
-	const RF_NAMED_CONTROLS_ID=3;	// counter for automatic id
-	const RF_SKIN_ID=4;				// skin ID
-	const RF_DATA_BINDINGS=5;		// data bindings
-	const RF_EVENTS=6;				// event handlers
-	const RF_CONTROLSTATE=7;		// controlstate
-	const RF_NAMED_OBJECTS=8;		// controls declared with ID on template
-	const RF_ADAPTER=9;				// adapter
-	const RF_AUTO_BINDINGS=10;		// auto data bindings
+	const RF_CONTROLS=0; // child controls
+	const RF_CHILD_STATE=1; // child state field
+	const RF_NAMED_CONTROLS=2; // list of controls whose namingcontainer is this control
+	const RF_NAMED_CONTROLS_ID=3; // counter for automatic id
+	const RF_SKIN_ID=4; // skin ID
+	const RF_DATA_BINDINGS=5; // data bindings
+	const RF_EVENTS=6; // event handlers
+	const RF_CONTROLSTATE=7; // controlstate
+	const RF_NAMED_OBJECTS=8; // controls declared with ID on template
+	const RF_ADAPTER=9; // adapter
+	const RF_AUTO_BINDINGS=10; // auto data bindings
 
 	/**
 	 * @var string control ID
@@ -208,7 +208,7 @@ 
 	 */
 	public function getAdapter()
 	{
-		return isset($this->_rf[self::RF_ADAPTER])?$this->_rf[self::RF_ADAPTER]:null;
+		return isset($this->_rf[self::RF_ADAPTER]) ? $this->_rf[self::RF_ADAPTER] : null;
 	}
 
 	/**
@@ -348,10 +348,10 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT,$id))
-			throw new TInvalidDataValueException('control_id_invalid',get_class($this),$id);
+		if(!preg_match(self::ID_FORMAT, $id))
+			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
 		$this->_id=$id;
-		$this->_flags |= self::IS_ID_SET;
+		$this->_flags|=self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
 		if($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
@@ -368,7 +368,7 @@ 
 	{
 		if($this->_uid==='' || $this->_uid===null)	// need to build the UniqueID
 		{
-			$this->_uid='';  // set to not-null, so that clearCachedUniqueID() may take action
+			$this->_uid=''; // set to not-null, so that clearCachedUniqueID() may take action
 			if($namingContainer=$this->getNamingContainer())
 			{
 				if($this->getPage()===$namingContainer)
@@ -402,7 +402,7 @@ 
 	 */
 	public function getClientID()
 	{
-		return strtr($this->getUniqueID(),self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($this->getUniqueID(), self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 	 */
 	public static function convertUniqueIdToClientId($uniqueID)
 	{
-		return strtr($uniqueID,self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($uniqueID, self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 */
 	public function getSkinID()
 	{
-		return isset($this->_rf[self::RF_SKIN_ID])?$this->_rf[self::RF_SKIN_ID]:'';
+		return isset($this->_rf[self::RF_SKIN_ID]) ? $this->_rf[self::RF_SKIN_ID] : '';
 	}
 
 	/**
@@ -429,8 +429,8 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
+		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
 			$this->_rf[self::RF_SKIN_ID]=$value;
 	}
@@ -453,7 +453,7 @@ 
 		if($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 
 	/**
@@ -462,12 +462,12 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
+		if($this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
 		else if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
+			$this->_flags&=~self::IS_DISABLE_THEMING;
 		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+			$this->_flags|=self::IS_DISABLE_THEMING;
 	}
 
 	/**
@@ -479,7 +479,7 @@ 
 	 */
 	public function getCustomData()
 	{
-		return $this->getViewState('CustomData',null);
+		return $this->getViewState('CustomData', null);
 	}
 
 	/**
@@ -489,7 +489,7 @@ 
 	 */
 	public function setCustomData($value)
 	{
-		$this->setViewState('CustomData',$value,null);
+		$this->setViewState('CustomData', $value, null);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 */
 	public function getHasControls()
 	{
-		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount()>0;
+		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount() > 0;
 	}
 
 	/**
@@ -517,7 +517,7 @@ 
 	 */
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 
 	/**
@@ -531,13 +531,13 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
+			for($control=$this; $control; $control=$control->_parent)
 				if(!$control->getVisible(false))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Visible',true);
+			return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -545,7 +545,7 @@ 
 	 */
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -562,13 +562,13 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for($control=$this; $control; $control=$control->_parent)
+				if(!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Enabled',true);
+			return $this->getViewState('Enabled', true);
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->setViewState('Enabled',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Enabled', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -584,8 +584,8 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
+		if($attributes=$this->getViewState('Attributes', null))
+			return $attributes->getCount() > 0;
 		else
 			return false;
 	}
@@ -598,12 +598,12 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
 			$attributes=new TAttributeCollection;
-			$this->setViewState('Attributes',$attributes,null);
+			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -613,7 +613,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -624,7 +624,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -635,9 +635,9 @@ 
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -647,7 +647,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -660,7 +660,7 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
+			for($control=$this; $control!==null; $control=$control->getParent())
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
@@ -675,9 +675,9 @@ 
 	public function setEnableViewState($value)
 	{
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+			$this->_flags&=~self::IS_DISABLE_VIEWSTATE;
 		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+			$this->_flags|=self::IS_DISABLE_VIEWSTATE;
 	}
 
 	/**
@@ -689,9 +689,9 @@ 
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
 	 * @return mixed the controlstate value corresponding to $key
 	 */
-	protected function getControlState($key,$defaultValue=null)
+	protected function getControlState($key, $defaultValue=null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
 
 	/**
@@ -704,7 +704,7 @@ 
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
 	 */
-	protected function setControlState($key,$value,$defaultValue=null)
+	protected function setControlState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
@@ -741,10 +741,10 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	public function getViewState($key,$defaultValue=null)
+	public function getViewState($key, $defaultValue=null)
 	{
 		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
+			return $this->_viewState[$key]!==null ? $this->_viewState[$key] : $defaultValue;
 		else if(isset($this->_tempState[$key]))
 		{
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
@@ -765,7 +765,7 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	public function setViewState($key,$value,$defaultValue=null)
+	public function setViewState($key, $value, $defaultValue=null)
 	{
 		if($this->_trackViewState)
 		{
@@ -801,7 +801,7 @@ 
 	 * @param string the property name, or property path
 	 * @param string the expression
 	 */
-	public function bindProperty($name,$expression)
+	public function bindProperty($name, $expression)
 	{
 		$this->_rf[self::RF_DATA_BINDINGS][$name]=$expression;
 	}
@@ -823,7 +823,7 @@ 
 	 * @param string the property name, or property path
 	 * @param string the expression
 	 */
-	public function autoBindProperty($name,$expression)
+	public function autoBindProperty($name, $expression)
 	{
 		$this->_rf[self::RF_AUTO_BINDINGS][$name]=$expression;
 	}
@@ -843,13 +843,13 @@ 
 	 */
 	protected function dataBindProperties()
 	{
-		Prado::trace("Data bind properties",'System.Web.UI.TControl');
+		Prado::trace("Data bind properties", 'System.Web.UI.TControl');
 		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
 			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 
@@ -863,7 +863,7 @@ 
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
 			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 
@@ -872,7 +872,7 @@ 
 	 */
 	protected function dataBindChildren()
 	{
-		Prado::trace("dataBindChildren()",'System.Web.UI.TControl');
+		Prado::trace("dataBindChildren()", 'System.Web.UI.TControl');
 		if(isset($this->_rf[self::RF_CONTROLS]))
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
@@ -897,12 +897,12 @@ 
 	final protected function setChildControlsCreated($value)
 	{
 		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
+			$this->_flags|=self::IS_CHILD_CREATED;
 		else
 		{
 			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
-			$this->_flags &= ~self::IS_CHILD_CREATED;
+			$this->_flags&=~self::IS_CHILD_CREATED;
 		}
 	}
 
@@ -917,18 +917,18 @@ 
 		{
 			try
 			{
-				$this->_flags |= self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CREATING_CHILD;
 				if(isset($this->_rf[self::RF_ADAPTER]))
 					$this->_rf[self::RF_ADAPTER]->createChildControls();
 				else
 					$this->createChildControls();
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 			}
 			catch(Exception $e)
 			{
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 				throw $e;
 			}
 		}
@@ -957,21 +957,21 @@ 
 	 */
 	public function findControl($id)
 	{
-		$id=strtr($id,'.',self::ID_SEPARATOR);
-		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
+		$id=strtr($id, '.', self::ID_SEPARATOR);
+		$container=($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
 		if(!$container || !$container->getHasControls())
 			return null;
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS]=array();
-			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
+			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if(($pos=strpos($id, self::ID_SEPARATOR))===false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
-			$cid=substr($id,0,$pos);
-			$sid=substr($id,$pos+1);
+			$cid=substr($id, 0, $pos);
+			$sid=substr($id, $pos + 1);
 			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
@@ -985,7 +985,7 @@ 
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
 	 * @return array list of controls found
 	 */
-	public function findControlsByType($type,$strict=true)
+	public function findControlsByType($type, $strict=true)
 	{
 		$controls=array();
 		if($this->getHasControls())
@@ -995,7 +995,7 @@ 
 				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type))))
 					$controls[]=$control;
 				if(($control instanceof TControl) && $control->getHasControls())
-					$controls=array_merge($controls,$control->findControlsByType($type,$strict));
+					$controls=array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
 		return $controls;
@@ -1021,7 +1021,7 @@ 
 				{
 					if($control->_id===$id)
 						$controls[]=$control;
-					$controls=array_merge($controls,$control->findControlsByID($id));
+					$controls=array_merge($controls, $control->findControlsByID($id));
 				}
 			}
 		}
@@ -1046,10 +1046,10 @@ 
 	 * @param object object to be declared
 	 * @see __get
 	 */
-	public function registerObject($name,$object)
+	public function registerObject($name, $object)
 	{
 		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered',$name);
+			throw new TInvalidOperationException('control_object_reregistered', $name);
 		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
 	}
 
@@ -1121,7 +1121,7 @@ 
 	 */
 	public function getRegisteredObject($name)
 	{
-		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
+		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name]) ? $this->_rf[self::RF_NAMED_OBJECTS][$name] : null;
 	}
 
 	/**
@@ -1181,7 +1181,7 @@ 
 			$control->_parent->getControls()->remove($control);
 		$control->_parent=$this;
 		$control->_page=$this->getPage();
-		$namingContainer=($this instanceof INamingContainer)?$this:$this->_namingContainer;
+		$namingContainer=($this instanceof INamingContainer) ? $this : $this->_namingContainer;
 		if($namingContainer)
 		{
 			$control->_namingContainer=$namingContainer;
@@ -1192,10 +1192,10 @@ 
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
+		if($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage>=self::CS_STATE_LOADED)
+			if($this->_stage >= self::CS_STATE_LOADED)
 			{
 				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
@@ -1204,11 +1204,11 @@ 
 				}
 				else
 					$state=null;
-				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage>=self::CS_LOADED)
+				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+				if($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage>=self::CS_PRERENDERED)
+					if($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -1262,13 +1262,13 @@ 
 				}
 			}
 		}
-		if($this->_stage<self::CS_INITIALIZED)
+		if($this->_stage < self::CS_INITIALIZED)
 		{
 			$this->_stage=self::CS_CHILD_INITIALIZED;
 			if(($page=$this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
-				$this->_flags |= self::IS_SKIN_APPLIED;
+				$this->_flags|=self::IS_SKIN_APPLIED;
 			}
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
@@ -1284,7 +1284,7 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_stage<self::CS_LOADED)
+		if($this->_stage < self::CS_LOADED)
 		{
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
@@ -1299,7 +1299,7 @@ 
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage<self::CS_LOADED)
+		if($this->_stage < self::CS_LOADED)
 			$this->_stage=self::CS_LOADED;
 	}
 
@@ -1360,7 +1360,7 @@ 
 	 */
 	public function onInit($param)
 	{
-		$this->raiseEvent('OnInit',$this,$param);
+		$this->raiseEvent('OnInit', $this, $param);
 	}
 
 	/**
@@ -1372,7 +1372,7 @@ 
 	 */
 	public function onLoad($param)
 	{
-		$this->raiseEvent('OnLoad',$this,$param);
+		$this->raiseEvent('OnLoad', $this, $param);
 	}
 
 	/**
@@ -1382,8 +1382,8 @@ 
 	 */
 	public function onDataBinding($param)
 	{
-		Prado::trace("onDataBinding()",'System.Web.UI.TControl');
-		$this->raiseEvent('OnDataBinding',$this,$param);
+		Prado::trace("onDataBinding()", 'System.Web.UI.TControl');
+		$this->raiseEvent('OnDataBinding', $this, $param);
 	}
 
 
@@ -1396,7 +1396,7 @@ 
 	 */
 	public function onUnload($param)
 	{
-		$this->raiseEvent('OnUnload',$this,$param);
+		$this->raiseEvent('OnUnload', $this, $param);
 	}
 
 	/**
@@ -1408,7 +1408,7 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$this->raiseEvent('OnPreRender',$this,$param);
+		$this->raiseEvent('OnPreRender', $this, $param);
 	}
 
 	/**
@@ -1418,12 +1418,12 @@ 
 	 * @param TEventParameter event parameter
 	 * @see bubbleEvent
 	 */
-	protected function raiseBubbleEvent($sender,$param)
+	protected function raiseBubbleEvent($sender, $param)
 	{
 		$control=$this;
 		while($control=$control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
+			if($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
@@ -1437,7 +1437,7 @@ 
 	 * @return boolean true if the event bubbling is handled and no more bubbling.
 	 * @see raiseBubbleEvent
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		return false;
 	}
@@ -1458,10 +1458,10 @@ 
 	 * @param TControl sender of this event
 	 * @param TEventParameter event parameter
 	 */
-	public function broadcastEvent($name,$sender,$param)
+	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl=(($page=$this->getPage())===null)?$this:$page;
-		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
+		$rootControl=(($page=$this->getPage())===null) ? $this : $page;
+		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
 
 	/**
@@ -1471,18 +1471,18 @@ 
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
 	 */
-	private function broadcastEventInternal($name,$sender,$param)
+	private function broadcastEventInternal($name, $sender, $param)
 	{
 		if($this->hasEvent($name))
-			$this->raiseEvent($name,$sender,$param->getParameter());
+			$this->raiseEvent($name, $sender, $param->getParameter());
 		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender,$param);
+			$this->broadcastEventReceived($sender, $param);
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
-					$control->broadcastEventInternal($name,$sender,$param);
+					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
 	}
@@ -1504,22 +1504,22 @@ 
 	 * @param callback callback invoked before traversing child controls. If null, it is ignored.
 	 * @param callback callback invoked after traversing child controls. If null, it is ignored.
 	 */
-	protected function traverseChildControls($param,$preCallback=null,$postCallback=null)
+	protected function traverseChildControls($param, $preCallback=null, $postCallback=null)
 	{
 		if($preCallback!==null)
-			call_user_func($preCallback,$this,$param);
+			call_user_func($preCallback, $this, $param);
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
 				{
-					$control->traverseChildControls($param,$preCallback,$postCallback);
+					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
 		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+			call_user_func($postCallback, $this, $param);
 	}
 
 	/**
@@ -1596,7 +1596,7 @@ 
 	 * @param array the collection of the state
 	 * @param boolean whether the viewstate should be loaded
 	 */
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState=true)
 	{
 		if(is_array($state))
 		{
@@ -1626,7 +1626,7 @@ 
 					{
 						if(isset($state[$control->_id]))
 						{
-							$control->loadStateRecursive($state[$control->_id],$needViewState);
+							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
 						}
 					}
@@ -1662,7 +1662,7 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
+					if(count($tmp=&$control->saveStateRecursive($needViewState)))
 						$state[$control->_id]=$tmp;
 				}
 			}
@@ -1684,10 +1684,10 @@ 
 		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
-			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+			$this->_flags|=self::IS_STYLESHEET_APPLIED;
 		}
 		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
+			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
 	/**
@@ -1711,11 +1711,11 @@ 
 	 */
 	private function generateAutomaticID()
 	{
-		$this->_flags &= ~self::IS_ID_SET;
+		$this->_flags&=~self::IS_ID_SET;
 		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
 			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
 		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id=self::AUTOMATIC_ID_PREFIX . $id;
+		$this->_id=self::AUTOMATIC_ID_PREFIX.$id;
 		$this->_namingContainer->clearNameTable();
 	}
 
@@ -1733,7 +1733,7 @@ 
 	 * @param TControlCollection list of controls
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
-	private function fillNameTable($container,$controls)
+	private function fillNameTable($container, $controls)
 	{
 		foreach($controls as $control)
 		{
@@ -1742,12 +1742,12 @@ 
 				if($control->_id!=='')
 				{
 					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$control->_id);
+						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
 						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
 				}
 				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container,$control->_rf[self::RF_CONTROLS]);
+					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}
@@ -1777,10 +1777,10 @@ 
 	 * @param TControl the control that owns this collection.
 	 * @param boolean whether the list is read-only
 	 */
-	public function __construct(TControl $owner,$readOnly=false)
+	public function __construct(TControl $owner, $readOnly=false)
 	{
 		$this->_o=$owner;
-		parent::__construct(null,$readOnly);
+		parent::__construct(null, $readOnly);
 	}
 
 	/**
@@ -1799,15 +1799,15 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is neither a string nor a TControl.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TControl)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
 		}
 		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
@@ -1856,7 +1856,7 @@ 
 	 */
 	public function __construct(TControl $owner)
 	{
-		parent::__construct($owner,true);
+		parent::__construct($owner, true);
 	}
 
 	/**
@@ -1865,10 +1865,10 @@ 
 	 * @param integer the speicified position.
 	 * @param mixed new item
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(!is_string($item))  // string is possible if property tag is used. we simply ignore it in this case
-			parent::insertAt($index,$item);  // this will generate an exception in parent implementation
+			parent::insertAt($index, $item); // this will generate an exception in parent implementation
 	}
 }
 
@@ -1923,7 +1923,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values);
+	public function loadPostData($key, $values);
 	/**
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
@@ -2019,7 +2019,7 @@ 
 	 * @param TControl sender of the event
 	 * @param TBroadCastEventParameter event parameter
 	 */
-	public function broadcastEventReceived($sender,$param);
+	public function broadcastEventReceived($sender, $param);
 }
 
 /**
@@ -2192,7 +2192,7 @@ 
 	 * @param string name of the broadcast event
 	 * @param mixed parameter of the broadcast event
 	 */
-	public function __construct($name='',$parameter=null)
+	public function __construct($name='', $parameter=null)
 	{
 		$this->_name=$name;
 		$this->_param=$parameter;
@@ -2253,7 +2253,7 @@ 
 	 * @param string name of the command
 	 * @param string parameter of the command
 	 */
-	public function __construct($name='',$parameter='')
+	public function __construct($name='', $parameter='')
 	{
 		$this->_name=$name;
 		$this->_param=$parameter;
@@ -2345,7 +2345,7 @@ 
 	 */
 	public function evaluateDynamicContent()
 	{
-		$context=$this->_container===null?$this:$this->_container;
+		$context=$this->_container===null ? $this : $this->_container;
 		foreach($this->_expressions as $id=>$expression)
 			$this->_items[$id]=$context->evaluateExpression($expression);
 		foreach($this->_statements as $id=>$statement)
@@ -2358,7 +2358,7 @@ 
 	 */
 	public function dataBind()
 	{
-		$context=$this->_container===null?$this:$this->_container;
+		$context=$this->_container===null ? $this : $this->_container;
 		foreach($this->_bindings as $id=>$binding)
 			$this->_items[$id]=$context->evaluateExpression($binding);
 	}
@@ -2370,7 +2370,7 @@ 
 	 */
 	public function render($writer)
 	{
-		$writer->write(implode('',$this->_items));
+		$writer->write(implode('', $this->_items));
 	}
 }
 

Braces +16 added lines, -28 removed lines

@@ -377,11 +377,9 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
-			}
-			else	// no naming container
+			} else	// no naming container
 				return $this->_id;
-		}
-		else
+		} else
 			return $this->_uid;
 	}
 
@@ -535,8 +533,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible',true);
 	}
 
@@ -566,8 +563,7 @@ 
 				if(!$control->getViewState('Enabled',true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled',true);
 	}
 
@@ -664,8 +660,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
@@ -750,8 +745,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 
@@ -774,8 +768,7 @@ 
 				unset($this->_viewState[$key]);
 			else
 				$this->_viewState[$key]=$value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value===$defaultValue)
@@ -924,8 +917,7 @@ 
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -1164,8 +1156,9 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
+		while($control!==$ancestor && $control->_parent) {
+					$control=$control->_parent;
+		}
 		return $control===$ancestor;
 	}
 
@@ -1201,8 +1194,7 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
-				}
-				else
+				} else
 					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
@@ -1607,8 +1599,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -1685,8 +1676,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 
@@ -1805,8 +1795,7 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
-		}
-		else if(is_string($item) || ($item instanceof IRenderable))
+		} else if(is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index,$item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
@@ -2318,8 +2307,7 @@ 
 				else if($item[0]===self::TYPE_DATABINDING)
 					$this->_bindings[$id]=$item[1];
 				$this->_items[$id]='';
-			}
-			else
+			} else
 				$this->_items[$id]=$item;
 		}
 	}

framework/Web/UI/WebControls/TImageButton.php

Doc Comments +5 added lines

@@ -220,6 +220,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageClickEventParameter event parameter to be passed to the event handlers
+	 * @param TImageClickEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -232,6 +233,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{
@@ -324,6 +326,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -396,6 +399,8 @@ 
 	 * Constructor.
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
+	 * @param integer $x
+	 * @param integer $y
 	 */
 	public function __construct($x,$y)
 	{

Braces +2 added lines, -4 removed lines

@@ -106,8 +106,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -141,8 +140,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +29 added lines, -29 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -99,16 +99,16 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
+		$writer->addAttribute('type', 'image');
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getEnabled(true))
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -117,9 +117,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -151,7 +151,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -177,10 +177,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 
 		return $options;
 	}
@@ -192,7 +192,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$uid=$this->getUniqueID();
 		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
@@ -223,7 +223,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
 	 */
-	public function __construct($x,$y)
+	public function __construct($x, $y)
 	{
 		$this->_x=$x;
 		$this->_y=$y;

framework/Web/UI/WebControls/TListItem.php

Doc Comments +3 added lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * @param boolean whether the item is enabled
+	 * @param boolean $value
 	 */
 	public function setEnabled($value)
 	{
@@ -108,6 +109,7 @@ 
 
 	/**
 	 * @param boolean whether the item is selected
+	 * @param boolean $value
 	 */
 	public function setSelected($value)
 	{
@@ -184,6 +186,7 @@ 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TListItem class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.WebControls
- */
+	 * TListItem class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.WebControls
+	 */
 
 /**
  * TListItem class.

Spacing +17 added lines, -17 removed lines

@@ -53,7 +53,7 @@ 
 	 * @param boolean whether the item is enabled
 	 * @param boolean whether the item is selected
 	 */
-	public function __construct($text='',$value='',$enabled=true,$selected=false)
+	public function __construct($text='', $value='', $enabled=true, $selected=false)
 	{
 		$this->setText($text);
 		$this->setValue($value);
@@ -70,16 +70,16 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_attributes===null)
-			$exprops[] = "\0TListItem\0_attributes";
+		if($this->_attributes===null)
+			$exprops[]="\0TListItem\0_attributes";
 		if($this->_text==='')
-			$exprops[] = "\0TListItem\0_text";
+			$exprops[]="\0TListItem\0_text";
 		if($this->_value==='')
-			$exprops[] = "\0TListItem\0_value";
-		if ($this->_enabled===true)
-			$exprops[] = "\0TListItem\0_enabled";
-		if ($this->_selected===false)
-			$exprops[] = "\0TListItem\0_selected";
+			$exprops[]="\0TListItem\0_value";
+		if($this->_enabled===true)
+			$exprops[]="\0TListItem\0_enabled";
+		if($this->_selected===false)
+			$exprops[]="\0TListItem\0_selected";
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text===''?$this->_value:$this->_text;
+		return $this->_text==='' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value===''?$this->_text:$this->_value;
+		return $this->_value==='' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		return $this->_attributes && $this->_attributes->getCount()>0;
+		return $this->_attributes && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -178,16 +178,16 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }
 

framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 			case 'datetime': case 'timestamp':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -50,16 +50,16 @@ 
 			case 'time':
 				return $this->getTimeValue($container, $column, $record);
 			case 'datetime': case 'timestamp':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$control = parent::createDateControl($container, $column, $record);
-		$value = $this->getRecordPropertyValue($column, $record);
+		$control=parent::createDateControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 			$control->setTimestamp(intval($value));
 		return $control;
@@ -67,12 +67,12 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$time = parent::createDateTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$time=parent::createDateTimeControl($container, $column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate(intval($value));
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate(intval($value));
 			$time[1]->setSelectedValue($date['hours']);
 			$time[2]->setSelectedValue($date['minutes']);
 			$time[3]->setSelectedValue($date['seconds']);
@@ -84,13 +84,13 @@ 
 	{
 		if(preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$time = $container->findControl(self::DEFAULT_ID)->getTimestamp();
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate($time);
-			$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-			$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-			$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
-			return $s->getTimeStamp($hour,$mins,$secs,$date['mon'],$date['mday'],$date['year']);
+			$time=$container->findControl(self::DEFAULT_ID)->getTimestamp();
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate($time);
+			$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+			$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+			$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
+			return $s->getTimeStamp($hour, $mins, $secs, $date['mon'], $date['mday'], $date['year']);
 		}
 		else
 			return parent::getDateTimeValue($container, $column, $record);

framework/Data/SqlMap/DataMapper/TPropertyAccess.php

Braces +6 added lines, -12 removed lines

@@ -61,8 +61,7 @@ 
 					$object = $object[$prop];
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -73,8 +72,7 @@ 
 					$object = $object->{$prop};
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else
+			} else
 				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
 		}
 		return $object;
@@ -98,8 +96,7 @@ 
 					$object = $object[$prop];
 				else
 					return false;
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -110,8 +107,7 @@ 
 					$object = $object->{$prop};
 				else
 					return false;
-			}
-			else
+			} else
 				return false;
 		}
 		return true;
@@ -136,16 +132,14 @@ 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
 			$object[$prop] = $value;
-		}
-		else if(is_object($object))
+		} else if(is_object($object))
 		{
 			$setter = 'set'.$prop;
 			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
 				$object->{$prop} = $value;
-		}
-		else
+		} else
 			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
 	}
 

Spacing +25 added lines, -25 removed lines

@@ -48,34 +48,34 @@ 
 	 * @return mixed property value.
 	 * @throws TInvalidDataValueException if property path is invalid.
 	 */
-	public static function get($object,$path)
+	public static function get($object, $path)
 	{
 		if(!is_array($object) && !is_object($object))
 			return $object;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else
-				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+				throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 		}
 		return $object;
 	}
@@ -89,25 +89,25 @@ 
 	{
 		if(!is_array($object) && !is_object($object))
 			return false;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
 					return false;
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
 					return false;
 			}
@@ -126,27 +126,27 @@ 
 	 */
 	public static function set(&$originalObject, $path, $value)
 	{
-		$properties = explode('.', $path);
-		$prop = array_pop($properties);
+		$properties=explode('.', $path);
+		$prop=array_pop($properties);
 		if(count($properties) > 0)
-			$object = self::get($originalObject, implode('.',$properties));
+			$object=self::get($originalObject, implode('.', $properties));
 		else
-			$object = &$originalObject;
+			$object=&$originalObject;
 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
-			$object[$prop] = $value;
+			$object[$prop]=$value;
 		}
 		else if(is_object($object))
 		{
-			$setter = 'set'.$prop;
-			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
+			$setter='set'.$prop;
+			if(method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
-				$object->{$prop} = $value;
+				$object->{$prop}=$value;
 		}
 		else
-			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
+			throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 	}
 
 }

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
 			if($handler!==null)
@@ -165,7 +165,7 @@ 
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -179,18 +179,18 @@ 
 	 * @param array row data.
 	 * @return TResultMap result sub-map.
 	 */
-	public function resolveSubMap($registry,$row)
+	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator())!==null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry,$row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
 			if($subMap===null)
-				$subMap = $this;
-			else if($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry,$row);
+				$subMap=$this;
+			else if($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}

framework/Caching/TDbCache.php

Braces +10 added lines, -20 removed lines

@@ -199,8 +199,7 @@ 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -223,8 +222,7 @@ 
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
-			}
-			else
+			} else
 				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
 		}
 		$this->_cacheInitialized = true;
@@ -293,8 +291,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			if($this->_connectionString!=='')
@@ -304,8 +301,7 @@ 
 					$db->setUsername($this->_username);
 				if($this->_password!=='')
 					$db->setPassword($this->_password);
-			}
-			else
+			} else
 			{
 				// default to SQLite3 database
 				$dbFile=$this->getApplication()->getRuntimePath().'/sqlite3.cache';
@@ -462,8 +458,7 @@ 
 			$sql='SELECT value FROM '.$this->_cacheTable.' WHERE itemkey=\''.$key.'\' AND (expire=0 OR expire>'.time().') ORDER BY expire DESC';
 			$command=$this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -506,16 +501,14 @@ 
 			$command->bindValue(':value',serialize($value),PDO::PARAM_LOB);
 			$command->execute();
 			return true;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				return false;
 			}
@@ -537,8 +530,7 @@ 
 			$command->bindValue(':key',$key,PDO::PARAM_STR);
 			$command->execute();
 			return true;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -557,16 +549,14 @@ 
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				return false;
 			}

Spacing +28 added lines, -28 removed lines

@@ -105,11 +105,11 @@ 
 	/**
 	 * @var boolean
 	 */
-	private $_cacheInitialized = false;
+	private $_cacheInitialized=false;
 	/**
 	 * @var boolean
 	 */
-	private $_createCheck= false;
+	private $_createCheck=false;
 	/**
 	 * @var boolean whether the cache DB table should be created automatically
 	 */
@@ -183,20 +183,20 @@ 
 		$db=$this->getDbConnection();
 		try
 		{
-			$key = 'TDbCache:' . $this->_cacheTable . ':created';
+			$key='TDbCache:'.$this->_cacheTable.':created';
 			if($force)
-				$this -> _createCheck = false;
+				$this -> _createCheck=false;
 			else
-				$this -> _createCheck = $this -> getApplication() -> getGlobalState($key, 0);
+				$this -> _createCheck=$this -> getApplication() -> getGlobalState($key, 0);
 
 			if($this->_autoCreate && !$this -> _createCheck) {
 
-				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ') . $this -> id . ', ' . $this->_cacheTable, 'System.Caching.TDbCache');
+				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ').$this -> id.', '.$this->_cacheTable, 'System.Caching.TDbCache');
 
 				$sql='SELECT 1 FROM '.$this->_cacheTable.' WHERE 0=1';
 				$db->createCommand($sql)->queryScalar();
 
-				$this -> _createCheck = true;
+				$this -> _createCheck=true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 		}
@@ -205,7 +205,7 @@ 
 			// DB table not exists
 			if($this->_autoCreate)
 			{
-				Prado::trace('Autocreate: ' . $this->_cacheTable, 'System.Caching.TDbCache');
+				Prado::trace('Autocreate: '.$this->_cacheTable, 'System.Caching.TDbCache');
 
 				$driver=$db->getDriverName();
 				if($driver==='mysql')
@@ -218,16 +218,16 @@ 
 				$sql='CREATE TABLE '.$this->_cacheTable." (itemkey CHAR(128) PRIMARY KEY, value $blob, expire INTEGER)";
 				$db->createCommand($sql)->execute();
 
-				$sql='CREATE INDEX IX_expire ON ' . $this->_cacheTable . ' (expire)';
+				$sql='CREATE INDEX IX_expire ON '.$this->_cacheTable.' (expire)';
 				$db->createCommand($sql)->execute();
 
-				$this -> _createCheck = true;
+				$this -> _createCheck=true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 			else
-				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
+				throw new TConfigurationException('db_cachetable_inexistent', $this->_cacheTable);
 		}
-		$this->_cacheInitialized = true;
+		$this->_cacheInitialized=true;
 	}
 
 	/**
@@ -238,17 +238,17 @@ 
 	 */
 	public function flushCacheExpired($force=false)
 	{
-		$interval = $this -> getFlushInterval();
-		if(!$force && $interval === 0) return;
+		$interval=$this -> getFlushInterval();
+		if(!$force && $interval===0) return;
 
-		$key	= 'TDbCache:' . $this->_cacheTable . ':flushed';
-		$now	= time();
-		$next	= $interval + (integer)$this -> getApplication() -> getGlobalState($key, 0);
+		$key='TDbCache:'.$this->_cacheTable.':flushed';
+		$now=time();
+		$next=$interval + (integer) $this -> getApplication() -> getGlobalState($key, 0);
 
 		if($force || $next <= $now)
 		{
 			if(!$this->_cacheInitialized) $this->initializeCache();
-			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ') . $this -> id . ', ' . $this->_cacheTable, 'System.Caching.TDbCache');
+			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ').$this -> id.', '.$this->_cacheTable, 'System.Caching.TDbCache');
 			$sql='DELETE FROM '.$this->_cacheTable.' WHERE expire<>0 AND expire<'.$now;
 			$this->getDbConnection()->createCommand($sql)->execute();
 			$this -> getApplication() -> setGlobalState($key, $now);
@@ -275,7 +275,7 @@ 
 	 */
 	public function setFlushInterval($value)
 	{
-		$this->_flushInterval = (integer) $value;
+		$this->_flushInterval=(integer) $value;
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 			if($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
-				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
+				throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
 		}
 		else
 		{
@@ -479,10 +479,10 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
 		$this->deleteValue($key);
-		return $this->addValue($key,$value,$expire);
+		return $this->addValue($key, $value, $expire);
 	}
 
 	/**
@@ -494,16 +494,16 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
 		if(!$this->_cacheInitialized) $this->initializeCache();
-		$expire=($expire<=0)?0:time()+$expire;
+		$expire=($expire <= 0) ? 0 : time() + $expire;
 		$sql="INSERT INTO {$this->_cacheTable} (itemkey,value,expire) VALUES(:key,:value,$expire)";
 		try
 		{
 			$command=$this->getDbConnection()->createCommand($sql);
-			$command->bindValue(':key',$key,PDO::PARAM_STR);
-			$command->bindValue(':value',serialize($value),PDO::PARAM_LOB);
+			$command->bindValue(':key', $key, PDO::PARAM_STR);
+			$command->bindValue(':value', serialize($value), PDO::PARAM_LOB);
 			$command->execute();
 			return true;
 		}
@@ -534,7 +534,7 @@ 
 		try
 		{
 			$command=$this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable} WHERE itemkey=:key");
-			$command->bindValue(':key',$key,PDO::PARAM_STR);
+			$command->bindValue(':key', $key, PDO::PARAM_STR);
 			$command->execute();
 			return true;
 		}
@@ -555,7 +555,7 @@ 
 		if(!$this->_cacheInitialized) $this->initializeCache();
 		try
 		{
-			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
+			$command=$this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
 		}
 		catch(Exception $e)

framework/Security/TUserManager.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -310,8 +309,7 @@ 
 			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username=strtolower($username);
 			if(isset($this->_users[$username]))
@@ -322,8 +320,7 @@ 
 				if(isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

Spacing +17 added lines, -17 removed lines

@@ -111,7 +111,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$userFile = include $this->_userFile;
+				$userFile=include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
@@ -146,13 +146,13 @@ 
 		{
 			foreach($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
-				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
+				$name=trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password=isset($user['password']) ? $user['password'] : '';
+				$this->_users[$name]=$password;
+				$roles=isset($user['roles']) ? $user['roles'] : '';
 				if($roles!=='')
 				{
-					foreach(explode(',',$roles) as $role)
+					foreach(explode(',', $roles) as $role)
 					{
 						if(($role=trim($role))!=='')
 							$this->_roles[$name][]=$role;
@@ -164,9 +164,9 @@ 
 		{
 			foreach($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
-				foreach(explode(',',$users) as $user)
+				$name=isset($role['name']) ? $role['name'] : '';
+				$users=isset($role['users']) ? $role['users'] : '';
+				foreach(explode(',', $users) as $user)
 				{
 					if(($user=trim($user))!=='')
 						$this->_roles[strtolower($user)][]=$name;
@@ -187,7 +187,7 @@ 
 			$this->_users[$name]=$node->getAttribute('password');
 			if(($roles=trim($node->getAttribute('roles')))!=='')
 			{
-				foreach(explode(',',$roles) as $role)
+				foreach(explode(',', $roles) as $role)
 				{
 					if(($role=trim($role))!=='')
 						$this->_roles[$name][]=$role;
@@ -196,7 +196,7 @@ 
 		}
 		foreach($xmlNode->getElementsByTagName('role') as $node)
 		{
-			foreach(explode(',',$node->getAttribute('users')) as $user)
+			foreach(explode(',', $node->getAttribute('users')) as $user)
 			{
 				if(($user=trim($user))!=='')
 					$this->_roles[strtolower($user)][]=$node->getAttribute('name');
@@ -246,8 +246,8 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		else if(($this->_userFile=Prado::getPathOfNamespace($value, self::USER_FILE_EXT))===null || !is_file($this->_userFile))
+			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode=TPropertyValue::ensureEnum($value,'TUserManagerPasswordMode');
+		$this->_passwordMode=TPropertyValue::ensureEnum($value, 'TUserManagerPasswordMode');
 	}
 
 	/**
@@ -288,7 +288,7 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
 		if($this->_passwordMode===TUserManagerPasswordMode::MD5)
 			$password=md5($password);
@@ -341,7 +341,7 @@ 
 			$data=unserialize($data);
 			if(is_array($data) && count($data)===2)
 			{
-				list($username,$token)=$data;
+				list($username, $token)=$data;
 				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
 					return $this->getUser($username);
 			}
@@ -360,7 +360,7 @@ 
 		$username=strtolower($user->getName());
 		if(isset($this->_users[$username]))
 		{
-			$data=array($username,md5($username.$this->_users[$username]));
+			$data=array($username, md5($username.$this->_users[$username]));
 			$cookie->setValue(serialize($data));
 		}
 	}