pradosoft / prado

framework/Web/UI/WebControls/TCheckBoxList.php

Doc Comments +3 added lines, -3 removed lines

@@ -154,7 +154,7 @@ 
 	}
 
 	/**
-	 * @return string the direction of traversing the list, defaults to 'Vertical'
+	 * @return TRepeatDirection the direction of traversing the list, defaults to 'Vertical'
 	 */
 	public function getRepeatDirection()
 	{
@@ -170,7 +170,7 @@ 
 	}
 
 	/**
-	 * @return string how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
+	 * @return TRepeatLayout how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
 	 */
 	public function getRepeatLayout()
 	{
@@ -449,7 +449,7 @@ 
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Spacing +51 added lines, -51 removed lines

@@ -45,13 +45,13 @@ 
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
-class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingContainer, IPostBackDataHandler,  IValidatable
+class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingContainer, IPostBackDataHandler, IValidatable
 {
 	private $_repeatedControl;
 	private $_isEnabled;
-	private $_changedEventRaised=false;
-	private $_dataChanged=false;
-	private $_isValid=true;
+	private $_changedEventRaised = false;
+	private $_dataChanged = false;
+	private $_isValid = true;
 
 	/**
 	 * Constructor.
@@ -60,7 +60,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->_repeatedControl=$this->createRepeatedControl();
+		$this->_repeatedControl = $this->createRepeatedControl();
 		$this->_repeatedControl->setEnableViewState(false);
 		$this->_repeatedControl->setID('c0');
 		$this->getControls()->add($this->_repeatedControl);
@@ -82,9 +82,9 @@ 
 	 * @param string control ID
 	 * @return TControl control being found
 	 */
-	public function findControl($id, $real=false)
+	public function findControl($id, $real = false)
 	{
-  		if ($real===true)
+  		if ($real === true)
   			return parent::findControl($id);
 		return $this;
 	}
@@ -112,7 +112,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'TTextAlign'), TTextAlign::Right);
 	}
 
 
@@ -129,10 +129,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if (($repeatInfo = $this->getViewState('RepeatInfo', null)) === null)
 		{
-			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$repeatInfo = new TRepeatInfo;
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -190,7 +190,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellSpacing();
 		else
 			return -1;
@@ -210,7 +210,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellPadding();
 		else
 			return -1;
@@ -266,16 +266,16 @@ 
 		// and it's a callback,
 		// and we can update clientside,
 		// then update the 'disabled' attribute of the items.
-		if(($this instanceof IActiveControl) &&
+		if (($this instanceof IActiveControl) &&
 				$this->getPage()->getIsCallBack() &&
 				$this->getActiveControl()->canUpdateClientSide())
 		{
 			$items = $this->getItems();
 			$cs = $this->getPage()->getCallbackClient();
-			$baseClientID = $this->getClientID().'_c';
-			foreach($items as $index=>$item)
+			$baseClientID = $this->getClientID() . '_c';
+			foreach ($items as $index=>$item)
 			{
-				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
+				$cs->setAttribute($baseClientID . $index, 'disabled', $value);
 			}
 		}
 	}
@@ -287,7 +287,7 @@ 
 	 * @param integer index of the item being rendered
 	 * @return null
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
 		return null;
 	}
@@ -300,18 +300,18 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
-		$repeatedControl=$this->_repeatedControl;
-		$item=$this->getItems()->itemAt($index);
-		if($item->getHasAttributes())
+		$repeatedControl = $this->_repeatedControl;
+		$item = $this->getItems()->itemAt($index);
+		if ($item->getHasAttributes())
 			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
-		else if($repeatedControl->getHasAttributes())
+		else if ($repeatedControl->getHasAttributes())
 			$repeatedControl->getAttributes()->clear();
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
-		$repeatedControl->setAttribute('value',$item->getValue());
+		$repeatedControl->setAttribute('value', $item->getValue());
 		$repeatedControl->setEnabled($this->_isEnabled && $item->getEnabled());
 		$repeatedControl->setEnableClientScript(false);
 		$repeatedControl->renderControl($writer);
@@ -324,25 +324,25 @@ 
 	 * @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)
 	{
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 		{
-			$index=(int)substr($key,strlen($this->getUniqueID())+2);
+			$index = (int) substr($key, strlen($this->getUniqueID()) + 2);
 			$this->ensureDataBound();
-			if($index>=0 && $index<$this->getItemCount())
+			if ($index >= 0 && $index < $this->getItemCount())
 			{
-				$item=$this->getItems()->itemAt($index);
-				if($item->getEnabled())
+				$item = $this->getItems()->itemAt($index);
+				if ($item->getEnabled())
 				{
-					$checked=isset($values[$key]);
-					if($item->getSelected()!==$checked)
+					$checked = isset($values[$key]);
+					if ($item->getSelected() !== $checked)
 					{
 						$item->setSelected($checked);
-						if(!$this->_changedEventRaised)
+						if (!$this->_changedEventRaised)
 						{
-							$this->_changedEventRaised=true;
-							return $this->_dataChanged=true;
+							$this->_changedEventRaised = true;
+							return $this->_dataChanged = true;
 						}
 					}
 				}
@@ -360,7 +360,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onSelectedIndexChanged(null);
 	}
@@ -376,9 +376,9 @@ 
 		$this->_repeatedControl->setAutoPostBack($this->getAutoPostBack());
 		$this->_repeatedControl->setCausesValidation($this->getCausesValidation());
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
-		$page=$this->getPage();
-		$n=$this->getItemCount();
-		for($i=0;$i<$n;++$i)
+		$page = $this->getPage();
+		$n = $this->getItemCount();
+		for ($i = 0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -390,9 +390,9 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
-		return $this->getRepeatLayout()===TRepeatLayout::Raw;
+		return $this->getRepeatLayout() === TRepeatLayout::Raw;
 	}
 
 	/**
@@ -402,24 +402,24 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getItemCount()>0)
+		if ($this->getItemCount() > 0)
 		{
-			if ($needSpan=$this->getSpanNeeded())
+			if ($needSpan = $this->getSpanNeeded())
 			{
 				$writer->addAttribute('id', $this->getClientId());
 				$writer->renderBeginTag('span');
 			}
-			$this->_isEnabled=$this->getEnabled(true);
-			$repeatInfo=$this->getRepeatInfo();
-			$accessKey=$this->getAccessKey();
-			$tabIndex=$this->getTabIndex();
+			$this->_isEnabled = $this->getEnabled(true);
+			$repeatInfo = $this->getRepeatInfo();
+			$accessKey = $this->getAccessKey();
+			$tabIndex = $this->getTabIndex();
 			$this->_repeatedControl->setTextAlign($this->getTextAlign());
 			$this->_repeatedControl->setAccessKey($accessKey);
 			$this->_repeatedControl->setTabIndex($tabIndex);
 			$this->setAccessKey('');
 			$this->setTabIndex(0);
 			$this->addAttributesToRender($writer);
-			$repeatInfo->renderRepeater($writer,$this);
+			$repeatInfo->renderRepeater($writer, $this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 			if ($needSpan)
@@ -427,7 +427,7 @@ 
 		}
 
 		//checkbox skipped the client control script in addAttributesToRender
-		if($this->getEnabled(true)
+		if ($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $this->getPage()->getClientSupportsJavaScript())
@@ -470,7 +470,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	    $this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Braces +24 added lines, -18 removed lines

@@ -84,8 +84,9 @@ 
 	 */
 	public function findControl($id, $real=false)
 	{
-  		if ($real===true)
-  			return parent::findControl($id);
+  		if ($real===true) {
+  		  			return parent::findControl($id);
+  		}
 		return $this;
 	}
 
@@ -190,10 +191,11 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellSpacing();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellSpacing();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -210,10 +212,11 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellPadding();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellPadding();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -304,10 +307,11 @@ 
 	{
 		$repeatedControl=$this->_repeatedControl;
 		$item=$this->getItems()->itemAt($index);
-		if($item->getHasAttributes())
-			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
-		else if($repeatedControl->getHasAttributes())
-			$repeatedControl->getAttributes()->clear();
+		if($item->getHasAttributes()) {
+					$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
+		} else if($repeatedControl->getHasAttributes()) {
+					$repeatedControl->getAttributes()->clear();
+		}
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
@@ -360,8 +364,9 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getAutoPostBack() && $this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onSelectedIndexChanged(null);
 	}
 
@@ -422,8 +427,9 @@ 
 			$repeatInfo->renderRepeater($writer,$this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
-			if ($needSpan)
-				$writer->renderEndTag();
+			if ($needSpan) {
+							$writer->renderEndTag();
+			}
 		}
 
 		//checkbox skipped the client control script in addAttributesToRender

Indentation +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TCheckBoxList 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
- */
+	 * TCheckBoxList 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
+	 */
 
 /**
  * Includes TListControl class
@@ -463,14 +463,14 @@ 
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

framework/Web/UI/WebControls/TCompareValidator.php

Doc Comments +2 added lines

@@ -186,6 +186,8 @@
 	 * Parse the pair of values into the appropriate value type.
 	 * @param string value one
 	 * @param string second value
+	 * @param string $value1
+	 * @param string $value2
 	 * @return array appropriate type of the value pair, array($value1, $value2);
 	 */
 	protected function getComparisonValues($value1, $value2)

Indentation +3 added lines, -3 removed lines

@@ -124,9 +124,9 @@
 	}
 
 	/**
-     * Sets the date format for a date validation
-     * @param string the date format value
-     */
+	 * Sets the date format for a date validation
+	 * @param string the date format value
+	 */
 	public function setDateFormat($value)
 	{
 		$this->setViewState('DateFormat', $value, '');

Spacing +32 added lines, -32 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType',TValidationDataType::String);
+		return $this->getViewState('DataType', TValidationDataType::String);
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'TValidationDataType'),TValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'TValidationDataType'), TValidationDataType::String);
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 */
 	public function getControlToCompare()
 	{
-		return $this->getViewState('ControlToCompare','');
+		return $this->getViewState('ControlToCompare', '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setControlToCompare($value)
 	{
-		$this->setViewState('ControlToCompare',$value,'');
+		$this->setViewState('ControlToCompare', $value, '');
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function getValueToCompare()
 	{
-		return $this->getViewState('ValueToCompare','');
+		return $this->getViewState('ValueToCompare', '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function setValueToCompare($value)
 	{
-		$this->setViewState('ValueToCompare',$value,'');
+		$this->setViewState('ValueToCompare', $value, '');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function getOperator()
 	{
-		return $this->getViewState('Operator',TValidationCompareOperator::Equal);
+		return $this->getViewState('Operator', TValidationCompareOperator::Equal);
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setOperator($value)
 	{
-		$this->setViewState('Operator',TPropertyValue::ensureEnum($value,'TValidationCompareOperator'),TValidationCompareOperator::Equal);
+		$this->setViewState('Operator', TPropertyValue::ensureEnum($value, 'TValidationCompareOperator'), TValidationCompareOperator::Equal);
 	}
 
 	/**
@@ -149,21 +149,21 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value=$this->getValidationValue($this->getValidationTarget()))==='')
+		if (($value = $this->getValidationValue($this->getValidationTarget())) === '')
 			return true;
 
-		if(($controlToCompare=$this->getControlToCompare())!=='')
+		if (($controlToCompare = $this->getControlToCompare()) !== '')
 		{
-			if(($control2=$this->findControl($controlToCompare))===null)
+			if (($control2 = $this->findControl($controlToCompare)) === null)
 				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2=$this->getValidationValue($control2))==='')
+			if (($value2 = $this->getValidationValue($control2)) === '')
 				return false;
 		}
 		else
-			$value2=$this->getValueToCompare();
+			$value2 = $this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
-		switch($this->getOperator())
+		switch ($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
 				return $values[0] == $values[1];
@@ -190,7 +190,7 @@ 
 	 */
 	protected function getComparisonValues($value1, $value2)
 	{
-		switch($this->getDataType())
+		switch ($this->getDataType())
 		{
 			case TValidationDataType::Integer:
 				return array(intval($value1), intval($value2));
@@ -198,7 +198,7 @@ 
 				return array(floatval($value1), floatval($value2));
 			case TValidationDataType::Date:
 				$dateFormat = $this->getDateFormat();
-				if($dateFormat!=='')
+				if ($dateFormat !== '')
 				{
 					$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
 					return array($formatter->parse($value1), $formatter->parse($value2));
@@ -216,18 +216,18 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($name=$this->getControlToCompare())!=='')
+		if (($name = $this->getControlToCompare()) !== '')
 		{
-			if(($control=$this->findControl($name))!==null)
-				$options['ControlToCompare']=$control->getClientID();
+			if (($control = $this->findControl($name)) !== null)
+				$options['ControlToCompare'] = $control->getClientID();
 		}
-		if(($value=$this->getValueToCompare())!=='')
-			$options['ValueToCompare']=$value;
-		if(($operator=$this->getOperator())!==TValidationCompareOperator::Equal)
-			$options['Operator']=$operator;
-		$options['DataType']=$this->getDataType();
-		if(($dateFormat=$this->getDateFormat())!=='')
-			$options['DateFormat']=$dateFormat;
+		if (($value = $this->getValueToCompare()) !== '')
+			$options['ValueToCompare'] = $value;
+		if (($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
+			$options['Operator'] = $operator;
+		$options['DataType'] = $this->getDataType();
+		if (($dateFormat = $this->getDateFormat()) !== '')
+			$options['DateFormat'] = $dateFormat;
 		return $options;
 	}
 }
@@ -252,11 +252,11 @@ 
  */
 class TValidationCompareOperator extends TEnumerable
 {
-	const Equal='Equal';
-	const NotEqual='NotEqual';
-	const GreaterThan='GreaterThan';
-	const GreaterThanEqual='GreaterThanEqual';
-	const LessThan='LessThan';
-	const LessThanEqual='LessThanEqual';
+	const Equal = 'Equal';
+	const NotEqual = 'NotEqual';
+	const GreaterThan = 'GreaterThan';
+	const GreaterThanEqual = 'GreaterThanEqual';
+	const LessThan = 'LessThan';
+	const LessThanEqual = 'LessThanEqual';
 }
 

Braces +25 added lines, -18 removed lines

@@ -149,18 +149,21 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value=$this->getValidationValue($this->getValidationTarget()))==='')
-			return true;
+		if(($value=$this->getValidationValue($this->getValidationTarget()))==='') {
+					return true;
+		}
 
 		if(($controlToCompare=$this->getControlToCompare())!=='')
 		{
-			if(($control2=$this->findControl($controlToCompare))===null)
-				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2=$this->getValidationValue($control2))==='')
-				return false;
+			if(($control2=$this->findControl($controlToCompare))===null) {
+							throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
+			}
+			if(($value2=$this->getValidationValue($control2))==='') {
+							return false;
+			}
+		} else {
+					$value2=$this->getValueToCompare();
 		}
-		else
-			$value2=$this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
@@ -202,9 +205,9 @@ 
 				{
 					$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
 					return array($formatter->parse($value1), $formatter->parse($value2));
+				} else {
+									return array(strtotime($value1), strtotime($value2));
 				}
-				else
-					return array(strtotime($value1), strtotime($value2));
 		}
 		return array($value1, $value2);
 	}
@@ -218,16 +221,20 @@ 
 		$options = parent::getClientScriptOptions();
 		if(($name=$this->getControlToCompare())!=='')
 		{
-			if(($control=$this->findControl($name))!==null)
-				$options['ControlToCompare']=$control->getClientID();
+			if(($control=$this->findControl($name))!==null) {
+							$options['ControlToCompare']=$control->getClientID();
+			}
+		}
+		if(($value=$this->getValueToCompare())!=='') {
+					$options['ValueToCompare']=$value;
+		}
+		if(($operator=$this->getOperator())!==TValidationCompareOperator::Equal) {
+					$options['Operator']=$operator;
 		}
-		if(($value=$this->getValueToCompare())!=='')
-			$options['ValueToCompare']=$value;
-		if(($operator=$this->getOperator())!==TValidationCompareOperator::Equal)
-			$options['Operator']=$operator;
 		$options['DataType']=$this->getDataType();
-		if(($dateFormat=$this->getDateFormat())!=='')
-			$options['DateFormat']=$dateFormat;
+		if(($dateFormat=$this->getDateFormat())!=='') {
+					$options['DateFormat']=$dateFormat;
+		}
 		return $options;
 	}
 }

framework/Web/UI/WebControls/TCustomValidator.php

Doc Comments +1 added lines

@@ -171,6 +171,7 @@
 	 * Constructor.
 	 * @param string property value to be validated
 	 * @param boolean whether the value is valid
+	 * @param boolean $isValid
 	 */
 	public function __construct($value,$isValid)
 	{

Spacing +18 added lines, -18 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function getClientValidationFunction()
 	{
-		return $this->getViewState('ClientValidationFunction','');
+		return $this->getViewState('ClientValidationFunction', '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setClientValidationFunction($value)
 	{
-		$this->setViewState('ClientValidationFunction',$value,'');
+		$this->setViewState('ClientValidationFunction', $value, '');
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	public function evaluateIsValid()
 	{
 		$value = '';
-		if($this->getValidationTarget()!==null)
-			$value=$this->getValidationValue($this->getValidationTarget());
+		if ($this->getValidationTarget() !== null)
+			$value = $this->getValidationValue($this->getValidationTarget());
 		return $this->onServerValidate($value);
 	}
 
@@ -103,8 +103,8 @@ 
 	 */
 	public function onServerValidate($value)
 	{
-		$param=new TServerValidateEventParameter($value,true);
-		$this->raiseEvent('OnServerValidate',$this,$param);
+		$param = new TServerValidateEventParameter($value, true);
+		$this->raiseEvent('OnServerValidate', $this, $param);
 		return $param->getIsValid();
 	}
 
@@ -113,10 +113,10 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
+		if (($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
 			return $control;
-		else if(($id=$this->getControlToValidate())!=='')
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+		else if (($id = $this->getControlToValidate()) !== '')
+			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 		else
 			return null;
 	}
@@ -127,9 +127,9 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options=parent::getClientScriptOptions();
-		if(($clientJs=$this->getClientValidationFunction())!=='')
-			$options['ClientValidationFunction']=$clientJs;
+		$options = parent::getClientScriptOptions();
+		if (($clientJs = $this->getClientValidationFunction()) !== '')
+			$options['ClientValidationFunction'] = $clientJs;
 		return $options;
 	}
 
@@ -139,7 +139,7 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		if($this->getClientValidationFunction()!=='')
+		if ($this->getClientValidationFunction() !== '')
 			parent::registerClientScriptValidator();
 	}
 }
@@ -160,21 +160,21 @@ 
 	 * the value to be validated
 	 * @var string
 	 */
-	private $_value='';
+	private $_value = '';
 	/**
 	 * whether the value is valid
 	 * @var boolean
 	 */
-	private $_isValid=true;
+	private $_isValid = true;
 
 	/**
 	 * Constructor.
 	 * @param string property value to be validated
 	 * @param boolean whether the value is valid
 	 */
-	public function __construct($value,$isValid)
+	public function __construct($value, $isValid)
 	{
-		$this->_value=$value;
+		$this->_value = $value;
 		$this->setIsValid($isValid);
 	}
 
@@ -199,6 +199,6 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 }

Braces +16 added lines, -12 removed lines

@@ -87,8 +87,9 @@ 
 	public function evaluateIsValid()
 	{
 		$value = '';
-		if($this->getValidationTarget()!==null)
-			$value=$this->getValidationValue($this->getValidationTarget());
+		if($this->getValidationTarget()!==null) {
+					$value=$this->getValidationValue($this->getValidationTarget());
+		}
 		return $this->onServerValidate($value);
 	}
 
@@ -113,12 +114,13 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
-			return $control;
-		else if(($id=$this->getControlToValidate())!=='')
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
-		else
-			return null;
+		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null) {
+					return $control;
+		} else if(($id=$this->getControlToValidate())!=='') {
+					throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -128,8 +130,9 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options=parent::getClientScriptOptions();
-		if(($clientJs=$this->getClientValidationFunction())!=='')
-			$options['ClientValidationFunction']=$clientJs;
+		if(($clientJs=$this->getClientValidationFunction())!=='') {
+					$options['ClientValidationFunction']=$clientJs;
+		}
 		return $options;
 	}
 
@@ -139,8 +142,9 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		if($this->getClientValidationFunction()!=='')
-			parent::registerClientScriptValidator();
+		if($this->getClientValidationFunction()!=='') {
+					parent::registerClientScriptValidator();
+		}
 	}
 }
 

framework/Web/UI/WebControls/TDataBoundControl.php

Doc Comments +8 added lines

@@ -151,6 +151,7 @@ 
 
 	/**
 	 * @param boolean if databind has been invoked in this page request
+	 * @param boolean $value
 	 */
 	protected function setIsDataBound($value)
 	{
@@ -211,6 +212,7 @@ 
 
 	/**
 	 * @param integer the zero-based index of the current page
+	 * @param integer $value
 	 * @throws TInvalidDataValueException if the value is less than 0
 	 */
 	public function setCurrentPageIndex($value)
@@ -273,6 +275,7 @@ 
 	 * If true and the control has been prerendered while it uses the data source
 	 * specified by {@link setDataSourceID}, a databind call will be called by this method.
 	 * @param boolean whether a databind call is required.
+	 * @param boolean $value
 	 */
 	protected function setRequiresDataBinding($value)
 	{
@@ -405,6 +408,9 @@ 
 		return $this->_currentDataSource;
 	}
 
+	/**
+	 * @param Traversable $data
+	 */
 	abstract protected function performDataBinding($data);
 
 	/**
@@ -566,6 +572,7 @@ 
 	 * Sets the zero-based index for the item.
 	 * If the item is not in the item collection (e.g. it is a header item), -1 should be used.
 	 * @param integer zero-based index of the item.
+	 * @return void
 	 */
 	public function setItemIndex($value);
 
@@ -576,6 +583,7 @@ 
 
 	/**
 	 * @param TListItemType the item type.
+	 * @return void
 	 */
 	public function setItemType($value);
 }

Spacing +110 added lines, -110 removed lines

@@ -43,18 +43,18 @@ 
  */
 abstract class TDataBoundControl extends TWebControl
 {
-	private $_initialized=false;
-	private $_dataSource=null;
-	private $_requiresBindToNull=false;
-	private $_requiresDataBinding=false;
-	private $_prerendered=false;
-	private $_currentView=null;
-	private $_currentDataSource=null;
-	private $_currentViewValid=false;
-	private $_currentDataSourceValid=false;
-	private $_currentViewIsFromDataSourceID=false;
-	private $_parameters=null;
-	private $_isDataBound=false;
+	private $_initialized = false;
+	private $_dataSource = null;
+	private $_requiresBindToNull = false;
+	private $_requiresDataBinding = false;
+	private $_prerendered = false;
+	private $_currentView = null;
+	private $_currentDataSource = null;
+	private $_currentViewValid = false;
+	private $_currentDataSourceValid = false;
+	private $_currentViewIsFromDataSourceID = false;
+	private $_parameters = null;
+	private $_isDataBound = false;
 
 	/**
 	 * @return Traversable data source object, defaults to null.
@@ -73,7 +73,7 @@ 
 	 */
 	public function setDataSource($value)
 	{
-		$this->_dataSource=$this->validateDataSource($value);
+		$this->_dataSource = $this->validateDataSource($value);
 		$this->onDataSourceChanged();
 	}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function getDataSourceID()
 	{
-		return $this->getViewState('DataSourceID','');
+		return $this->getViewState('DataSourceID', '');
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 */
 	public function setDataSourceID($value)
 	{
-		$dsid=$this->getViewState('DataSourceID','');
-		if($dsid!=='' && $value==='')
-			$this->_requiresBindToNull=true;
-		$this->setViewState('DataSourceID',$value,'');
+		$dsid = $this->getViewState('DataSourceID', '');
+		if ($dsid !== '' && $value === '')
+			$this->_requiresBindToNull = true;
+		$this->setViewState('DataSourceID', $value, '');
 		$this->onDataSourceChanged();
 	}
 
@@ -105,7 +105,7 @@ 
 	 */
 	protected function getUsingDataSourceID()
 	{
-		return $this->getDataSourceID()!=='';
+		return $this->getDataSourceID() !== '';
 	}
 
 	/**
@@ -114,9 +114,9 @@ 
 	 */
 	public function onDataSourceChanged()
 	{
-		$this->_currentViewValid=false;
-		$this->_currentDataSourceValid=false;
-		if($this->getInitialized())
+		$this->_currentViewValid = false;
+		$this->_currentDataSourceValid = false;
+		if ($this->getInitialized())
 			$this->setRequiresDataBinding(true);
 	}
 
@@ -138,7 +138,7 @@ 
 	 */
 	protected function setInitialized($value)
 	{
-		$this->_initialized=TPropertyValue::ensureBoolean($value);
+		$this->_initialized = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	protected function setIsDataBound($value)
 	{
-		$this->_isDataBound=$value;
+		$this->_isDataBound = $value;
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	public function getAllowPaging()
 	{
-		return $this->getViewState('AllowPaging',false);
+		return $this->getViewState('AllowPaging', false);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public function setAllowPaging($value)
 	{
-		$this->setViewState('AllowPaging',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowPaging', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 */
 	public function getAllowCustomPaging()
 	{
-		return $this->getViewState('AllowCustomPaging',false);
+		return $this->getViewState('AllowCustomPaging', false);
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function setAllowCustomPaging($value)
 	{
-		$this->setViewState('AllowCustomPaging',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowCustomPaging', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function getCurrentPageIndex()
 	{
-		return $this->getViewState('CurrentPageIndex',0);
+		return $this->getViewState('CurrentPageIndex', 0);
 	}
 
 	/**
@@ -215,9 +215,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=0;
-		$this->setViewState('CurrentPageIndex',$value,0);
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = 0;
+		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 */
 	public function getPageSize()
 	{
-		return $this->getViewState('PageSize',10);
+		return $this->getViewState('PageSize', 10);
 	}
 
 	/**
@@ -234,9 +234,9 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<1)
-			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid',get_class($this));
-		$this->setViewState('PageSize',TPropertyValue::ensureInteger($value),10);
+		if (($value = TPropertyValue::ensureInteger($value)) < 1)
+			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid', get_class($this));
+		$this->setViewState('PageSize', TPropertyValue::ensureInteger($value), 10);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	public function getPageCount()
 	{
-		return $this->getViewState('PageCount',1);
+		return $this->getViewState('PageCount', 1);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function getVirtualItemCount()
 	{
-		return $this->getViewState('VirtualItemCount',0);
+		return $this->getViewState('VirtualItemCount', 0);
 	}
 
 	/**
@@ -263,9 +263,9 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid',get_class($this));
-		$this->setViewState('VirtualItemCount',$value,0);
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid', get_class($this));
+		$this->setViewState('VirtualItemCount', $value, 0);
 	}
 
 	/**
@@ -276,14 +276,14 @@ 
 	 */
 	protected function setRequiresDataBinding($value)
 	{
-		$value=TPropertyValue::ensureBoolean($value);
-		if($value && $this->_prerendered)
+		$value = TPropertyValue::ensureBoolean($value);
+		if ($value && $this->_prerendered)
 		{
-			$this->_requiresDataBinding=true;
+			$this->_requiresDataBinding = true;
 			$this->ensureDataBound();
 		}
 		else
-			$this->_requiresDataBinding=$value;
+			$this->_requiresDataBinding = $value;
 	}
 
 	/**
@@ -294,10 +294,10 @@ 
 	 */
 	protected function ensureDataBound()
 	{
-		if($this->_requiresDataBinding && ($this->getUsingDataSourceID() || $this->_requiresBindToNull))
+		if ($this->_requiresDataBinding && ($this->getUsingDataSourceID() || $this->_requiresBindToNull))
 		{
 			$this->dataBind();
-			$this->_requiresBindToNull=false;
+			$this->_requiresBindToNull = false;
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 	 */
 	protected function createPagedDataSource()
 	{
-		$ds=new TPagedDataSource;
+		$ds = new TPagedDataSource;
 		$ds->setCurrentPageIndex($this->getCurrentPageIndex());
 		$ds->setPageSize($this->getPageSize());
 		$ds->setAllowPaging($this->getAllowPaging());
@@ -327,21 +327,21 @@ 
 		$this->dataBindProperties();
 		$this->onDataBinding(null);
 
-		if(($view=$this->getDataSourceView())!==null)
-			$data=$view->select($this->getSelectParameters());
+		if (($view = $this->getDataSourceView()) !== null)
+			$data = $view->select($this->getSelectParameters());
 		else
-			$data=null;
+			$data = null;
 
-		if($data instanceof Traversable)
+		if ($data instanceof Traversable)
 		{
-			if($this->getAllowPaging())
+			if ($this->getAllowPaging())
 			{
-				$ds=$this->createPagedDataSource();
+				$ds = $this->createPagedDataSource();
 				$ds->setDataSource($data);
-				$this->setViewState('PageCount',$ds->getPageCount());
-				if($ds->getCurrentPageIndex()>=$ds->getPageCount())
+				$this->setViewState('PageCount', $ds->getPageCount());
+				if ($ds->getCurrentPageIndex() >= $ds->getPageCount())
 				{
-					$ds->setCurrentPageIndex($ds->getPageCount()-1);
+					$ds->setCurrentPageIndex($ds->getPageCount() - 1);
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
@@ -356,51 +356,51 @@ 
 		$this->onDataBound(null);
 	}
 
-	public function dataSourceViewChanged($sender,$param)
+	public function dataSourceViewChanged($sender, $param)
 	{
-		if(!$this->_ignoreDataSourceViewChanged)
+		if (!$this->_ignoreDataSourceViewChanged)
 			$this->setRequiresDataBinding(true);
 	}
 
 	protected function getDataSourceView()
 	{
-		if(!$this->_currentViewValid)
+		if (!$this->_currentViewValid)
 		{
-			if($this->_currentView && $this->_currentViewIsFromDataSourceID)
-				$this->_currentView->detachEventHandler('DataSourceViewChanged',array($this,'dataSourceViewChanged'));
-			if(($dataSource=$this->determineDataSource())!==null)
+			if ($this->_currentView && $this->_currentViewIsFromDataSourceID)
+				$this->_currentView->detachEventHandler('DataSourceViewChanged', array($this, 'dataSourceViewChanged'));
+			if (($dataSource = $this->determineDataSource()) !== null)
 			{
-				if(($view=$dataSource->getView($this->getDataMember()))===null)
-					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid',$this->getDataMember());
-				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID())
-					$view->attachEventHandler('OnDataSourceViewChanged',array($this,'dataSourceViewChanged'));
-				$this->_currentView=$view;
+				if (($view = $dataSource->getView($this->getDataMember())) === null)
+					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid', $this->getDataMember());
+				if ($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID())
+					$view->attachEventHandler('OnDataSourceViewChanged', array($this, 'dataSourceViewChanged'));
+				$this->_currentView = $view;
 			}
 			else
-				$this->_currentView=null;
-			$this->_currentViewValid=true;
+				$this->_currentView = null;
+			$this->_currentViewValid = true;
 		}
 		return $this->_currentView;
 	}
 
 	protected function determineDataSource()
 	{
-		if(!$this->_currentDataSourceValid)
+		if (!$this->_currentDataSourceValid)
 		{
-			if(($dsid=$this->getDataSourceID())!=='')
+			if (($dsid = $this->getDataSourceID()) !== '')
 			{
-				if(($dataSource=$this->getNamingContainer()->findControl($dsid))===null)
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent',$dsid);
-				else if(!($dataSource instanceof IDataSource))
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid',$dsid);
+				if (($dataSource = $this->getNamingContainer()->findControl($dsid)) === null)
+					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent', $dsid);
+				else if (!($dataSource instanceof IDataSource))
+					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
 				else
-					$this->_currentDataSource=$dataSource;
+					$this->_currentDataSource = $dataSource;
 			}
-			else if(($dataSource=$this->getDataSource())!==null)
-				$this->_currentDataSource=new TReadOnlyDataSource($dataSource,$this->getDataMember());
+			else if (($dataSource = $this->getDataSource()) !== null)
+				$this->_currentDataSource = new TReadOnlyDataSource($dataSource, $this->getDataMember());
 			else
-				$this->_currentDataSource=null;
-			$this->_currentDataSourceValid=true;
+				$this->_currentDataSource = null;
+			$this->_currentDataSourceValid = true;
 		}
 		return $this->_currentDataSource;
 	}
@@ -414,7 +414,7 @@ 
 	 */
 	public function onDataBound($param)
 	{
-		$this->raiseEvent('OnDataBound',$this,$param);
+		$this->raiseEvent('OnDataBound', $this, $param);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		$page=$this->getPage();
-		$page->attachEventHandler('OnPreLoad',array($this,'pagePreLoad'));
+		$page = $this->getPage();
+		$page->attachEventHandler('OnPreLoad', array($this, 'pagePreLoad'));
 	}
 
 	/**
@@ -437,11 +437,11 @@ 
 	 * @param mixed event sender
 	 * @param TEventParameter event parameter
 	 */
-	public function pagePreLoad($sender,$param)
+	public function pagePreLoad($sender, $param)
 	{
-		$this->_initialized=true;
-		$isPostBack=$this->getPage()->getIsPostBack();
-		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
+		$this->_initialized = true;
+		$isPostBack = $this->getPage()->getIsPostBack();
+		if (!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
 			$this->setRequiresDataBinding(true);
 	}
 
@@ -452,7 +452,7 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$this->_prerendered=true;
+		$this->_prerendered = true;
 		$this->ensureDataBound();
 		parent::onPreRender($param);
 	}
@@ -466,44 +466,44 @@ 
 	 */
 	protected function validateDataSource($value)
 	{
-		if(is_string($value))
+		if (is_string($value))
 		{
-			$list=new TList;
-			foreach(TPropertyValue::ensureArray($value) as $key=>$value)
+			$list = new TList;
+			foreach (TPropertyValue::ensureArray($value) as $key=>$value)
 			{
-				if(is_array($value))
+				if (is_array($value))
 					$list->add($value);
 				else
-					$list->add(array($value,is_string($key)?$key:$value));
+					$list->add(array($value, is_string($key) ? $key : $value));
 			}
 			return $list;
 		}
-		else if(is_array($value))
+		else if (is_array($value))
 			return new TMap($value);
-		else if($value instanceof TDbDataReader) {
+		else if ($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
 		}
-		else if(($value instanceof Traversable) || $value===null)
+		else if (($value instanceof Traversable) || $value === null)
 			return $value;
 		else
-			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this));
+			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));
 	}
 
 	public function getDataMember()
 	{
-		return $this->getViewState('DataMember','');
+		return $this->getViewState('DataMember', '');
 	}
 
 	public function setDataMember($value)
 	{
-		$this->setViewState('DataMember',$value,'');
+		$this->setViewState('DataMember', $value, '');
 	}
 
 	public function getSelectParameters()
 	{
-		if(!$this->_parameters)
-			$this->_parameters=new TDataSourceSelectParameters;
+		if (!$this->_parameters)
+			$this->_parameters = new TDataSourceSelectParameters;
 		return $this->_parameters;
 	}
 }
@@ -530,14 +530,14 @@ 
  */
 class TListItemType extends TEnumerable
 {
-	const Header='Header';
-	const Footer='Footer';
-	const Item='Item';
-	const Separator='Separator';
-	const AlternatingItem='AlternatingItem';
-	const EditItem='EditItem';
-	const SelectedItem='SelectedItem';
-	const Pager='Pager';
+	const Header = 'Header';
+	const Footer = 'Footer';
+	const Item = 'Item';
+	const Separator = 'Separator';
+	const AlternatingItem = 'AlternatingItem';
+	const EditItem = 'EditItem';
+	const SelectedItem = 'SelectedItem';
+	const Pager = 'Pager';
 }
 
 

Braces +66 added lines, -54 removed lines

@@ -92,8 +92,9 @@ 
 	public function setDataSourceID($value)
 	{
 		$dsid=$this->getViewState('DataSourceID','');
-		if($dsid!=='' && $value==='')
-			$this->_requiresBindToNull=true;
+		if($dsid!=='' && $value==='') {
+					$this->_requiresBindToNull=true;
+		}
 		$this->setViewState('DataSourceID',$value,'');
 		$this->onDataSourceChanged();
 	}
@@ -116,8 +117,9 @@ 
 	{
 		$this->_currentViewValid=false;
 		$this->_currentDataSourceValid=false;
-		if($this->getInitialized())
-			$this->setRequiresDataBinding(true);
+		if($this->getInitialized()) {
+					$this->setRequiresDataBinding(true);
+		}
 	}
 
 	/**
@@ -215,8 +217,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=0;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=0;
+		}
 		$this->setViewState('CurrentPageIndex',$value,0);
 	}
 
@@ -234,8 +237,9 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<1)
-			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid',get_class($this));
+		if(($value=TPropertyValue::ensureInteger($value))<1) {
+					throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid',get_class($this));
+		}
 		$this->setViewState('PageSize',TPropertyValue::ensureInteger($value),10);
 	}
 
@@ -263,8 +267,9 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid',get_class($this));
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid',get_class($this));
+		}
 		$this->setViewState('VirtualItemCount',$value,0);
 	}
 
@@ -281,9 +286,9 @@ 
 		{
 			$this->_requiresDataBinding=true;
 			$this->ensureDataBound();
+		} else {
+					$this->_requiresDataBinding=$value;
 		}
-		else
-			$this->_requiresDataBinding=$value;
 	}
 
 	/**
@@ -327,10 +332,11 @@ 
 		$this->dataBindProperties();
 		$this->onDataBinding(null);
 
-		if(($view=$this->getDataSourceView())!==null)
-			$data=$view->select($this->getSelectParameters());
-		else
-			$data=null;
+		if(($view=$this->getDataSourceView())!==null) {
+					$data=$view->select($this->getSelectParameters());
+		} else {
+					$data=null;
+		}
 
 		if($data instanceof Traversable)
 		{
@@ -345,8 +351,7 @@ 
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
-			}
-			else
+			} else
 			{
 				$this->clearViewState('PageCount');
 				$this->performDataBinding($data);
@@ -358,26 +363,30 @@ 
 
 	public function dataSourceViewChanged($sender,$param)
 	{
-		if(!$this->_ignoreDataSourceViewChanged)
-			$this->setRequiresDataBinding(true);
+		if(!$this->_ignoreDataSourceViewChanged) {
+					$this->setRequiresDataBinding(true);
+		}
 	}
 
 	protected function getDataSourceView()
 	{
 		if(!$this->_currentViewValid)
 		{
-			if($this->_currentView && $this->_currentViewIsFromDataSourceID)
-				$this->_currentView->detachEventHandler('DataSourceViewChanged',array($this,'dataSourceViewChanged'));
+			if($this->_currentView && $this->_currentViewIsFromDataSourceID) {
+							$this->_currentView->detachEventHandler('DataSourceViewChanged',array($this,'dataSourceViewChanged'));
+			}
 			if(($dataSource=$this->determineDataSource())!==null)
 			{
-				if(($view=$dataSource->getView($this->getDataMember()))===null)
-					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid',$this->getDataMember());
-				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID())
-					$view->attachEventHandler('OnDataSourceViewChanged',array($this,'dataSourceViewChanged'));
+				if(($view=$dataSource->getView($this->getDataMember()))===null) {
+									throw new TInvalidDataValueException('databoundcontrol_datamember_invalid',$this->getDataMember());
+				}
+				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID()) {
+									$view->attachEventHandler('OnDataSourceViewChanged',array($this,'dataSourceViewChanged'));
+				}
 				$this->_currentView=$view;
+			} else {
+							$this->_currentView=null;
 			}
-			else
-				$this->_currentView=null;
 			$this->_currentViewValid=true;
 		}
 		return $this->_currentView;
@@ -389,17 +398,18 @@ 
 		{
 			if(($dsid=$this->getDataSourceID())!=='')
 			{
-				if(($dataSource=$this->getNamingContainer()->findControl($dsid))===null)
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent',$dsid);
-				else if(!($dataSource instanceof IDataSource))
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid',$dsid);
-				else
-					$this->_currentDataSource=$dataSource;
+				if(($dataSource=$this->getNamingContainer()->findControl($dsid))===null) {
+									throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent',$dsid);
+				} else if(!($dataSource instanceof IDataSource)) {
+									throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid',$dsid);
+				} else {
+									$this->_currentDataSource=$dataSource;
+				}
+			} else if(($dataSource=$this->getDataSource())!==null) {
+							$this->_currentDataSource=new TReadOnlyDataSource($dataSource,$this->getDataMember());
+			} else {
+							$this->_currentDataSource=null;
 			}
-			else if(($dataSource=$this->getDataSource())!==null)
-				$this->_currentDataSource=new TReadOnlyDataSource($dataSource,$this->getDataMember());
-			else
-				$this->_currentDataSource=null;
 			$this->_currentDataSourceValid=true;
 		}
 		return $this->_currentDataSource;
@@ -441,8 +451,9 @@ 
 	{
 		$this->_initialized=true;
 		$isPostBack=$this->getPage()->getIsPostBack();
-		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
-			$this->setRequiresDataBinding(true);
+		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound()))) {
+					$this->setRequiresDataBinding(true);
+		}
 	}
 
 	/**
@@ -471,23 +482,23 @@ 
 			$list=new TList;
 			foreach(TPropertyValue::ensureArray($value) as $key=>$value)
 			{
-				if(is_array($value))
-					$list->add($value);
-				else
-					$list->add(array($value,is_string($key)?$key:$value));
+				if(is_array($value)) {
+									$list->add($value);
+				} else {
+									$list->add(array($value,is_string($key)?$key:$value));
+				}
 			}
 			return $list;
-		}
-		else if(is_array($value))
-			return new TMap($value);
-		else if($value instanceof TDbDataReader) {
+		} else if(is_array($value)) {
+					return new TMap($value);
+		} else if($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
+		} else if(($value instanceof Traversable) || $value===null) {
+					return $value;
+		} else {
+					throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this));
 		}
-		else if(($value instanceof Traversable) || $value===null)
-			return $value;
-		else
-			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this));
 	}
 
 	public function getDataMember()
@@ -502,8 +513,9 @@ 
 
 	public function getSelectParameters()
 	{
-		if(!$this->_parameters)
-			$this->_parameters=new TDataSourceSelectParameters;
+		if(!$this->_parameters) {
+					$this->_parameters=new TDataSourceSelectParameters;
+		}
 		return $this->_parameters;
 	}
 }

framework/Web/UI/WebControls/TDataGrid.php

Doc Comments +24 added lines, -1 removed lines

@@ -534,6 +534,7 @@ 
 	 * If the item to be selected is already in edit mode, it will remain in edit mode.
 	 * If the index is less than 0, any existing selection will be cleared up.
 	 * @param integer the selected item index
+	 * @param integer $value
 	 */
 	public function setSelectedItemIndex($value)
 	{
@@ -762,6 +763,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>cancel</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onCancelCommand($param)
 	{
@@ -773,6 +775,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>delete</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onDeleteCommand($param)
 	{
@@ -784,6 +787,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>edit</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onEditCommand($param)
 	{
@@ -794,6 +798,7 @@ 
 	 * Raises <b>OnItemCommand</b> event.
 	 * This method is invoked when a button control raises <b>OnCommand</b> event.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onItemCommand($param)
 	{
@@ -805,6 +810,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>sort</b> command name.
 	 * @param TDataGridSortCommandEventParameter event parameter
+	 * @param TDataGridSortCommandEventParameter $param
 	 */
 	public function onSortCommand($param)
 	{
@@ -816,6 +822,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>update</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onUpdateCommand($param)
 	{
@@ -827,6 +834,7 @@ 
 	 * This method is invoked right after a datagrid item is created and before
 	 * added to page hierarchy.
 	 * @param TDataGridItemEventParameter event parameter
+	 * @param TDataGridItemEventParameter $param
 	 */
 	public function onItemCreated($param)
 	{
@@ -838,6 +846,7 @@ 
 	 * This method is invoked right after a datagrid pager is created and before
 	 * added to page hierarchy.
 	 * @param TDataGridPagerEventParameter event parameter
+	 * @param TDataGridPagerEventParameter $param
 	 */
 	public function onPagerCreated($param)
 	{
@@ -849,6 +858,7 @@ 
 	 * This method is invoked for each datagrid item after it performs
 	 * databinding.
 	 * @param TDataGridItemEventParameter event parameter
+	 * @param TDataGridItemEventParameter $param
 	 */
 	public function onItemDataBound($param)
 	{
@@ -859,6 +869,7 @@ 
 	 * Raises <b>OnPageIndexChanged</b> event.
 	 * This method is invoked when current page is changed.
 	 * @param TDataGridPageChangedEventParameter event parameter
+	 * @param TDataGridPageChangedEventParameter $param
 	 */
 	public function onPageIndexChanged($param)
 	{
@@ -1155,6 +1166,11 @@ 
 		return new TDataGridItem($itemIndex,$dataSourceIndex,$itemType);
 	}
 
+	/**
+	 * @param integer $itemIndex
+	 * @param boolean $dataBind
+	 * @param TList $columns
+	 */
 	private function createItemInternal($itemIndex,$dataSourceIndex,$itemType,$dataBind,$dataItem,$columns)
 	{
 		$item=$this->createItem($itemIndex,$dataSourceIndex,$itemType);
@@ -1180,6 +1196,7 @@ 
 	 * Initializes a datagrid item and cells inside it
 	 * @param TDataGrid datagrid item to be initialized
 	 * @param TDataGridColumnCollection datagrid columns to be used to initialize the cells in the item
+	 * @param TDataGridItem $item
 	 */
 	protected function initializeItem($item,$columns)
 	{
@@ -1212,6 +1229,7 @@ 
 	/**
 	 * Builds the pager content based on pager style.
 	 * @param TDataGridPager the container for the pager
+	 * @param TDataGridPager $pager
 	 */
 	protected function buildPager($pager)
 	{
@@ -1237,6 +1255,9 @@ 
 	 * @param string caption of the button
 	 * @param string CommandName corresponding to the OnCommand event of the button
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
+	 * @param TDataGridPagerButtonType $buttonType
+	 * @param boolean $enabled
+	 * @param string $commandName
 	 * @return mixed the button instance
 	 */
 	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter)
@@ -1881,6 +1902,7 @@ 
 	 * Constructor.
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param integer new page index
+	 * @param integer $newPageIndex
 	 */
 	public function __construct($source,$newPageIndex)
 	{
@@ -1957,7 +1979,7 @@ 
 	}
 
 	/**
-	 * @return TListItemType item type.
+	 * @return string item type.
 	 */
 	public function getItemType()
 	{
@@ -2062,6 +2084,7 @@ 
 	/**
 	 * Constructor.
 	 * @param TDataGrid datagrid object
+	 * @param TDataGrid $dataGrid
 	 */
 	public function __construct($dataGrid)
 	{

Spacing +466 added lines, -466 removed lines

@@ -153,68 +153,68 @@ 
 	 * datagrid item types
 	 * @deprecated deprecated since version 3.0.4. Use TListItemType constants instead.
 	 */
-	const IT_HEADER='Header';
-	const IT_FOOTER='Footer';
-	const IT_ITEM='Item';
-	const IT_SEPARATOR='Separator';
-	const IT_ALTERNATINGITEM='AlternatingItem';
-	const IT_EDITITEM='EditItem';
-	const IT_SELECTEDITEM='SelectedItem';
-	const IT_PAGER='Pager';
+	const IT_HEADER = 'Header';
+	const IT_FOOTER = 'Footer';
+	const IT_ITEM = 'Item';
+	const IT_SEPARATOR = 'Separator';
+	const IT_ALTERNATINGITEM = 'AlternatingItem';
+	const IT_EDITITEM = 'EditItem';
+	const IT_SELECTEDITEM = 'SelectedItem';
+	const IT_PAGER = 'Pager';
 
 	/**
 	 * Command name that TDataGrid understands.
 	 */
-	const CMD_SELECT='Select';
-	const CMD_EDIT='Edit';
-	const CMD_UPDATE='Update';
-	const CMD_DELETE='Delete';
-	const CMD_CANCEL='Cancel';
-	const CMD_SORT='Sort';
-	const CMD_PAGE='Page';
-	const CMD_PAGE_NEXT='Next';
-	const CMD_PAGE_PREV='Previous';
-	const CMD_PAGE_FIRST='First';
-	const CMD_PAGE_LAST='Last';
+	const CMD_SELECT = 'Select';
+	const CMD_EDIT = 'Edit';
+	const CMD_UPDATE = 'Update';
+	const CMD_DELETE = 'Delete';
+	const CMD_CANCEL = 'Cancel';
+	const CMD_SORT = 'Sort';
+	const CMD_PAGE = 'Page';
+	const CMD_PAGE_NEXT = 'Next';
+	const CMD_PAGE_PREV = 'Previous';
+	const CMD_PAGE_FIRST = 'First';
+	const CMD_PAGE_LAST = 'Last';
 
 	/**
 	 * @var TDataGridColumnCollection manually created column collection
 	 */
-	private $_columns=null;
+	private $_columns = null;
 	/**
 	 * @var TDataGridColumnCollection automatically created column collection
 	 */
-	private $_autoColumns=null;
+	private $_autoColumns = null;
 	/**
 	 * @var TList all columns including both manually and automatically created columns
 	 */
-	private $_allColumns=null;
+	private $_allColumns = null;
 	/**
 	 * @var TDataGridItemCollection datagrid item collection
 	 */
-	private $_items=null;
+	private $_items = null;
 	/**
 	 * @var TDataGridItem header item
 	 */
-	private $_header=null;
+	private $_header = null;
 	/**
 	 * @var TDataGridItem footer item
 	 */
-	private $_footer=null;
+	private $_footer = null;
 	/**
 	 * @var TPagedDataSource paged data source object
 	 */
-	private $_pagedDataSource=null;
-	private $_topPager=null;
-	private $_bottomPager=null;
+	private $_pagedDataSource = null;
+	private $_topPager = null;
+	private $_bottomPager = null;
 	/**
 	 * @var ITemplate template used when empty data is bounded
 	 */
-	private $_emptyTemplate=null;
+	private $_emptyTemplate = null;
 	/**
 	 * @var boolean whether empty template is effective
 	 */
-	private $_useEmptyTemplate=false;
+	private $_useEmptyTemplate = false;
 
 	/**
 	 * @return string tag name (table) of the datagrid
@@ -239,10 +239,10 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TDataGridColumn)
+		if ($object instanceof TDataGridColumn)
 			$this->getColumns()->add($object);
 		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+			parent::addParsedObject($object); // this is needed by EmptyTemplate
 	}
 
 	/**
@@ -250,8 +250,8 @@ 
 	 */
 	public function getColumns()
 	{
-		if(!$this->_columns)
-			$this->_columns=new TDataGridColumnCollection($this);
+		if (!$this->_columns)
+			$this->_columns = new TDataGridColumnCollection($this);
 		return $this->_columns;
 	}
 
@@ -260,8 +260,8 @@ 
 	 */
 	public function getAutoColumns()
 	{
-		if(!$this->_autoColumns)
-			$this->_autoColumns=new TDataGridColumnCollection($this);
+		if (!$this->_autoColumns)
+			$this->_autoColumns = new TDataGridColumnCollection($this);
 		return $this->_autoColumns;
 	}
 
@@ -270,8 +270,8 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=new TDataGridItemCollection;
+		if (!$this->_items)
+			$this->_items = new TDataGridItemCollection;
 		return $this->_items;
 	}
 
@@ -280,7 +280,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -314,10 +314,10 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null)
+		if (($style = $this->getViewState('ItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -327,10 +327,10 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style=$this->getViewState('AlternatingItemStyle',null))===null)
+		if (($style = $this->getViewState('AlternatingItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('AlternatingItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -340,10 +340,10 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style=$this->getViewState('SelectedItemStyle',null))===null)
+		if (($style = $this->getViewState('SelectedItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('SelectedItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -353,10 +353,10 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style=$this->getViewState('EditItemStyle',null))===null)
+		if (($style = $this->getViewState('EditItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('EditItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -366,10 +366,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -379,10 +379,10 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null)
+		if (($style = $this->getViewState('FooterStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -392,10 +392,10 @@ 
 	 */
 	public function getPagerStyle()
 	{
-		if(($style=$this->getViewState('PagerStyle',null))===null)
+		if (($style = $this->getViewState('PagerStyle', null)) === null)
 		{
-			$style=new TDataGridPagerStyle;
-			$this->setViewState('PagerStyle',$style,null);
+			$style = new TDataGridPagerStyle;
+			$this->setViewState('PagerStyle', $style, null);
 		}
 		return $style;
 	}
@@ -406,10 +406,10 @@ 
 	 */
 	public function getTableHeadStyle()
 	{
-		if(($style=$this->getViewState('TableHeadStyle',null))===null)
+		if (($style = $this->getViewState('TableHeadStyle', null)) === null)
 		{
-			$style=new TStyle;
-			$this->setViewState('TableHeadStyle',$style,null);
+			$style = new TStyle;
+			$this->setViewState('TableHeadStyle', $style, null);
 		}
 		return $style;
 	}
@@ -420,10 +420,10 @@ 
 	 */
 	public function getTableBodyStyle()
 	{
-		if(($style=$this->getViewState('TableBodyStyle',null))===null)
+		if (($style = $this->getViewState('TableBodyStyle', null)) === null)
 		{
-			$style=new TStyle;
-			$this->setViewState('TableBodyStyle',$style,null);
+			$style = new TStyle;
+			$this->setViewState('TableBodyStyle', $style, null);
 		}
 		return $style;
 	}
@@ -434,10 +434,10 @@ 
 	 */
 	public function getTableFootStyle()
 	{
-		if(($style=$this->getViewState('TableFootStyle',null))===null)
+		if (($style = $this->getViewState('TableFootStyle', null)) === null)
 		{
-			$style=new TStyle;
-			$this->setViewState('TableFootStyle',$style,null);
+			$style = new TStyle;
+			$this->setViewState('TableFootStyle', $style, null);
 		}
 		return $style;
 	}
@@ -447,7 +447,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',$value,'');
+		$this->setViewState('Caption', $value, '');
 	}
 
 	/**
@@ -463,7 +463,7 @@ 
 	 */
 	public function getCaptionAlign()
 	{
-		return $this->getViewState('CaptionAlign',TTableCaptionAlign::NotSet);
+		return $this->getViewState('CaptionAlign', TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->setViewState('CaptionAlign',TPropertyValue::ensureEnum($value,'TTableCaptionAlign'),TTableCaptionAlign::NotSet);
+		$this->setViewState('CaptionAlign', TPropertyValue::ensureEnum($value, 'TTableCaptionAlign'), TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -511,9 +511,9 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		$index=$this->getSelectedItemIndex();
-		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		$index = $this->getSelectedItemIndex();
+		$items = $this->getItems();
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -525,7 +525,7 @@ 
 	 */
 	public function getSelectedItemIndex()
 	{
-		return $this->getViewState('SelectedItemIndex',-1);
+		return $this->getViewState('SelectedItemIndex', -1);
 	}
 
 	/**
@@ -537,23 +537,23 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		if(($current=$this->getSelectedItemIndex())!==$value)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		if (($current = $this->getSelectedItemIndex()) !== $value)
 		{
-			$this->setViewState('SelectedItemIndex',$value,-1);
-			$items=$this->getItems();
-			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
+			$this->setViewState('SelectedItemIndex', $value, -1);
+			$items = $this->getItems();
+			$itemCount = $items->getCount();
+			if ($current >= 0 && $current < $itemCount)
 			{
-				$item=$items->itemAt($current);
-				if($item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
+				$item = $items->itemAt($current);
+				if ($item->getItemType() !== TListItemType::EditItem)
+					$item->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value>=0 && $value<$itemCount)
+			if ($value >= 0 && $value < $itemCount)
 			{
-				$item=$items->itemAt($value);
-				if($item->getItemType()!==TListItemType::EditItem)
+				$item = $items->itemAt($value);
+				if ($item->getItemType() !== TListItemType::EditItem)
 					$item->setItemType(TListItemType::SelectedItem);
 			}
 		}
@@ -564,9 +564,9 @@ 
 	 */
 	public function getEditItem()
 	{
-		$index=$this->getEditItemIndex();
-		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		$index = $this->getEditItemIndex();
+		$items = $this->getItems();
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -578,7 +578,7 @@ 
 	 */
 	public function getEditItemIndex()
 	{
-		return $this->getViewState('EditItemIndex',-1);
+		return $this->getViewState('EditItemIndex', -1);
 	}
 
 	/**
@@ -589,16 +589,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		if(($current=$this->getEditItemIndex())!==$value)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		if (($current = $this->getEditItemIndex()) !== $value)
 		{
-			$this->setViewState('EditItemIndex',$value,-1);
-			$items=$this->getItems();
-			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
+			$this->setViewState('EditItemIndex', $value, -1);
+			$items = $this->getItems();
+			$itemCount = $items->getCount();
+			if ($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
+			if ($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -608,7 +608,7 @@ 
 	 */
 	public function getAllowSorting()
 	{
-		return $this->getViewState('AllowSorting',false);
+		return $this->getViewState('AllowSorting', false);
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	 */
 	public function setAllowSorting($value)
 	{
-		$this->setViewState('AllowSorting',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowSorting', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	public function getAutoGenerateColumns()
 	{
-		return $this->getViewState('AutoGenerateColumns',true);
+		return $this->getViewState('AutoGenerateColumns', true);
 	}
 
 	/**
@@ -632,7 +632,7 @@ 
 	 */
 	public function setAutoGenerateColumns($value)
 	{
-		$this->setViewState('AutoGenerateColumns',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AutoGenerateColumns', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -640,7 +640,7 @@ 
 	 */
 	public function getShowHeader()
 	{
-		return $this->getViewState('ShowHeader',true);
+		return $this->getViewState('ShowHeader', true);
 	}
 
 	/**
@@ -648,7 +648,7 @@ 
 	 */
 	public function setShowHeader($value)
 	{
-		$this->setViewState('ShowHeader',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowHeader', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 */
 	public function getShowFooter()
 	{
-		return $this->getViewState('ShowFooter',false);
+		return $this->getViewState('ShowFooter', false);
 	}
 
 	/**
@@ -664,7 +664,7 @@ 
 	 */
 	public function setShowFooter($value)
 	{
-		$this->setViewState('ShowFooter',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ShowFooter', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -681,10 +681,10 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_emptyTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_emptyTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datagrid_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -700,57 +700,57 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TDataGridCommandEventParameter)
+		if ($param instanceof TDataGridCommandEventParameter)
 		{
 			$this->onItemCommand($param);
-			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_SELECT)===0)
+			$command = $param->getCommandName();
+			if (strcasecmp($command, self::CMD_SELECT) === 0)
 			{
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			else if (strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			else if (strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			else if (strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			else if (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_SORT)===0)
+			else if (strcasecmp($command, self::CMD_SORT) === 0)
 			{
-				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender,$param));
+				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE)===0)
+			else if (strcasecmp($command, self::CMD_PAGE) === 0)
 			{
-				$p=$param->getCommandParameter();
-				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0)
-					$pageIndex=$this->getCurrentPageIndex()+1;
-				else if(strcasecmp($p,self::CMD_PAGE_PREV)===0)
-					$pageIndex=$this->getCurrentPageIndex()-1;
-				else if(strcasecmp($p,self::CMD_PAGE_FIRST)===0)
-					$pageIndex=0;
-				else if(strcasecmp($p,self::CMD_PAGE_LAST)===0)
-					$pageIndex=$this->getPageCount()-1;
+				$p = $param->getCommandParameter();
+				if (strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
+					$pageIndex = $this->getCurrentPageIndex() + 1;
+				else if (strcasecmp($p, self::CMD_PAGE_PREV) === 0)
+					$pageIndex = $this->getCurrentPageIndex() - 1;
+				else if (strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
+					$pageIndex = 0;
+				else if (strcasecmp($p, self::CMD_PAGE_LAST) === 0)
+					$pageIndex = $this->getPageCount() - 1;
 				else
-					$pageIndex=TPropertyValue::ensureInteger($p)-1;
-				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender,$pageIndex));
+					$pageIndex = TPropertyValue::ensureInteger($p) - 1;
+				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
 		}
@@ -765,7 +765,7 @@ 
 	 */
 	public function onCancelCommand($param)
 	{
-		$this->raiseEvent('OnCancelCommand',$this,$param);
+		$this->raiseEvent('OnCancelCommand', $this, $param);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 */
 	public function onDeleteCommand($param)
 	{
-		$this->raiseEvent('OnDeleteCommand',$this,$param);
+		$this->raiseEvent('OnDeleteCommand', $this, $param);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 */
 	public function onEditCommand($param)
 	{
-		$this->raiseEvent('OnEditCommand',$this,$param);
+		$this->raiseEvent('OnEditCommand', $this, $param);
 	}
 
 	/**
@@ -797,7 +797,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -808,7 +808,7 @@ 
 	 */
 	public function onSortCommand($param)
 	{
-		$this->raiseEvent('OnSortCommand',$this,$param);
+		$this->raiseEvent('OnSortCommand', $this, $param);
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 */
 	public function onUpdateCommand($param)
 	{
-		$this->raiseEvent('OnUpdateCommand',$this,$param);
+		$this->raiseEvent('OnUpdateCommand', $this, $param);
 	}
 
 	/**
@@ -830,7 +830,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -841,7 +841,7 @@ 
 	 */
 	public function onPagerCreated($param)
 	{
-		$this->raiseEvent('OnPagerCreated',$this,$param);
+		$this->raiseEvent('OnPagerCreated', $this, $param);
 	}
 
 	/**
@@ -852,7 +852,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -872,27 +872,27 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if(!$this->getEnableViewState(true))
+		if (!$this->getEnableViewState(true))
 			return;
-		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+		if ($this->_items)
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
-		if($this->_autoColumns)
+		if ($this->_autoColumns)
 		{
-			$state=array();
-			foreach($this->_autoColumns as $column)
-				$state[]=$column->saveState();
-			$this->setViewState('AutoColumns',$state,array());
+			$state = array();
+			foreach ($this->_autoColumns as $column)
+				$state[] = $column->saveState();
+			$this->setViewState('AutoColumns', $state, array());
 		}
 		else
 			$this->clearViewState('AutoColumns');
-		if($this->_columns)
+		if ($this->_columns)
 		{
-			$state=array();
-			foreach($this->_columns as $column)
-				$state[]=$column->saveState();
-			$this->setViewState('Columns',$state,array());
+			$state = array();
+			foreach ($this->_columns as $column)
+				$state[] = $column->saveState();
+			$this->setViewState('Columns', $state, array());
 		}
 		else
 			$this->clearViewState('Columns');
@@ -905,28 +905,28 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getEnableViewState(true))
+		if (!$this->getEnableViewState(true))
 			return;
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 		{
-			$state=$this->getViewState('AutoColumns',array());
-			if(!empty($state))
+			$state = $this->getViewState('AutoColumns', array());
+			if (!empty($state))
 			{
-				$this->_autoColumns=new TDataGridColumnCollection($this);
-				foreach($state as $st)
+				$this->_autoColumns = new TDataGridColumnCollection($this);
+				foreach ($state as $st)
 				{
-					$column=new $this->AutoGenerateColumnName;
+					$column = new $this->AutoGenerateColumnName;
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
 			}
 			else
-				$this->_autoColumns=null;
-			$state=$this->getViewState('Columns',array());
-			if($this->_columns && $this->_columns->getCount()===count($state))
+				$this->_autoColumns = null;
+			$state = $this->getViewState('Columns', array());
+			if ($this->_columns && $this->_columns->getCount() === count($state))
 			{
-				$i=0;
-				foreach($this->_columns as $column)
+				$i = 0;
+				foreach ($this->_columns as $column)
 				{
 					$column->loadState($state[$i]);
 					$i++;
@@ -943,11 +943,11 @@ 
 	{
 		$this->getControls()->clear();
 		$this->getItems()->clear();
-		$this->_header=null;
-		$this->_footer=null;
-		$this->_topPager=null;
-		$this->_bottomPager=null;
-		$this->_useEmptyTemplate=false;
+		$this->_header = null;
+		$this->_footer = null;
+		$this->_topPager = null;
+		$this->_bottomPager = null;
+		$this->_useEmptyTemplate = false;
 	}
 
 	/**
@@ -957,52 +957,52 @@ 
 	{
 		$this->reset();
 
-		$allowPaging=$this->getAllowPaging();
+		$allowPaging = $this->getAllowPaging();
 
-		$itemCount=$this->getViewState('ItemCount',0);
-		$dsIndex=$this->getViewState('DataSourceIndex',0);
+		$itemCount = $this->getViewState('ItemCount', 0);
+		$dsIndex = $this->getViewState('DataSourceIndex', 0);
 
-		$columns=new TList($this->getColumns());
+		$columns = new TList($this->getColumns());
 		$columns->mergeWith($this->_autoColumns);
-		$this->_allColumns=$columns;
+		$this->_allColumns = $columns;
 
-		$items=$this->getItems();
+		$items = $this->getItems();
 
-		if($columns->getCount())
+		if ($columns->getCount())
 		{
-			foreach($columns as $column)
+			foreach ($columns as $column)
 				$column->initialize();
-			$selectedIndex=$this->getSelectedItemIndex();
-			$editIndex=$this->getEditItemIndex();
-			for($index=0;$index<$itemCount;++$index)
+			$selectedIndex = $this->getSelectedItemIndex();
+			$editIndex = $this->getEditItemIndex();
+			for ($index = 0; $index < $itemCount; ++$index)
 			{
-				if($index===0)
+				if ($index === 0)
 				{
-					if($allowPaging)
-						$this->_topPager=$this->createPager();
-					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,false,null,$columns);
+					if ($allowPaging)
+						$this->_topPager = $this->createPager();
+					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
-				if($index===$editIndex)
-					$itemType=TListItemType::EditItem;
-				else if($index===$selectedIndex)
-					$itemType=TListItemType::SelectedItem;
-				else if($index % 2)
-					$itemType=TListItemType::AlternatingItem;
+				if ($index === $editIndex)
+					$itemType = TListItemType::EditItem;
+				else if ($index === $selectedIndex)
+					$itemType = TListItemType::SelectedItem;
+				else if ($index % 2)
+					$itemType = TListItemType::AlternatingItem;
 				else
-					$itemType=TListItemType::Item;
-				$items->add($this->createItemInternal($index,$dsIndex,$itemType,false,null,$columns));
+					$itemType = TListItemType::Item;
+				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
-			if($index>0)
+			if ($index > 0)
 			{
-				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,false,null,$columns);
-				if($allowPaging)
-					$this->_bottomPager=$this->createPager();
+				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, false, null, $columns);
+				if ($allowPaging)
+					$this->_bottomPager = $this->createPager();
 			}
 		}
-		if(!$dsIndex && $this->_emptyTemplate!==null)
+		if (!$dsIndex && $this->_emptyTemplate !== null)
 		{
-			$this->_useEmptyTemplate=true;
+			$this->_useEmptyTemplate = true;
 			$this->_emptyTemplate->instantiateIn($this);
 		}
 	}
@@ -1016,69 +1016,69 @@ 
 	protected function performDataBinding($data)
 	{
 		$this->reset();
-		$keys=$this->getDataKeys();
+		$keys = $this->getDataKeys();
 		$keys->clear();
-		$keyField=$this->getDataKeyField();
+		$keyField = $this->getDataKeyField();
 
 		// get all columns
-		if($this->getAutoGenerateColumns())
+		if ($this->getAutoGenerateColumns())
 		{
-			$columns=new TList($this->getColumns());
-			$autoColumns=$this->createAutoColumns($data);
+			$columns = new TList($this->getColumns());
+			$autoColumns = $this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
 		}
 		else
-			$columns=$this->getColumns();
-		$this->_allColumns=$columns;
+			$columns = $this->getColumns();
+		$this->_allColumns = $columns;
 
-		$items=$this->getItems();
+		$items = $this->getItems();
 
-		$index=0;
-		$allowPaging=$this->getAllowPaging() && ($data instanceof TPagedDataSource);
-		$dsIndex=$allowPaging?$data->getFirstIndexInPage():0;
-		$this->setViewState('DataSourceIndex',$dsIndex,0);
-		if($columns->getCount())
+		$index = 0;
+		$allowPaging = $this->getAllowPaging() && ($data instanceof TPagedDataSource);
+		$dsIndex = $allowPaging ? $data->getFirstIndexInPage() : 0;
+		$this->setViewState('DataSourceIndex', $dsIndex, 0);
+		if ($columns->getCount())
 		{
-			foreach($columns as $column)
+			foreach ($columns as $column)
 				$column->initialize();
 
-			$selectedIndex=$this->getSelectedItemIndex();
-			$editIndex=$this->getEditItemIndex();
-			foreach($data as $key=>$row)
+			$selectedIndex = $this->getSelectedItemIndex();
+			$editIndex = $this->getEditItemIndex();
+			foreach ($data as $key=>$row)
 			{
-				if($keyField!=='')
-					$keys->add($this->getDataFieldValue($row,$keyField));
+				if ($keyField !== '')
+					$keys->add($this->getDataFieldValue($row, $keyField));
 				else
 					$keys->add($key);
-				if($index===0)
+				if ($index === 0)
 				{
-					if($allowPaging)
-						$this->_topPager=$this->createPager();
-					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,true,null,$columns);
+					if ($allowPaging)
+						$this->_topPager = $this->createPager();
+					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
-				if($index===$editIndex)
-					$itemType=TListItemType::EditItem;
-				else if($index===$selectedIndex)
-					$itemType=TListItemType::SelectedItem;
-				else if($index % 2)
-					$itemType=TListItemType::AlternatingItem;
+				if ($index === $editIndex)
+					$itemType = TListItemType::EditItem;
+				else if ($index === $selectedIndex)
+					$itemType = TListItemType::SelectedItem;
+				else if ($index % 2)
+					$itemType = TListItemType::AlternatingItem;
 				else
-					$itemType=TListItemType::Item;
-				$items->add($this->createItemInternal($index,$dsIndex,$itemType,true,$row,$columns));
+					$itemType = TListItemType::Item;
+				$items->add($this->createItemInternal($index, $dsIndex, $itemType, true, $row, $columns));
 				$index++;
 				$dsIndex++;
 			}
-			if($index>0)
+			if ($index > 0)
 			{
-				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,true,null,$columns);
-				if($allowPaging)
-					$this->_bottomPager=$this->createPager();
+				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
+				if ($allowPaging)
+					$this->_bottomPager = $this->createPager();
 			}
 		}
-		$this->setViewState('ItemCount',$index,0);
-		if(!$dsIndex && $this->_emptyTemplate!==null)
+		$this->setViewState('ItemCount', $index, 0);
+		if (!$dsIndex && $this->_emptyTemplate !== null)
 		{
-			$this->_useEmptyTemplate=true;
+			$this->_useEmptyTemplate = true;
 			$this->_emptyTemplate->instantiateIn($this);
 			$this->dataBindChildren();
 		}
@@ -1090,39 +1090,39 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns=$this->_allColumns)===null)
+		if (($columns = $this->_allColumns) === null)
 			return;
-		$items=$this->getItems();
-		foreach($columns as $id=>$column)
+		$items = $this->getItems();
+		foreach ($columns as $id=>$column)
 		{
-			if(!$column->getEnableCellGrouping())
+			if (!$column->getEnableCellGrouping())
 				continue;
-			$prevCell=null;
-			$prevCellText=null;
-			foreach($items as $item)
+			$prevCell = null;
+			$prevCellText = null;
+			foreach ($items as $item)
 			{
-				$itemType=$item->getItemType();
-				$cell=$item->getCells()->itemAt($id);
-				if(!$cell->getVisible())
+				$itemType = $item->getItemType();
+				$cell = $item->getCells()->itemAt($id);
+				if (!$cell->getVisible())
 					continue;
-				if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
+				if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
 				{
-					if(($cellText=$this->getCellText($cell))==='')
+					if (($cellText = $this->getCellText($cell)) === '')
 					{
-						$prevCell=null;
-						$prevCellText=null;
+						$prevCell = null;
+						$prevCellText = null;
 						continue;
 					}
-					if($prevCell===null || $prevCellText!==$cellText)
+					if ($prevCell === null || $prevCellText !== $cellText)
 					{
-						$prevCell=$cell;
-						$prevCellText=$cellText;
+						$prevCell = $cell;
+						$prevCellText = $cellText;
 					}
 					else
 					{
-						if(($rowSpan=$prevCell->getRowSpan())===0)
-							$rowSpan=1;
-						$prevCell->setRowSpan($rowSpan+1);
+						if (($rowSpan = $prevCell->getRowSpan()) === 0)
+							$rowSpan = 1;
+						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
 					}
 				}
@@ -1132,12 +1132,12 @@ 
 
 	private function getCellText($cell)
 	{
-		if(($data=$cell->getText())==='' && $cell->getHasControls())
+		if (($data = $cell->getText()) === '' && $cell->getHasControls())
 		{
-			$controls=$cell->getControls();
-			foreach($controls as $control)
+			$controls = $cell->getControls();
+			foreach ($controls as $control)
 			{
-				if($control instanceof IDataRenderer)
+				if ($control instanceof IDataRenderer)
 					return $control->getData();
 			}
 		}
@@ -1150,17 +1150,17 @@ 
 	 * @param TListItemType item type
 	 * @return TDataGridItem created data list item
 	 */
-	protected function createItem($itemIndex,$dataSourceIndex,$itemType)
+	protected function createItem($itemIndex, $dataSourceIndex, $itemType)
 	{
-		return new TDataGridItem($itemIndex,$dataSourceIndex,$itemType);
+		return new TDataGridItem($itemIndex, $dataSourceIndex, $itemType);
 	}
 
-	private function createItemInternal($itemIndex,$dataSourceIndex,$itemType,$dataBind,$dataItem,$columns)
+	private function createItemInternal($itemIndex, $dataSourceIndex, $itemType, $dataBind, $dataItem, $columns)
 	{
-		$item=$this->createItem($itemIndex,$dataSourceIndex,$itemType);
-		$this->initializeItem($item,$columns);
-		$param=new TDataGridItemEventParameter($item);
-		if($dataBind)
+		$item = $this->createItem($itemIndex, $dataSourceIndex, $itemType);
+		$this->initializeItem($item, $columns);
+		$param = new TDataGridItemEventParameter($item);
+		if ($dataBind)
 		{
 			$item->setDataItem($dataItem);
 			$this->onItemCreated($param);
@@ -1181,28 +1181,28 @@ 
 	 * @param TDataGrid datagrid item to be initialized
 	 * @param TDataGridColumnCollection datagrid columns to be used to initialize the cells in the item
 	 */
-	protected function initializeItem($item,$columns)
+	protected function initializeItem($item, $columns)
 	{
-		$cells=$item->getCells();
-		$itemType=$item->getItemType();
-		$index=0;
-		foreach($columns as $column)
+		$cells = $item->getCells();
+		$itemType = $item->getItemType();
+		$index = 0;
+		foreach ($columns as $column)
 		{
-			if($itemType===TListItemType::Header)
-				$cell=new TTableHeaderCell;
+			if ($itemType === TListItemType::Header)
+				$cell = new TTableHeaderCell;
 			else
-				$cell=new TTableCell;
-			if(($id=$column->getID())!=='')
-				$item->registerObject($id,$cell);
+				$cell = new TTableCell;
+			if (($id = $column->getID()) !== '')
+				$item->registerObject($id, $cell);
 			$cells->add($cell);
-			$column->initializeCell($cell,$index,$itemType);
+			$column->initializeCell($cell, $index, $itemType);
 			$index++;
 		}
 	}
 
 	protected function createPager()
 	{
-		$pager=new TDataGridPager($this);
+		$pager = new TDataGridPager($this);
 		$this->buildPager($pager);
 		$this->onPagerCreated(new TDataGridPagerEventParameter($pager));
 		$this->getControls()->add($pager);
@@ -1215,7 +1215,7 @@ 
 	 */
 	protected function buildPager($pager)
 	{
-		switch($this->getPagerStyle()->getMode())
+		switch ($this->getPagerStyle()->getMode())
 		{
 			case TDataGridPagerMode::NextPrev:
 				$this->buildNextPrevPager($pager);
@@ -1239,23 +1239,23 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType===TDataGridPagerButtonType::LinkButton)
+		if ($buttonType === TDataGridPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button=new TLinkButton;
+			if ($enabled)
+				$button = new TLinkButton;
 			else
 			{
-				$button=new TLabel;
+				$button = new TLabel;
 				$button->setText($text);
 				return $button;
 			}
 		}
 		else
 		{
-			$button=new TButton;
-			if(!$enabled)
+			$button = new TButton;
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 		$button->setText($text);
@@ -1271,54 +1271,54 @@ 
 	 */
 	protected function buildNextPrevPager($pager)
 	{
-		$style=$this->getPagerStyle();
-		$buttonType=$style->getButtonType();
-		$controls=$pager->getControls();
-		$currentPageIndex=$this->getCurrentPageIndex();
-		if($currentPageIndex===0)
+		$style = $this->getPagerStyle();
+		$buttonType = $style->getButtonType();
+		$controls = $pager->getControls();
+		$currentPageIndex = $this->getCurrentPageIndex();
+		if ($currentPageIndex === 0)
 		{
-			if(($text=$style->getFirstPageText())!=='')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
-				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
+				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 				$controls->add("\n");
 			}
 
-			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
+			$label = $this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
 		}
 		else
 		{
-			if(($text=$style->getFirstPageText())!=='')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_FIRST);
+				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
 				$controls->add("\n");
 			}
 
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getPrevPageText(),self::CMD_PAGE,self::CMD_PAGE_PREV);
+			$button = $this->createPagerButton($pager, $buttonType, true, $style->getPrevPageText(), self::CMD_PAGE, self::CMD_PAGE_PREV);
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($currentPageIndex===$this->getPageCount()-1)
+		if ($currentPageIndex === $this->getPageCount() - 1)
 		{
-			$label=$this->createPagerButton($pager,$buttonType,false,$style->getNextPageText(),'','');
+			$label = $this->createPagerButton($pager, $buttonType, false, $style->getNextPageText(), '', '');
 			$controls->add($label);
-			if(($text=$style->getLastPageText())!=='')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
-				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
+				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 			}
 		}
 		else
 		{
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,self::CMD_PAGE_NEXT);
+			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
-			if(($text=$style->getLastPageText())!=='')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_LAST);
+				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
 				$controls->add($button);
 			}
 		}
@@ -1330,67 +1330,67 @@ 
 	 */
 	protected function buildNumericPager($pager)
 	{
-		$style=$this->getPagerStyle();
-		$buttonType=$style->getButtonType();
-		$controls=$pager->getControls();
-		$pageCount=$this->getPageCount();
-		$pageIndex=$this->getCurrentPageIndex()+1;
-		$maxButtonCount=$style->getPageButtonCount();
-		$buttonCount=$maxButtonCount>$pageCount?$pageCount:$maxButtonCount;
-		$startPageIndex=1;
-		$endPageIndex=$buttonCount;
-		if($pageIndex>$endPageIndex)
+		$style = $this->getPagerStyle();
+		$buttonType = $style->getButtonType();
+		$controls = $pager->getControls();
+		$pageCount = $this->getPageCount();
+		$pageIndex = $this->getCurrentPageIndex() + 1;
+		$maxButtonCount = $style->getPageButtonCount();
+		$buttonCount = $maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
+		$startPageIndex = 1;
+		$endPageIndex = $buttonCount;
+		if ($pageIndex > $endPageIndex)
 		{
-			$startPageIndex=((int)(($pageIndex-1)/$maxButtonCount))*$maxButtonCount+1;
-			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount)
-				$endPageIndex=$pageCount;
-			if($endPageIndex-$startPageIndex+1<$maxButtonCount)
+			$startPageIndex = ((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if (($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount)
+				$endPageIndex = $pageCount;
+			if ($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1)
-					$startPageIndex=1;
+				if (($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1)
+					$startPageIndex = 1;
 			}
 		}
 
-		if($startPageIndex>1)
+		if ($startPageIndex > 1)
 		{
-			if(($text=$style->getFirstPageText())!=='')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_FIRST);
+				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$prevPageIndex=$startPageIndex-1;
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getPrevPageText(),self::CMD_PAGE,"$prevPageIndex");
+			$prevPageIndex = $startPageIndex - 1;
+			$button = $this->createPagerButton($pager, $buttonType, true, $style->getPrevPageText(), self::CMD_PAGE, "$prevPageIndex");
 			$controls->add($button);
 			$controls->add("\n");
 		}
 
-		for($i=$startPageIndex;$i<=$endPageIndex;++$i)
+		for ($i = $startPageIndex; $i <= $endPageIndex; ++$i)
 		{
-			if($i===$pageIndex)
+			if ($i === $pageIndex)
 			{
-				$label=$this->createPagerButton($pager,$buttonType,false,"$i",'','');
+				$label = $this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
 			}
 			else
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,"$i",self::CMD_PAGE,"$i");
+				$button = $this->createPagerButton($pager, $buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i<$endPageIndex)
+			if ($i < $endPageIndex)
 				$controls->add("\n");
 		}
 
-		if($pageCount>$endPageIndex)
+		if ($pageCount > $endPageIndex)
 		{
 			$controls->add("\n");
-			$nextPageIndex=$endPageIndex+1;
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,"$nextPageIndex");
+			$nextPageIndex = $endPageIndex + 1;
+			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
-			if(($text=$style->getLastPageText())!=='')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_LAST);
+				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
 				$controls->add($button);
 			}
 		}
@@ -1403,16 +1403,16 @@ 
 	 */
 	protected function createAutoColumns($dataSource)
 	{
-		if(!$dataSource)
+		if (!$dataSource)
 			return null;
-		$autoColumns=$this->getAutoColumns();
+		$autoColumns = $this->getAutoColumns();
 		$autoColumns->clear();
-		foreach($dataSource as $row)
+		foreach ($dataSource as $row)
 		{
-			foreach($row as $key=>$value)
+			foreach ($row as $key=>$value)
 			{
-				$column=new $this->AutoGenerateColumnName;
-				if(is_string($key))
+				$column = new $this->AutoGenerateColumnName;
+				if (is_string($key))
 				{
 					$column->setHeaderText($key);
 					$column->setDataField($key);
@@ -1445,104 +1445,104 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle=$this->getViewState('ItemStyle',null);
+		$itemStyle = $this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
-		if($itemStyle!==null)
+		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
+		if ($itemStyle !== null)
 		{
-			if($alternatingItemStyle===null)
-				$alternatingItemStyle=$itemStyle;
+			if ($alternatingItemStyle === null)
+				$alternatingItemStyle = $itemStyle;
 			else
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
+		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle=$this->getViewState('EditItemStyle',null);
-		if($selectedItemStyle!==null)
+		$editItemStyle = $this->getViewState('EditItemStyle', null);
+		if ($selectedItemStyle !== null)
 		{
-			if($editItemStyle===null)
-				$editItemStyle=$selectedItemStyle;
+			if ($editItemStyle === null)
+				$editItemStyle = $selectedItemStyle;
 			else
 				$editItemStyle->mergeWith($selectedItemStyle);
 		}
 
-		$headerStyle=$this->getViewState('HeaderStyle',null);
-		$footerStyle=$this->getViewState('FooterStyle',null);
-		$pagerStyle=$this->getViewState('PagerStyle',null);
-		$separatorStyle=$this->getViewState('SeparatorStyle',null);
+		$headerStyle = $this->getViewState('HeaderStyle', null);
+		$footerStyle = $this->getViewState('FooterStyle', null);
+		$pagerStyle = $this->getViewState('PagerStyle', null);
+		$separatorStyle = $this->getViewState('SeparatorStyle', null);
 
-		foreach($this->getControls() as $index=>$item)
+		foreach ($this->getControls() as $index=>$item)
 		{
-			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
+			if (!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
 				continue;
-			$itemType=$item->getItemType();
-			switch($itemType)
+			$itemType = $item->getItemType();
+			switch ($itemType)
 			{
 				case TListItemType::Header:
-					if($headerStyle)
+					if ($headerStyle)
 						$item->getStyle()->mergeWith($headerStyle);
-					if(!$this->getShowHeader())
+					if (!$this->getShowHeader())
 						$item->setVisible(false);
 					break;
 				case TListItemType::Footer:
-					if($footerStyle)
+					if ($footerStyle)
 						$item->getStyle()->mergeWith($footerStyle);
-					if(!$this->getShowFooter())
+					if (!$this->getShowFooter())
 						$item->setVisible(false);
 					break;
 				case TListItemType::Separator:
-					if($separatorStyle)
+					if ($separatorStyle)
 						$item->getStyle()->mergeWith($separatorStyle);
 					break;
 				case TListItemType::Item:
-					if($itemStyle)
+					if ($itemStyle)
 						$item->getStyle()->mergeWith($itemStyle);
 					break;
 				case TListItemType::AlternatingItem:
-					if($alternatingItemStyle)
+					if ($alternatingItemStyle)
 						$item->getStyle()->mergeWith($alternatingItemStyle);
 					break;
 				case TListItemType::SelectedItem:
-					if($selectedItemStyle)
+					if ($selectedItemStyle)
 						$item->getStyle()->mergeWith($selectedItemStyle);
-					if($index % 2==1)
+					if ($index % 2 == 1)
 					{
-						if($itemStyle)
+						if ($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
 					}
 					else
 					{
-						if($alternatingItemStyle)
+						if ($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
 					}
 					break;
 				case TListItemType::EditItem:
-					if($editItemStyle)
+					if ($editItemStyle)
 						$item->getStyle()->mergeWith($editItemStyle);
-					if($index % 2==1)
+					if ($index % 2 == 1)
 					{
-						if($itemStyle)
+						if ($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
 					}
 					else
 					{
-						if($alternatingItemStyle)
+						if ($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
 					}
 					break;
 				case TListItemType::Pager:
-					if($pagerStyle)
+					if ($pagerStyle)
 					{
 						$item->getStyle()->mergeWith($pagerStyle);
-						if($index===0)
+						if ($index === 0)
 						{
-							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
+							if ($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 						else
 						{
-							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
+							if ($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 					}
@@ -1550,25 +1550,25 @@ 
 				default:
 					break;
 			}
-			if($this->_columns && $itemType!==TListItemType::Pager)
+			if ($this->_columns && $itemType !== TListItemType::Pager)
 			{
-				$n=$this->_columns->getCount();
-				$cells=$item->getCells();
-				for($i=0;$i<$n;++$i)
+				$n = $this->_columns->getCount();
+				$cells = $item->getCells();
+				for ($i = 0; $i < $n; ++$i)
 				{
-					$cell=$cells->itemAt($i);
-					$column=$this->_columns->itemAt($i);
-					if(!$column->getVisible())
+					$cell = $cells->itemAt($i);
+					$column = $this->_columns->itemAt($i);
+					if (!$column->getVisible())
 						$cell->setVisible(false);
 					else
 					{
-						if($itemType===TListItemType::Header)
-							$style=$column->getHeaderStyle(false);
-						else if($itemType===TListItemType::Footer)
-							$style=$column->getFooterStyle(false);
+						if ($itemType === TListItemType::Header)
+							$style = $column->getHeaderStyle(false);
+						else if ($itemType === TListItemType::Footer)
+							$style = $column->getFooterStyle(false);
 						else
-							$style=$column->getItemStyle(false);
-						if($style!==null)
+							$style = $column->getItemStyle(false);
+						if ($style !== null)
 							$cell->getStyle()->mergeWith($style);
 					}
 				}
@@ -1583,10 +1583,10 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($caption=$this->getCaption())!=='')
+		if (($caption = $this->getCaption()) !== '')
 		{
-			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+			if (($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -1599,30 +1599,30 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$this->groupCells();
-			if($this->_useEmptyTemplate)
+			if ($this->_useEmptyTemplate)
 			{
-				$control=new TWebControl;
+				$control = new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
-				if($this->getHasStyle())
+				if ($this->getHasStyle())
 					$control->getStyle()->copyFrom($this->getStyle());
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
 			}
-			else if($this->getViewState('ItemCount',0)>0)
+			else if ($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
-				if($this->_topPager)
+				if ($this->_topPager)
 				{
 					$this->_topPager->renderControl($writer);
 					$writer->writeLine();
 				}
 				$this->renderTable($writer);
-				if($this->_bottomPager)
+				if ($this->_bottomPager)
 				{
 					$writer->writeLine();
 					$this->_bottomPager->renderControl($writer);
@@ -1638,27 +1638,27 @@ 
 	protected function renderTable($writer)
 	{
 		$this->renderBeginTag($writer);
-		if($this->_header && $this->_header->getVisible())
+		if ($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableHeadStyle',null))
+			if ($style = $this->getViewState('TableHeadStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('thead');
 			$this->_header->render($writer);
 			$writer->renderEndTag();
 		}
 		$writer->writeLine();
-		if($style=$this->getViewState('TableBodyStyle',null))
+		if ($style = $this->getViewState('TableBodyStyle', null))
 			$style->addAttributesToRender($writer);
 		$writer->renderBeginTag('tbody');
-		foreach($this->getItems() as $item)
+		foreach ($this->getItems() as $item)
 			$item->renderControl($writer);
 		$writer->renderEndTag();
 
-		if($this->_footer && $this->_footer->getVisible())
+		if ($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableFootStyle',null))
+			if ($style = $this->getViewState('TableFootStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);
@@ -1687,7 +1687,7 @@ 
 	 * The TDataGridItem control responsible for the event.
 	 * @var TDataGridItem
 	 */
-	private $_item=null;
+	private $_item = null;
 
 	/**
 	 * Constructor.
@@ -1695,7 +1695,7 @@ 
 	 */
 	public function __construct(TDataGridItem $item)
 	{
-		$this->_item=$item;
+		$this->_item = $item;
 	}
 
 	/**
@@ -1724,7 +1724,7 @@ 
 	 * The TDataGridPager control responsible for the event.
 	 * @var TDataGridPager
 	 */
-	protected $_pager=null;
+	protected $_pager = null;
 
 	/**
 	 * Constructor.
@@ -1732,7 +1732,7 @@ 
 	 */
 	public function __construct(TDataGridPager $pager)
 	{
-		$this->_pager=$pager;
+		$this->_pager = $pager;
 	}
 
 	/**
@@ -1763,11 +1763,11 @@ 
 	/**
 	 * @var TDataGridItem the TDataGridItem control responsible for the event.
 	 */
-	private $_item=null;
+	private $_item = null;
 	/**
 	 * @var TControl the control originally raises the <b>Command</b> event.
 	 */
-	private $_source=null;
+	private $_source = null;
 
 	/**
 	 * Constructor.
@@ -1775,11 +1775,11 @@ 
 	 * @param TControl original event sender
 	 * @param TCommandEventParameter original event parameter
 	 */
-	public function __construct($item,$source,TCommandEventParameter $param)
+	public function __construct($item, $source, TCommandEventParameter $param)
 	{
-		$this->_item=$item;
-		$this->_source=$source;
-		parent::__construct($param->getCommandName(),$param->getCommandParameter());
+		$this->_item = $item;
+		$this->_source = $source;
+		parent::__construct($param->getCommandName(), $param->getCommandParameter());
 	}
 
 	/**
@@ -1818,21 +1818,21 @@ 
 	/**
 	 * @var string sort expression
 	 */
-	private $_sortExpression='';
+	private $_sortExpression = '';
 	/**
 	 * @var TControl original event sender
 	 */
-	private $_source=null;
+	private $_source = null;
 
 	/**
 	 * Constructor.
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param TDataGridCommandEventParameter command event parameter
 	 */
-	public function __construct($source,TDataGridCommandEventParameter $param)
+	public function __construct($source, TDataGridCommandEventParameter $param)
 	{
-		$this->_source=$source;
-		$this->_sortExpression=$param->getCommandParameter();
+		$this->_source = $source;
+		$this->_sortExpression = $param->getCommandParameter();
 	}
 
 	/**
@@ -1875,17 +1875,17 @@ 
 	/**
 	 * @var TControl original event sender
 	 */
-	private $_source=null;
+	private $_source = null;
 
 	/**
 	 * Constructor.
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param integer new page index
 	 */
-	public function __construct($source,$newPageIndex)
+	public function __construct($source, $newPageIndex)
 	{
-		$this->_source=$source;
-		$this->_newIndex=$newPageIndex;
+		$this->_source = $source;
+		$this->_newIndex = $newPageIndex;
 	}
 
 	/**
@@ -1924,35 +1924,35 @@ 
 	/**
 	 * @var integer index of the data item in the Items collection of datagrid
 	 */
-	private $_itemIndex='';
+	private $_itemIndex = '';
 	/**
 	 * @var integer index of the item from the bound data source
 	 */
-	private $_dataSourceIndex=0;
+	private $_dataSourceIndex = 0;
 	/**
 	 * type of the TDataGridItem
 	 * @var string
 	 */
-	private $_itemType='';
+	private $_itemType = '';
 	/**
 	 * value of the data item
 	 * @var mixed
 	 */
-	private $_data=null;
+	private $_data = null;
 
 	/**
 	 * Constructor.
 	 * @param integer zero-based index of the item in the item collection of datagrid
 	 * @param TListItemType item type
 	 */
-	public function __construct($itemIndex,$dataSourceIndex,$itemType)
+	public function __construct($itemIndex, $dataSourceIndex, $itemType)
 	{
-		$this->_itemIndex=$itemIndex;
-		$this->_dataSourceIndex=$dataSourceIndex;
+		$this->_itemIndex = $itemIndex;
+		$this->_dataSourceIndex = $dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType===TListItemType::Header)
+		if ($itemType === TListItemType::Header)
 			$this->setTableSection(TTableRowSection::Header);
-		else if($itemType===TListItemType::Footer)
+		else if ($itemType === TListItemType::Footer)
 			$this->setTableSection(TTableRowSection::Footer);
 	}
 
@@ -1969,7 +1969,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType = TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -2003,7 +2003,7 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data=$value;
+		$this->_data = $value;
 	}
 
 	/**
@@ -2033,11 +2033,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TCommandEventParameter)
+		if ($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -2065,7 +2065,7 @@ 
 	 */
 	public function __construct($dataGrid)
 	{
-		$this->_dataGrid=$dataGrid;
+		$this->_dataGrid = $dataGrid;
 	}
 
 	/**
@@ -2075,11 +2075,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TCommandEventParameter)
+		if ($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -2122,10 +2122,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TDataGridItem.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TDataGridItem)
-			parent::insertAt($index,$item);
+		if ($item instanceof TDataGridItem)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
 	}
@@ -2154,7 +2154,7 @@ 
 	 */
 	public function __construct(TDataGrid $owner)
 	{
-		$this->_o=$owner;
+		$this->_o = $owner;
 	}
 
 	/**
@@ -2172,12 +2172,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TDataGridColumn.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TDataGridColumn)
+		if ($item instanceof TDataGridColumn)
 		{
 			$item->setOwner($this->_o);
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		}
 		else
 			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
@@ -2198,8 +2198,8 @@ 
  */
 class TDataGridPagerMode extends TEnumerable
 {
-	const NextPrev='NextPrev';
-	const Numeric='Numeric';
+	const NextPrev = 'NextPrev';
+	const Numeric = 'Numeric';
 }
 
 
@@ -2217,8 +2217,8 @@ 
  */
 class TDataGridPagerButtonType extends TEnumerable
 {
-	const LinkButton='LinkButton';
-	const PushButton='PushButton';
+	const LinkButton = 'LinkButton';
+	const PushButton = 'PushButton';
 }
 
 
@@ -2237,8 +2237,8 @@ 
  */
 class TDataGridPagerPosition extends TEnumerable
 {
-	const Bottom='Bottom';
-	const Top='Top';
-	const TopAndBottom='TopAndBottom';
+	const Bottom = 'Bottom';
+	const Top = 'Top';
+	const TopAndBottom = 'TopAndBottom';
 }
 

Braces +288 added lines, -236 removed lines

@@ -239,10 +239,12 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TDataGridColumn)
-			$this->getColumns()->add($object);
-		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+		if($object instanceof TDataGridColumn) {
+					$this->getColumns()->add($object);
+		} else {
+					parent::addParsedObject($object);
+		}
+		// this is needed by EmptyTemplate
 	}
 
 	/**
@@ -250,8 +252,9 @@ 
 	 */
 	public function getColumns()
 	{
-		if(!$this->_columns)
-			$this->_columns=new TDataGridColumnCollection($this);
+		if(!$this->_columns) {
+					$this->_columns=new TDataGridColumnCollection($this);
+		}
 		return $this->_columns;
 	}
 
@@ -260,8 +263,9 @@ 
 	 */
 	public function getAutoColumns()
 	{
-		if(!$this->_autoColumns)
-			$this->_autoColumns=new TDataGridColumnCollection($this);
+		if(!$this->_autoColumns) {
+					$this->_autoColumns=new TDataGridColumnCollection($this);
+		}
 		return $this->_autoColumns;
 	}
 
@@ -270,8 +274,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=new TDataGridItemCollection;
+		if(!$this->_items) {
+					$this->_items=new TDataGridItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -513,10 +518,11 @@ 
 	{
 		$index=$this->getSelectedItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index>=0 && $index<$items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -537,8 +543,9 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
 			$this->setViewState('SelectedItemIndex',$value,-1);
@@ -547,14 +554,16 @@ 
 			if($current>=0 && $current<$itemCount)
 			{
 				$item=$items->itemAt($current);
-				if($item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
+				if($item->getItemType()!==TListItemType::EditItem) {
+									$item->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
+				}
 			}
 			if($value>=0 && $value<$itemCount)
 			{
 				$item=$items->itemAt($value);
-				if($item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType(TListItemType::SelectedItem);
+				if($item->getItemType()!==TListItemType::EditItem) {
+									$item->setItemType(TListItemType::SelectedItem);
+				}
 			}
 		}
 	}
@@ -566,10 +575,11 @@ 
 	{
 		$index=$this->getEditItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index>=0 && $index<$items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -589,17 +599,20 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		if(($current=$this->getEditItemIndex())!==$value)
 		{
 			$this->setViewState('EditItemIndex',$value,-1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
-				$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			if($current>=0 && $current<$itemCount) {
+							$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
+			}
+			if($value>=0 && $value<$itemCount) {
+							$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			}
 		}
 	}
 
@@ -681,10 +694,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_emptyTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datagrid_template_required','EmptyTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_emptyTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datagrid_template_required','EmptyTemplate');
+		}
 	}
 
 	/**
@@ -711,45 +725,40 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			} else if(strcasecmp($command,self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			} else if(strcasecmp($command,self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			} else if(strcasecmp($command,self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			} else if(strcasecmp($command,self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_SORT)===0)
+			} else if(strcasecmp($command,self::CMD_SORT)===0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender,$param));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE)===0)
 			{
 				$p=$param->getCommandParameter();
-				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0)
-					$pageIndex=$this->getCurrentPageIndex()+1;
-				else if(strcasecmp($p,self::CMD_PAGE_PREV)===0)
-					$pageIndex=$this->getCurrentPageIndex()-1;
-				else if(strcasecmp($p,self::CMD_PAGE_FIRST)===0)
-					$pageIndex=0;
-				else if(strcasecmp($p,self::CMD_PAGE_LAST)===0)
-					$pageIndex=$this->getPageCount()-1;
-				else
-					$pageIndex=TPropertyValue::ensureInteger($p)-1;
+				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0) {
+									$pageIndex=$this->getCurrentPageIndex()+1;
+				} else if(strcasecmp($p,self::CMD_PAGE_PREV)===0) {
+									$pageIndex=$this->getCurrentPageIndex()-1;
+				} else if(strcasecmp($p,self::CMD_PAGE_FIRST)===0) {
+									$pageIndex=0;
+				} else if(strcasecmp($p,self::CMD_PAGE_LAST)===0) {
+									$pageIndex=$this->getPageCount()-1;
+				} else {
+									$pageIndex=TPropertyValue::ensureInteger($p)-1;
+				}
 				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender,$pageIndex));
 				return true;
 			}
@@ -872,30 +881,34 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if(!$this->getEnableViewState(true))
-			return;
-		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
-		else
-			$this->clearViewState('ItemCount');
+		if(!$this->getEnableViewState(true)) {
+					return;
+		}
+		if($this->_items) {
+					$this->setViewState('ItemCount',$this->_items->getCount(),0);
+		} else {
+					$this->clearViewState('ItemCount');
+		}
 		if($this->_autoColumns)
 		{
 			$state=array();
-			foreach($this->_autoColumns as $column)
-				$state[]=$column->saveState();
+			foreach($this->_autoColumns as $column) {
+							$state[]=$column->saveState();
+			}
 			$this->setViewState('AutoColumns',$state,array());
+		} else {
+					$this->clearViewState('AutoColumns');
 		}
-		else
-			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
 			$state=array();
-			foreach($this->_columns as $column)
-				$state[]=$column->saveState();
+			foreach($this->_columns as $column) {
+							$state[]=$column->saveState();
+			}
 			$this->setViewState('Columns',$state,array());
+		} else {
+					$this->clearViewState('Columns');
 		}
-		else
-			$this->clearViewState('Columns');
 	}
 
 	/**
@@ -905,8 +918,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getEnableViewState(true))
-			return;
+		if(!$this->getEnableViewState(true)) {
+					return;
+		}
 		if(!$this->getIsDataBound())
 		{
 			$state=$this->getViewState('AutoColumns',array());
@@ -919,9 +933,9 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
+			} else {
+							$this->_autoColumns=null;
 			}
-			else
-				$this->_autoColumns=null;
 			$state=$this->getViewState('Columns',array());
 			if($this->_columns && $this->_columns->getCount()===count($state))
 			{
@@ -970,34 +984,38 @@ 
 
 		if($columns->getCount())
 		{
-			foreach($columns as $column)
-				$column->initialize();
+			foreach($columns as $column) {
+							$column->initialize();
+			}
 			$selectedIndex=$this->getSelectedItemIndex();
 			$editIndex=$this->getEditItemIndex();
 			for($index=0;$index<$itemCount;++$index)
 			{
 				if($index===0)
 				{
-					if($allowPaging)
-						$this->_topPager=$this->createPager();
+					if($allowPaging) {
+											$this->_topPager=$this->createPager();
+					}
 					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,false,null,$columns);
 				}
-				if($index===$editIndex)
-					$itemType=TListItemType::EditItem;
-				else if($index===$selectedIndex)
-					$itemType=TListItemType::SelectedItem;
-				else if($index % 2)
-					$itemType=TListItemType::AlternatingItem;
-				else
-					$itemType=TListItemType::Item;
+				if($index===$editIndex) {
+									$itemType=TListItemType::EditItem;
+				} else if($index===$selectedIndex) {
+									$itemType=TListItemType::SelectedItem;
+				} else if($index % 2) {
+									$itemType=TListItemType::AlternatingItem;
+				} else {
+									$itemType=TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($index,$dsIndex,$itemType,false,null,$columns));
 				$dsIndex++;
 			}
 			if($index>0)
 			{
 				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,false,null,$columns);
-				if($allowPaging)
-					$this->_bottomPager=$this->createPager();
+				if($allowPaging) {
+									$this->_bottomPager=$this->createPager();
+				}
 			}
 		}
 		if(!$dsIndex && $this->_emptyTemplate!==null)
@@ -1026,9 +1044,9 @@ 
 			$columns=new TList($this->getColumns());
 			$autoColumns=$this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
+		} else {
+					$columns=$this->getColumns();
 		}
-		else
-			$columns=$this->getColumns();
 		$this->_allColumns=$columns;
 
 		$items=$this->getItems();
@@ -1039,31 +1057,35 @@ 
 		$this->setViewState('DataSourceIndex',$dsIndex,0);
 		if($columns->getCount())
 		{
-			foreach($columns as $column)
-				$column->initialize();
+			foreach($columns as $column) {
+							$column->initialize();
+			}
 
 			$selectedIndex=$this->getSelectedItemIndex();
 			$editIndex=$this->getEditItemIndex();
 			foreach($data as $key=>$row)
 			{
-				if($keyField!=='')
-					$keys->add($this->getDataFieldValue($row,$keyField));
-				else
-					$keys->add($key);
+				if($keyField!=='') {
+									$keys->add($this->getDataFieldValue($row,$keyField));
+				} else {
+									$keys->add($key);
+				}
 				if($index===0)
 				{
-					if($allowPaging)
-						$this->_topPager=$this->createPager();
+					if($allowPaging) {
+											$this->_topPager=$this->createPager();
+					}
 					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,true,null,$columns);
 				}
-				if($index===$editIndex)
-					$itemType=TListItemType::EditItem;
-				else if($index===$selectedIndex)
-					$itemType=TListItemType::SelectedItem;
-				else if($index % 2)
-					$itemType=TListItemType::AlternatingItem;
-				else
-					$itemType=TListItemType::Item;
+				if($index===$editIndex) {
+									$itemType=TListItemType::EditItem;
+				} else if($index===$selectedIndex) {
+									$itemType=TListItemType::SelectedItem;
+				} else if($index % 2) {
+									$itemType=TListItemType::AlternatingItem;
+				} else {
+									$itemType=TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($index,$dsIndex,$itemType,true,$row,$columns));
 				$index++;
 				$dsIndex++;
@@ -1071,8 +1093,9 @@ 
 			if($index>0)
 			{
 				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,true,null,$columns);
-				if($allowPaging)
-					$this->_bottomPager=$this->createPager();
+				if($allowPaging) {
+									$this->_bottomPager=$this->createPager();
+				}
 			}
 		}
 		$this->setViewState('ItemCount',$index,0);
@@ -1090,21 +1113,24 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns=$this->_allColumns)===null)
-			return;
+		if(($columns=$this->_allColumns)===null) {
+					return;
+		}
 		$items=$this->getItems();
 		foreach($columns as $id=>$column)
 		{
-			if(!$column->getEnableCellGrouping())
-				continue;
+			if(!$column->getEnableCellGrouping()) {
+							continue;
+			}
 			$prevCell=null;
 			$prevCellText=null;
 			foreach($items as $item)
 			{
 				$itemType=$item->getItemType();
 				$cell=$item->getCells()->itemAt($id);
-				if(!$cell->getVisible())
-					continue;
+				if(!$cell->getVisible()) {
+									continue;
+				}
 				if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 				{
 					if(($cellText=$this->getCellText($cell))==='')
@@ -1117,11 +1143,11 @@ 
 					{
 						$prevCell=$cell;
 						$prevCellText=$cellText;
-					}
-					else
+					} else
 					{
-						if(($rowSpan=$prevCell->getRowSpan())===0)
-							$rowSpan=1;
+						if(($rowSpan=$prevCell->getRowSpan())===0) {
+													$rowSpan=1;
+						}
 						$prevCell->setRowSpan($rowSpan+1);
 						$cell->setVisible(false);
 					}
@@ -1137,8 +1163,9 @@ 
 			$controls=$cell->getControls();
 			foreach($controls as $control)
 			{
-				if($control instanceof IDataRenderer)
-					return $control->getData();
+				if($control instanceof IDataRenderer) {
+									return $control->getData();
+				}
 			}
 		}
 		return $data;
@@ -1167,8 +1194,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1188,12 +1214,14 @@ 
 		$index=0;
 		foreach($columns as $column)
 		{
-			if($itemType===TListItemType::Header)
-				$cell=new TTableHeaderCell;
-			else
-				$cell=new TTableCell;
-			if(($id=$column->getID())!=='')
-				$item->registerObject($id,$cell);
+			if($itemType===TListItemType::Header) {
+							$cell=new TTableHeaderCell;
+			} else {
+							$cell=new TTableCell;
+			}
+			if(($id=$column->getID())!=='') {
+							$item->registerObject($id,$cell);
+			}
 			$cells->add($cell);
 			$column->initializeCell($cell,$index,$itemType);
 			$index++;
@@ -1243,20 +1271,20 @@ 
 	{
 		if($buttonType===TDataGridPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button=new TLinkButton;
-			else
+			if($enabled) {
+							$button=new TLinkButton;
+			} else
 			{
 				$button=new TLabel;
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button=new TButton;
-			if(!$enabled)
-				$button->setEnabled(false);
+			if(!$enabled) {
+							$button->setEnabled(false);
+			}
 		}
 		$button->setText($text);
 		$button->setCommandName($commandName);
@@ -1286,8 +1314,7 @@ 
 
 			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
@@ -1310,8 +1337,7 @@ 
 				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,self::CMD_PAGE_NEXT);
 			$controls->add($button);
@@ -1342,12 +1368,14 @@ 
 		if($pageIndex>$endPageIndex)
 		{
 			$startPageIndex=((int)(($pageIndex-1)/$maxButtonCount))*$maxButtonCount+1;
-			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount)
-				$endPageIndex=$pageCount;
+			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount) {
+							$endPageIndex=$pageCount;
+			}
 			if($endPageIndex-$startPageIndex+1<$maxButtonCount)
 			{
-				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1)
-					$startPageIndex=1;
+				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1) {
+									$startPageIndex=1;
+				}
 			}
 		}
 
@@ -1371,14 +1399,14 @@ 
 			{
 				$label=$this->createPagerButton($pager,$buttonType,false,"$i",'','');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button=$this->createPagerButton($pager,$buttonType,true,"$i",self::CMD_PAGE,"$i");
 				$controls->add($button);
 			}
-			if($i<$endPageIndex)
-				$controls->add("\n");
+			if($i<$endPageIndex) {
+							$controls->add("\n");
+			}
 		}
 
 		if($pageCount>$endPageIndex)
@@ -1403,8 +1431,9 @@ 
 	 */
 	protected function createAutoColumns($dataSource)
 	{
-		if(!$dataSource)
-			return null;
+		if(!$dataSource) {
+					return null;
+		}
 		$autoColumns=$this->getAutoColumns();
 		$autoColumns->clear();
 		foreach($dataSource as $row)
@@ -1418,8 +1447,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1450,10 +1478,11 @@ 
 		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
 		if($itemStyle!==null)
 		{
-			if($alternatingItemStyle===null)
-				$alternatingItemStyle=$itemStyle;
-			else
-				$alternatingItemStyle->mergeWith($itemStyle);
+			if($alternatingItemStyle===null) {
+							$alternatingItemStyle=$itemStyle;
+			} else {
+							$alternatingItemStyle->mergeWith($itemStyle);
+			}
 		}
 
 		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
@@ -1461,10 +1490,11 @@ 
 		$editItemStyle=$this->getViewState('EditItemStyle',null);
 		if($selectedItemStyle!==null)
 		{
-			if($editItemStyle===null)
-				$editItemStyle=$selectedItemStyle;
-			else
-				$editItemStyle->mergeWith($selectedItemStyle);
+			if($editItemStyle===null) {
+							$editItemStyle=$selectedItemStyle;
+			} else {
+							$editItemStyle->mergeWith($selectedItemStyle);
+			}
 		}
 
 		$headerStyle=$this->getViewState('HeaderStyle',null);
@@ -1474,61 +1504,73 @@ 
 
 		foreach($this->getControls() as $index=>$item)
 		{
-			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
-				continue;
+			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager)) {
+							continue;
+			}
 			$itemType=$item->getItemType();
 			switch($itemType)
 			{
 				case TListItemType::Header:
-					if($headerStyle)
-						$item->getStyle()->mergeWith($headerStyle);
-					if(!$this->getShowHeader())
-						$item->setVisible(false);
+					if($headerStyle) {
+											$item->getStyle()->mergeWith($headerStyle);
+					}
+					if(!$this->getShowHeader()) {
+											$item->setVisible(false);
+					}
 					break;
 				case TListItemType::Footer:
-					if($footerStyle)
-						$item->getStyle()->mergeWith($footerStyle);
-					if(!$this->getShowFooter())
-						$item->setVisible(false);
+					if($footerStyle) {
+											$item->getStyle()->mergeWith($footerStyle);
+					}
+					if(!$this->getShowFooter()) {
+											$item->setVisible(false);
+					}
 					break;
 				case TListItemType::Separator:
-					if($separatorStyle)
-						$item->getStyle()->mergeWith($separatorStyle);
+					if($separatorStyle) {
+											$item->getStyle()->mergeWith($separatorStyle);
+					}
 					break;
 				case TListItemType::Item:
-					if($itemStyle)
-						$item->getStyle()->mergeWith($itemStyle);
+					if($itemStyle) {
+											$item->getStyle()->mergeWith($itemStyle);
+					}
 					break;
 				case TListItemType::AlternatingItem:
-					if($alternatingItemStyle)
-						$item->getStyle()->mergeWith($alternatingItemStyle);
+					if($alternatingItemStyle) {
+											$item->getStyle()->mergeWith($alternatingItemStyle);
+					}
 					break;
 				case TListItemType::SelectedItem:
-					if($selectedItemStyle)
-						$item->getStyle()->mergeWith($selectedItemStyle);
+					if($selectedItemStyle) {
+											$item->getStyle()->mergeWith($selectedItemStyle);
+					}
 					if($index % 2==1)
 					{
-						if($itemStyle)
-							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+						if($itemStyle) {
+													$item->getStyle()->mergeWith($itemStyle);
+						}
+					} else
 					{
-						if($alternatingItemStyle)
-							$item->getStyle()->mergeWith($alternatingItemStyle);
+						if($alternatingItemStyle) {
+													$item->getStyle()->mergeWith($alternatingItemStyle);
+						}
 					}
 					break;
 				case TListItemType::EditItem:
-					if($editItemStyle)
-						$item->getStyle()->mergeWith($editItemStyle);
+					if($editItemStyle) {
+											$item->getStyle()->mergeWith($editItemStyle);
+					}
 					if($index % 2==1)
 					{
-						if($itemStyle)
-							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+						if($itemStyle) {
+													$item->getStyle()->mergeWith($itemStyle);
+						}
+					} else
 					{
-						if($alternatingItemStyle)
-							$item->getStyle()->mergeWith($alternatingItemStyle);
+						if($alternatingItemStyle) {
+													$item->getStyle()->mergeWith($alternatingItemStyle);
+						}
 					}
 					break;
 				case TListItemType::Pager:
@@ -1537,13 +1579,14 @@ 
 						$item->getStyle()->mergeWith($pagerStyle);
 						if($index===0)
 						{
-							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
-								$item->setVisible(false);
-						}
-						else
+							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible()) {
+															$item->setVisible(false);
+							}
+						} else
 						{
-							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
-								$item->setVisible(false);
+							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible()) {
+															$item->setVisible(false);
+							}
 						}
 					}
 					break;
@@ -1558,18 +1601,20 @@ 
 				{
 					$cell=$cells->itemAt($i);
 					$column=$this->_columns->itemAt($i);
-					if(!$column->getVisible())
-						$cell->setVisible(false);
-					else
+					if(!$column->getVisible()) {
+											$cell->setVisible(false);
+					} else
 					{
-						if($itemType===TListItemType::Header)
-							$style=$column->getHeaderStyle(false);
-						else if($itemType===TListItemType::Footer)
-							$style=$column->getFooterStyle(false);
-						else
-							$style=$column->getItemStyle(false);
-						if($style!==null)
-							$cell->getStyle()->mergeWith($style);
+						if($itemType===TListItemType::Header) {
+													$style=$column->getHeaderStyle(false);
+						} else if($itemType===TListItemType::Footer) {
+													$style=$column->getFooterStyle(false);
+						} else {
+													$style=$column->getItemStyle(false);
+						}
+						if($style!==null) {
+													$cell->getStyle()->mergeWith($style);
+						}
 					}
 				}
 			}
@@ -1585,8 +1630,9 @@ 
 		parent::renderBeginTag($writer);
 		if(($caption=$this->getCaption())!=='')
 		{
-			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet) {
+							$writer->addAttribute('align',strtolower($align));
+			}
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -1607,13 +1653,13 @@ 
 				$control=new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
-				if($this->getHasStyle())
-					$control->getStyle()->copyFrom($this->getStyle());
+				if($this->getHasStyle()) {
+									$control->getStyle()->copyFrom($this->getStyle());
+				}
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			else if($this->getViewState('ItemCount',0)>0)
+			} else if($this->getViewState('ItemCount',0)>0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)
@@ -1641,25 +1687,29 @@ 
 		if($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableHeadStyle',null))
-				$style->addAttributesToRender($writer);
+			if($style=$this->getViewState('TableHeadStyle',null)) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('thead');
 			$this->_header->render($writer);
 			$writer->renderEndTag();
 		}
 		$writer->writeLine();
-		if($style=$this->getViewState('TableBodyStyle',null))
-			$style->addAttributesToRender($writer);
+		if($style=$this->getViewState('TableBodyStyle',null)) {
+					$style->addAttributesToRender($writer);
+		}
 		$writer->renderBeginTag('tbody');
-		foreach($this->getItems() as $item)
-			$item->renderControl($writer);
+		foreach($this->getItems() as $item) {
+					$item->renderControl($writer);
+		}
 		$writer->renderEndTag();
 
 		if($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableFootStyle',null))
-				$style->addAttributesToRender($writer);
+			if($style=$this->getViewState('TableFootStyle',null)) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);
 			$writer->renderEndTag();
@@ -1950,10 +2000,11 @@ 
 		$this->_itemIndex=$itemIndex;
 		$this->_dataSourceIndex=$dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType===TListItemType::Header)
-			$this->setTableSection(TTableRowSection::Header);
-		else if($itemType===TListItemType::Footer)
-			$this->setTableSection(TTableRowSection::Footer);
+		if($itemType===TListItemType::Header) {
+					$this->setTableSection(TTableRowSection::Header);
+		} else if($itemType===TListItemType::Footer) {
+					$this->setTableSection(TTableRowSection::Footer);
+		}
 	}
 
 	/**
@@ -2039,9 +2090,9 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -2081,9 +2132,9 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -2124,10 +2175,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TDataGridItem)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
+		if($item instanceof TDataGridItem) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
+		}
 	}
 }
 
@@ -2178,9 +2230,9 @@ 
 		{
 			$item->setOwner($this->_o);
 			parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
 		}
-		else
-			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
 	}
 }
 

framework/Web/UI/WebControls/TDataGridColumn.php

Doc Comments +4 added lines

@@ -281,6 +281,7 @@ 
 	 *
 	 * @param string the name of the viewstate value to be returned
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
+	 * @param string $key
 	 * @return mixed the viewstate value corresponding to $key
 	 */
 	protected function getViewState($key,$defaultValue=null)
@@ -295,6 +296,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
 	 */
 	protected function setViewState($key,$value,$defaultValue=null)
 	{
@@ -356,6 +358,7 @@ 
 	 * If the data is a component, the field is used as the name of a property.
 	 * @param mixed data containing the field of value
 	 * @param string the data field
+	 * @param string $field
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data or the field is invalid.
 	 */
@@ -515,6 +518,7 @@ 
 	 * as the first and second parameters in {@link sprintf}.
 	 * @param string format string
 	 * @param mixed the data to be formatted
+	 * @param string $formatString
 	 * @return string the formatted result
 	 */
 	protected function formatDataValue($formatString,$value)

Spacing +87 added lines, -87 removed lines

@@ -62,9 +62,9 @@ 
  */
 abstract class TDataGridColumn extends TApplicationComponent
 {
-	private $_id='';
-	private $_owner=null;
-	private $_viewState=array();
+	private $_id = '';
+	private $_owner = null;
+	private $_viewState = array();
 
 	/**
 	 * @return string the ID of the column.
@@ -83,9 +83,9 @@ 
 	 */
 	public function setID($value)
 	{
-		if(!preg_match(TControl::ID_FORMAT,$value))
-			throw new TInvalidDataValueException('datagridcolumn_id_invalid',get_class($this),$value);
-		$this->_id=$value;
+		if (!preg_match(TControl::ID_FORMAT, $value))
+			throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
+		$this->_id = $value;
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 */
 	public function getHeaderText()
 	{
-		return $this->getViewState('HeaderText','');
+		return $this->getViewState('HeaderText', '');
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setHeaderText($value)
 	{
-		$this->setViewState('HeaderText',$value,'');
+		$this->setViewState('HeaderText', $value, '');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function getHeaderImageUrl()
 	{
-		return $this->getViewState('HeaderImageUrl','');
+		return $this->getViewState('HeaderImageUrl', '');
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function setHeaderImageUrl($value)
 	{
-		$this->setViewState('HeaderImageUrl',$value,'');
+		$this->setViewState('HeaderImageUrl', $value, '');
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -141,19 +141,19 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
 	 * @param boolean whether to create a style if previously not existing
 	 * @return TTableItemStyle the style for header
 	 */
-	public function getHeaderStyle($createStyle=true)
+	public function getHeaderStyle($createStyle = true)
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null && $createStyle)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null && $createStyle)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -163,7 +163,7 @@ 
 	 */
 	public function getFooterText()
 	{
-		return $this->getViewState('FooterText','');
+		return $this->getViewState('FooterText', '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function setFooterText($value)
 	{
-		$this->setViewState('FooterText',$value,'');
+		$this->setViewState('FooterText', $value, '');
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -195,19 +195,19 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
 	 * @param boolean whether to create a style if previously not existing
 	 * @return TTableItemStyle the style for footer
 	 */
-	public function getFooterStyle($createStyle=true)
+	public function getFooterStyle($createStyle = true)
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null && $createStyle)
+		if (($style = $this->getViewState('FooterStyle', null)) === null && $createStyle)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -216,12 +216,12 @@ 
 	 * @param boolean whether to create a style if previously not existing
 	 * @return TTableItemStyle the style for item
 	 */
-	public function getItemStyle($createStyle=true)
+	public function getItemStyle($createStyle = true)
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null && $createStyle)
+		if (($style = $this->getViewState('ItemStyle', null)) === null && $createStyle)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -231,7 +231,7 @@ 
 	 */
 	public function getSortExpression()
 	{
-		return $this->getViewState('SortExpression','');
+		return $this->getViewState('SortExpression', '');
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 	 */
 	public function setSortExpression($value)
 	{
-		$this->setViewState('SortExpression',$value,'');
+		$this->setViewState('SortExpression', $value, '');
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function getEnableCellGrouping()
 	{
-		return $this->getViewState('EnableCellGrouping',false);
+		return $this->getViewState('EnableCellGrouping', false);
 	}
 
 	/**
@@ -257,15 +257,15 @@ 
 	 */
 	public function setEnableCellGrouping($value)
 	{
-		$this->setViewState('EnableCellGrouping',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('EnableCellGrouping', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
 	 * @return boolean whether the column is visible. Defaults to true.
 	 */
-	public function getVisible($checkParents=true)
+	public function getVisible($checkParents = true)
 	{
-		return $this->getViewState('Visible',true);
+		return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 */
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -283,9 +283,9 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	protected function getViewState($key,$defaultValue=null)
+	protected function getViewState($key, $defaultValue = null)
 	{
-		return isset($this->_viewState[$key])?$this->_viewState[$key]:$defaultValue;
+		return isset($this->_viewState[$key]) ? $this->_viewState[$key] : $defaultValue;
 	}
 
 	/**
@@ -296,12 +296,12 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	protected function setViewState($key,$value,$defaultValue=null)
+	protected function setViewState($key, $value, $defaultValue = null)
 	{
-		if($value===$defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_viewState[$key]);
 		else
-			$this->_viewState[$key]=$value;
+			$this->_viewState[$key] = $value;
 	}
 
 	/**
@@ -310,7 +310,7 @@ 
 	 */
 	public function loadState($state)
 	{
-		$this->_viewState=$state;
+		$this->_viewState = $state;
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 	 */
 	public function setOwner(TDataGrid $value)
 	{
-		$this->_owner=$value;
+		$this->_owner = $value;
 	}
 
 	/**
@@ -359,9 +359,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data or the field is invalid.
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 
 
@@ -376,12 +376,12 @@ 
 	 * @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($itemType===TListItemType::Header)
-			$this->initializeHeaderCell($cell,$columnIndex);
-		else if($itemType===TListItemType::Footer)
-			$this->initializeFooterCell($cell,$columnIndex);
+		if ($itemType === TListItemType::Header)
+			$this->initializeHeaderCell($cell, $columnIndex);
+		else if ($itemType === TListItemType::Footer)
+			$this->initializeFooterCell($cell, $columnIndex);
 	}
 
 	/**
@@ -392,7 +392,7 @@ 
 	 */
 	public function getAllowSorting()
 	{
-		return $this->getSortExpression()!=='' && (!$this->_owner || $this->_owner->getAllowSorting());
+		return $this->getSortExpression() !== '' && (!$this->_owner || $this->_owner->getAllowSorting());
 	}
 
 	/**
@@ -409,42 +409,42 @@ 
 	 * @param TTableCell the cell to be initialized
 	 * @param integer the index to the Columns property that the cell resides in.
 	 */
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
-		$text=$this->getHeaderText();
+		$text = $this->getHeaderText();
 
-		if(($classPath=$this->getHeaderRenderer())!=='')
+		if (($classPath = $this->getHeaderRenderer()) !== '')
 		{
-			$control=Prado::createComponent($classPath);
+			$control = Prado::createComponent($classPath);
 			$cell->getControls()->add($control);
-			if($control instanceof IDataRenderer)
+			if ($control instanceof IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
-					$item=$cell->getParent();
+					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
 					$control->setItemType($item->getItemType());
 				}
 				$control->setData($text);
 			}
 		}
-		else if($this->getAllowSorting())
+		else if ($this->getAllowSorting())
 		{
-			$sortExpression=$this->getSortExpression();
-			if(($url=$this->getHeaderImageUrl())!=='')
+			$sortExpression = $this->getSortExpression();
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
-				$button=Prado::createComponent('System.Web.UI.WebControls.TImageButton');
+				$button = Prado::createComponent('System.Web.UI.WebControls.TImageButton');
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text!=='')
+				if ($text !== '')
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
 			}
-			else if($text!=='')
+			else if ($text !== '')
 			{
-				$button=Prado::createComponent('System.Web.UI.WebControls.TLinkButton');
+				$button = Prado::createComponent('System.Web.UI.WebControls.TLinkButton');
 				$button->setText($text);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
@@ -456,15 +456,15 @@ 
 		}
 		else
 		{
-			if(($url=$this->getHeaderImageUrl())!=='')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
-				$image=Prado::createComponent('System.Web.UI.WebControls.TImage');
+				$image = Prado::createComponent('System.Web.UI.WebControls.TImage');
 				$image->setImageUrl($url);
-				if($text!=='')
+				if ($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
 			}
-			else if($text!=='')
+			else if ($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -481,25 +481,25 @@ 
 	 * @param TTableCell the cell to be initialized
 	 * @param integer the index to the Columns property that the cell resides in.
 	 */
-	protected function initializeFooterCell($cell,$columnIndex)
+	protected function initializeFooterCell($cell, $columnIndex)
 	{
-		$text=$this->getFooterText();
-		if(($classPath=$this->getFooterRenderer())!=='')
+		$text = $this->getFooterText();
+		if (($classPath = $this->getFooterRenderer()) !== '')
 		{
-			$control=Prado::createComponent($classPath);
+			$control = Prado::createComponent($classPath);
 			$cell->getControls()->add($control);
-			if($control instanceof IDataRenderer)
+			if ($control instanceof IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
-					$item=$cell->getParent();
+					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
 					$control->setItemType($item->getItemType());
 				}
 				$control->setData($text);
 			}
 		}
-		else if($text!=='')
+		else if ($text !== '')
 			$cell->setText($text);
 		else
 			$cell->setText(' ');
@@ -517,26 +517,26 @@ 
 	 * @param mixed the data to be formatted
 	 * @return string the formatted result
 	 */
-	protected function formatDataValue($formatString,$value)
+	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString==='')
+		if ($formatString === '')
 			return TPropertyValue::ensureString($value);
-		else if($formatString[0]==='#')
+		else if ($formatString[0] === '#')
 		{
-			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
+			$expression = strtr(substr($formatString, 1), array('{0}'=>'$value'));
 			try
 			{
-				if(eval("\$result=$expression;")===false)
+				if (eval("\$result=$expression;") === false)
 					throw new Exception('');
 				return $result;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage());
+				throw new TInvalidDataValueException('datagridcolumn_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}
 		}
 		else
-			return sprintf($formatString,$value);
+			return sprintf($formatString, $value);
 	}
 }
 
@@ -557,8 +557,8 @@ 
  */
 class TButtonColumnType extends TEnumerable
 {
-	const LinkButton='LinkButton';
-	const PushButton='PushButton';
-	const ImageButton='ImageButton';
+	const LinkButton = 'LinkButton';
+	const PushButton = 'PushButton';
+	const ImageButton = 'ImageButton';
 }
 

Braces +41 added lines, -39 removed lines

@@ -83,8 +83,9 @@ 
 	 */
 	public function setID($value)
 	{
-		if(!preg_match(TControl::ID_FORMAT,$value))
-			throw new TInvalidDataValueException('datagridcolumn_id_invalid',get_class($this),$value);
+		if(!preg_match(TControl::ID_FORMAT,$value)) {
+					throw new TInvalidDataValueException('datagridcolumn_id_invalid',get_class($this),$value);
+		}
 		$this->_id=$value;
 	}
 
@@ -298,10 +299,11 @@ 
 	 */
 	protected function setViewState($key,$value,$defaultValue=null)
 	{
-		if($value===$defaultValue)
-			unset($this->_viewState[$key]);
-		else
-			$this->_viewState[$key]=$value;
+		if($value===$defaultValue) {
+					unset($this->_viewState[$key]);
+		} else {
+					$this->_viewState[$key]=$value;
+		}
 	}
 
 	/**
@@ -378,10 +380,11 @@ 
 	 */
 	public function initializeCell($cell,$columnIndex,$itemType)
 	{
-		if($itemType===TListItemType::Header)
-			$this->initializeHeaderCell($cell,$columnIndex);
-		else if($itemType===TListItemType::Footer)
-			$this->initializeFooterCell($cell,$columnIndex);
+		if($itemType===TListItemType::Header) {
+					$this->initializeHeaderCell($cell,$columnIndex);
+		} else if($itemType===TListItemType::Footer) {
+					$this->initializeFooterCell($cell,$columnIndex);
+		}
 	}
 
 	/**
@@ -427,8 +430,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -437,12 +439,12 @@ 
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text!=='')
-					$button->setAlternateText($text);
+				if($text!=='') {
+									$button->setAlternateText($text);
+				}
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TLinkButton');
 				$button->setText($text);
@@ -450,24 +452,24 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
+			} else {
+							$cell->setText(' ');
 			}
-			else
-				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
 				$image=Prado::createComponent('System.Web.UI.WebControls.TImage');
 				$image->setImageUrl($url);
-				if($text!=='')
-					$image->setAlternateText($text);
+				if($text!=='') {
+									$image->setAlternateText($text);
+				}
 				$cell->getControls()->add($image);
+			} else if($text!=='') {
+							$cell->setText($text);
+			} else {
+							$cell->setText(' ');
 			}
-			else if($text!=='')
-				$cell->setText($text);
-			else
-				$cell->setText(' ');
 		}
 	}
 
@@ -498,11 +500,11 @@ 
 				}
 				$control->setData($text);
 			}
+		} else if($text!=='') {
+					$cell->setText($text);
+		} else {
+					$cell->setText(' ');
 		}
-		else if($text!=='')
-			$cell->setText($text);
-		else
-			$cell->setText(' ');
 	}
 
 	/**
@@ -519,24 +521,24 @@ 
 	 */
 	protected function formatDataValue($formatString,$value)
 	{
-		if($formatString==='')
-			return TPropertyValue::ensureString($value);
-		else if($formatString[0]==='#')
+		if($formatString==='') {
+					return TPropertyValue::ensureString($value);
+		} else if($formatString[0]==='#')
 		{
 			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
 			try
 			{
-				if(eval("\$result=$expression;")===false)
-					throw new Exception('');
+				if(eval("\$result=$expression;")===false) {
+									throw new Exception('');
+				}
 				return $result;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage());
 			}
+		} else {
+					return sprintf($formatString,$value);
 		}
-		else
-			return sprintf($formatString,$value);
 	}
 }
 

framework/Web/UI/WebControls/TDataList.php

Doc Comments +11 added lines

@@ -404,6 +404,7 @@ 
 
 	/**
 	 * @param ITemplate the template for item
+	 * @param TWizardSideBarListItemTemplate $value
 	 * @throws TInvalidDataTypeException if the input is not an {@link ITemplate} or not null.
 	 */
 	public function setItemTemplate($value)
@@ -959,6 +960,7 @@ 
 	 * If you override this method, be sure to call parent's implementation
 	 * so that event handlers have chance to respond to the event.
 	 * @param TDataListItemEventParameter event parameter
+	 * @param TDataListItemEventParameter $param
 	 */
 	public function onItemCreated($param)
 	{
@@ -973,6 +975,7 @@ 
 	 * If you override this method, be sure to call parent's implementation
 	 * so that event handlers have chance to respond to the event.
 	 * @param TDataListItemEventParameter event parameter
+	 * @param TDataListItemEventParameter $param
 	 */
 	public function onItemDataBound($param)
 	{
@@ -984,6 +987,7 @@ 
 	 * This method is invoked when a child control of the data list
 	 * raises an <b>OnCommand</b> event.
 	 * @param TDataListCommandEventParameter event parameter
+	 * @param TDataListCommandEventParameter $param
 	 */
 	public function onItemCommand($param)
 	{
@@ -995,6 +999,7 @@ 
 	 * This method is invoked when a child control of the data list
 	 * raises an <b>OnCommand</b> event and the command name is 'edit' (case-insensitive).
 	 * @param TDataListCommandEventParameter event parameter
+	 * @param TDataListCommandEventParameter $param
 	 */
 	public function onEditCommand($param)
 	{
@@ -1006,6 +1011,7 @@ 
 	 * This method is invoked when a child control of the data list
 	 * raises an <b>OnCommand</b> event and the command name is 'delete' (case-insensitive).
 	 * @param TDataListCommandEventParameter event parameter
+	 * @param TDataListCommandEventParameter $param
 	 */
 	public function onDeleteCommand($param)
 	{
@@ -1017,6 +1023,7 @@ 
 	 * This method is invoked when a child control of the data list
 	 * raises an <b>OnCommand</b> event and the command name is 'update' (case-insensitive).
 	 * @param TDataListCommandEventParameter event parameter
+	 * @param TDataListCommandEventParameter $param
 	 */
 	public function onUpdateCommand($param)
 	{
@@ -1028,6 +1035,7 @@ 
 	 * This method is invoked when a child control of the data list
 	 * raises an <b>OnCommand</b> event and the command name is 'cancel' (case-insensitive).
 	 * @param TDataListCommandEventParameter event parameter
+	 * @param TDataListCommandEventParameter $param
 	 */
 	public function onCancelCommand($param)
 	{
@@ -1131,6 +1139,7 @@ 
 	 * This method invokes {@link createItem} to create a new datalist item.
 	 * @param integer zero-based item index.
 	 * @param TListItemType item type
+	 * @param integer $itemIndex
 	 * @return TControl the created item, null if item is not created
 	 */
 	private function createItemInternal($itemIndex,$itemType)
@@ -1152,6 +1161,7 @@ 
 	 * @param integer zero-based item index.
 	 * @param TListItemType item type
 	 * @param mixed data to be associated with the item
+	 * @param integer $itemIndex
 	 * @return TControl the created item, null if item is not created
 	 */
 	private function createItemWithDataInternal($itemIndex,$itemType,$dataItem)
@@ -1511,6 +1521,7 @@ 
 	/**
 	 * Constructor.
 	 * @param TControl DataList item related with the corresponding event
+	 * @param TControl $item
 	 */
 	public function __construct($item)
 	{

Spacing +289 added lines, -289 removed lines

@@ -153,43 +153,43 @@ 
 	/**
 	 * Command name that TDataList understands. They are case-insensitive.
 	 */
-	const CMD_SELECT='Select';
-	const CMD_EDIT='Edit';
-	const CMD_UPDATE='Update';
-	const CMD_DELETE='Delete';
-	const CMD_CANCEL='Cancel';
+	const CMD_SELECT = 'Select';
+	const CMD_EDIT = 'Edit';
+	const CMD_UPDATE = 'Update';
+	const CMD_DELETE = 'Delete';
+	const CMD_CANCEL = 'Cancel';
 
 	/**
 	 * @var TDataListItemCollection item list
 	 */
-	private $_items=null;
+	private $_items = null;
 	/**
 	 * @var Itemplate various item templates
 	 */
-	private $_itemTemplate=null;
-	private $_emptyTemplate=null;
-	private $_alternatingItemTemplate=null;
-	private $_selectedItemTemplate=null;
-	private $_editItemTemplate=null;
-	private $_headerTemplate=null;
-	private $_footerTemplate=null;
-	private $_separatorTemplate=null;
+	private $_itemTemplate = null;
+	private $_emptyTemplate = null;
+	private $_alternatingItemTemplate = null;
+	private $_selectedItemTemplate = null;
+	private $_editItemTemplate = null;
+	private $_headerTemplate = null;
+	private $_footerTemplate = null;
+	private $_separatorTemplate = null;
 	/**
 	 * @var TControl header item
 	 */
-	private $_header=null;
+	private $_header = null;
 	/**
 	 * @var TControl footer item
 	 */
-	private $_footer=null;
+	private $_footer = null;
 
 	/**
 	 * @return TDataListItemCollection item list
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=new TDataListItemCollection;
+		if (!$this->_items)
+			$this->_items = new TDataListItemCollection;
 		return $this->_items;
 	}
 
@@ -198,7 +198,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -231,7 +231,7 @@ 
 	 */
 	public function getAlternatingItemRenderer()
 	{
-		return $this->getViewState('AlternatingItemRenderer','');
+		return $this->getViewState('AlternatingItemRenderer', '');
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 	 */
 	public function setAlternatingItemRenderer($value)
 	{
-		$this->setViewState('AlternatingItemRenderer',$value,'');
+		$this->setViewState('AlternatingItemRenderer', $value, '');
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getSelectedItemRenderer()
 	{
-		return $this->getViewState('SelectedItemRenderer','');
+		return $this->getViewState('SelectedItemRenderer', '');
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 */
 	public function setSelectedItemRenderer($value)
 	{
-		$this->setViewState('SelectedItemRenderer',$value,'');
+		$this->setViewState('SelectedItemRenderer', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getSeparatorRenderer()
 	{
-		return $this->getViewState('SeparatorRenderer','');
+		return $this->getViewState('SeparatorRenderer', '');
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function setSeparatorRenderer($value)
 	{
-		$this->setViewState('SeparatorRenderer',$value,'');
+		$this->setViewState('SeparatorRenderer', $value, '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -342,7 +342,7 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 */
 	public function getEmptyRenderer()
 	{
-		return $this->getViewState('EmptyRenderer','');
+		return $this->getViewState('EmptyRenderer', '');
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	 */
 	public function setEmptyRenderer($value)
 	{
-		$this->setViewState('EmptyRenderer',$value,'');
+		$this->setViewState('EmptyRenderer', $value, '');
 	}
 
 	/**
@@ -408,10 +408,10 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_itemTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_itemTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -419,10 +419,10 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null)
+		if (($style = $this->getViewState('ItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -441,10 +441,10 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_alternatingItemTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_alternatingItemTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','AlternatingItemType');
+			throw new TInvalidDataTypeException('datalist_template_required', 'AlternatingItemType');
 	}
 
 	/**
@@ -452,10 +452,10 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style=$this->getViewState('AlternatingItemStyle',null))===null)
+		if (($style = $this->getViewState('AlternatingItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('AlternatingItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -474,10 +474,10 @@ 
 	 */
 	public function setSelectedItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_selectedItemTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_selectedItemTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','SelectedItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'SelectedItemTemplate');
 	}
 
 	/**
@@ -485,10 +485,10 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style=$this->getViewState('SelectedItemStyle',null))===null)
+		if (($style = $this->getViewState('SelectedItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('SelectedItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -507,10 +507,10 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_editItemTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_editItemTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','EditItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'EditItemTemplate');
 	}
 
 	/**
@@ -518,10 +518,10 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style=$this->getViewState('EditItemStyle',null))===null)
+		if (($style = $this->getViewState('EditItemStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('EditItemStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -540,10 +540,10 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_headerTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_headerTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -551,10 +551,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -581,10 +581,10 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_footerTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_footerTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -592,10 +592,10 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null)
+		if (($style = $this->getViewState('FooterStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -622,10 +622,10 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_emptyTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_emptyTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -642,10 +642,10 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_separatorTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_separatorTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','SeparatorTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'SeparatorTemplate');
 	}
 
 	/**
@@ -653,10 +653,10 @@ 
 	 */
 	public function getSeparatorStyle()
 	{
-		if(($style=$this->getViewState('SeparatorStyle',null))===null)
+		if (($style = $this->getViewState('SeparatorStyle', null)) === null)
 		{
-			$style=new TTableItemStyle;
-			$this->setViewState('SeparatorStyle',$style,null);
+			$style = new TTableItemStyle;
+			$this->setViewState('SeparatorStyle', $style, null);
 		}
 		return $style;
 	}
@@ -667,7 +667,7 @@ 
 	 */
 	public function getSelectedItemIndex()
 	{
-		return $this->getViewState('SelectedItemIndex',-1);
+		return $this->getViewState('SelectedItemIndex', -1);
 	}
 
 	/**
@@ -679,23 +679,23 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		if(($current=$this->getSelectedItemIndex())!==$value)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		if (($current = $this->getSelectedItemIndex()) !== $value)
 		{
-			$this->setViewState('SelectedItemIndex',$value,-1);
-			$items=$this->getItems();
-			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
+			$this->setViewState('SelectedItemIndex', $value, -1);
+			$items = $this->getItems();
+			$itemCount = $items->getCount();
+			if ($current >= 0 && $current < $itemCount)
 			{
-				$item=$items->itemAt($current);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
+				$item = $items->itemAt($current);
+				if (($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
+					$item->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value>=0 && $value<$itemCount)
+			if ($value >= 0 && $value < $itemCount)
 			{
-				$item=$items->itemAt($value);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
+				$item = $items->itemAt($value);
+				if (($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
 					$item->setItemType(TListItemType::SelectedItem);
 			}
 		}
@@ -706,9 +706,9 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		$index=$this->getSelectedItemIndex();
-		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		$index = $this->getSelectedItemIndex();
+		$items = $this->getItems();
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -720,11 +720,11 @@ 
 	 */
 	public function getSelectedDataKey()
 	{
-		if($this->getDataKeyField()==='')
+		if ($this->getDataKeyField() === '')
 			throw new TInvalidOperationException('datalist_datakeyfield_required');
-		$index=$this->getSelectedItemIndex();
-		$dataKeys=$this->getDataKeys();
-		if($index>=0 && $index<$dataKeys->getCount())
+		$index = $this->getSelectedItemIndex();
+		$dataKeys = $this->getDataKeys();
+		if ($index >= 0 && $index < $dataKeys->getCount())
 			return $dataKeys->itemAt($index);
 		else
 			return null;
@@ -736,7 +736,7 @@ 
 	 */
 	public function getEditItemIndex()
 	{
-		return $this->getViewState('EditItemIndex',-1);
+		return $this->getViewState('EditItemIndex', -1);
 	}
 
 	/**
@@ -747,16 +747,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		if(($current=$this->getEditItemIndex())!==$value)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		if (($current = $this->getEditItemIndex()) !== $value)
 		{
-			$this->setViewState('EditItemIndex',$value,-1);
-			$items=$this->getItems();
-			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
+			$this->setViewState('EditItemIndex', $value, -1);
+			$items = $this->getItems();
+			$itemCount = $items->getCount();
+			if ($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
+			if ($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -766,9 +766,9 @@ 
 	 */
 	public function getEditItem()
 	{
-		$index=$this->getEditItemIndex();
-		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		$index = $this->getEditItemIndex();
+		$items = $this->getItems();
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -779,7 +779,7 @@ 
 	 */
 	public function getShowHeader()
 	{
-		return $this->getViewState('ShowHeader',true);
+		return $this->getViewState('ShowHeader', true);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 */
 	public function setShowHeader($value)
 	{
-		$this->setViewState('ShowHeader',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowHeader', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -795,7 +795,7 @@ 
 	 */
 	public function getShowFooter()
 	{
-		return $this->getViewState('ShowFooter',true);
+		return $this->getViewState('ShowFooter', true);
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 	 */
 	public function setShowFooter($value)
 	{
-		$this->setViewState('ShowFooter',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowFooter', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -811,10 +811,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if (($repeatInfo = $this->getViewState('RepeatInfo', null)) === null)
 		{
-			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$repeatInfo = new TRepeatInfo;
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -912,35 +912,35 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TDataListCommandEventParameter)
+		if ($param instanceof TDataListCommandEventParameter)
 		{
 			$this->onItemCommand($param);
-			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_SELECT)===0)
+			$command = $param->getCommandName();
+			if (strcasecmp($command, self::CMD_SELECT) === 0)
 			{
-				if(($item=$param->getItem()) instanceof IItemDataRenderer)
+				if (($item = $param->getItem()) instanceof IItemDataRenderer)
 					$this->setSelectedItemIndex($item->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			else if (strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			else if (strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			else if (strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			else if (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -962,7 +962,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -976,7 +976,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -987,7 +987,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -998,7 +998,7 @@ 
 	 */
 	public function onEditCommand($param)
 	{
-		$this->raiseEvent('OnEditCommand',$this,$param);
+		$this->raiseEvent('OnEditCommand', $this, $param);
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 	 */
 	public function onDeleteCommand($param)
 	{
-		$this->raiseEvent('OnDeleteCommand',$this,$param);
+		$this->raiseEvent('OnDeleteCommand', $this, $param);
 	}
 
 	/**
@@ -1020,7 +1020,7 @@ 
 	 */
 	public function onUpdateCommand($param)
 	{
-		$this->raiseEvent('OnUpdateCommand',$this,$param);
+		$this->raiseEvent('OnUpdateCommand', $this, $param);
 	}
 
 	/**
@@ -1031,7 +1031,7 @@ 
 	 */
 	public function onCancelCommand($param)
 	{
-		$this->raiseEvent('OnCancelCommand',$this,$param);
+		$this->raiseEvent('OnCancelCommand', $this, $param);
 	}
 
 	/**
@@ -1041,7 +1041,7 @@ 
 	 */
 	public function getHasHeader()
 	{
-		return ($this->getShowHeader() && ($this->_headerTemplate!==null || $this->getHeaderRenderer()!==''));
+		return ($this->getShowHeader() && ($this->_headerTemplate !== null || $this->getHeaderRenderer() !== ''));
 	}
 
 	/**
@@ -1051,7 +1051,7 @@ 
 	 */
 	public function getHasFooter()
 	{
-		return ($this->getShowFooter() && ($this->_footerTemplate!==null || $this->getFooterRenderer()!==''));
+		return ($this->getShowFooter() && ($this->_footerTemplate !== null || $this->getFooterRenderer() !== ''));
 	}
 
 	/**
@@ -1061,7 +1061,7 @@ 
 	 */
 	public function getHasSeparators()
 	{
-		return $this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
+		return $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 	}
 
 	/**
@@ -1071,11 +1071,11 @@ 
 	 * @param integer index of the item being rendered
 	 * @return TStyle item style
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
-		if(($item=$this->getItem($itemType,$index))!==null && ($item instanceof IStyleable) && $item->getHasStyle())
+		if (($item = $this->getItem($itemType, $index)) !== null && ($item instanceof IStyleable) && $item->getHasStyle())
 		{
-			$style=$item->getStyle();
+			$style = $item->getStyle();
 			$item->clearStyle();
 			return $style;
 		}
@@ -1091,10 +1091,10 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
-		$item=$this->getItem($itemType,$index);
-		if($repeatInfo->getRepeatLayout()===TRepeatLayout::Raw && get_class($item)==='TDataListItem')
+		$item = $this->getItem($itemType, $index);
+		if ($repeatInfo->getRepeatLayout() === TRepeatLayout::Raw && get_class($item) === 'TDataListItem')
 			$item->setTagName('div');
 		$item->renderControl($writer);
 	}
@@ -1104,9 +1104,9 @@ 
 	 * @param integer item index
 	 * @return TControl data list item with the specified item type and index
 	 */
-	private function getItem($itemType,$index)
+	private function getItem($itemType, $index)
 	{
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
@@ -1116,10 +1116,10 @@ 
 			case TListItemType::Header:
 				return $this->getControls()->itemAt(0);
 			case TListItemType::Footer:
-				return $this->getControls()->itemAt($this->getControls()->getCount()-1);
+				return $this->getControls()->itemAt($this->getControls()->getCount() - 1);
 			case TListItemType::Separator:
-				$i=$index+$index+1;
-				if($this->_headerTemplate!==null || $this->getHeaderRenderer()!=='')
+				$i = $index + $index + 1;
+				if ($this->_headerTemplate !== null || $this->getHeaderRenderer() !== '')
 					$i++;
 				return $this->getControls()->itemAt($i);
 		}
@@ -1133,11 +1133,11 @@ 
 	 * @param TListItemType item type
 	 * @return TControl the created item, null if item is not created
 	 */
-	private function createItemInternal($itemIndex,$itemType)
+	private function createItemInternal($itemIndex, $itemType)
 	{
-		if(($item=$this->createItem($itemIndex,$itemType))!==null)
+		if (($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
-			$param=new TDataListItemEventParameter($item);
+			$param = new TDataListItemEventParameter($item);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
@@ -1154,12 +1154,12 @@ 
 	 * @param mixed data to be associated with the item
 	 * @return TControl the created item, null if item is not created
 	 */
-	private function createItemWithDataInternal($itemIndex,$itemType,$dataItem)
+	private function createItemWithDataInternal($itemIndex, $itemType, $dataItem)
 	{
-		if(($item=$this->createItem($itemIndex,$itemType))!==null)
+		if (($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
-			$param=new TDataListItemEventParameter($item);
-			if($item instanceof IDataRenderer)
+			$param = new TDataListItemEventParameter($item);
+			if ($item instanceof IDataRenderer)
 				$item->setData($dataItem);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1173,31 +1173,31 @@ 
 
 	private function getAlternatingItemDisplay()
 	{
-		if(($classPath=$this->getAlternatingItemRenderer())==='' && $this->_alternatingItemTemplate===null)
-			return array($this->getItemRenderer(),$this->_itemTemplate);
+		if (($classPath = $this->getAlternatingItemRenderer()) === '' && $this->_alternatingItemTemplate === null)
+			return array($this->getItemRenderer(), $this->_itemTemplate);
 		else
-			return array($classPath,$this->_alternatingItemTemplate);
+			return array($classPath, $this->_alternatingItemTemplate);
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
-		if(($classPath=$this->getSelectedItemRenderer())==='' && $this->_selectedItemTemplate===null)
+		if (($classPath = $this->getSelectedItemRenderer()) === '' && $this->_selectedItemTemplate === null)
 		{
-			if($itemIndex%2===0)
-				return array($this->getItemRenderer(),$this->_itemTemplate);
+			if ($itemIndex % 2 === 0)
+				return array($this->getItemRenderer(), $this->_itemTemplate);
 			else
 				return $this->getAlternatingItemDisplay();
 		}
 		else
-			return array($classPath,$this->_selectedItemTemplate);
+			return array($classPath, $this->_selectedItemTemplate);
 	}
 
 	private function getEditItemDisplay($itemIndex)
 	{
-		if(($classPath=$this->getEditItemRenderer())==='' && $this->_editItemTemplate===null)
+		if (($classPath = $this->getEditItemRenderer()) === '' && $this->_editItemTemplate === null)
 			return $this->getSelectedItemDisplay($itemIndex);
 		else
-			return array($classPath,$this->_editItemTemplate);
+			return array($classPath, $this->_editItemTemplate);
 	}
 
 	/**
@@ -1206,58 +1206,58 @@ 
 	 * @param TListItemType item type
 	 * @return TControl created datalist item
 	 */
-	protected function createItem($itemIndex,$itemType)
+	protected function createItem($itemIndex, $itemType)
 	{
-		$template=null;
-		$classPath=null;
-		switch($itemType)
+		$template = null;
+		$classPath = null;
+		switch ($itemType)
 		{
 			case TListItemType::Item :
-				$classPath=$this->getItemRenderer();
-				$template=$this->_itemTemplate;
+				$classPath = $this->getItemRenderer();
+				$template = $this->_itemTemplate;
 				break;
 			case TListItemType::AlternatingItem :
-				list($classPath,$template)=$this->getAlternatingItemDisplay();
+				list($classPath, $template) = $this->getAlternatingItemDisplay();
 				break;
 			case TListItemType::SelectedItem:
-				list($classPath,$template)=$this->getSelectedItemDisplay($itemIndex);
+				list($classPath, $template) = $this->getSelectedItemDisplay($itemIndex);
 				break;
 			case TListItemType::EditItem:
-				list($classPath,$template)=$this->getEditItemDisplay($itemIndex);
+				list($classPath, $template) = $this->getEditItemDisplay($itemIndex);
 				break;
 			case TListItemType::Header :
-				$classPath=$this->getHeaderRenderer();
-				$template=$this->_headerTemplate;
+				$classPath = $this->getHeaderRenderer();
+				$template = $this->_headerTemplate;
 				break;
 			case TListItemType::Footer :
-				$classPath=$this->getFooterRenderer();
-				$template=$this->_footerTemplate;
+				$classPath = $this->getFooterRenderer();
+				$template = $this->_footerTemplate;
 				break;
 			case TListItemType::Separator :
-				$classPath=$this->getSeparatorRenderer();
-				$template=$this->_separatorTemplate;
+				$classPath = $this->getSeparatorRenderer();
+				$template = $this->_separatorTemplate;
 				break;
 			default:
-				throw new TInvalidDataValueException('datalist_itemtype_unknown',$itemType);
+				throw new TInvalidDataValueException('datalist_itemtype_unknown', $itemType);
 		}
-		if($classPath!=='')
+		if ($classPath !== '')
 		{
-			$item=Prado::createComponent($classPath);
-			if($item instanceof IItemDataRenderer)
+			$item = Prado::createComponent($classPath);
+			if ($item instanceof IItemDataRenderer)
 			{
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
 		}
-		else if($template!==null)
+		else if ($template !== null)
 		{
-			$item=new TDataListItem;
+			$item = new TDataListItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
 		}
 		else
-			$item=null;
+			$item = null;
 
 		return $item;
 	}
@@ -1267,9 +1267,9 @@ 
 	 */
 	protected function createEmptyContent()
 	{
-		if(($classPath=$this->getEmptyRenderer())!=='')
+		if (($classPath = $this->getEmptyRenderer()) !== '')
 			$this->getControls()->add(Prado::createComponent($classPath));
-		else if($this->_emptyTemplate!==null)
+		else if ($this->_emptyTemplate !== null)
 			$this->_emptyTemplate->instantiateIn($this);
 	}
 
@@ -1286,68 +1286,68 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle=$this->getViewState('ItemStyle',null);
+		$itemStyle = $this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
-		if($itemStyle!==null)
+		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
+		if ($itemStyle !== null)
 		{
-			if($alternatingItemStyle===null)
-				$alternatingItemStyle=$itemStyle;
+			if ($alternatingItemStyle === null)
+				$alternatingItemStyle = $itemStyle;
 			else
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
+		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle=$this->getViewState('EditItemStyle',null);
-		if($selectedItemStyle!==null)
+		$editItemStyle = $this->getViewState('EditItemStyle', null);
+		if ($selectedItemStyle !== null)
 		{
-			if($editItemStyle===null)
-				$editItemStyle=$selectedItemStyle;
+			if ($editItemStyle === null)
+				$editItemStyle = $selectedItemStyle;
 			else
 				$editItemStyle->mergeWith($selectedItemStyle);
 		}
 
 		// apply header style if any
-		if($this->_header!==null && $this->_header instanceof IStyleable)
+		if ($this->_header !== null && $this->_header instanceof IStyleable)
 		{
-			if($headerStyle=$this->getViewState('HeaderStyle',null))
+			if ($headerStyle = $this->getViewState('HeaderStyle', null))
 				$this->_header->getStyle()->mergeWith($headerStyle);
 		}
 
 		// apply footer style if any
-		if($this->_footer!==null && $this->_footer instanceof IStyleable)
+		if ($this->_footer !== null && $this->_footer instanceof IStyleable)
 		{
-			if($footerStyle=$this->getViewState('FooterStyle',null))
+			if ($footerStyle = $this->getViewState('FooterStyle', null))
 				$this->_footer->getStyle()->mergeWith($footerStyle);
 		}
 
-		$selectedIndex=$this->getSelectedItemIndex();
-		$editIndex=$this->getEditItemIndex();
+		$selectedIndex = $this->getSelectedItemIndex();
+		$editIndex = $this->getEditItemIndex();
 
 		// apply item styles if any
-		foreach($this->getItems() as $index=>$item)
+		foreach ($this->getItems() as $index=>$item)
 		{
-			if($index===$editIndex)
-				$style=$editItemStyle;
-			else if($index===$selectedIndex)
-				$style=$selectedItemStyle;
-			else if($index%2===0)
-				$style=$itemStyle;
+			if ($index === $editIndex)
+				$style = $editItemStyle;
+			else if ($index === $selectedIndex)
+				$style = $selectedItemStyle;
+			else if ($index % 2 === 0)
+				$style = $itemStyle;
 			else
-				$style=$alternatingItemStyle;
-			if($style && $item instanceof IStyleable)
+				$style = $alternatingItemStyle;
+			if ($style && $item instanceof IStyleable)
 				$item->getStyle()->mergeWith($style);
 		}
 
 		// apply separator style if any
-		if(($separatorStyle=$this->getViewState('SeparatorStyle',null))!==null && $this->getHasSeparators())
+		if (($separatorStyle = $this->getViewState('SeparatorStyle', null)) !== null && $this->getHasSeparators())
 		{
-			$controls=$this->getControls();
-			$count=$controls->getCount();
-			for($i=$this->_header?2:1;$i<$count;$i+=2)
+			$controls = $this->getControls();
+			$count = $controls->getCount();
+			for ($i = $this->_header ? 2 : 1; $i < $count; $i += 2)
 			{
-				if(($separator=$controls->itemAt($i)) instanceof IStyleable)
+				if (($separator = $controls->itemAt($i)) instanceof IStyleable)
 					$separator->getStyle()->mergeWith($separatorStyle);
 			}
 		}
@@ -1360,8 +1360,8 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+		if ($this->_items)
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
 	}
@@ -1373,7 +1373,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 			$this->restoreItemsFromViewState();
 		$this->clearViewState('ItemCount');
 	}
@@ -1385,8 +1385,8 @@ 
 	{
 		$this->getControls()->clear();
 		$this->getItems()->clear();
-		$this->_header=null;
-		$this->_footer=null;
+		$this->_header = null;
+		$this->_footer = null;
 	}
 
 	/**
@@ -1395,26 +1395,26 @@ 
 	protected function restoreItemsFromViewState()
 	{
 		$this->reset();
-		if(($itemCount=$this->getViewState('ItemCount',0))>0)
+		if (($itemCount = $this->getViewState('ItemCount', 0)) > 0)
 		{
-			$items=$this->getItems();
-			$selectedIndex=$this->getSelectedItemIndex();
-			$editIndex=$this->getEditItemIndex();
-			$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
-			$this->_header=$this->createItemInternal(-1,TListItemType::Header);
-			for($i=0;$i<$itemCount;++$i)
+			$items = $this->getItems();
+			$selectedIndex = $this->getSelectedItemIndex();
+			$editIndex = $this->getEditItemIndex();
+			$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
+			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
-				if($hasSeparator && $i>0)
-					$this->createItemInternal($i-1,TListItemType::Separator);
-				if($i===$editIndex)
-					$itemType=TListItemType::EditItem;
-				else if($i===$selectedIndex)
-					$itemType=TListItemType::SelectedItem;
+				if ($hasSeparator && $i > 0)
+					$this->createItemInternal($i - 1, TListItemType::Separator);
+				if ($i === $editIndex)
+					$itemType = TListItemType::EditItem;
+				else if ($i === $selectedIndex)
+					$itemType = TListItemType::SelectedItem;
 				else
-					$itemType=$i%2?TListItemType::AlternatingItem : TListItemType::Item;
-				$items->add($this->createItemInternal($i,$itemType));
+					$itemType = $i % 2 ? TListItemType::AlternatingItem : TListItemType::Item;
+				$items->add($this->createItemInternal($i, $itemType));
 			}
-			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
+			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
 		}
 		else
 			$this->createEmptyContent();
@@ -1430,41 +1430,41 @@ 
 	protected function performDataBinding($data)
 	{
 		$this->reset();
-		$keys=$this->getDataKeys();
+		$keys = $this->getDataKeys();
 		$keys->clear();
-		$keyField=$this->getDataKeyField();
-		$itemIndex=0;
-		$items=$this->getItems();
-		$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
-		$selectedIndex=$this->getSelectedItemIndex();
-		$editIndex=$this->getEditItemIndex();
-		foreach($data as $key=>$dataItem)
+		$keyField = $this->getDataKeyField();
+		$itemIndex = 0;
+		$items = $this->getItems();
+		$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
+		$selectedIndex = $this->getSelectedItemIndex();
+		$editIndex = $this->getEditItemIndex();
+		foreach ($data as $key=>$dataItem)
 		{
-			if($keyField!=='')
-				$keys->add($this->getDataFieldValue($dataItem,$keyField));
+			if ($keyField !== '')
+				$keys->add($this->getDataFieldValue($dataItem, $keyField));
 			else
 				$keys->add($key);
-			if($itemIndex===0)
-				$this->_header=$this->createItemWithDataInternal(-1,TListItemType::Header,null);
-			if($hasSeparator && $itemIndex>0)
-				$this->createItemWithDataInternal($itemIndex-1,TListItemType::Separator,null);
-			if($itemIndex===$editIndex)
-				$itemType=TListItemType::EditItem;
-			else if($itemIndex===$selectedIndex)
-				$itemType=TListItemType::SelectedItem;
+			if ($itemIndex === 0)
+				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
+			if ($hasSeparator && $itemIndex > 0)
+				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
+			if ($itemIndex === $editIndex)
+				$itemType = TListItemType::EditItem;
+			else if ($itemIndex === $selectedIndex)
+				$itemType = TListItemType::SelectedItem;
 			else
-				$itemType=$itemIndex%2?TListItemType::AlternatingItem : TListItemType::Item;
-			$items->add($this->createItemWithDataInternal($itemIndex,$itemType,$dataItem));
+				$itemType = $itemIndex % 2 ? TListItemType::AlternatingItem : TListItemType::Item;
+			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex>0)
-			$this->_footer=$this->createItemWithDataInternal(-1,TListItemType::Footer,null);
+		if ($itemIndex > 0)
+			$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
 		else
 		{
 			$this->createEmptyContent();
 			$this->dataBindChildren();
 		}
-		$this->setViewState('ItemCount',$itemIndex,0);
+		$this->setViewState('ItemCount', $itemIndex, 0);
 	}
 
 	/**
@@ -1474,15 +1474,15 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this->getItemCount()>0)
+			if ($this->getItemCount() > 0)
 			{
 				$this->applyItemStyles();
-				$repeatInfo=$this->getRepeatInfo();
-				$repeatInfo->renderRepeater($writer,$this);
+				$repeatInfo = $this->getRepeatInfo();
+				$repeatInfo->renderRepeater($writer, $this);
 			}
-			else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
+			else if ($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
 				parent::render($writer);
 		}
 	}
@@ -1506,7 +1506,7 @@ 
 	 * The datalist item control responsible for the event.
 	 * @var TControl
 	 */
-	private $_item=null;
+	private $_item = null;
 
 	/**
 	 * Constructor.
@@ -1514,7 +1514,7 @@ 
 	 */
 	public function __construct($item)
 	{
-		$this->_item=$item;
+		$this->_item = $item;
 	}
 
 	/**
@@ -1545,11 +1545,11 @@ 
 	/**
 	 * @var TControl the datalist item control responsible for the event.
 	 */
-	private $_item=null;
+	private $_item = null;
 	/**
 	 * @var TControl the control originally raises the <b>OnCommand</b> event.
 	 */
-	private $_source=null;
+	private $_source = null;
 
 	/**
 	 * Constructor.
@@ -1557,11 +1557,11 @@ 
 	 * @param TControl original event sender
 	 * @param TCommandEventParameter original event parameter
 	 */
-	public function __construct($item,$source,TCommandEventParameter $param)
+	public function __construct($item, $source, TCommandEventParameter $param)
 	{
-		$this->_item=$item;
-		$this->_source=$source;
-		parent::__construct($param->getCommandName(),$param->getCommandParameter());
+		$this->_item = $item;
+		$this->_source = $source;
+		parent::__construct($param->getCommandName(), $param->getCommandParameter());
 	}
 
 	/**
@@ -1611,7 +1611,7 @@ 
 	 */
 	private $_data;
 
-	private $_tagName='span';
+	private $_tagName = 'span';
 
 	/**
 	 * Returns the tag name used for this control.
@@ -1627,7 +1627,7 @@ 
 	 */
 	public function setTagName($value)
 	{
-		$this->_tagName=$value;
+		$this->_tagName = $value;
 	}
 
 	/**
@@ -1653,7 +1653,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType = TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -1671,7 +1671,7 @@ 
 	 */
 	public function setItemIndex($value)
 	{
-		$this->_itemIndex=TPropertyValue::ensureInteger($value);
+		$this->_itemIndex = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -1689,7 +1689,7 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data=$value;
+		$this->_data = $value;
 	}
 
 	/**
@@ -1719,11 +1719,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TCommandEventParameter)
+		if ($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -1749,10 +1749,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TControl descendant.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TControl)
-			parent::insertAt($index,$item);
+		if ($item instanceof TControl)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datalistitemcollection_datalistitem_required');
 	}

Braces +207 added lines, -169 removed lines

@@ -188,8 +188,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=new TDataListItemCollection;
+		if(!$this->_items) {
+					$this->_items=new TDataListItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -408,10 +409,11 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_itemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','ItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_itemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','ItemTemplate');
+		}
 	}
 
 	/**
@@ -441,10 +443,11 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_alternatingItemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','AlternatingItemType');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_alternatingItemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','AlternatingItemType');
+		}
 	}
 
 	/**
@@ -474,10 +477,11 @@ 
 	 */
 	public function setSelectedItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_selectedItemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','SelectedItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_selectedItemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','SelectedItemTemplate');
+		}
 	}
 
 	/**
@@ -507,10 +511,11 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_editItemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','EditItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_editItemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','EditItemTemplate');
+		}
 	}
 
 	/**
@@ -540,10 +545,11 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_headerTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','HeaderTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_headerTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','HeaderTemplate');
+		}
 	}
 
 	/**
@@ -581,10 +587,11 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_footerTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','FooterTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_footerTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','FooterTemplate');
+		}
 	}
 
 	/**
@@ -622,10 +629,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_emptyTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','EmptyTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_emptyTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','EmptyTemplate');
+		}
 	}
 
 	/**
@@ -642,10 +650,11 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_separatorTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required','SeparatorTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_separatorTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required','SeparatorTemplate');
+		}
 	}
 
 	/**
@@ -679,8 +688,9 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
 			$this->setViewState('SelectedItemIndex',$value,-1);
@@ -689,14 +699,16 @@ 
 			if($current>=0 && $current<$itemCount)
 			{
 				$item=$items->itemAt($current);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
+				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem) {
+									$item->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
+				}
 			}
 			if($value>=0 && $value<$itemCount)
 			{
 				$item=$items->itemAt($value);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType(TListItemType::SelectedItem);
+				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem) {
+									$item->setItemType(TListItemType::SelectedItem);
+				}
 			}
 		}
 	}
@@ -708,10 +720,11 @@ 
 	{
 		$index=$this->getSelectedItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index>=0 && $index<$items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -720,14 +733,16 @@ 
 	 */
 	public function getSelectedDataKey()
 	{
-		if($this->getDataKeyField()==='')
-			throw new TInvalidOperationException('datalist_datakeyfield_required');
+		if($this->getDataKeyField()==='') {
+					throw new TInvalidOperationException('datalist_datakeyfield_required');
+		}
 		$index=$this->getSelectedItemIndex();
 		$dataKeys=$this->getDataKeys();
-		if($index>=0 && $index<$dataKeys->getCount())
-			return $dataKeys->itemAt($index);
-		else
-			return null;
+		if($index>=0 && $index<$dataKeys->getCount()) {
+					return $dataKeys->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -747,17 +762,20 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		if(($current=$this->getEditItemIndex())!==$value)
 		{
 			$this->setViewState('EditItemIndex',$value,-1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
-				$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			if($current>=0 && $current<$itemCount) {
+							$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
+			}
+			if($value>=0 && $value<$itemCount) {
+							$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			}
 		}
 	}
 
@@ -768,10 +786,11 @@ 
 	{
 		$index=$this->getEditItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index>=0 && $index<$items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -920,27 +939,24 @@ 
 			$command=$param->getCommandName();
 			if(strcasecmp($command,self::CMD_SELECT)===0)
 			{
-				if(($item=$param->getItem()) instanceof IItemDataRenderer)
-					$this->setSelectedItemIndex($item->getItemIndex());
+				if(($item=$param->getItem()) instanceof IItemDataRenderer) {
+									$this->setSelectedItemIndex($item->getItemIndex());
+				}
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			} else if(strcasecmp($command,self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			} else if(strcasecmp($command,self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			} else if(strcasecmp($command,self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			} else if(strcasecmp($command,self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -1078,9 +1094,9 @@ 
 			$style=$item->getStyle();
 			$item->clearStyle();
 			return $style;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -1094,8 +1110,9 @@ 
 	public function renderItem($writer,$repeatInfo,$itemType,$index)
 	{
 		$item=$this->getItem($itemType,$index);
-		if($repeatInfo->getRepeatLayout()===TRepeatLayout::Raw && get_class($item)==='TDataListItem')
-			$item->setTagName('div');
+		if($repeatInfo->getRepeatLayout()===TRepeatLayout::Raw && get_class($item)==='TDataListItem') {
+					$item->setTagName('div');
+		}
 		$item->renderControl($writer);
 	}
 
@@ -1119,8 +1136,9 @@ 
 				return $this->getControls()->itemAt($this->getControls()->getCount()-1);
 			case TListItemType::Separator:
 				$i=$index+$index+1;
-				if($this->_headerTemplate!==null || $this->getHeaderRenderer()!=='')
-					$i++;
+				if($this->_headerTemplate!==null || $this->getHeaderRenderer()!=='') {
+									$i++;
+				}
 				return $this->getControls()->itemAt($i);
 		}
 		return null;
@@ -1141,9 +1159,9 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -1159,45 +1177,49 @@ 
 		if(($item=$this->createItem($itemIndex,$itemType))!==null)
 		{
 			$param=new TDataListItemEventParameter($item);
-			if($item instanceof IDataRenderer)
-				$item->setData($dataItem);
+			if($item instanceof IDataRenderer) {
+							$item->setData($dataItem);
+			}
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	private function getAlternatingItemDisplay()
 	{
-		if(($classPath=$this->getAlternatingItemRenderer())==='' && $this->_alternatingItemTemplate===null)
-			return array($this->getItemRenderer(),$this->_itemTemplate);
-		else
-			return array($classPath,$this->_alternatingItemTemplate);
+		if(($classPath=$this->getAlternatingItemRenderer())==='' && $this->_alternatingItemTemplate===null) {
+					return array($this->getItemRenderer(),$this->_itemTemplate);
+		} else {
+					return array($classPath,$this->_alternatingItemTemplate);
+		}
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
 		if(($classPath=$this->getSelectedItemRenderer())==='' && $this->_selectedItemTemplate===null)
 		{
-			if($itemIndex%2===0)
-				return array($this->getItemRenderer(),$this->_itemTemplate);
-			else
-				return $this->getAlternatingItemDisplay();
+			if($itemIndex%2===0) {
+							return array($this->getItemRenderer(),$this->_itemTemplate);
+			} else {
+							return $this->getAlternatingItemDisplay();
+			}
+		} else {
+					return array($classPath,$this->_selectedItemTemplate);
 		}
-		else
-			return array($classPath,$this->_selectedItemTemplate);
 	}
 
 	private function getEditItemDisplay($itemIndex)
 	{
-		if(($classPath=$this->getEditItemRenderer())==='' && $this->_editItemTemplate===null)
-			return $this->getSelectedItemDisplay($itemIndex);
-		else
-			return array($classPath,$this->_editItemTemplate);
+		if(($classPath=$this->getEditItemRenderer())==='' && $this->_editItemTemplate===null) {
+					return $this->getSelectedItemDisplay($itemIndex);
+		} else {
+					return array($classPath,$this->_editItemTemplate);
+		}
 	}
 
 	/**
@@ -1248,16 +1270,15 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		else if($template!==null)
+		} else if($template!==null)
 		{
 			$item=new TDataListItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
+		} else {
+					$item=null;
 		}
-		else
-			$item=null;
 
 		return $item;
 	}
@@ -1267,10 +1288,11 @@ 
 	 */
 	protected function createEmptyContent()
 	{
-		if(($classPath=$this->getEmptyRenderer())!=='')
-			$this->getControls()->add(Prado::createComponent($classPath));
-		else if($this->_emptyTemplate!==null)
-			$this->_emptyTemplate->instantiateIn($this);
+		if(($classPath=$this->getEmptyRenderer())!=='') {
+					$this->getControls()->add(Prado::createComponent($classPath));
+		} else if($this->_emptyTemplate!==null) {
+					$this->_emptyTemplate->instantiateIn($this);
+		}
 	}
 
 	/**
@@ -1291,10 +1313,11 @@ 
 		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
 		if($itemStyle!==null)
 		{
-			if($alternatingItemStyle===null)
-				$alternatingItemStyle=$itemStyle;
-			else
-				$alternatingItemStyle->mergeWith($itemStyle);
+			if($alternatingItemStyle===null) {
+							$alternatingItemStyle=$itemStyle;
+			} else {
+							$alternatingItemStyle->mergeWith($itemStyle);
+			}
 		}
 
 		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
@@ -1302,24 +1325,27 @@ 
 		$editItemStyle=$this->getViewState('EditItemStyle',null);
 		if($selectedItemStyle!==null)
 		{
-			if($editItemStyle===null)
-				$editItemStyle=$selectedItemStyle;
-			else
-				$editItemStyle->mergeWith($selectedItemStyle);
+			if($editItemStyle===null) {
+							$editItemStyle=$selectedItemStyle;
+			} else {
+							$editItemStyle->mergeWith($selectedItemStyle);
+			}
 		}
 
 		// apply header style if any
 		if($this->_header!==null && $this->_header instanceof IStyleable)
 		{
-			if($headerStyle=$this->getViewState('HeaderStyle',null))
-				$this->_header->getStyle()->mergeWith($headerStyle);
+			if($headerStyle=$this->getViewState('HeaderStyle',null)) {
+							$this->_header->getStyle()->mergeWith($headerStyle);
+			}
 		}
 
 		// apply footer style if any
 		if($this->_footer!==null && $this->_footer instanceof IStyleable)
 		{
-			if($footerStyle=$this->getViewState('FooterStyle',null))
-				$this->_footer->getStyle()->mergeWith($footerStyle);
+			if($footerStyle=$this->getViewState('FooterStyle',null)) {
+							$this->_footer->getStyle()->mergeWith($footerStyle);
+			}
 		}
 
 		$selectedIndex=$this->getSelectedItemIndex();
@@ -1328,16 +1354,18 @@ 
 		// apply item styles if any
 		foreach($this->getItems() as $index=>$item)
 		{
-			if($index===$editIndex)
-				$style=$editItemStyle;
-			else if($index===$selectedIndex)
-				$style=$selectedItemStyle;
-			else if($index%2===0)
-				$style=$itemStyle;
-			else
-				$style=$alternatingItemStyle;
-			if($style && $item instanceof IStyleable)
-				$item->getStyle()->mergeWith($style);
+			if($index===$editIndex) {
+							$style=$editItemStyle;
+			} else if($index===$selectedIndex) {
+							$style=$selectedItemStyle;
+			} else if($index%2===0) {
+							$style=$itemStyle;
+			} else {
+							$style=$alternatingItemStyle;
+			}
+			if($style && $item instanceof IStyleable) {
+							$item->getStyle()->mergeWith($style);
+			}
 		}
 
 		// apply separator style if any
@@ -1347,8 +1375,9 @@ 
 			$count=$controls->getCount();
 			for($i=$this->_header?2:1;$i<$count;$i+=2)
 			{
-				if(($separator=$controls->itemAt($i)) instanceof IStyleable)
-					$separator->getStyle()->mergeWith($separatorStyle);
+				if(($separator=$controls->itemAt($i)) instanceof IStyleable) {
+									$separator->getStyle()->mergeWith($separatorStyle);
+				}
 			}
 		}
 	}
@@ -1360,10 +1389,11 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
-		else
-			$this->clearViewState('ItemCount');
+		if($this->_items) {
+					$this->setViewState('ItemCount',$this->_items->getCount(),0);
+		} else {
+					$this->clearViewState('ItemCount');
+		}
 	}
 
 	/**
@@ -1373,8 +1403,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
-			$this->restoreItemsFromViewState();
+		if(!$this->getIsDataBound()) {
+					$this->restoreItemsFromViewState();
+		}
 		$this->clearViewState('ItemCount');
 	}
 
@@ -1404,20 +1435,22 @@ 
 			$this->_header=$this->createItemInternal(-1,TListItemType::Header);
 			for($i=0;$i<$itemCount;++$i)
 			{
-				if($hasSeparator && $i>0)
-					$this->createItemInternal($i-1,TListItemType::Separator);
-				if($i===$editIndex)
-					$itemType=TListItemType::EditItem;
-				else if($i===$selectedIndex)
-					$itemType=TListItemType::SelectedItem;
-				else
-					$itemType=$i%2?TListItemType::AlternatingItem : TListItemType::Item;
+				if($hasSeparator && $i>0) {
+									$this->createItemInternal($i-1,TListItemType::Separator);
+				}
+				if($i===$editIndex) {
+									$itemType=TListItemType::EditItem;
+				} else if($i===$selectedIndex) {
+									$itemType=TListItemType::SelectedItem;
+				} else {
+									$itemType=$i%2?TListItemType::AlternatingItem : TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($i,$itemType));
 			}
 			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
+		} else {
+					$this->createEmptyContent();
 		}
-		else
-			$this->createEmptyContent();
 		$this->clearChildState();
 	}
 
@@ -1440,26 +1473,30 @@ 
 		$editIndex=$this->getEditItemIndex();
 		foreach($data as $key=>$dataItem)
 		{
-			if($keyField!=='')
-				$keys->add($this->getDataFieldValue($dataItem,$keyField));
-			else
-				$keys->add($key);
-			if($itemIndex===0)
-				$this->_header=$this->createItemWithDataInternal(-1,TListItemType::Header,null);
-			if($hasSeparator && $itemIndex>0)
-				$this->createItemWithDataInternal($itemIndex-1,TListItemType::Separator,null);
-			if($itemIndex===$editIndex)
-				$itemType=TListItemType::EditItem;
-			else if($itemIndex===$selectedIndex)
-				$itemType=TListItemType::SelectedItem;
-			else
-				$itemType=$itemIndex%2?TListItemType::AlternatingItem : TListItemType::Item;
+			if($keyField!=='') {
+							$keys->add($this->getDataFieldValue($dataItem,$keyField));
+			} else {
+							$keys->add($key);
+			}
+			if($itemIndex===0) {
+							$this->_header=$this->createItemWithDataInternal(-1,TListItemType::Header,null);
+			}
+			if($hasSeparator && $itemIndex>0) {
+							$this->createItemWithDataInternal($itemIndex-1,TListItemType::Separator,null);
+			}
+			if($itemIndex===$editIndex) {
+							$itemType=TListItemType::EditItem;
+			} else if($itemIndex===$selectedIndex) {
+							$itemType=TListItemType::SelectedItem;
+			} else {
+							$itemType=$itemIndex%2?TListItemType::AlternatingItem : TListItemType::Item;
+			}
 			$items->add($this->createItemWithDataInternal($itemIndex,$itemType,$dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex>0)
-			$this->_footer=$this->createItemWithDataInternal(-1,TListItemType::Footer,null);
-		else
+		if($itemIndex>0) {
+					$this->_footer=$this->createItemWithDataInternal(-1,TListItemType::Footer,null);
+		} else
 		{
 			$this->createEmptyContent();
 			$this->dataBindChildren();
@@ -1481,9 +1518,9 @@ 
 				$this->applyItemStyles();
 				$repeatInfo=$this->getRepeatInfo();
 				$repeatInfo->renderRepeater($writer,$this);
+			} else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='') {
+							parent::render($writer);
 			}
-			else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
-				parent::render($writer);
 		}
 	}
 }
@@ -1725,9 +1762,9 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -1751,10 +1788,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TControl)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('datalistitemcollection_datalistitem_required');
+		if($item instanceof TControl) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('datalistitemcollection_datalistitem_required');
+		}
 	}
 }
 

framework/Web/UI/WebControls/TDataSourceControl.php

Doc Comments +7 added lines

@@ -20,6 +20,10 @@ 
 {
 	public function getView($viewName);
 	public function getViewNames();
+
+	/**
+	 * @return void
+	 */
 	public function onDataSourceChanged($param);
 }
 
@@ -95,6 +99,9 @@ 
 	private $_dataSource;
 	private $_dataMember;
 
+	/**
+	 * @param Traversable $dataSource
+	 */
 	public function __construct($dataSource,$dataMember)
 	{
 		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))

Spacing +8 added lines, -8 removed lines

@@ -44,7 +44,7 @@ 
 
 	public function onDataSourceChanged($param)
 	{
-		$this->raiseEvent('OnDataSourceChanged',$this,$param);
+		$this->raiseEvent('OnDataSourceChanged', $this, $param);
 	}
 
 	public function focus()
@@ -72,7 +72,7 @@ 
 		throw new TNotSupportedException('datasourcecontrol_skinid_unsupported');
 	}
 
-	public function getVisible($checkParents=true)
+	public function getVisible($checkParents = true)
 	{
 		return false;
 	}
@@ -95,20 +95,20 @@ 
 	private $_dataSource;
 	private $_dataMember;
 
-	public function __construct($dataSource,$dataMember)
+	public function __construct($dataSource, $dataMember)
 	{
-		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))
+		if (!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))
 			throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
-		$this->_dataSource=$dataSource;
-		$this->_dataMember=$dataMember;
+		$this->_dataSource = $dataSource;
+		$this->_dataMember = $dataMember;
 	}
 
 	public function getView($viewName)
 	{
-		if($this->_dataSource instanceof IDataSource)
+		if ($this->_dataSource instanceof IDataSource)
 			return $this->_dataSource->getView($viewName);
 		else
-			return new TReadOnlyDataSourceView($this,$this->_dataMember,$this->_dataSource);
+			return new TReadOnlyDataSourceView($this, $this->_dataMember, $this->_dataSource);
 	}
 }
 

Braces +8 added lines, -6 removed lines

@@ -97,18 +97,20 @@
 
 	public function __construct($dataSource,$dataMember)
 	{
-		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))
-			throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
+		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable)) {
+					throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
+		}
 		$this->_dataSource=$dataSource;
 		$this->_dataMember=$dataMember;
 	}
 
 	public function getView($viewName)
 	{
-		if($this->_dataSource instanceof IDataSource)
-			return $this->_dataSource->getView($viewName);
-		else
-			return new TReadOnlyDataSourceView($this,$this->_dataMember,$this->_dataSource);
+		if($this->_dataSource instanceof IDataSource) {
+					return $this->_dataSource->getView($viewName);
+		} else {
+					return new TReadOnlyDataSourceView($this,$this->_dataMember,$this->_dataSource);
+		}
 	}
 }
 

framework/Web/UI/WebControls/TDatePicker.php

Doc Comments +4 added lines

@@ -106,6 +106,7 @@ 
 	/**
 	 * Sets the format of the date string.
 	 * @param string the format of the date string
+	 * @param string $value
 	 */
 	public function setDateFormat($value)
 	{
@@ -245,6 +246,7 @@ 
 
 	/**
 	 * @param integer date picker starting year, default is 2000.
+	 * @param integer $value
 	 */
 	public function setFromYear($value)
 	{
@@ -354,6 +356,7 @@ 
 
 	/**
 	 * @param string date string
+	 * @param string $value
 	 */
 	public function setDate($value)
 	{
@@ -731,6 +734,7 @@ 
 	 * "MMMM" will return the month names, "MM" or "MMM" return abbr. month names
 	 * and "M" return month digits.
 	 * @param DateTimeFormatInfo localized date format information.
+	 * @param DateTimeFormatInfo $info
 	 * @return array localized month names.
 	 */
 	protected function getLocalizedMonthNames($info)

Spacing +87 added lines, -87 removed lines

@@ -100,7 +100,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getShowCalendar()
 	{
-		return $this->getViewState('ShowCalendar',true);
+		return $this->getViewState('ShowCalendar', true);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setShowCalendar($value)
 	{
-		$this->setViewState('ShowCalendar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowCalendar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function setFromYear($value)
 	{
-		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))-5);
+		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 */
 	public function getFromYear()
 	{
-		return $this->getViewState('FromYear', intval(@date('Y'))-5);
+		return $this->getViewState('FromYear', intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setUpToYear($value)
 	{
-		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))+10);
+		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 */
 	public function getUpToYear()
 	{
-		return $this->getViewState('UpToYear', intval(@date('Y'))+10);
+		return $this->getViewState('UpToYear', intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText())==='')
+		if (trim($this->getText()) === '')
 			return null;
 		else
 			return $this->getTimeStampFromText();
@@ -308,12 +308,12 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value===null || (is_string($value) && trim($value)===''))
+		if ($value === null || (is_string($value) && trim($value) === ''))
 			$this->setText('');
 		else
 		{
 			$date = TPropertyValue::ensureFloat($value);
-			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
+			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -372,7 +372,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript===null)
+		if ($this->_clientScript === null)
 			$this->_clientScript = $this->createClientScript();
 		return $this->_clientScript;
 	}
@@ -392,7 +392,7 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			return '';
 		$date = $this->getTimeStamp();
 		return $date == null ? $text : $date;
@@ -416,7 +416,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if ($this->getInputMode() == TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -424,7 +424,7 @@ 
 		else
 		{
 			$this->renderDropDownListCalendar($writer);
-			if($this->hasDayPattern())
+			if ($this->hasDayPattern())
 			{
 				$this->renderClientControlScript($writer);
 				$this->renderDatePickerButtons($writer);
@@ -437,7 +437,7 @@ 
 	 */
 	protected function renderDatePickerButtons($writer)
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			switch ($this->getMode())
 			{
@@ -459,12 +459,12 @@ 
 	 * @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)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if ($this->getInputMode() == TDatePickerInputMode::TextBox)
 			return parent::loadPostData($key, $values);
 		$value = $this->getDateFromPostData($key, $values);
-		if(!$this->getReadOnly() && $this->getText()!==$value)
+		if (!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return true;
@@ -483,18 +483,18 @@ 
 	{
 		$date = @getdate();
 
-		if(isset($values[$key.'$day']))
-			$day = intval($values[$key.'$day']);
+		if (isset($values[$key . '$day']))
+			$day = intval($values[$key . '$day']);
 		else
 			$day = $date['mday'];
 
-		if(isset($values[$key.'$month']))
-			$month = intval($values[$key.'$month']) + 1;
+		if (isset($values[$key . '$month']))
+			$month = intval($values[$key . '$month']) + 1;
 		else
 			$month = $date['mon'];
 
-		if(isset($values[$key.'$year']))
-			$year = intval($values[$key.'$year']);
+		if (isset($values[$key . '$year']))
+			$year = intval($values[$key . '$year']);
 		else
 			$year = $date['year'];
 
@@ -503,7 +503,7 @@ 
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
+		$pattern = str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->format($date);
 	}
@@ -518,12 +518,12 @@ 
 		$options['InputMode'] = $this->getInputMode();
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass=$this->getCssClass())!=='')
+		if (($cssClass = $this->getCssClass()) !== '')
 			$options['ClassName'] = $cssClass;
 		$options['CalendarStyle'] = $this->getCalendarStyle();
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
-		switch($this->getMode())
+		switch ($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
@@ -537,7 +537,7 @@ 
 		$options['PositionMode'] = $this->getPositionMode();
 
 		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript!==null)
+		if ($this->_clientScript !== null)
 			$options = array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
@@ -549,7 +549,7 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if ($this->getCurrentCulture() == 'en')
 			return array();
 
 		$date = $this->getLocalizedCalendarInfo();
@@ -587,14 +587,14 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
+		if ($this->getMode() == TDatePickerMode::Basic)
 			$this->setMode(TDatePickerMode::ImageButton);
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
+		if (strlen($class = $this->getCssClass()) > 0)
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
@@ -618,7 +618,7 @@ 
 	{
 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
-		return ($formatter->getDayPattern()!==null);
+		return ($formatter->getDayPattern() !== null);
 	}
 
 	/**
@@ -631,14 +631,14 @@ 
 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 
-		foreach($formatter->getDayMonthYearOrdering() as $type)
+		foreach ($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer,$date['mday']);
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer,$date['mon']);
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer,$date['year']);
+			if ($type == 'day')
+				$this->renderCalendarDayOptions($writer, $date['mday']);
+			elseif ($type == 'month')
+				$this->renderCalendarMonthOptions($writer, $date['mon']);
+			elseif ($type == 'year')
+				$this->renderCalendarYearOptions($writer, $date['year']);
 		}
 	}
 
@@ -649,8 +649,8 @@ 
 	protected function getTimeStampFromText()
 	{
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$pattern);
+		$pattern = str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -660,12 +660,12 @@ 
 	 * @param array list of selection options
 	 * @param mixed selected key.
 	 */
-	private function renderDropDownListOptions($writer,$options,$selected=null)
+	private function renderDropDownListOptions($writer, $options, $selected = null)
 	{
-		foreach($options as $k => $v)
+		foreach ($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
+			if ($k == $selected)
 				$writer->addAttribute('selected', 'selected');
 			$writer->renderBeginTag('option');
 			$writer->write($v);
@@ -678,13 +678,13 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 * @param mixed selected day.
 	 */
-	protected function renderCalendarDayOptions($writer, $selected=null)
+	protected function renderCalendarDayOptions($writer, $selected = null)
 	{
 		$days = $this->getDropDownDayOptions();
-		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
-		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
+		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'day');
+		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $days, $selected);
@@ -700,7 +700,7 @@ 
 						$this->getDateFormat());
 		$days = array();
 		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i=1;$i<=31;$i++)
+		for ($i = 1; $i <= 31; $i++)
 		{
 			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
@@ -712,17 +712,17 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 * @param mixed selected month.
 	 */
-	protected function renderCalendarMonthOptions($writer, $selected=null)
+	protected function renderCalendarMonthOptions($writer, $selected = null)
 	{
 		$info = $this->getLocalizedCalendarInfo();
-		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
-		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
+		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'month');
+		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
-					$this->getLocalizedMonthNames($info), $selected-1);
+					$this->getLocalizedMonthNames($info), $selected - 1);
 		$writer->renderEndTag();
 	}
 
@@ -737,16 +737,16 @@ 
 	{
 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
-		switch($formatter->getMonthPattern())
+		switch ($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
 				$array = array();
-				for($i=1;$i<=12;$i++)
-						$array[$i-1] = $i < 10 ? '0'.$i : $i;
+				for ($i = 1; $i <= 12; $i++)
+						$array[$i - 1] = $i < 10 ? '0' . $i : $i;
 				return $array;
 			case 'M':
-				$array = array(); for($i=1;$i<=12;$i++) $array[$i-1] = $i;
+				$array = array(); for ($i = 1; $i <= 12; $i++) $array[$i - 1] = $i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -757,15 +757,15 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 * @param mixed selected year.
 	 */
-	protected function renderCalendarYearOptions($writer, $selected=null)
+	protected function renderCalendarYearOptions($writer, $selected = null)
 	{
 		$years = array();
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
+		for ($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
 			$years[$i] = $i;
-		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
-		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
+		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'year');
+		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $years, $selected);
@@ -778,7 +778,7 @@ 
 	 */
 	protected function getDatePickerButtonID()
 	{
-		return $this->getClientID().'button';
+		return $this->getClientID() . 'button';
 	}
 
 	/**
@@ -789,9 +789,9 @@ 
 	{
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
-		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
-		$writer->addAttribute('value',$this->getButtonText());
-		if(!$this->getEnabled(true))
+		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerButton');
+		$writer->addAttribute('value', $this->getButtonText());
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag("input");
 		$writer->renderEndTag();
@@ -808,8 +808,8 @@ 
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
-		$writer->addAttribute('class', $this->getCssClass().' TDatePickerImageButton');
-		if(!$this->getEnabled(true))
+		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerImageButton');
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->addAttribute('type', 'image');
 		$writer->addAttribute('onclick', 'return false;');
@@ -821,10 +821,10 @@ 
 	 * @param string date picker asset file in the self::SCRIPT_PATH directory.
 	 * @return string date picker asset url.
 	 */
-	protected function getAssetUrl($file='')
+	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
+		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
 	}
 
 	/**
@@ -833,9 +833,9 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
+		$url = $this->getAssetUrl($this->getCalendarStyle() . '.css');
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
 	}
@@ -847,7 +847,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -855,7 +855,7 @@ 
 	 */
 	protected function registerCalendarClientScriptPre()
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			$cs = $this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
@@ -864,10 +864,10 @@ 
 
 	protected function renderClientControlScript($writer)
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			$cs = $this->getPage()->getClientScript();
-			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
+			if (!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
 				$spacer = $this->getAssetUrl('spacer.gif');
 				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
@@ -876,7 +876,7 @@ 
 
 			$options = TJavaScript::encode($this->getDatePickerOptions());
 			$code = "new Prado.WebUI.TDatePicker($options);";
-			$cs->registerEndScript("prado:".$this->getClientID(), $code);
+			$cs->registerEndScript("prado:" . $this->getClientID(), $code);
 		}
 	}
 }
@@ -932,8 +932,8 @@ 
  */
 class TDatePickerInputMode extends TEnumerable
 {
-	const TextBox='TextBox';
-	const DropDownList='DropDownList';
+	const TextBox = 'TextBox';
+	const DropDownList = 'DropDownList';
 }
 
 /**
@@ -953,10 +953,10 @@ 
  */
 class TDatePickerMode extends TEnumerable
 {
-	const Basic='Basic';
-	const Clickable='Clickable';
-	const Button='Button';
-	const ImageButton='ImageButton';
+	const Basic = 'Basic';
+	const Clickable = 'Clickable';
+	const Button = 'Button';
+	const ImageButton = 'ImageButton';
 }
 
 /**
@@ -973,6 +973,6 @@ 
  */
 class TDatePickerPositionMode extends TEnumerable
 {
-	const Top='Top';
-	const Bottom='Bottom';
+	const Top = 'Top';
+	const Bottom = 'Bottom';
 }

Braces +87 added lines, -64 removed lines

@@ -296,10 +296,11 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText())==='')
-			return null;
-		else
-			return $this->getTimeStampFromText();
+		if(trim($this->getText())==='') {
+					return null;
+		} else {
+					return $this->getTimeStampFromText();
+		}
 	}
 
 	/**
@@ -308,9 +309,9 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value===null || (is_string($value) && trim($value)===''))
-			$this->setText('');
-		else
+		if($value===null || (is_string($value) && trim($value)==='')) {
+					$this->setText('');
+		} else
 		{
 			$date = TPropertyValue::ensureFloat($value);
 			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
@@ -372,8 +373,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript===null) {
+					$this->_clientScript = $this->createClientScript();
+		}
 		return $this->_clientScript;
 	}
 
@@ -392,8 +394,9 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
-			return '';
+		if(($text = $this->getText()) === '') {
+					return '';
+		}
 		$date = $this->getTimeStamp();
 		return $date == null ? $text : $date;
 	}
@@ -420,8 +423,7 @@ 
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
-		}
-		else
+		} else
 		{
 			$this->renderDropDownListCalendar($writer);
 			if($this->hasDayPattern())
@@ -461,16 +463,17 @@ 
 	 */
 	public function loadPostData($key,$values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
-			return parent::loadPostData($key, $values);
+		if($this->getInputMode() == TDatePickerInputMode::TextBox) {
+					return parent::loadPostData($key, $values);
+		}
 		$value = $this->getDateFromPostData($key, $values);
 		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -483,20 +486,23 @@ 
 	{
 		$date = @getdate();
 
-		if(isset($values[$key.'$day']))
-			$day = intval($values[$key.'$day']);
-		else
-			$day = $date['mday'];
+		if(isset($values[$key.'$day'])) {
+					$day = intval($values[$key.'$day']);
+		} else {
+					$day = $date['mday'];
+		}
 
-		if(isset($values[$key.'$month']))
-			$month = intval($values[$key.'$month']) + 1;
-		else
-			$month = $date['mon'];
+		if(isset($values[$key.'$month'])) {
+					$month = intval($values[$key.'$month']) + 1;
+		} else {
+					$month = $date['mon'];
+		}
 
-		if(isset($values[$key.'$year']))
-			$year = intval($values[$key.'$year']);
-		else
-			$year = $date['year'];
+		if(isset($values[$key.'$year'])) {
+					$year = intval($values[$key.'$year']);
+		} else {
+					$year = $date['year'];
+		}
 
 		$s = Prado::createComponent('System.Util.TDateTimeStamp');
 		$date = $s->getTimeStamp(0, 0, 0, $month, $day, $year);
@@ -518,8 +524,9 @@ 
 		$options['InputMode'] = $this->getInputMode();
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass=$this->getCssClass())!=='')
-			$options['ClassName'] = $cssClass;
+		if(($cssClass=$this->getCssClass())!=='') {
+					$options['ClassName'] = $cssClass;
+		}
 		$options['CalendarStyle'] = $this->getCalendarStyle();
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
@@ -537,9 +544,10 @@ 
 		$options['PositionMode'] = $this->getPositionMode();
 
 		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript!==null)
-			$options = array_merge($options,
+		if($this->_clientScript!==null) {
+					$options = array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
+		}
 		return $options;
 	}
 
@@ -549,8 +557,9 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
-			return array();
+		if($this->getCurrentCulture() == 'en') {
+					return array();
+		}
 
 		$date = $this->getLocalizedCalendarInfo();
 		$options['MonthNames'] = $date->getMonthNames();
@@ -587,15 +596,17 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
-			$this->setMode(TDatePickerMode::ImageButton);
+		if($this->getMode() == TDatePickerMode::Basic) {
+					$this->setMode(TDatePickerMode::ImageButton);
+		}
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
-			$writer->addAttribute('class', $class);
+		if(strlen($class = $this->getCssClass()) > 0) {
+					$writer->addAttribute('class', $class);
+		}
 		$writer->renderBeginTag('span');
 
 		$s = Prado::createComponent('System.Util.TDateTimeStamp');
@@ -633,12 +644,13 @@ 
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer,$date['mday']);
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer,$date['mon']);
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer,$date['year']);
+			if($type == 'day') {
+							$this->renderCalendarDayOptions($writer,$date['mday']);
+			} elseif($type == 'month') {
+							$this->renderCalendarMonthOptions($writer,$date['mon']);
+			} elseif($type == 'year') {
+							$this->renderCalendarYearOptions($writer,$date['year']);
+			}
 		}
 	}
 
@@ -665,8 +677,9 @@ 
 		foreach($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
-				$writer->addAttribute('selected', 'selected');
+			if($k == $selected) {
+							$writer->addAttribute('selected', 'selected');
+			}
 			$writer->renderBeginTag('option');
 			$writer->write($v);
 			$writer->renderEndTag();
@@ -684,8 +697,9 @@ 
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $days, $selected);
 		$writer->renderEndTag();
@@ -718,8 +732,9 @@ 
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
 					$this->getLocalizedMonthNames($info), $selected-1);
@@ -742,11 +757,14 @@ 
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
 				$array = array();
-				for($i=1;$i<=12;$i++)
-						$array[$i-1] = $i < 10 ? '0'.$i : $i;
+				for($i=1;$i<=12;$i++) {
+										$array[$i-1] = $i < 10 ? '0'.$i : $i;
+				}
 				return $array;
 			case 'M':
-				$array = array(); for($i=1;$i<=12;$i++) $array[$i-1] = $i;
+				$array = array(); for($i=1;$i<=12;$i++) {
+					$array[$i-1] = $i;
+				}
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -760,13 +778,15 @@ 
 	protected function renderCalendarYearOptions($writer, $selected=null)
 	{
 		$years = array();
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
+		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++) {
+					$years[$i] = $i;
+		}
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $years, $selected);
 		$writer->renderEndTag();
@@ -791,8 +811,9 @@ 
 		$writer->addAttribute('type', 'button');
 		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
 		$writer->addAttribute('value',$this->getButtonText());
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag("input");
 		$writer->renderEndTag();
 	}
@@ -809,8 +830,9 @@ 
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
 		$writer->addAttribute('class', $this->getCssClass().' TDatePickerImageButton');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->addAttribute('type', 'image');
 		$writer->addAttribute('onclick', 'return false;');
 		$writer->renderBeginTag('input');
@@ -835,8 +857,9 @@ 
 	{
 		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
 	}