pradosoft / prado

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/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

@@ -114,7 +114,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$userFile = include $this->_userFile;
+				$userFile=include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
@@ -149,13 +149,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;
@@ -167,9 +167,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;
@@ -190,7 +190,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;
@@ -199,7 +199,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');
@@ -249,8 +249,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);
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode=TPropertyValue::ensureEnum($value,'Prado\\Security\\TUserManagerPasswordMode');
+		$this->_passwordMode=TPropertyValue::ensureEnum($value, 'Prado\\Security\\TUserManagerPasswordMode');
 	}
 
 	/**
@@ -291,7 +291,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);
@@ -344,7 +344,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);
 			}
@@ -363,7 +363,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));
 		}
 	}

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user=Prado::createComponent($this->_userClass,$this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

Doc Comments +2 added lines, -1 removed lines

@@ -162,7 +162,8 @@
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
-	 * @return TDbConnection the created DB connection
+	 * @param string $connectionID
+	 * @return \Prado\Data\TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
 	protected function createDbConnection($connectionID)

Spacing +6 added lines, -6 removed lines

@@ -62,9 +62,9 @@ 
 	{
 		if($this->_userClass==='')
 			throw new TConfigurationException('dbusermanager_userclass_required');
-		$this->_userFactory=Prado::createComponent($this->_userClass,$this);
+		$this->_userFactory=Prado::createComponent($this->_userClass, $this);
 		if(!($this->_userFactory instanceof TDbUser))
-			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid',$this->_userClass);
+			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
-		return $this->_userFactory->validateUser($username,$password);
+		return $this->_userFactory->validateUser($username, $password);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	{
 		if($username===null)
 		{
-			$user=Prado::createComponent($this->_userClass,$this);
+			$user=Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
 		}
@@ -173,7 +173,7 @@ 
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('dbusermanager_connectionid_required');

framework/I18N/TDateFormat.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			&& strlen($datetime[1]) == 1)
 		{
 			$pattern = $datetime;
-		}
-		else //no subpattern, try the presets
+		} else //no subpattern, try the presets
 			$pattern = $this->getPreset($string);
 
 		//no presets found, use the string as the pattern

Spacing +35 added lines, -35 removed lines

@@ -70,11 +70,11 @@ 
 	 * A set of pattern presets and their respective formatting shorthand.
 	 * @var array
 	 */
-	static private $_patternPresets = array(
-			'fulldate'=>'P','full'=>'P',
-			'longdate'=>'D','long'=>'d',
-			'mediumdate'=>'p','medium'=>'p',
-			'shortdate'=>'d','short'=>'d',
+	static private $_patternPresets=array(
+			'fulldate'=>'P', 'full'=>'P',
+			'longdate'=>'D', 'long'=>'d',
+			'mediumdate'=>'p', 'medium'=>'p',
+			'shortdate'=>'d', 'short'=>'d',
 			'fulltime'=>'Q', 'longtime'=>'T',
 			'mediumtime'=>'q', 'shorttime'=>'t');
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->setViewState('Pattern',$value,'');
+		$this->setViewState('Pattern', $value, '');
 	}
 
 	/**
@@ -93,35 +93,35 @@ 
 	 */
 	public function getPattern()
 	{
-		$string = $this->getViewState('Pattern','');
+		$string=$this->getViewState('Pattern', '');
 
-		$pattern = null;
+		$pattern=null;
 
 		//try the subpattern of "date time" presets
-		$subpatterns = explode(' ',$string,2);
-		$datetime = array();
+		$subpatterns=explode(' ', $string, 2);
+		$datetime=array();
 		if(count($subpatterns)==2)
 		{
-			$datetime[] = $this->getPreset($subpatterns[0]);
-			$datetime[] = $this->getPreset($subpatterns[1]);
+			$datetime[]=$this->getPreset($subpatterns[0]);
+			$datetime[]=$this->getPreset($subpatterns[1]);
 		}
 
 		//we have a good subpattern
-		if(count($datetime) == 2
-			&& strlen($datetime[0]) == 1
-			&& strlen($datetime[1]) == 1)
+		if(count($datetime)==2
+			&& strlen($datetime[0])==1
+			&& strlen($datetime[1])==1)
 		{
-			$pattern = $datetime;
+			$pattern=$datetime;
 		}
 		else //no subpattern, try the presets
-			$pattern = $this->getPreset($string);
+			$pattern=$this->getPreset($string);
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
 		if($pattern===null)
-			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
-			$pattern = null;
+			$pattern=$string;
+		if(!is_array($pattern) && strlen($pattern)==0)
+			$pattern=null;
 		return $pattern;
 	}
 
@@ -132,10 +132,10 @@ 
 	 */
 	protected function getPreset($string)
 	{
-		$string = strtolower($string);
+		$string=strtolower($string);
 		foreach(self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
+			if($string==$pattern)
 				return $preset;
 		}
 	}
@@ -146,10 +146,10 @@ 
 	 */
 	public function getValue()
 	{
-		$value = $this->getViewState('Value','');
+		$value=$this->getViewState('Value', '');
 		if(empty($value))
 		{
-			$defaultText = $this->getDefaultText();
+			$defaultText=$this->getDefaultText();
 			if(empty($defaultText))
 				return time();
 		}
@@ -162,7 +162,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getDefaultText()
 	{
-		return $this->getViewState('DefaultText','');
+		return $this->getViewState('DefaultText', '');
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function setDefaultText($value)
 	{
-		$this->setViewState('DefaultText',$value,'');
+		$this->setViewState('DefaultText', $value, '');
 	}
 
 	/**
@@ -217,29 +217,29 @@ 
 	 */
 	protected function getFormattedDate()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
 		if(self::$formatter===null)
-			self::$formatter = new DateFormat($app->getCulture());
+			self::$formatter=new DateFormat($app->getCulture());
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 
 		//return the specific cultural formatted date time
-		if(strlen($culture) && $app->getCulture() !== $culture)
+		if(strlen($culture) && $app->getCulture()!==$culture)
 		{
-			$formatter = new DateFormat($culture);
+			$formatter=new DateFormat($culture);
 			return $formatter->format($value,
 									  $this->getPattern(),
 									  $this->getCharset());
 		}
 		//return the application wide culture formatted date time.
-		$result = self::$formatter->format($value,
+		$result=self::$formatter->format($value,
 										$this->getPattern(),
 										$this->getCharset());
 		return $result;

framework/Web/UI/WebControls/TRadioButton.php

Braces +2 added lines, -4 removed lines

@@ -120,11 +120,9 @@
 			{
 				$this->setChecked(true);
 				return true;
-			}
-			else
+			} else
 				return false;
-		}
-		else if($this->getChecked())
+		} else if($this->getChecked())
 			$this->setChecked(false);
 		return false;
 	}

Spacing +30 added lines, -30 removed lines

@@ -76,7 +76,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->_globalID = self::$_buttonCount++;
+		$this->_globalID=self::$_buttonCount++;
 	}
 
 	/**
@@ -108,10 +108,10 @@ 
 	 * @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)
 	{
 		$uniqueGroupName=$this->getUniqueGroupName();
-		$value=isset($values[$uniqueGroupName])?$values[$uniqueGroupName]:null;
+		$value=isset($values[$uniqueGroupName]) ? $values[$uniqueGroupName] : null;
 		if($value!==null && $value===$this->getValueAttribute())
 		{
 			if(!$this->getChecked())
@@ -132,7 +132,7 @@ 
 	 */
 	public function getGroupName()
 	{
-		return $this->getViewState('GroupName','');
+		return $this->getViewState('GroupName', '');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setGroupName($value)
 	{
-		$this->setViewState('GroupName',$value,'');
+		$this->setViewState('GroupName', $value, '');
 		$this->_uniqueGroupName=null;
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName=$this->getViewState('UniqueGroupName',''))!=='')
+		if(($groupName=$this->getViewState('UniqueGroupName', ''))!=='')
 			return $groupName;
 		else if(($uniqueID=$this->getUniqueID())!==$this->_previousUniqueID || $this->_uniqueGroupName===null)
 		{
@@ -160,12 +160,12 @@ 
 			$this->_previousUniqueID=$uniqueID;
 			if($uniqueID!=='')
 			{
-				if(($pos=strrpos($uniqueID,\Prado\Web\UI\TControl::ID_SEPARATOR))!==false)
+				if(($pos=strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR))!==false)
 				{
 					if($groupName!=='')
-						$groupName=substr($uniqueID,0,$pos+1).$groupName;
+						$groupName=substr($uniqueID, 0, $pos + 1).$groupName;
 					else if($this->getNamingContainer() instanceof TRadioButtonList)
-						$groupName=substr($uniqueID,0,$pos);
+						$groupName=substr($uniqueID, 0, $pos);
 				}
 				if($groupName==='')
 					$groupName=$uniqueID;
@@ -193,7 +193,7 @@ 
 	 */
 	public function setUniqueGroupName($value)
 	{
-		$this->setViewState('UniqueGroupName',$value,'');
+		$this->setViewState('UniqueGroupName', $value, '');
 	}
 
 	/**
@@ -204,12 +204,12 @@ 
 	 */
 	public function getRadioButtonsInGroup()
 	{
-		$group = $this->getUniqueGroupName();
-		$buttons = array();
+		$group=$this->getUniqueGroupName();
+		$buttons=array();
 		foreach(self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
-				$buttons[] = $control;
+			if($control->getUniqueGroupName()===$group)
+				$buttons[]=$control;
 		}
 		return $buttons;
 	}
@@ -230,7 +230,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -247,19 +247,19 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
 		if($clientID!=='')
-			$writer->addAttribute('id',$clientID);
-		$writer->addAttribute('type','radio');
-		$writer->addAttribute('name',$this->getUniqueGroupName());
-		$writer->addAttribute('value',$this->getValueAttribute());
+			$writer->addAttribute('id', $clientID);
+		$writer->addAttribute('type', 'radio');
+		$writer->addAttribute('name', $this->getUniqueGroupName());
+		$writer->addAttribute('value', $this->getValueAttribute());
 		if(!empty($onclick))
-			$writer->addAttribute('onclick',$onclick);
+			$writer->addAttribute('onclick', $onclick);
 		if($this->getChecked())
-			$writer->addAttribute('checked','checked');
+			$writer->addAttribute('checked', 'checked');
 		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 
 		$page=$this->getPage();
 		if($this->getEnabled(true)
@@ -271,10 +271,10 @@ 
 		}
 
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabindex");
-		if($attributes=$this->getViewState('InputAttributes',null))
+			$writer->addAttribute('accesskey', $accesskey);
+		if(($tabindex=$this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabindex");
+		if($attributes=$this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
@@ -285,8 +285,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**

framework/Web/UI/WebControls/TButton.php

Braces +2 added lines, -4 removed lines

@@ -107,8 +107,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);
@@ -142,8 +141,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +29 added lines, -29 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function getButtonTag()
 	{
-		return $this->getViewState('ButtonTag',TButtonTag::Input);
+		return $this->getViewState('ButtonTag', TButtonTag::Input);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setButtonTag($value)
 	{
-		$this->setViewState('ButtonTag',TPropertyValue::ensureEnum($value,'TButtonTag'),TButtonTag::Input);
+		$this->setViewState('ButtonTag', TPropertyValue::ensureEnum($value, 'TButtonTag'), TButtonTag::Input);
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -100,20 +100,20 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type',strtolower($this->getButtonType()));
+		$writer->addAttribute('type', strtolower($this->getButtonType()));
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getButtonTag()===TButtonTag::Button)
 		  $this->addParsedObject($this->getText());
 		else
-		  $writer->addAttribute('value',$this->getText());
+		  $writer->addAttribute('value', $this->getText());
 		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);
 	}
@@ -123,8 +123,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$this->getPage()->getClientScript()->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$this->getPage()->getClientScript()->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 		if($this->getCausesValidation())
 		{
 			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -156,7 +156,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	{
 		$options['ID']=$this->getClientID();
 		$options['CausesValidation']=$this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['EventTarget']=$this->getUniqueID();
 		$options['ValidationGroup']=$this->getValidationGroup();
 
 		return $options;
@@ -213,7 +213,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -225,8 +225,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
-		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -293,7 +293,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -325,7 +325,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -341,7 +341,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -349,7 +349,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonType::Submit);
+		return $this->getViewState('ButtonType', TButtonType::Submit);
 	}
 
 	/**
@@ -365,6 +365,6 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TButtonType'),TButtonType::Submit);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TButtonType'), TButtonType::Submit);
 	}
 }

Doc Comments +1 added lines

@@ -222,6 +222,7 @@
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

framework/Web/UI/WebControls/TLabel.php

Braces +2 added lines, -4 removed lines

@@ -69,11 +69,9 @@
 					$this->_forControl=$control->getClientID();
 					parent::render($writer);
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('label_associatedcontrol_invalid',$aid);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		return ($this->getForControl()==='')?'span':'label';
+		return ($this->getForControl()==='') ? 'span' : 'label';
 	}
 
 	/**
@@ -48,7 +48,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if($this->_forControl!=='')
-			$writer->addAttribute('for',$this->_forControl);
+			$writer->addAttribute('for', $this->_forControl);
 		parent::addAttributesToRender($writer);
 	}
 
@@ -71,7 +71,7 @@ 
 				}
 			}
 			else
-				throw new TInvalidDataValueException('label_associatedcontrol_invalid',$aid);
+				throw new TInvalidDataValueException('label_associatedcontrol_invalid', $aid);
 		}
 		else
 			parent::render($writer);
@@ -94,7 +94,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 */
 	public function getForControl()
 	{
-		return $this->getViewState('ForControl','');
+		return $this->getViewState('ForControl', '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		$this->setViewState('ForControl',$value,'');
+		$this->setViewState('ForControl', $value, '');
 	}
 }
 

framework/Web/UI/WebControls/TDropDownListColumn.php

Braces +2 added lines, -4 removed lines

@@ -270,8 +270,7 @@ 
 					$cell->getControls()->add($listControl);
 					$cell->registerObject('DropDownList',$listControl);
 					$control=$listControl;
-				}
-				else
+				} else
 					$control=$cell;
 				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 				break;
@@ -307,8 +306,7 @@ 
 				$value=$text;
 			$formatString=$this->getDataTextFormatString();
 			$text=$this->formatDataValue($formatString,$text);
-		}
-		else
+		} else
 			$text=$value;
 		if($sender instanceof TTableCell)
 			$sender->setText($text);

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 		parent::loadState($state);
 		$this->_stateLoaded=true;
 		if(!$this->_dataBound)
-			$this->_listControl->getItems()->loadState($this->getViewState('Items',null));
+			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function saveState()
 	{
-		$this->setViewState('Items',$this->_listControl->getItems()->saveState(),null);
+		$this->setViewState('Items', $this->_listControl->getItems()->saveState(), null);
 		return parent::saveState();
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function getDataValueField()
 	{
-		return $this->getViewState('DataValueField','');
+		return $this->getViewState('DataValueField', '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setDataValueField($value)
 	{
-		$this->setViewState('DataValueField',$value,'');
+		$this->setViewState('DataValueField', $value, '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function getListValueField()
 	{
-		return $this->getViewState('ListValueField','');
+		return $this->getViewState('ListValueField', '');
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	 */
 	public function setListValueField($value)
 	{
-		$this->setViewState('ListValueField',$value,'');
+		$this->setViewState('ListValueField', $value, '');
 	}
 
 	/**
@@ -213,7 +213,7 @@ 
 	 */
 	public function getListTextField()
 	{
-		return $this->getViewState('ListTextField','');
+		return $this->getViewState('ListTextField', '');
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function setListTextField($value)
 	{
-		$this->setViewState('ListTextField',$value,'');
+		$this->setViewState('ListTextField', $value, '');
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function getListTextFormatString()
 	{
-		return $this->getViewState('ListTextFormatString','');
+		return $this->getViewState('ListTextFormatString', '');
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setListTextFormatString($value)
 	{
-		$this->setViewState('ListTextFormatString',$value,'');
+		$this->setViewState('ListTextFormatString', $value, '');
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if(!$this->_dataBound && $this->_listControl->getDataSource()!==null)
 		{
@@ -268,21 +268,21 @@ 
 				{
 					$listControl=clone $this->_listControl;
 					$cell->getControls()->add($listControl);
-					$cell->registerObject('DropDownList',$listControl);
+					$cell->registerObject('DropDownList', $listControl);
 					$control=$listControl;
 				}
 				else
 					$control=$cell;
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
 				if($this->getDataTextField()!=='' || $this->getDataValueField()!=='')
-					$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+					$cell->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			default:
-				parent::initializeCell($cell,$columnIndex,$itemType);
+				parent::initializeCell($cell, $columnIndex, $itemType);
 				break;
 		}
 	}
@@ -292,21 +292,21 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$data=$item->getData();
 		if(($valueField=$this->getDataValueField())!=='')
-			$value=$this->getDataFieldValue($data,$valueField);
+			$value=$this->getDataFieldValue($data, $valueField);
 		else
 			$value='';
 		if(($textField=$this->getDataTextField())!=='')
 		{
-			$text=$this->getDataFieldValue($data,$textField);
+			$text=$this->getDataFieldValue($data, $textField);
 			if($valueField==='')
 				$value=$text;
 			$formatString=$this->getDataTextFormatString();
-			$text=$this->formatDataValue($formatString,$text);
+			$text=$this->formatDataValue($formatString, $text);
 		}
 		else
 			$text=$value;

framework/Web/UI/WebControls/TLinkButton.php

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 		{
 			$this->renderLinkButtonHref($writer);
 			$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');
 	}
 

Spacing +27 added lines, -27 removed lines

@@ -70,7 +70,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		// We call parent implementation here because some attributes
 		// may be overwritten in the following
@@ -103,7 +103,7 @@ 
 			$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -112,8 +112,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//".$this->getClientID();
+		$nop="javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -160,11 +160,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['StopEvent'] = true;
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['StopEvent']=true;
 
 		return $options;
 	}
@@ -188,7 +188,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
-		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -328,8 +328,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 }
 

Doc Comments +1 added lines

@@ -325,6 +325,7 @@
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param \Prado\Web\UI\TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{