pradosoft / prado

framework/Web/UI/WebControls/TListControlValidator.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 
 	/**
 	 * @param TListControl control to validate
+	 * @param TControl $control
 	 * @return array number of selected values and its values.
 	 */
 	protected function getSelection($control)

Spacing +28 added lines, -28 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function getMinSelection()
 	{
-		return $this->getViewState('MinSelection',-1);
+		return $this->getViewState('MinSelection', -1);
 	}
 
 	/**
@@ -84,9 +84,9 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		$this->setViewState('MinSelection',$value,-1);
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		$this->setViewState('MinSelection', $value, -1);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function getMaxSelection()
 	{
-		return $this->getViewState('MaxSelection',-1);
+		return $this->getViewState('MaxSelection', -1);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		$this->setViewState('MaxSelection',$value,-1);
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		$this->setViewState('MaxSelection', $value, -1);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function getRequiredSelections()
 	{
-		return $this->getViewState('RequiredSelections','');
+		return $this->getViewState('RequiredSelections', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setRequiredSelections($value)
 	{
-		$this->setViewState('RequiredSelections',$value,'');
+		$this->setViewState('RequiredSelections', $value, '');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$control=$this->getValidationTarget();
+		$control = $this->getValidationTarget();
 
 		$exists = true;
 		$values = $this->getSelection($control);
@@ -141,22 +141,22 @@ 
 		$required = $this->getRequiredValues();
 
 		//if required, check the values
-		if(!empty($required))
+		if (!empty($required))
 		{
-			if($count < count($required) )
+			if ($count < count($required))
 				return false;
-			foreach($required as $require)
+			foreach ($required as $require)
 				$exists = $exists && in_array($require, $values);
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
+		if ($min !== -1 && $max !== -1)
 			return $exists && $count >= $min && $count <= $max;
-		else if($min === -1 && $max !== -1)
+		else if ($min === -1 && $max !== -1)
 			return $exists && $count <= $max;
-		else if($min !== -1 && $max === -1)
+		else if ($min !== -1 && $max === -1)
 			return $exists && $count >= $min;
 		else
 			return $exists;
@@ -171,9 +171,9 @@ 
 		$values = array();
 
 		//get the data
-		foreach($control->getItems() as $item)
+		foreach ($control->getItems() as $item)
 		{
-			if($item->getSelected())
+			if ($item->getSelected())
 				$values[] = $item->getValue();
 		}
 		return $values;
@@ -186,7 +186,7 @@ 
 	{
 		$required = array();
 		$string = $this->getRequiredSelections();
-		if(!empty($string))
+		if (!empty($string))
 			$required = preg_split('/,\s*/', $string);
 		return $required;
 	}
@@ -200,22 +200,22 @@ 
 		$options = parent::getClientScriptOptions();
 		$control = $this->getValidationTarget();
 
-		if(!$control instanceof TListControl)
+		if (!$control instanceof TListControl)
 		{
 			throw new TConfigurationException(
 				'listcontrolvalidator_invalid_control',
-				$this->getID(),$this->getControlToValidate(), get_class($control));
+				$this->getID(), $this->getControlToValidate(), get_class($control));
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
-		if($min !== -1)
-			$options['Min']= $min;
-		if($max !== -1)
-			$options['Max']= $max;
+		if ($min !== -1)
+			$options['Min'] = $min;
+		if ($max !== -1)
+			$options['Max'] = $max;
 		$required = $this->getRequiredSelections();
-		if(strlen($required) > 0)
-			$options['Required']= $required;
+		if (strlen($required) > 0)
+			$options['Required'] = $required;
 		$options['TotalItems'] = $control->getItemCount();
 
 		return $options;

Braces +36 added lines, -26 removed lines

@@ -84,8 +84,9 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		$this->setViewState('MinSelection',$value,-1);
 	}
 
@@ -102,8 +103,9 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		$this->setViewState('MaxSelection',$value,-1);
 	}
 
@@ -143,23 +145,26 @@ 
 		//if required, check the values
 		if(!empty($required))
 		{
-			if($count < count($required) )
-				return false;
-			foreach($required as $require)
-				$exists = $exists && in_array($require, $values);
+			if($count < count($required) ) {
+							return false;
+			}
+			foreach($required as $require) {
+							$exists = $exists && in_array($require, $values);
+			}
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
-			return $exists && $count >= $min && $count <= $max;
-		else if($min === -1 && $max !== -1)
-			return $exists && $count <= $max;
-		else if($min !== -1 && $max === -1)
-			return $exists && $count >= $min;
-		else
-			return $exists;
+		if($min !== -1 && $max !== -1) {
+					return $exists && $count >= $min && $count <= $max;
+		} else if($min === -1 && $max !== -1) {
+					return $exists && $count <= $max;
+		} else if($min !== -1 && $max === -1) {
+					return $exists && $count >= $min;
+		} else {
+					return $exists;
+		}
 	}
 
 	/**
@@ -173,8 +178,9 @@ 
 		//get the data
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected())
-				$values[] = $item->getValue();
+			if($item->getSelected()) {
+							$values[] = $item->getValue();
+			}
 		}
 		return $values;
 	}
@@ -186,8 +192,9 @@ 
 	{
 		$required = array();
 		$string = $this->getRequiredSelections();
-		if(!empty($string))
-			$required = preg_split('/,\s*/', $string);
+		if(!empty($string)) {
+					$required = preg_split('/,\s*/', $string);
+		}
 		return $required;
 	}
 
@@ -209,13 +216,16 @@ 
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
-		if($min !== -1)
-			$options['Min']= $min;
-		if($max !== -1)
-			$options['Max']= $max;
+		if($min !== -1) {
+					$options['Min']= $min;
+		}
+		if($max !== -1) {
+					$options['Max']= $max;
+		}
 		$required = $this->getRequiredSelections();
-		if(strlen($required) > 0)
-			$options['Required']= $required;
+		if(strlen($required) > 0) {
+					$options['Required']= $required;
+		}
 		$options['TotalItems'] = $control->getItemCount();
 
 		return $options;

framework/Web/UI/WebControls/TListItem.php

Doc Comments +5 added lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * @param boolean whether the item is enabled
+	 * @param boolean $value
 	 */
 	public function setEnabled($value)
 	{
@@ -108,6 +109,7 @@ 
 
 	/**
 	 * @param boolean whether the item is selected
+	 * @param boolean $value
 	 */
 	public function setSelected($value)
 	{
@@ -166,6 +168,7 @@ 
 
 	/**
 	 * @param string name of the attribute
+	 * @param string $name
 	 * @return boolean whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -174,6 +177,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string the named attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -184,6 +188,7 @@ 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{

Spacing +25 added lines, -25 removed lines

@@ -28,23 +28,23 @@ 
 	/**
 	 * @var TMap list of custom attributes
 	 */
-	private $_attributes=null;
+	private $_attributes = null;
 	/**
 	 * @var string text of the item
 	 */
-	private $_text='';
+	private $_text = '';
 	/**
 	 * @var string value of the item
 	 */
-	private $_value='';
+	private $_value = '';
 	/**
 	 * @var boolean whether the item is enabled
 	 */
-	private $_enabled=true;
+	private $_enabled = true;
 	/**
 	 * @var boolean whether the item is selected
 	 */
-	private $_selected=false;
+	private $_selected = false;
 
 	/**
 	 * Constructor.
@@ -53,7 +53,7 @@ 
 	 * @param boolean whether the item is enabled
 	 * @param boolean whether the item is selected
 	 */
-	public function __construct($text='',$value='',$enabled=true,$selected=false)
+	public function __construct($text = '', $value = '', $enabled = true, $selected = false)
 	{
 		$this->setText($text);
 		$this->setValue($value);
@@ -70,15 +70,15 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_attributes===null)
+		if ($this->_attributes === null)
 			$exprops[] = "\0TListItem\0_attributes";
-		if($this->_text==='')
+		if ($this->_text === '')
 			$exprops[] = "\0TListItem\0_text";
-		if($this->_value==='')
+		if ($this->_value === '')
 			$exprops[] = "\0TListItem\0_value";
-		if ($this->_enabled===true)
+		if ($this->_enabled === true)
 			$exprops[] = "\0TListItem\0_enabled";
-		if ($this->_selected===false)
+		if ($this->_selected === false)
 			$exprops[] = "\0TListItem\0_selected";
 	}
 
@@ -95,7 +95,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled=TPropertyValue::ensureBoolean($value);
+		$this->_enabled = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setSelected($value)
 	{
-		$this->_selected=TPropertyValue::ensureBoolean($value);
+		$this->_selected = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text===''?$this->_value:$this->_text;
+		return $this->_text === '' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->_text=TPropertyValue::ensureString($value);
+		$this->_text = TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value===''?$this->_text:$this->_value;
+		return $this->_value === '' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value=TPropertyValue::ensureString($value);
+		$this->_value = TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TAttributeCollection;
+		if (!$this->_attributes)
+			$this->_attributes = new TAttributeCollection;
 		return $this->_attributes;
 	}
 
@@ -161,7 +161,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		return $this->_attributes && $this->_attributes->getCount()>0;
+		return $this->_attributes && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -178,16 +178,16 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }
 

Braces +18 added lines, -12 removed lines

@@ -70,16 +70,21 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_attributes===null)
-			$exprops[] = "\0TListItem\0_attributes";
-		if($this->_text==='')
-			$exprops[] = "\0TListItem\0_text";
-		if($this->_value==='')
-			$exprops[] = "\0TListItem\0_value";
-		if ($this->_enabled===true)
-			$exprops[] = "\0TListItem\0_enabled";
-		if ($this->_selected===false)
-			$exprops[] = "\0TListItem\0_selected";
+		if ($this->_attributes===null) {
+					$exprops[] = "\0TListItem\0_attributes";
+		}
+		if($this->_text==='') {
+					$exprops[] = "\0TListItem\0_text";
+		}
+		if($this->_value==='') {
+					$exprops[] = "\0TListItem\0_value";
+		}
+		if ($this->_enabled===true) {
+					$exprops[] = "\0TListItem\0_enabled";
+		}
+		if ($this->_selected===false) {
+					$exprops[] = "\0TListItem\0_selected";
+		}
 	}
 
 	/**
@@ -151,8 +156,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TAttributeCollection;
+		if(!$this->_attributes) {
+					$this->_attributes=new TAttributeCollection;
+		}
 		return $this->_attributes;
 	}
 

framework/Web/UI/WebControls/TMultiView.php

Doc Comments +1 added lines

@@ -281,6 +281,7 @@
 	 * controls be added into the collection.
 	 * @param integer the speicified position.
 	 * @param mixed new item
+	 * @param TWizardStep $item
 	 * @throws TInvalidDataTypeException if the item to be inserted is neither a string nor a TControl.
 	 */
 	public function insertAt($index,$item)

Spacing +64 added lines, -64 removed lines

@@ -36,12 +36,12 @@ 
  */
 class TMultiView extends TControl
 {
-	const CMD_NEXTVIEW='NextView';
-	const CMD_PREVIOUSVIEW='PreviousView';
-	const CMD_SWITCHVIEWID='SwitchViewID';
-	const CMD_SWITCHVIEWINDEX='SwitchViewIndex';
-	private $_cachedActiveViewIndex=-1;
-	private $_ignoreBubbleEvents=false;
+	const CMD_NEXTVIEW = 'NextView';
+	const CMD_PREVIOUSVIEW = 'PreviousView';
+	const CMD_SWITCHVIEWID = 'SwitchViewID';
+	const CMD_SWITCHVIEWINDEX = 'SwitchViewIndex';
+	private $_cachedActiveViewIndex = -1;
+	private $_ignoreBubbleEvents = false;
 
 	/**
 	 * Processes an object that is created during parsing template.
@@ -53,9 +53,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TView)
+		if ($object instanceof TView)
 			$this->getControls()->add($object);
-		else if(!is_string($object))
+		else if (!is_string($object))
 			throw new TConfigurationException('multiview_view_required');
 	}
 
@@ -73,10 +73,10 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex>-1)
+		if ($this->_cachedActiveViewIndex > -1)
 			return $this->_cachedActiveViewIndex;
 		else
-			return $this->getControlState('ActiveViewIndex',-1);
+			return $this->getControlState('ActiveViewIndex', -1);
 	}
 
 	/**
@@ -85,21 +85,21 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index=TPropertyValue::ensureInteger($value))<0)
-			$index=-1;
-		$views=$this->getViews();
-		$count=$views->getCount();
-		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED)
-			$this->_cachedActiveViewIndex=$index;
-		else if($index<$count)
+		if (($index = TPropertyValue::ensureInteger($value)) < 0)
+			$index = -1;
+		$views = $this->getViews();
+		$count = $views->getCount();
+		if ($count === 0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
+			$this->_cachedActiveViewIndex = $index;
+		else if ($index < $count)
 		{
-			$this->setControlState('ActiveViewIndex',$index,-1);
-			$this->_cachedActiveViewIndex=-1;
-			if($index>=0)
-				$this->activateView($views->itemAt($index),true);
+			$this->setControlState('ActiveViewIndex', $index, -1);
+			$this->_cachedActiveViewIndex = -1;
+			if ($index >= 0)
+				$this->activateView($views->itemAt($index), true);
 		}
 		else
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
 	/**
@@ -108,15 +108,15 @@ 
 	 */
 	public function getActiveView()
 	{
-		$index=$this->getActiveViewIndex();
-		$views=$this->getViews();
-		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
-		if($index<0)
+		$index = $this->getActiveViewIndex();
+		$views = $this->getViews();
+		if ($index >= $views->getCount())
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
+		if ($index < 0)
 			return null;
-		$view=$views->itemAt($index);
-		if(!$view->getActive())
-			$this->activateView($view,false);
+		$view = $views->itemAt($index);
+		if (!$view->getActive())
+			$this->activateView($view, false);
 		return $view;
 	}
 
@@ -126,7 +126,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index=$this->getViews()->indexOf($view))>=0)
+		if (($index = $this->getViews()->indexOf($view)) >= 0)
 			$this->setActiveViewIndex($index);
 		else
 			throw new TInvalidOperationException('multiview_view_inexistent');
@@ -138,26 +138,26 @@ 
 	 * @param TView the view to be activated
 	 * @param boolean whether to trigger OnActiveViewChanged event.
 	 */
-	protected function activateView($view,$triggerViewChangedEvent=true)
+	protected function activateView($view, $triggerViewChangedEvent = true)
 	{
-		if($view->getActive())
+		if ($view->getActive())
 			return;
-		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
-		foreach($this->getViews() as $v)
+		$triggerEvent = $triggerViewChangedEvent && ($this->getControlStage() >= TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
+		foreach ($this->getViews() as $v)
 		{
-			if($v===$view)
+			if ($v === $view)
 			{
 				$view->setActive(true);
-				if($triggerEvent)
+				if ($triggerEvent)
 				{
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
 			}
-			else if($v->getActive())
+			else if ($v->getActive())
 			{
 				$v->setActive(false);
-				if($triggerEvent)
+				if ($triggerEvent)
 					$v->onDeactivate(null);
 			}
 		}
@@ -178,7 +178,7 @@ 
 	 */
 	public function ignoreBubbleEvents()
 	{
-		$this->_ignoreBubbleEvents=true;
+		$this->_ignoreBubbleEvents = true;
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex>=0)
+		if ($this->_cachedActiveViewIndex >= 0)
 			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
 	}
 
@@ -200,7 +200,7 @@ 
 	 */
 	public function onActiveViewChanged($param)
 	{
-		$this->raiseEvent('OnActiveViewChanged',$this,$param);
+		$this->raiseEvent('OnActiveViewChanged', $this, $param);
 	}
 
 	/**
@@ -210,25 +210,25 @@ 
 	 * @param mixed event parameter
 	 * @return boolean whether this event is handled
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if(!$this->_ignoreBubbleEvents && ($param instanceof TCommandEventParameter))
+		if (!$this->_ignoreBubbleEvents && ($param instanceof TCommandEventParameter))
 		{
-			switch($param->getCommandName())
+			switch ($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index=$this->getActiveViewIndex())<$this->getViews()->getCount()-1)
-						$this->setActiveViewIndex($index+1);
+					if (($index = $this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
+						$this->setActiveViewIndex($index + 1);
 					else
 						$this->setActiveViewIndex(-1);
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index=$this->getActiveViewIndex())>=0)
-						$this->setActiveViewIndex($index-1);
+					if (($index = $this->getActiveViewIndex()) >= 0)
+						$this->setActiveViewIndex($index - 1);
 					return true;
 				case self::CMD_SWITCHVIEWID:
-					$view=$this->findControl($viewID=$param->getCommandParameter());
-					if($view!==null && $view->getParent()===$this)
+					$view = $this->findControl($viewID = $param->getCommandParameter());
+					if ($view !== null && $view->getParent() === $this)
 					{
 						$this->setActiveView($view);
 						return true;
@@ -236,7 +236,7 @@ 
 					else
 						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 				case self::CMD_SWITCHVIEWINDEX:
-					$index=TPropertyValue::ensureInteger($param->getCommandParameter());
+					$index = TPropertyValue::ensureInteger($param->getCommandParameter());
 					$this->setActiveViewIndex($index);
 					return true;
 			}
@@ -260,7 +260,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if(($view=$this->getActiveView())!==null)
+		if (($view = $this->getActiveView()) !== null)
 			$view->renderControl($writer);
 	}
 }
@@ -283,10 +283,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is neither a string nor a TControl.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TView)
-			parent::insertAt($index,$item);
+		if ($item instanceof TView)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('viewcollection_view_required');
 	}
@@ -309,7 +309,7 @@ 
  */
 class TView extends TControl
 {
-	private $_active=false;
+	private $_active = false;
 
 	/**
 	 * Raises <b>OnActivate</b> event.
@@ -317,7 +317,7 @@ 
 	 */
 	public function onActivate($param)
 	{
-		$this->raiseEvent('OnActivate',$this,$param);
+		$this->raiseEvent('OnActivate', $this, $param);
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 	 */
 	public function onDeactivate($param)
 	{
-		$this->raiseEvent('OnDeactivate',$this,$param);
+		$this->raiseEvent('OnDeactivate', $this, $param);
 	}
 
 	/**
@@ -342,8 +342,8 @@ 
 	 */
 	public function setActive($value)
 	{
-		$value=TPropertyValue::ensureBoolean($value);
-		$this->_active=$value;
+		$value = TPropertyValue::ensureBoolean($value);
+		$this->_active = $value;
 		parent::setVisible($value);
 	}
 
@@ -352,11 +352,11 @@ 
 	 * @return boolean whether this view is visible.
 	 * The view is visible if it is active and its parent is visible.
 	 */
-	public function getVisible($checkParents=true)
+	public function getVisible($checkParents = true)
 	{
-		if(($parent=$this->getParent())===null)
+		if (($parent = $this->getParent()) === null)
 			return $this->getActive();
-		else if($this->getActive())
+		else if ($this->getActive())
 			return $parent->getVisible($checkParents);
 		else
 			return false;

Braces +70 added lines, -55 removed lines

@@ -53,10 +53,11 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TView)
-			$this->getControls()->add($object);
-		else if(!is_string($object))
-			throw new TConfigurationException('multiview_view_required');
+		if($object instanceof TView) {
+					$this->getControls()->add($object);
+		} else if(!is_string($object)) {
+					throw new TConfigurationException('multiview_view_required');
+		}
 	}
 
 	/**
@@ -73,10 +74,11 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex>-1)
-			return $this->_cachedActiveViewIndex;
-		else
-			return $this->getControlState('ActiveViewIndex',-1);
+		if($this->_cachedActiveViewIndex>-1) {
+					return $this->_cachedActiveViewIndex;
+		} else {
+					return $this->getControlState('ActiveViewIndex',-1);
+		}
 	}
 
 	/**
@@ -85,21 +87,23 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index=TPropertyValue::ensureInteger($value))<0)
-			$index=-1;
+		if(($index=TPropertyValue::ensureInteger($value))<0) {
+					$index=-1;
+		}
 		$views=$this->getViews();
 		$count=$views->getCount();
-		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED)
-			$this->_cachedActiveViewIndex=$index;
-		else if($index<$count)
+		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED) {
+					$this->_cachedActiveViewIndex=$index;
+		} else if($index<$count)
 		{
 			$this->setControlState('ActiveViewIndex',$index,-1);
 			$this->_cachedActiveViewIndex=-1;
-			if($index>=0)
-				$this->activateView($views->itemAt($index),true);
+			if($index>=0) {
+							$this->activateView($views->itemAt($index),true);
+			}
+		} else {
+					throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
 		}
-		else
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
 	}
 
 	/**
@@ -110,13 +114,16 @@ 
 	{
 		$index=$this->getActiveViewIndex();
 		$views=$this->getViews();
-		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
-		if($index<0)
-			return null;
+		if($index>=$views->getCount()) {
+					throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
+		}
+		if($index<0) {
+					return null;
+		}
 		$view=$views->itemAt($index);
-		if(!$view->getActive())
-			$this->activateView($view,false);
+		if(!$view->getActive()) {
+					$this->activateView($view,false);
+		}
 		return $view;
 	}
 
@@ -126,10 +133,11 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index=$this->getViews()->indexOf($view))>=0)
-			$this->setActiveViewIndex($index);
-		else
-			throw new TInvalidOperationException('multiview_view_inexistent');
+		if(($index=$this->getViews()->indexOf($view))>=0) {
+					$this->setActiveViewIndex($index);
+		} else {
+					throw new TInvalidOperationException('multiview_view_inexistent');
+		}
 	}
 
 	/**
@@ -140,8 +148,9 @@ 
 	 */
 	protected function activateView($view,$triggerViewChangedEvent=true)
 	{
-		if($view->getActive())
-			return;
+		if($view->getActive()) {
+					return;
+		}
 		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
 		foreach($this->getViews() as $v)
 		{
@@ -153,12 +162,12 @@ 
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
-			}
-			else if($v->getActive())
+			} else if($v->getActive())
 			{
 				$v->setActive(false);
-				if($triggerEvent)
-					$v->onDeactivate(null);
+				if($triggerEvent) {
+									$v->onDeactivate(null);
+				}
 			}
 		}
 	}
@@ -189,8 +198,9 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex>=0)
-			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
+		if($this->_cachedActiveViewIndex>=0) {
+					$this->setActiveViewIndex($this->_cachedActiveViewIndex);
+		}
 	}
 
 	/**
@@ -217,14 +227,16 @@ 
 			switch($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index=$this->getActiveViewIndex())<$this->getViews()->getCount()-1)
-						$this->setActiveViewIndex($index+1);
-					else
-						$this->setActiveViewIndex(-1);
+					if(($index=$this->getActiveViewIndex())<$this->getViews()->getCount()-1) {
+											$this->setActiveViewIndex($index+1);
+					} else {
+											$this->setActiveViewIndex(-1);
+					}
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index=$this->getActiveViewIndex())>=0)
-						$this->setActiveViewIndex($index-1);
+					if(($index=$this->getActiveViewIndex())>=0) {
+											$this->setActiveViewIndex($index-1);
+					}
 					return true;
 				case self::CMD_SWITCHVIEWID:
 					$view=$this->findControl($viewID=$param->getCommandParameter());
@@ -232,9 +244,9 @@ 
 					{
 						$this->setActiveView($view);
 						return true;
+					} else {
+											throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 					}
-					else
-						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 				case self::CMD_SWITCHVIEWINDEX:
 					$index=TPropertyValue::ensureInteger($param->getCommandParameter());
 					$this->setActiveViewIndex($index);
@@ -260,8 +272,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if(($view=$this->getActiveView())!==null)
-			$view->renderControl($writer);
+		if(($view=$this->getActiveView())!==null) {
+					$view->renderControl($writer);
+		}
 	}
 }
 
@@ -285,10 +298,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TView)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('viewcollection_view_required');
+		if($item instanceof TView) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('viewcollection_view_required');
+		}
 	}
 }
 
@@ -354,12 +368,13 @@ 
 	 */
 	public function getVisible($checkParents=true)
 	{
-		if(($parent=$this->getParent())===null)
-			return $this->getActive();
-		else if($this->getActive())
-			return $parent->getVisible($checkParents);
-		else
-			return false;
+		if(($parent=$this->getParent())===null) {
+					return $this->getActive();
+		} else if($this->getActive()) {
+					return $parent->getVisible($checkParents);
+		} else {
+					return false;
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TOutputCache.php

Doc Comments +4 added lines, -1 removed lines

@@ -231,7 +231,7 @@ 
 	 * into cache if needed.
 	 * This method should only be used by framework developers.
 	 * @param boolean whether the viewstate should be saved
-	 * @return array the collection of the control state (including its children's state).
+	 * @return string the collection of the control state (including its children's state).
 	 */
 	protected function &saveStateRecursive($needViewState=true)
 	{
@@ -327,6 +327,7 @@ 
 	 * Sets the prefix of the cache key.
 	 * This method is used internally by {@link TTemplate}.
 	 * @param string key prefix
+	 * @param string $value
 	 */
 	public function setCacheKeyPrefix($value)
 	{
@@ -445,6 +446,7 @@ 
 	 * The checking result should be saved by setting {@link TOutputCacheCheckDependencyEventParameter::setIsValid IsValid}
 	 * property of the event parameter (which defaults to true).
 	 * @param TOutputCacheCheckDependencyEventParameter event parameter
+	 * @param TOutputCacheCheckDependencyEventParameter $param
 	 */
 	public function onCheckDependency($param)
 	{
@@ -458,6 +460,7 @@ 
 	 * The value set in {@link TOutputCacheCalculateKeyEventParameter::setCacheKey CacheKey} of
 	 * this event parameter will be appended to the default key calculation scheme.
 	 * @param TOutputCacheCalculateKeyEventParameter event parameter
+	 * @param TOutputCacheCalculateKeyEventParameter $param
 	 */
 	public function onCalculateKey($param)
 	{

Spacing +97 added lines, -97 removed lines

@@ -67,22 +67,22 @@ 
  */
 class TOutputCache extends TControl implements INamingContainer
 {
-	const CACHE_ID_PREFIX='prado:outputcache';
-	private $_cacheModuleID='';
-	private $_dataCached=false;
-	private $_cacheAvailable=false;
-	private $_cacheChecked=false;
-	private $_cacheKey=null;
-	private $_duration=60;
-	private $_cache=null;
+	const CACHE_ID_PREFIX = 'prado:outputcache';
+	private $_cacheModuleID = '';
+	private $_dataCached = false;
+	private $_cacheAvailable = false;
+	private $_cacheChecked = false;
+	private $_cacheKey = null;
+	private $_duration = 60;
+	private $_cache = null;
 	private $_contents;
 	private $_state;
-	private $_actions=array();
-	private $_varyByParam='';
-	private $_keyPrefix='';
-	private $_varyBySession=false;
-	private $_cachePostBack=false;
-	private $_cacheTime=0;
+	private $_actions = array();
+	private $_varyByParam = '';
+	private $_keyPrefix = '';
+	private $_varyBySession = false;
+	private $_cachePostBack = false;
+	private $_cacheTime = 0;
 
 	/**
 	 * Returns a value indicating whether body contents are allowed for this control.
@@ -98,34 +98,34 @@ 
 
 	private function determineCacheability()
 	{
-		if(!$this->_cacheChecked)
+		if (!$this->_cacheChecked)
 		{
-			$this->_cacheChecked=true;
-			if($this->_duration>0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
+			$this->_cacheChecked = true;
+			if ($this->_duration > 0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
 			{
-				if($this->_cacheModuleID!=='')
+				if ($this->_cacheModuleID !== '')
 				{
-					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+					$this->_cache = $this->getApplication()->getModule($this->_cacheModuleID);
+					if (!($this->_cache instanceof ICache))
+						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
 				}
 				else
-					$this->_cache=$this->getApplication()->getCache();
-				if($this->_cache!==null)
+					$this->_cache = $this->getApplication()->getCache();
+				if ($this->_cache !== null)
 				{
-					$this->_cacheAvailable=true;
-					$data=$this->_cache->get($this->getCacheKey());
-					if(is_array($data))
+					$this->_cacheAvailable = true;
+					$data = $this->_cache->get($this->getCacheKey());
+					if (is_array($data))
 					{
-						$param=new TOutputCacheCheckDependencyEventParameter;
-						$param->setCacheTime(isset($data[3])?$data[3]:0);
+						$param = new TOutputCacheCheckDependencyEventParameter;
+						$param->setCacheTime(isset($data[3]) ? $data[3] : 0);
 						$this->onCheckDependency($param);
-						$this->_dataCached=$param->getIsValid();
+						$this->_dataCached = $param->getIsValid();
 					}
 					else
-						$this->_dataCached=false;
-					if($this->_dataCached)
-						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
+						$this->_dataCached = false;
+					if ($this->_dataCached)
+						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 				}
 			}
 		}
@@ -138,11 +138,11 @@ 
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer=null)
+	protected function initRecursive($namingContainer = null)
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
@@ -161,16 +161,16 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
 		}
 		else
 		{
-			if($this->_dataCached)
+			if ($this->_dataCached)
 				$this->performActions();
 			parent::loadRecursive();
 		}
@@ -178,16 +178,16 @@ 
 
 	private function performActions()
 	{
-		$page=$this->getPage();
-		$cs=$page->getClientScript();
-		foreach($this->_actions as $action)
+		$page = $this->getPage();
+		$cs = $page->getClientScript();
+		foreach ($this->_actions as $action)
 		{
-			if($action[0]==='Page.ClientScript')
-				call_user_func_array(array($cs,$action[1]),$action[2]);
-			else if($action[0]==='Page')
-				call_user_func_array(array($page,$action[1]),$action[2]);
+			if ($action[0] === 'Page.ClientScript')
+				call_user_func_array(array($cs, $action[1]), $action[2]);
+			else if ($action[0] === 'Page')
+				call_user_func_array(array($page, $action[1]), $action[2]);
 			else
-				call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+				call_user_func_array(array($this->getSubProperty($action[0]), $action[1]), $action[2]);
 		}
 	}
 
@@ -200,9 +200,9 @@ 
 	 */
 	protected function preRenderRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
@@ -219,10 +219,10 @@ 
 	 * @param array the collection of the state
 	 * @param boolean whether the viewstate should be loaded
 	 */
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState = true)
 	{
-		$st=unserialize($state);
-		parent::loadStateRecursive($st,$needViewState);
+		$st = unserialize($state);
+		parent::loadStateRecursive($st, $needViewState);
 	}
 
 	/**
@@ -233,15 +233,15 @@ 
 	 * @param boolean whether the viewstate should be saved
 	 * @return array the collection of the control state (including its children's state).
 	 */
-	protected function &saveStateRecursive($needViewState=true)
+	protected function &saveStateRecursive($needViewState = true)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			return $this->_state;
 		else
 		{
-			$st=parent::saveStateRecursive($needViewState);
+			$st = parent::saveStateRecursive($needViewState);
 			// serialization is needed to avoid undefined classes when loading state
-			$this->_state=serialize($st);
+			$this->_state = serialize($st);
 			return $this->_state;
 		}
 	}
@@ -255,15 +255,15 @@ 
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
 	 */
-	public function registerAction($context,$funcName,$funcParams)
+	public function registerAction($context, $funcName, $funcParams)
 	{
-		$this->_actions[]=array($context,$funcName,$funcParams);
+		$this->_actions[] = array($context, $funcName, $funcParams);
 	}
 
 	public function getCacheKey()
 	{
-		if($this->_cacheKey===null)
-			$this->_cacheKey=$this->calculateCacheKey();
+		if ($this->_cacheKey === null)
+			$this->_cacheKey = $this->calculateCacheKey();
 		return $this->_cacheKey;
 	}
 
@@ -279,23 +279,23 @@ 
 	 */
 	protected function calculateCacheKey()
 	{
-		$key=$this->getBaseCacheKey();
-		if($this->_varyBySession)
-			$key.=$this->getSession()->getSessionID();
-		if($this->_varyByParam!=='')
+		$key = $this->getBaseCacheKey();
+		if ($this->_varyBySession)
+			$key .= $this->getSession()->getSessionID();
+		if ($this->_varyByParam !== '')
 		{
-			$params=array();
-			$request=$this->getRequest();
-			foreach(explode(',',$this->_varyByParam) as $name)
+			$params = array();
+			$request = $this->getRequest();
+			foreach (explode(',', $this->_varyByParam) as $name)
 			{
-				$name=trim($name);
-				$params[$name]=$request->itemAt($name);
+				$name = trim($name);
+				$params[$name] = $request->itemAt($name);
 			}
-			$key.=serialize($params);
+			$key .= serialize($params);
 		}
-		$param=new TOutputCacheCalculateKeyEventParameter;
+		$param = new TOutputCacheCalculateKeyEventParameter;
 		$this->onCalculateKey($param);
-		$key.=$param->getCacheKey();
+		$key .= $param->getCacheKey();
 		return $key;
 	}
 
@@ -304,7 +304,7 @@ 
 	 */
 	protected function getBaseCacheKey()
 	{
-		return self::CACHE_ID_PREFIX.$this->_keyPrefix.$this->getPage()->getPagePath().$this->getUniqueID();
+		return self::CACHE_ID_PREFIX . $this->_keyPrefix . $this->getPage()->getPagePath() . $this->getUniqueID();
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 */
 	public function setCacheModuleID($value)
 	{
-		$this->_cacheModuleID=$value;
+		$this->_cacheModuleID = $value;
 	}
 
 	/**
@@ -330,7 +330,7 @@ 
 	 */
 	public function setCacheKeyPrefix($value)
 	{
-		$this->_keyPrefix=$value;
+		$this->_keyPrefix = $value;
 	}
 
 	/**
@@ -378,9 +378,9 @@ 
 	 */
 	public function setDuration($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('outputcache_duration_invalid',get_class($this));
-		$this->_duration=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
+		$this->_duration = $value;
 	}
 
 	/**
@@ -400,7 +400,7 @@ 
 	 */
 	public function setVaryByParam($value)
 	{
-		$this->_varyByParam=trim($value);
+		$this->_varyByParam = trim($value);
 	}
 
 	/**
@@ -416,7 +416,7 @@ 
 	 */
 	public function setVaryBySession($value)
 	{
-		$this->_varyBySession=TPropertyValue::ensureBoolean($value);
+		$this->_varyBySession = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -436,7 +436,7 @@ 
 	 */
 	public function setCachingPostBack($value)
 	{
-		$this->_cachePostBack=TPropertyValue::ensureBoolean($value);
+		$this->_cachePostBack = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -448,7 +448,7 @@ 
 	 */
 	public function onCheckDependency($param)
 	{
-		$this->raiseEvent('OnCheckDependency',$this,$param);
+		$this->raiseEvent('OnCheckDependency', $this, $param);
 	}
 
 	/**
@@ -461,7 +461,7 @@ 
 	 */
 	public function onCalculateKey($param)
 	{
-		$this->raiseEvent('OnCalculateKey',$this,$param);
+		$this->raiseEvent('OnCalculateKey', $this, $param);
 	}
 
 	/**
@@ -472,22 +472,22 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			$writer->write($this->_contents);
-		else if($this->_cacheAvailable)
+		else if ($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
-			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
+			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(), $textwriter));
 			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
 
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::render($htmlWriter);
 			$stack->pop();
 
-			$content=$textwriter->flush();
-			$data=array($content,$this->_state,$this->_actions,time());
-			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
+			$content = $textwriter->flush();
+			$data = array($content, $this->_state, $this->_actions, time());
+			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
 		}
 		else
 			parent::render($writer);
@@ -506,8 +506,8 @@ 
  */
 class TOutputCacheCheckDependencyEventParameter extends TEventParameter
 {
-	private $_isValid=true;
-	private $_cacheTime=0;
+	private $_isValid = true;
+	private $_cacheTime = 0;
 
 	/**
 	 * @return boolean whether the dependency remains valid. Defaults to true.
@@ -522,7 +522,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -540,7 +540,7 @@ 
 	 */
 	public function setCacheTime($value)
 	{
-		$this->_cacheTime=TPropertyValue::ensureInteger($value);
+		$this->_cacheTime = TPropertyValue::ensureInteger($value);
 	}
 }
 
@@ -560,7 +560,7 @@ 
 	/**
 	 * @var string cache key to be appended to the default calculation scheme.
 	 */
-	private $_cacheKey='';
+	private $_cacheKey = '';
 
 	/**
 	 * @return string cache key to be appended to the default calculation scheme.
@@ -575,7 +575,7 @@ 
 	 */
 	public function setCacheKey($value)
 	{
-		$this->_cacheKey=TPropertyValue::ensureString($value);
+		$this->_cacheKey = TPropertyValue::ensureString($value);
 	}
 }
 
@@ -602,13 +602,13 @@ 
 
 	public function write($s)
 	{
-		foreach($this->_writers as $writer)
+		foreach ($this->_writers as $writer)
 			$writer->write($s);
 	}
 
 	public function flush()
 	{
-		foreach($this->_writers as $writer)
+		foreach ($this->_writers as $writer)
 			$s = $writer->flush();
 		return $s;
 	}

Braces +48 added lines, -40 removed lines

@@ -106,11 +106,12 @@ 
 				if($this->_cacheModuleID!=='')
 				{
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+					if(!($this->_cache instanceof ICache)) {
+											throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+					}
+				} else {
+									$this->_cache=$this->getApplication()->getCache();
 				}
-				else
-					$this->_cache=$this->getApplication()->getCache();
 				if($this->_cache!==null)
 				{
 					$this->_cacheAvailable=true;
@@ -121,11 +122,12 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached=$param->getIsValid();
+					} else {
+											$this->_dataCached=false;
+					}
+					if($this->_dataCached) {
+											list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
 					}
-					else
-						$this->_dataCached=false;
-					if($this->_dataCached)
-						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
 				}
 			}
 		}
@@ -146,9 +148,9 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
+		} else {
+					parent::initRecursive($namingContainer);
 		}
-		else
-			parent::initRecursive($namingContainer);
 	}
 
 	/**
@@ -167,11 +169,11 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
-			if($this->_dataCached)
-				$this->performActions();
+			if($this->_dataCached) {
+							$this->performActions();
+			}
 			parent::loadRecursive();
 		}
 	}
@@ -182,12 +184,13 @@ 
 		$cs=$page->getClientScript();
 		foreach($this->_actions as $action)
 		{
-			if($action[0]==='Page.ClientScript')
-				call_user_func_array(array($cs,$action[1]),$action[2]);
-			else if($action[0]==='Page')
-				call_user_func_array(array($page,$action[1]),$action[2]);
-			else
-				call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+			if($action[0]==='Page.ClientScript') {
+							call_user_func_array(array($cs,$action[1]),$action[2]);
+			} else if($action[0]==='Page') {
+							call_user_func_array(array($page,$action[1]),$action[2]);
+			} else {
+							call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+			}
 		}
 	}
 
@@ -206,9 +209,9 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
+		} else {
+					parent::preRenderRecursive();
 		}
-		else
-			parent::preRenderRecursive();
 	}
 
 	/**
@@ -235,9 +238,9 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState=true)
 	{
-		if($this->_dataCached)
-			return $this->_state;
-		else
+		if($this->_dataCached) {
+					return $this->_state;
+		} else
 		{
 			$st=parent::saveStateRecursive($needViewState);
 			// serialization is needed to avoid undefined classes when loading state
@@ -262,8 +265,9 @@ 
 
 	public function getCacheKey()
 	{
-		if($this->_cacheKey===null)
-			$this->_cacheKey=$this->calculateCacheKey();
+		if($this->_cacheKey===null) {
+					$this->_cacheKey=$this->calculateCacheKey();
+		}
 		return $this->_cacheKey;
 	}
 
@@ -280,8 +284,9 @@ 
 	protected function calculateCacheKey()
 	{
 		$key=$this->getBaseCacheKey();
-		if($this->_varyBySession)
-			$key.=$this->getSession()->getSessionID();
+		if($this->_varyBySession) {
+					$key.=$this->getSession()->getSessionID();
+		}
 		if($this->_varyByParam!=='')
 		{
 			$params=array();
@@ -378,8 +383,9 @@ 
 	 */
 	public function setDuration($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('outputcache_duration_invalid',get_class($this));
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					throw new TInvalidDataValueException('outputcache_duration_invalid',get_class($this));
+		}
 		$this->_duration=$value;
 	}
 
@@ -472,9 +478,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_dataCached)
-			$writer->write($this->_contents);
-		else if($this->_cacheAvailable)
+		if($this->_dataCached) {
+					$writer->write($this->_contents);
+		} else if($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
 			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
@@ -488,9 +494,9 @@ 
 			$content=$textwriter->flush();
 			$data=array($content,$this->_state,$this->_actions,time());
 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
 
@@ -602,14 +608,16 @@ 
 
 	public function write($s)
 	{
-		foreach($this->_writers as $writer)
-			$writer->write($s);
+		foreach($this->_writers as $writer) {
+					$writer->write($s);
+		}
 	}
 
 	public function flush()
 	{
-		foreach($this->_writers as $writer)
-			$s = $writer->flush();
+		foreach($this->_writers as $writer) {
+					$s = $writer->flush();
+		}
 		return $s;
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TOutputCache 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
- */
+	 * TOutputCache 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
+	 */
 
 /**
  * TOutputCache class.

framework/Web/UI/WebControls/TPager.php

Doc Comments +6 added lines

@@ -333,6 +333,7 @@ 
 
 	/**
 	 * @param integer the zero-based index of the current page
+	 * @param integer $value
 	 * @throws TInvalidDataValueException if the value is less than 0
 	 */
 	protected function setCurrentPageIndex($value)
@@ -352,6 +353,7 @@ 
 
 	/**
 	 * @param integer number of pages of data items available
+	 * @param integer $value
 	 * @throws TInvalidDataValueException if the value is less than 0
 	 */
 	protected function setPageCount($value)
@@ -446,6 +448,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 TPagerButtonType $buttonType
+	 * @param boolean $enabled
+	 * @param string $commandName
 	 * @return mixed the button instance
 	 */
 	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
@@ -660,6 +665,7 @@ 
 	/**
 	 * This event is raised when page index is changed due to a page button click.
 	 * @param TPagerPageChangedEventParameter event parameter
+	 * @param TPagerPageChangedEventParameter $param
 	 */
 	public function onPageIndexChanged($param)
 	{

Spacing +145 added lines, -145 removed lines

@@ -52,13 +52,13 @@ 
 	/**
 	 * Command name that TPager understands.
 	 */
-	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_PAGE = 'Page';
+	const CMD_PAGE_NEXT = 'Next';
+	const CMD_PAGE_PREV = 'Previous';
+	const CMD_PAGE_FIRST = 'First';
+	const CMD_PAGE_LAST = 'Last';
 
-	private $_pageCount=0;
+	private $_pageCount = 0;
 
 	/**
 	 * Restores the pager state.
@@ -68,7 +68,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if($this->getEnableViewState(true))
+		if ($this->getEnableViewState(true))
 		{
 			$this->getControls()->clear();
 			$this->buildPager();
@@ -80,7 +80,7 @@ 
 	 */
 	public function getControlToPaginate()
 	{
-		return $this->getViewState('ControlToPaginate','');
+		return $this->getViewState('ControlToPaginate', '');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setControlToPaginate($value)
 	{
-		$this->setViewState('ControlToPaginate',$value,'');
+		$this->setViewState('ControlToPaginate', $value, '');
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 */
 	public function getButtonCssClass()
 	{
-		return $this->getViewState('ButtonCssClass','');
+		return $this->getViewState('ButtonCssClass', '');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function setButtonCssClass($value)
 	{
-		$this->setViewState('ButtonCssClass',TPropertyValue::ensureString($value,''),'');
+		$this->setViewState('ButtonCssClass', TPropertyValue::ensureString($value, ''), '');
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getMode()
 	{
-		return $this->getViewState('Mode',TPagerMode::NextPrev);
+		return $this->getViewState('Mode', TPagerMode::NextPrev);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->setViewState('Mode',TPropertyValue::ensureEnum($value,'TPagerMode'),TPagerMode::NextPrev);
+		$this->setViewState('Mode', TPropertyValue::ensureEnum($value, 'TPagerMode'), TPagerMode::NextPrev);
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TPagerButtonType::LinkButton);
+		return $this->getViewState('ButtonType', TPagerButtonType::LinkButton);
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'TPagerButtonType'),TPagerButtonType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'TPagerButtonType'), TPagerButtonType::LinkButton);
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function getNextPageText()
 	{
-		return $this->getViewState('NextPageText','>');
+		return $this->getViewState('NextPageText', '>');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setNextPageText($value)
 	{
-		$this->setViewState('NextPageText',$value,'>');
+		$this->setViewState('NextPageText', $value, '>');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getPrevPageText()
 	{
-		return $this->getViewState('PrevPageText','<');
+		return $this->getViewState('PrevPageText', '<');
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setPrevPageText($value)
 	{
-		$this->setViewState('PrevPageText',$value,'<');
+		$this->setViewState('PrevPageText', $value, '<');
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 */
 	public function getFirstPageText()
 	{
-		return $this->getViewState('FirstPageText','<<');
+		return $this->getViewState('FirstPageText', '<<');
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function setFirstPageText($value)
 	{
-		$this->setViewState('FirstPageText',$value,'<<');
+		$this->setViewState('FirstPageText', $value, '<<');
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function getLastPageText()
 	{
-		return $this->getViewState('LastPageText','>>');
+		return $this->getViewState('LastPageText', '>>');
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	 */
 	public function setLastPageText($value)
 	{
-		$this->setViewState('LastPageText',$value,'>>');
+		$this->setViewState('LastPageText', $value, '>>');
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function getFirstPageImageUrl()
 	{
-		return $this->getViewState('FirstPageImageUrl','');
+		return $this->getViewState('FirstPageImageUrl', '');
 	}
 
 	/**
@@ -223,7 +223,7 @@ 
 	 */
 	public function setFirstPageImageUrl($value)
 	{
-		$this->setViewState('FirstPageImageUrl',$value);
+		$this->setViewState('FirstPageImageUrl', $value);
 	}
 
 	/**
@@ -232,7 +232,7 @@ 
 	 */
 	public function getLastPageImageUrl()
 	{
-		return $this->getViewState('LastPageImageUrl','');
+		return $this->getViewState('LastPageImageUrl', '');
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function setLastPageImageUrl($value)
 	{
-		$this->setViewState('LastPageImageUrl',$value);
+		$this->setViewState('LastPageImageUrl', $value);
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	 */
 	public function getNextPageImageUrl()
 	{
-		return $this->getViewState('NextPageImageUrl','');
+		return $this->getViewState('NextPageImageUrl', '');
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function setNextPageImageUrl($value)
 	{
-		$this->setViewState('NextPageImageUrl',$value);
+		$this->setViewState('NextPageImageUrl', $value);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function getPrevPageImageUrl()
 	{
-		return $this->getViewState('PrevPageImageUrl','');
+		return $this->getViewState('PrevPageImageUrl', '');
 	}
 
 	/**
@@ -277,7 +277,7 @@ 
 	 */
 	public function setPrevPageImageUrl($value)
 	{
-		$this->setViewState('PrevPageImageUrl',$value);
+		$this->setViewState('PrevPageImageUrl', $value);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function getNumericPageImageUrl()
 	{
-		return $this->getViewState('NumericPageImageUrl','');
+		return $this->getViewState('NumericPageImageUrl', '');
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 	 */
 	public function setNumericPageImageUrl($value)
 	{
-		$this->setViewState('NumericPageImageUrl',$value);
+		$this->setViewState('NumericPageImageUrl', $value);
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	 */
 	public function getPageButtonCount()
 	{
-		return $this->getViewState('PageButtonCount',10);
+		return $this->getViewState('PageButtonCount', 10);
 	}
 
 	/**
@@ -318,9 +318,9 @@ 
 	 */
 	public function setPageButtonCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<1)
+		if (($value = TPropertyValue::ensureInteger($value)) < 1)
 			throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
-		$this->setViewState('PageButtonCount',$value,10);
+		$this->setViewState('PageButtonCount', $value, 10);
 	}
 
 	/**
@@ -328,7 +328,7 @@ 
 	 */
 	public function getCurrentPageIndex()
 	{
-		return $this->getViewState('CurrentPageIndex',0);
+		return $this->getViewState('CurrentPageIndex', 0);
 	}
 
 	/**
@@ -337,9 +337,9 @@ 
 	 */
 	protected function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('pager_currentpageindex_invalid');
-		$this->setViewState('CurrentPageIndex',$value,0);
+		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
 	/**
@@ -347,7 +347,7 @@ 
 	 */
 	public function getPageCount()
 	{
-		return $this->getViewState('PageCount',0);
+		return $this->getViewState('PageCount', 0);
 	}
 
 	/**
@@ -356,9 +356,9 @@ 
 	 */
 	protected function setPageCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('pager_pagecount_invalid');
-		$this->setViewState('PageCount',$value,0);
+		$this->setViewState('PageCount', $value, 0);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		return $this->getCurrentPageIndex()===0;
+		return $this->getCurrentPageIndex() === 0;
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->getCurrentPageIndex()===$this->getPageCount()-1;
+		return $this->getCurrentPageIndex() === $this->getPageCount() - 1;
 	}
 
 	/**
@@ -387,20 +387,20 @@ 
 	{
 		parent::onPreRender($param);
 
-		$controlID=$this->getControlToPaginate();
-		if(($targetControl=$this->getNamingContainer()->findControl($controlID))===null || !($targetControl instanceof TDataBoundControl))
-			throw new TConfigurationException('pager_controltopaginate_invalid',$controlID);
+		$controlID = $this->getControlToPaginate();
+		if (($targetControl = $this->getNamingContainer()->findControl($controlID)) === null || !($targetControl instanceof TDataBoundControl))
+			throw new TConfigurationException('pager_controltopaginate_invalid', $controlID);
 
-		if($targetControl->getAllowPaging())
+		if ($targetControl->getAllowPaging())
 		{
-	 		$this->_pageCount=$targetControl->getPageCount();
+	 		$this->_pageCount = $targetControl->getPageCount();
 			$this->getControls()->clear();
 			$this->setPageCount($targetControl->getPageCount());
 			$this->setCurrentPageIndex($targetControl->getCurrentPageIndex());
 			$this->buildPager();
 		}
 		else
-			$this->_pageCount=0;
+			$this->_pageCount = 0;
 	}
 
 	/**
@@ -411,7 +411,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_pageCount>1)
+		if ($this->_pageCount > 1)
 			parent::render($writer);
 	}
 
@@ -422,7 +422,7 @@ 
 	 */
 	protected function buildPager()
 	{
-		switch($this->getMode())
+		switch ($this->getMode())
 		{
 			case TPagerMode::NextPrev:
 				$this->buildNextPrevPager();
@@ -448,15 +448,15 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType===TPagerButtonType::LinkButton)
+		if ($buttonType === TPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button=new TLinkButton;
+			if ($enabled)
+				$button = new TLinkButton;
 			else
 			{
-				$button=new TLabel;
+				$button = new TLabel;
 				$button->setText($text);
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
@@ -464,14 +464,14 @@ 
 		}
 		else
 		{
-			if($buttonType===TPagerButtonType::ImageButton)
+			if ($buttonType === TPagerButtonType::ImageButton)
 			{
-				$button=new TImageButton;
-				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+				$button = new TImageButton;
+				$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			}
 			else
-				$button=new TButton;
-			if(!$enabled)
+				$button = new TButton;
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 		$button->setText($text);
@@ -487,13 +487,13 @@ 
 	 * @param string the command name associated with the image button
 	 * @since 3.1.1
 	 */
-	protected function getPageImageUrl($text,$commandName)
+	protected function getPageImageUrl($text, $commandName)
 	{
-		switch($commandName)
+		switch ($commandName)
 		{
 			case self::CMD_PAGE:
-				$url=$this->getNumericPageImageUrl();
-				return str_replace('{0}',$text,$url);
+				$url = $this->getNumericPageImageUrl();
+				return str_replace('{0}', $text, $url);
 			case self::CMD_PAGE_NEXT:
 				return $this->getNextPageImageUrl();
 			case self::CMD_PAGE_PREV:
@@ -512,50 +512,50 @@ 
 	 */
 	protected function buildNextPrevPager()
 	{
-		$buttonType=$this->getButtonType();
-		$controls=$this->getControls();
-		if($this->getIsFirstPage())
+		$buttonType = $this->getButtonType();
+		$controls = $this->getControls();
+		if ($this->getIsFirstPage())
 		{
-			if(($text=$this->getFirstPageText())!=='')
+			if (($text = $this->getFirstPageText()) !== '')
 			{
-				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_FIRST,'');
+				$label = $this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($label);
 				$controls->add("\n");
 			}
-			$label=$this->createPagerButton($buttonType,false,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
+			$label = $this->createPagerButton($buttonType, false, $this->getPrevPageText(), self::CMD_PAGE_PREV, '');
 			$controls->add($label);
 		}
 		else
 		{
-			if(($text=$this->getFirstPageText())!=='')
+			if (($text = $this->getFirstPageText()) !== '')
 			{
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_FIRST,'');
+				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$button=$this->createPagerButton($buttonType,true,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
+			$button = $this->createPagerButton($buttonType, true, $this->getPrevPageText(), self::CMD_PAGE_PREV, '');
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($this->getIsLastPage())
+		if ($this->getIsLastPage())
 		{
-			$label=$this->createPagerButton($buttonType,false,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
+			$label = $this->createPagerButton($buttonType, false, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($label);
-			if(($text=$this->getLastPageText())!=='')
+			if (($text = $this->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
-				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_LAST,'');
+				$label = $this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($label);
 			}
 		}
 		else
 		{
-			$button=$this->createPagerButton($buttonType,true,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
+			$button = $this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($button);
-			if(($text=$this->getLastPageText())!=='')
+			if (($text = $this->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_LAST,'');
+				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($button);
 			}
 		}
@@ -566,66 +566,66 @@ 
 	 */
 	protected function buildNumericPager()
 	{
-		$buttonType=$this->getButtonType();
-		$controls=$this->getControls();
-		$pageCount=$this->getPageCount();
-		$pageIndex=$this->getCurrentPageIndex()+1;
-		$maxButtonCount=$this->getPageButtonCount();
-		$buttonCount=$maxButtonCount>$pageCount?$pageCount:$maxButtonCount;
-		$startPageIndex=1;
-		$endPageIndex=$buttonCount;
-		if($pageIndex>$endPageIndex)
+		$buttonType = $this->getButtonType();
+		$controls = $this->getControls();
+		$pageCount = $this->getPageCount();
+		$pageIndex = $this->getCurrentPageIndex() + 1;
+		$maxButtonCount = $this->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=$this->getFirstPageText())!=='')
+			if (($text = $this->getFirstPageText()) !== '')
 			{
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_FIRST,'');
+				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$prevPageIndex=$startPageIndex-1;
-			$button=$this->createPagerButton($buttonType,true,$this->getPrevPageText(),self::CMD_PAGE,"$prevPageIndex");
+			$prevPageIndex = $startPageIndex - 1;
+			$button = $this->createPagerButton($buttonType, true, $this->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($buttonType,false,"$i",self::CMD_PAGE,'');
+				$label = $this->createPagerButton($buttonType, false, "$i", self::CMD_PAGE, '');
 				$controls->add($label);
 			}
 			else
 			{
-				$button=$this->createPagerButton($buttonType,true,"$i",self::CMD_PAGE,"$i");
+				$button = $this->createPagerButton($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($buttonType,true,$this->getNextPageText(),self::CMD_PAGE,"$nextPageIndex");
+			$nextPageIndex = $endPageIndex + 1;
+			$button = $this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
-			if(($text=$this->getLastPageText())!=='')
+			if (($text = $this->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_LAST,'');
+				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($button);
 			}
 		}
@@ -636,13 +636,13 @@ 
 	 */
 	protected function buildListPager()
 	{
-		$list=new TDropDownList;
+		$list = new TDropDownList;
 		$this->getControls()->add($list);
-		$list->setDataSource(range(1,$this->getPageCount()));
+		$list->setDataSource(range(1, $this->getPageCount()));
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
+		$list->attachEventHandler('OnSelectedIndexChanged', array($this, 'listIndexChanged'));
 	}
 
 	/**
@@ -651,10 +651,10 @@ 
 	 * @param TDropDownList the dropdown list control raising the event
 	 * @param TEventParameter event parameter
 	 */
-	public function listIndexChanged($sender,$param)
+	public function listIndexChanged($sender, $param)
 	{
-		$pageIndex=$sender->getSelectedIndex();
-		$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+		$pageIndex = $sender->getSelectedIndex();
+		$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 	}
 
 	/**
@@ -663,7 +663,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -674,37 +674,37 @@ 
 	 * @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)
 		{
-			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_PAGE)===0)
+			$command = $param->getCommandName();
+			if (strcasecmp($command, self::CMD_PAGE) === 0)
 			{
-				$pageIndex=TPropertyValue::ensureInteger($param->getCommandParameter())-1;
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+				$pageIndex = TPropertyValue::ensureInteger($param->getCommandParameter()) - 1;
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
+			else if (strcasecmp($command, self::CMD_PAGE_NEXT) === 0)
 			{
-				$pageIndex=$this->getCurrentPageIndex()+1;
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+				$pageIndex = $this->getCurrentPageIndex() + 1;
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
+			else if (strcasecmp($command, self::CMD_PAGE_PREV) === 0)
 			{
-				$pageIndex=$this->getCurrentPageIndex()-1;
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+				$pageIndex = $this->getCurrentPageIndex() - 1;
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
+			else if (strcasecmp($command, self::CMD_PAGE_FIRST) === 0)
 			{
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,0));
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, 0));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
+			else if (strcasecmp($command, self::CMD_PAGE_LAST) === 0)
 			{
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$this->getPageCount()-1));
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $this->getPageCount() - 1));
 				return true;
 			}
 			return false;
@@ -737,17 +737,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;
 	}
 
 	/**
@@ -783,9 +783,9 @@ 
  */
 class TPagerMode extends TEnumerable
 {
-	const NextPrev='NextPrev';
-	const Numeric='Numeric';
-	const DropDownList='DropDownList';
+	const NextPrev = 'NextPrev';
+	const Numeric = 'Numeric';
+	const DropDownList = 'DropDownList';
 }
 
 
@@ -803,8 +803,8 @@ 
  */
 class TPagerButtonType extends TEnumerable
 {
-	const LinkButton='LinkButton';
-	const PushButton='PushButton';
-	const ImageButton='ImageButton';
+	const LinkButton = 'LinkButton';
+	const PushButton = 'PushButton';
+	const ImageButton = 'ImageButton';
 }
 

Braces +44 added lines, -43 removed lines

@@ -318,8 +318,9 @@ 
 	 */
 	public function setPageButtonCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<1)
-			throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
+		if(($value=TPropertyValue::ensureInteger($value))<1) {
+					throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
+		}
 		$this->setViewState('PageButtonCount',$value,10);
 	}
 
@@ -337,8 +338,9 @@ 
 	 */
 	protected function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('pager_currentpageindex_invalid');
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					throw new TInvalidDataValueException('pager_currentpageindex_invalid');
+		}
 		$this->setViewState('CurrentPageIndex',$value,0);
 	}
 
@@ -356,8 +358,9 @@ 
 	 */
 	protected function setPageCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('pager_pagecount_invalid');
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					throw new TInvalidDataValueException('pager_pagecount_invalid');
+		}
 		$this->setViewState('PageCount',$value,0);
 	}
 
@@ -388,8 +391,9 @@ 
 		parent::onPreRender($param);
 
 		$controlID=$this->getControlToPaginate();
-		if(($targetControl=$this->getNamingContainer()->findControl($controlID))===null || !($targetControl instanceof TDataBoundControl))
-			throw new TConfigurationException('pager_controltopaginate_invalid',$controlID);
+		if(($targetControl=$this->getNamingContainer()->findControl($controlID))===null || !($targetControl instanceof TDataBoundControl)) {
+					throw new TConfigurationException('pager_controltopaginate_invalid',$controlID);
+		}
 
 		if($targetControl->getAllowPaging())
 		{
@@ -398,9 +402,9 @@ 
 			$this->setPageCount($targetControl->getPageCount());
 			$this->setCurrentPageIndex($targetControl->getCurrentPageIndex());
 			$this->buildPager();
+		} else {
+					$this->_pageCount=0;
 		}
-		else
-			$this->_pageCount=0;
 	}
 
 	/**
@@ -411,8 +415,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_pageCount>1)
-			parent::render($writer);
+		if($this->_pageCount>1) {
+					parent::render($writer);
+		}
 	}
 
 	/**
@@ -452,27 +457,27 @@ 
 	{
 		if($buttonType===TPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button=new TLinkButton;
-			else
+			if($enabled) {
+							$button=new TLinkButton;
+			} else
 			{
 				$button=new TLabel;
 				$button->setText($text);
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			if($buttonType===TPagerButtonType::ImageButton)
 			{
 				$button=new TImageButton;
 				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+			} else {
+							$button=new TButton;
+			}
+			if(!$enabled) {
+							$button->setEnabled(false);
 			}
-			else
-				$button=new TButton;
-			if(!$enabled)
-				$button->setEnabled(false);
 		}
 		$button->setText($text);
 		$button->setCommandName($commandName);
@@ -524,8 +529,7 @@ 
 			}
 			$label=$this->createPagerButton($buttonType,false,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
@@ -547,8 +551,7 @@ 
 				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_LAST,'');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button=$this->createPagerButton($buttonType,true,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
 			$controls->add($button);
@@ -577,12 +580,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;
+				}
 			}
 		}
 
@@ -606,14 +611,14 @@ 
 			{
 				$label=$this->createPagerButton($buttonType,false,"$i",self::CMD_PAGE,'');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button=$this->createPagerButton($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)
@@ -684,33 +689,29 @@ 
 				$pageIndex=TPropertyValue::ensureInteger($param->getCommandParameter())-1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
 			{
 				$pageIndex=$this->getCurrentPageIndex()+1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
 			{
 				$pageIndex=$this->getCurrentPageIndex()-1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,0));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$this->getPageCount()-1));
 				return true;
 			}
 			return false;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 

framework/Web/UI/WebControls/TRangeValidator.php

Doc Comments +6 added lines

@@ -96,6 +96,7 @@ 
 
 	/**
 	 * @param boolean true to perform strict comparison (i.e. strictly less than max and/or strictly greater than min).
+	 * @param boolean $value
 	 */
 	public function setStrictComparison($value)
 	{
@@ -191,6 +192,7 @@ 
 	/**
 	* Determine if the value is within the integer range.
 	* @param string value to validate true
+	* @param string $value
 	* @return boolean true if within integer range.
 	*/
 	protected function isValidInteger($value)
@@ -220,6 +222,7 @@ 
 	/**
 	 * Determine if the value is within the specified float range.
 	 * @param string value to validate
+	 * @param string $value
 	 * @return boolean true if within range.
 	 */
 	protected function isValidFloat($value)
@@ -240,6 +243,7 @@ 
 	 * Determine if the date is within the specified range.
 	 * Uses pradoParseDate and strtotime to get the date from string.
 	 * @param string date as string to validate
+	 * @param string $value
 	 * @return boolean true if within range.
 	 */
 	protected function isValidDate($value)
@@ -275,6 +279,7 @@ 
 	 * Compare the string with a minimum and a maxiumum value.
 	 * Uses strcmp for comparision.
 	 * @param string value to compare with.
+	 * @param string $value
 	 * @return boolean true if the string is within range.
 	 */
 	protected function isValidString($value)
@@ -292,6 +297,7 @@ 
 
 	/**
 	 * @param string string for comparision
+	 * @param string $value
 	 * @return boolean true if min and max string length are satisfied.
 	 */
 	protected function isValidStringLength($value)

Spacing +69 added lines, -69 removed lines

@@ -65,7 +65,7 @@ 
 	 */
 	public function getMinValue()
 	{
-		return $this->getViewState('MinValue','');
+		return $this->getViewState('MinValue', '');
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function setMinValue($value)
 	{
-		$this->setViewState('MinValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('MinValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function getMaxValue()
 	{
-		return $this->getViewState('MaxValue','');
+		return $this->getViewState('MaxValue', '');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setMaxValue($value)
 	{
-		$this->setViewState('MaxValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('MaxValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setStrictComparison($value)
 	{
-		$this->setViewState('StrictComparison', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('StrictComparison', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType',TRangeValidationDataType::String);
+		return $this->getViewState('DataType', TRangeValidationDataType::String);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'TRangeValidationDataType'),TRangeValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'TRangeValidationDataType'), TRangeValidationDataType::String);
 	}
 
 	/**
@@ -169,11 +169,11 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$value=$this->getValidationValue($this->getValidationTarget());
-		if($value==='')
+		$value = $this->getValidationValue($this->getValidationTarget());
+		if ($value === '')
 			return true;
 
-		switch($this->getDataType())
+		switch ($this->getDataType())
 		{
 			case TRangeValidationDataType::Integer:
 				return $this->isValidInteger($value);
@@ -195,19 +195,19 @@ 
 	*/
 	protected function isValidInteger($value)
 	{
-		$minValue=$this->getMinValue();
-		$maxValue=$this->getMaxValue();
-
-		$valid=preg_match('/^[-+]?[0-9]+$/',trim($value));
-		$value=intval($value);
-		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value, intval($minValue));
-		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,intval($maxValue));
+		$minValue = $this->getMinValue();
+		$maxValue = $this->getMaxValue();
+
+		$valid = preg_match('/^[-+]?[0-9]+$/', trim($value));
+		$value = intval($value);
+		if ($minValue !== '')
+			$valid = $valid && $this->isGreaterThan($value, intval($minValue));
+		if ($maxValue !== '')
+			$valid = $valid && $this->isLessThan($value, intval($maxValue));
 		return $valid;
 	}
 
-	protected function isLessThan($left,$right)
+	protected function isLessThan($left, $right)
 	{
 		return $this->getStrictComparison() ? $left < $right : $left <= $right;
 	}
@@ -224,15 +224,15 @@ 
 	 */
 	protected function isValidFloat($value)
 	{
-		$minValue=$this->getMinValue();
-		$maxValue=$this->getMaxValue();
-
-		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
-		$value=floatval($value);
-		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value,floatval($minValue));
-		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,floatval($maxValue));
+		$minValue = $this->getMinValue();
+		$maxValue = $this->getMaxValue();
+
+		$valid = preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
+		$value = floatval($value);
+		if ($minValue !== '')
+			$valid = $valid && $this->isGreaterThan($value, floatval($minValue));
+		if ($maxValue !== '')
+			$valid = $valid && $this->isLessThan($value, floatval($maxValue));
 		return $valid;
 	}
 
@@ -244,29 +244,29 @@ 
 	 */
 	protected function isValidDate($value)
 	{
-		$minValue=$this->getMinValue();
-		$maxValue=$this->getMaxValue();
+		$minValue = $this->getMinValue();
+		$maxValue = $this->getMaxValue();
 
-		$valid=true;
+		$valid = true;
 
 		$dateFormat = $this->getDateFormat();
-		if($dateFormat!=='')
+		if ($dateFormat !== '')
 		{
-			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
+			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
 			$value = $formatter->parse($value);
-			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,$formatter->parse($minValue));
-			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
+			if ($minValue !== '')
+				$valid = $valid && $this->isGreaterThan($value, $formatter->parse($minValue));
+			if ($maxValue !== '')
+				$valid = $valid && $this->isLessThan($value, $formatter->parse($maxValue));
 			return $valid;
 		}
 		else
 		{
-			$value=strtotime($value);
-			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,strtotime($minValue));
-			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,strtotime($maxValue));
+			$value = strtotime($value);
+			if ($minValue !== '')
+				$valid = $valid && $this->isGreaterThan($value, strtotime($minValue));
+			if ($maxValue !== '')
+				$valid = $valid && $this->isLessThan($value, strtotime($maxValue));
 			return $valid;
 		}
 	}
@@ -279,14 +279,14 @@ 
 	 */
 	protected function isValidString($value)
 	{
-		$minValue=$this->getMinValue();
-		$maxValue=$this->getMaxValue();
-
-		$valid=true;
-		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan(strcmp($value,$minValue),0);
-		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan(strcmp($value,$maxValue),0);
+		$minValue = $this->getMinValue();
+		$maxValue = $this->getMaxValue();
+
+		$valid = true;
+		if ($minValue !== '')
+			$valid = $valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
+		if ($maxValue !== '')
+			$valid = $valid && $this->isLessThan(strcmp($value, $maxValue), 0);
 		return $valid;
 	}
 
@@ -296,24 +296,24 @@ 
 	 */
 	protected function isValidStringLength($value)
 	{
-		$minValue=$this->getMinValue();
-		$maxValue=$this->getMaxValue();
+		$minValue = $this->getMinValue();
+		$maxValue = $this->getMaxValue();
 
-		$valid=true;
+		$valid = true;
 		$charset = $this->getCharset();
-		if($charset==='')
+		if ($charset === '')
 		{
-			$app= $this->getApplication()->getGlobalization();
+			$app = $this->getApplication()->getGlobalization();
 			$charset = $app ? $app->getCharset() : null;
-			if(!$charset)
+			if (!$charset)
 				$charset = 'UTF-8';
 		}
 
 		$length = iconv_strlen($value, $charset);
-		if($minValue!=='')
-			$valid = $valid && $this->isGreaterThan($length,intval($minValue));
-		if($maxValue!=='')
-			$valid = $valid && $this->isLessThan($length,intval($maxValue));
+		if ($minValue !== '')
+			$valid = $valid && $this->isGreaterThan($length, intval($minValue));
+		if ($maxValue !== '')
+			$valid = $valid && $this->isLessThan($length, intval($maxValue));
 		return $valid;
 	}
 
@@ -323,13 +323,13 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options=parent::getClientScriptOptions();
-		$options['MinValue']=$this->getMinValue();
-		$options['MaxValue']=$this->getMaxValue();
-		$options['DataType']=$this->getDataType();
-		$options['StrictComparison']=$this->getStrictComparison();
-		if(($dateFormat=$this->getDateFormat())!=='')
-			$options['DateFormat']=$dateFormat;
+		$options = parent::getClientScriptOptions();
+		$options['MinValue'] = $this->getMinValue();
+		$options['MaxValue'] = $this->getMaxValue();
+		$options['DataType'] = $this->getDataType();
+		$options['StrictComparison'] = $this->getStrictComparison();
+		if (($dateFormat = $this->getDateFormat()) !== '')
+			$options['DateFormat'] = $dateFormat;
 		return $options;
 	}
 }
@@ -353,5 +353,5 @@ 
  */
 class TRangeValidationDataType extends TValidationDataType
 {
-	const StringLength='StringLength';
+	const StringLength = 'StringLength';
 }

Braces +46 added lines, -32 removed lines

@@ -170,8 +170,9 @@ 
 	protected function evaluateIsValid()
 	{
 		$value=$this->getValidationValue($this->getValidationTarget());
-		if($value==='')
-			return true;
+		if($value==='') {
+					return true;
+		}
 
 		switch($this->getDataType())
 		{
@@ -200,10 +201,12 @@ 
 
 		$valid=preg_match('/^[-+]?[0-9]+$/',trim($value));
 		$value=intval($value);
-		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value, intval($minValue));
-		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,intval($maxValue));
+		if($minValue!=='') {
+					$valid=$valid && $this->isGreaterThan($value, intval($minValue));
+		}
+		if($maxValue!=='') {
+					$valid=$valid && $this->isLessThan($value,intval($maxValue));
+		}
 		return $valid;
 	}
 
@@ -229,10 +232,12 @@ 
 
 		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
 		$value=floatval($value);
-		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value,floatval($minValue));
-		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,floatval($maxValue));
+		if($minValue!=='') {
+					$valid=$valid && $this->isGreaterThan($value,floatval($minValue));
+		}
+		if($maxValue!=='') {
+					$valid=$valid && $this->isLessThan($value,floatval($maxValue));
+		}
 		return $valid;
 	}
 
@@ -254,19 +259,22 @@ 
 		{
 			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
 			$value = $formatter->parse($value);
-			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,$formatter->parse($minValue));
-			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
+			if($minValue!=='') {
+							$valid=$valid && $this->isGreaterThan($value,$formatter->parse($minValue));
+			}
+			if($maxValue!=='') {
+							$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
+			}
 			return $valid;
-		}
-		else
+		} else
 		{
 			$value=strtotime($value);
-			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,strtotime($minValue));
-			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,strtotime($maxValue));
+			if($minValue!=='') {
+							$valid=$valid && $this->isGreaterThan($value,strtotime($minValue));
+			}
+			if($maxValue!=='') {
+							$valid=$valid && $this->isLessThan($value,strtotime($maxValue));
+			}
 			return $valid;
 		}
 	}
@@ -283,10 +291,12 @@ 
 		$maxValue=$this->getMaxValue();
 
 		$valid=true;
-		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan(strcmp($value,$minValue),0);
-		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan(strcmp($value,$maxValue),0);
+		if($minValue!=='') {
+					$valid=$valid && $this->isGreaterThan(strcmp($value,$minValue),0);
+		}
+		if($maxValue!=='') {
+					$valid=$valid && $this->isLessThan(strcmp($value,$maxValue),0);
+		}
 		return $valid;
 	}
 
@@ -305,15 +315,18 @@ 
 		{
 			$app= $this->getApplication()->getGlobalization();
 			$charset = $app ? $app->getCharset() : null;
-			if(!$charset)
-				$charset = 'UTF-8';
+			if(!$charset) {
+							$charset = 'UTF-8';
+			}
 		}
 
 		$length = iconv_strlen($value, $charset);
-		if($minValue!=='')
-			$valid = $valid && $this->isGreaterThan($length,intval($minValue));
-		if($maxValue!=='')
-			$valid = $valid && $this->isLessThan($length,intval($maxValue));
+		if($minValue!=='') {
+					$valid = $valid && $this->isGreaterThan($length,intval($minValue));
+		}
+		if($maxValue!=='') {
+					$valid = $valid && $this->isLessThan($length,intval($maxValue));
+		}
 		return $valid;
 	}
 
@@ -328,8 +341,9 @@ 
 		$options['MaxValue']=$this->getMaxValue();
 		$options['DataType']=$this->getDataType();
 		$options['StrictComparison']=$this->getStrictComparison();
-		if(($dateFormat=$this->getDateFormat())!=='')
-			$options['DateFormat']=$dateFormat;
+		if(($dateFormat=$this->getDateFormat())!=='') {
+					$options['DateFormat']=$dateFormat;
+		}
 		return $options;
 	}
 }

Indentation +15 added lines, -15 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TRangeValidator 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
- */
+	 * TRangeValidator 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
+	 */
 
 /**
  * Using TBaseValidator class
@@ -129,9 +129,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, '');
@@ -189,10 +189,10 @@ 
 	}
 
 	/**
-	* Determine if the value is within the integer range.
-	* @param string value to validate true
-	* @return boolean true if within integer range.
-	*/
+	 * Determine if the value is within the integer range.
+	 * @param string value to validate true
+	 * @return boolean true if within integer range.
+	 */
 	protected function isValidInteger($value)
 	{
 		$minValue=$this->getMinValue();

framework/Web/UI/WebControls/TRatingList.php

Doc Comments +1 added lines

@@ -132,6 +132,7 @@
 
 	/**
 	 * @param float rating value
+	 * @param double $rating
 	 * @return int rating as integer
 	 */
 	protected function getRatingIndex($rating)

Indentation +2 added lines, -2 removed lines

@@ -215,7 +215,7 @@ 
  	}
 
  	/**
-	 * @return string rating style css class name.
+ 	 * @return string rating style css class name.
  	 */
 	protected function getRatingStyleCssClass()
  	{
@@ -258,7 +258,7 @@ 
  	}
 
  	/**
-	 * @return string find the client ID of the caption control.
+ 	 * @return string find the client ID of the caption control.
  	 */
 	protected function getCaptionControlID()
  	{

Spacing +25 added lines, -25 removed lines

@@ -29,7 +29,7 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH='prado/ratings';
+	const SCRIPT_PATH = 'prado/ratings';
 
 	/**
 	 * @var array list of published rating images.
@@ -50,7 +50,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		if($value!==TRepeatLayout::Table)
+		if ($value !== TRepeatLayout::Table)
 			throw new TInvalidDataValueException('ratinglist_table_layout_only');
 		else
 			parent::setRepeatLayout($value);
@@ -108,7 +108,7 @@ 
 	{
 		$rating = $this->getViewState('Rating', null);
 		if ($rating === null)
-			return $this->getSelectedIndex()+1;
+			return $this->getSelectedIndex() + 1;
 		else
 			return $rating;
 	}
@@ -126,7 +126,7 @@ 
 
 	public function setSelectedIndex($value)
 	{
-		$this->setRating($value+1);
+		$this->setRating($value + 1);
 		parent::setSelectedIndex($value);
 	}
 
@@ -137,9 +137,9 @@ 
 	protected function getRatingIndex($rating)
 	{
 		$interval = $this->getHalfRatingInterval();
-		$base = intval($rating)-1;
-		$remainder = $rating-$base-1;
-		return $remainder > $interval[1] ? $base+1 : $base;
+		$base = intval($rating) - 1;
+		$remainder = $rating - $base - 1;
+		return $remainder > $interval[1] ? $base + 1 : $base;
 	}
 
 	/**
@@ -171,15 +171,15 @@ 
 
 	protected function getCaptionControl()
 	{
-		if(($id=$this->getCaptionID())!=='')
+		if (($id = $this->getCaptionID()) !== '')
 		{
-			if($control=$this->getPage()->findControl($id))
+			if ($control = $this->getPage()->findControl($id))
 				return $control;
-			if($control=$this->getNamingContainer()->findControl($id))
+			if ($control = $this->getNamingContainer()->findControl($id))
 				return $control;
 		}
 		throw new TInvalidDataValueException(
-			'ratinglist_invalid_caption_id',$id,$this->getID());
+			'ratinglist_invalid_caption_id', $id, $this->getID());
 	}
 
 	/**
@@ -219,7 +219,7 @@ 
  	 */
 	protected function getRatingStyleCssClass()
  	{
-		return 'TRatingList_'.$this->getRatingStyle();
+		return 'TRatingList_' . $this->getRatingStyle();
  	}
 
 	/**
@@ -262,11 +262,11 @@ 
  	 */
 	protected function getCaptionControlID()
  	{
-		if(($id=$this->getCaptionID())!=='')
+		if (($id = $this->getCaptionID()) !== '')
  		{
-			if($control=$this->getParent()->findControl($id))
+			if ($control = $this->getParent()->findControl($id))
 			{
-				if($control->getVisible(true))
+				if ($control->getVisible(true))
 					return $control->getClientID();
 			}
 			else
@@ -293,8 +293,8 @@ 
 	protected function publishStyle($style)
  	{
 		$cs = $this->getPage()->getClientScript();
-		$url = $this->getAssetUrl($style.'.css');
-		if(!$cs->isStyleSheetFileRegistered($url))
+		$url = $this->getAssetUrl($style . '.css');
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
  	}
@@ -304,11 +304,11 @@ 
 	 * @param string rating image file extension, default is '.gif'
 	 * @return array URL of publish the rating images
 	 */
-	protected function publishImages($style, $fileExt='.gif')
+	protected function publishImages($style, $fileExt = '.gif')
  	{
 		$types = array('blank', 'selected', 'half', 'combined');
 		$files = array();
-		foreach($types as $type)
+		foreach ($types as $type)
 			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
 		return $files;
  	}
@@ -318,7 +318,7 @@ 
 	 */
 	protected function registerClientScript()
 	{
-		$cs=$this->getPage()->getClientScript();
+		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('ratings');
 	}
 
@@ -326,10 +326,10 @@ 
 	 * @param string asset file in the self::SCRIPT_PATH directory.
 	 * @return string asset file 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;
  	}
 
 	/**
@@ -340,7 +340,7 @@ 
 	 */
 	public function render($writer)
  	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getPage()->getClientScript()->registerPostBackControl(
 			$this->getClientClassName(), $this->getPostBackOptions());
 		parent::render($writer);

Braces +27 added lines, -20 removed lines

@@ -95,10 +95,11 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		if($value!==TRepeatLayout::Table)
-			throw new TInvalidDataValueException('ratinglist_table_layout_only');
-		else
-			parent::setRepeatLayout($value);
+		if($value!==TRepeatLayout::Table) {
+					throw new TInvalidDataValueException('ratinglist_table_layout_only');
+		} else {
+					parent::setRepeatLayout($value);
+		}
 	}
 
 	/**
@@ -107,10 +108,11 @@ 
 	public function getRating()
 	{
 		$rating = $this->getViewState('Rating', null);
-		if ($rating === null)
-			return $this->getSelectedIndex()+1;
-		else
-			return $rating;
+		if ($rating === null) {
+					return $this->getSelectedIndex()+1;
+		} else {
+					return $rating;
+		}
 	}
 
 	/**
@@ -173,10 +175,12 @@ 
 	{
 		if(($id=$this->getCaptionID())!=='')
 		{
-			if($control=$this->getPage()->findControl($id))
-				return $control;
-			if($control=$this->getNamingContainer()->findControl($id))
-				return $control;
+			if($control=$this->getPage()->findControl($id)) {
+							return $control;
+			}
+			if($control=$this->getNamingContainer()->findControl($id)) {
+							return $control;
+			}
 		}
 		throw new TInvalidDataValueException(
 			'ratinglist_invalid_caption_id',$id,$this->getID());
@@ -266,11 +270,12 @@ 
  		{
 			if($control=$this->getParent()->findControl($id))
 			{
-				if($control->getVisible(true))
-					return $control->getClientID();
+				if($control->getVisible(true)) {
+									return $control->getClientID();
+				}
+			} else {
+							return $id;
 			}
-			else
-				return $id;
  		}
 		return '';
  	}
@@ -294,8 +299,9 @@ 
  	{
 		$cs = $this->getPage()->getClientScript();
 		$url = $this->getAssetUrl($style.'.css');
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
  	}
 
@@ -308,8 +314,9 @@ 
  	{
 		$types = array('blank', 'selected', 'half', 'combined');
 		$files = array();
-		foreach($types as $type)
-			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+		foreach($types as $type) {
+					$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+		}
 		return $files;
  	}
 

framework/Web/UI/WebControls/TRepeater.php

Doc Comments +7 added lines

@@ -464,6 +464,7 @@ 
 	 * This method invokes {@link createItem} to create a new repeater 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)
@@ -485,6 +486,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)
@@ -718,6 +720,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 TRepeaterItemEventParameter event parameter
+	 * @param TRepeaterItemEventParameter $param
 	 */
 	public function onItemCreated($param)
 	{
@@ -732,6 +735,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 TRepeaterItemEventParameter event parameter
+	 * @param TRepeaterItemEventParameter $param
 	 */
 	public function onItemDataBound($param)
 	{
@@ -751,6 +755,7 @@ 
 	 * Be sure to call parent's implementation so that
 	 * event handlers have chance to respond to the event.
 	 * @param TRepeaterCommandEventParameter event parameter
+	 * @param TRepeaterCommandEventParameter $param
 	 */
 	public function onItemCommand($param)
 	{
@@ -765,6 +770,7 @@ 
 	 * Otherwise, an exception will be raised.
 	 * @param mixed data item
 	 * @param mixed field name
+	 * @param string $field
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */
@@ -796,6 +802,7 @@ 
 	/**
 	 * Constructor.
 	 * @param TControl repeater item related with the corresponding event
+	 * @param TControl $item
 	 */
 	public function __construct($item)
 	{

Spacing +139 added lines, -139 removed lines

@@ -95,48 +95,48 @@ 
 	 * Repeater 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_HEADER = 'Header';
+	const IT_FOOTER = 'Footer';
+	const IT_ITEM = 'Item';
+	const IT_SEPARATOR = 'Separator';
+	const IT_ALTERNATINGITEM = 'AlternatingItem';
 
 	/**
 	 * @var ITemplate template for repeater items
 	 */
-	private $_itemTemplate=null;
+	private $_itemTemplate = null;
 	/**
 	 * @var ITemplate template for each alternating item
 	 */
-	private $_alternatingItemTemplate=null;
+	private $_alternatingItemTemplate = null;
 	/**
 	 * @var ITemplate template for header
 	 */
-	private $_headerTemplate=null;
+	private $_headerTemplate = null;
 	/**
 	 * @var ITemplate template for footer
 	 */
-	private $_footerTemplate=null;
+	private $_footerTemplate = null;
 	/**
 	 * @var ITemplate template used for repeater when no data is bound
 	 */
-	private $_emptyTemplate=null;
+	private $_emptyTemplate = null;
 	/**
 	 * @var ITemplate template for separator
 	 */
-	private $_separatorTemplate=null;
+	private $_separatorTemplate = null;
 	/**
 	 * @var TRepeaterItemCollection list of repeater items
 	 */
-	private $_items=null;
+	private $_items = null;
 	/**
 	 * @var TControl header item
 	 */
-	private $_header=null;
+	private $_header = null;
 	/**
 	 * @var TControl footer item
 	 */
-	private $_footer=null;
+	private $_footer = null;
 
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	 */
 	public function getAlternatingItemRenderer()
 	{
-		return $this->getViewState('AlternatingItemRenderer','');
+		return $this->getViewState('AlternatingItemRenderer', '');
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function setAlternatingItemRenderer($value)
 	{
-		$this->setViewState('AlternatingItemRenderer',$value,'');
+		$this->setViewState('AlternatingItemRenderer', $value, '');
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	public function getSeparatorRenderer()
 	{
-		return $this->getViewState('SeparatorRenderer','');
+		return $this->getViewState('SeparatorRenderer', '');
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	 */
 	public function setSeparatorRenderer($value)
 	{
-		$this->setViewState('SeparatorRenderer',$value,'');
+		$this->setViewState('SeparatorRenderer', $value, '');
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -232,7 +232,7 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function getEmptyRenderer()
 	{
-		return $this->getViewState('EmptyRenderer','');
+		return $this->getViewState('EmptyRenderer', '');
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 */
 	public function setEmptyRenderer($value)
 	{
-		$this->setViewState('EmptyRenderer',$value,'');
+		$this->setViewState('EmptyRenderer', $value, '');
 	}
 
 	/**
@@ -298,10 +298,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('repeater_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -318,10 +318,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('repeater_template_required','AlternatingItemTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'AlternatingItemTemplate');
 	}
 
 	/**
@@ -338,10 +338,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('repeater_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -358,10 +358,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('repeater_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -378,10 +378,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('repeater_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -398,10 +398,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('repeater_template_required','SeparatorTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'SeparatorTemplate');
 	}
 
 	/**
@@ -425,8 +425,8 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=new TRepeaterItemCollection;
+		if (!$this->_items)
+			$this->_items = new TRepeaterItemCollection;
 		return $this->_items;
 	}
 
@@ -435,7 +435,7 @@ 
 	 */
 	public function getDataKeyField()
 	{
-		return $this->getViewState('DataKeyField','');
+		return $this->getViewState('DataKeyField', '');
 	}
 
 	/**
@@ -443,7 +443,7 @@ 
 	 */
 	public function setDataKeyField($value)
 	{
-		$this->setViewState('DataKeyField',$value,'');
+		$this->setViewState('DataKeyField', $value, '');
 	}
 
 	/**
@@ -451,10 +451,10 @@ 
 	 */
 	public function getDataKeys()
 	{
-		if(($dataKeys=$this->getViewState('DataKeys',null))===null)
+		if (($dataKeys = $this->getViewState('DataKeys', null)) === null)
 		{
-			$dataKeys=new TList;
-			$this->setViewState('DataKeys',$dataKeys,null);
+			$dataKeys = new TList;
+			$this->setViewState('DataKeys', $dataKeys, null);
 		}
 		return $dataKeys;
 	}
@@ -466,11 +466,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 TRepeaterItemEventParameter($item);
+			$param = new TRepeaterItemEventParameter($item);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
@@ -487,12 +487,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 TRepeaterItemEventParameter($item);
-			if($item instanceof IDataRenderer)
+			$param = new TRepeaterItemEventParameter($item);
+			if ($item instanceof IDataRenderer)
 				$item->setData($dataItem);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -510,56 +510,56 @@ 
 	 * @param TListItemType item type
 	 * @return TControl created repeater 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 :
-				if(($classPath=$this->getAlternatingItemRenderer())==='' && ($template=$this->_alternatingItemTemplate)===null)
+				if (($classPath = $this->getAlternatingItemRenderer()) === '' && ($template = $this->_alternatingItemTemplate) === null)
 				{
-					$classPath=$this->getItemRenderer();
-					$template=$this->_itemTemplate;
+					$classPath = $this->getItemRenderer();
+					$template = $this->_itemTemplate;
 				}
 				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('repeater_itemtype_unknown',$itemType);
+				throw new TInvalidDataValueException('repeater_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 TRepeaterItem;
+			$item = new TRepeaterItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
 		}
 		else
-			$item=null;
+			$item = null;
 
 		return $item;
 	}
@@ -569,9 +569,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);
 	}
 
@@ -583,7 +583,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
+		if ($this->_items && $this->_items->getCount() || $this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
 			$this->renderContents($writer);
 	}
 
@@ -594,8 +594,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');
 	}
@@ -607,7 +607,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 			$this->restoreItemsFromViewState();
 		$this->clearViewState('ItemCount');
 	}
@@ -619,8 +619,8 @@ 
 	{
 		$this->getControls()->clear();
 		$this->getItems()->clear();
-		$this->_header=null;
-		$this->_footer=null;
+		$this->_header = null;
+		$this->_footer = null;
 	}
 
 	/**
@@ -629,19 +629,19 @@ 
 	protected function restoreItemsFromViewState()
 	{
 		$this->reset();
-		if(($itemCount=$this->getViewState('ItemCount',0))>0)
+		if (($itemCount = $this->getViewState('ItemCount', 0)) > 0)
 		{
-			$items=$this->getItems();
-			$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
-			$this->_header=$this->createItemInternal(-1,TListItemType::Header);
-			for($i=0;$i<$itemCount;++$i)
+			$items = $this->getItems();
+			$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);
-				$itemType=$i%2==0?TListItemType::Item : TListItemType::AlternatingItem;
-				$items->add($this->createItemInternal($i,$itemType,false,null));
+				if ($hasSeparator && $i > 0)
+					$this->createItemInternal($i - 1, TListItemType::Separator);
+				$itemType = $i % 2 == 0 ? TListItemType::Item : TListItemType::AlternatingItem;
+				$items->add($this->createItemInternal($i, $itemType, false, null));
 			}
-			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
+			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
 		}
 		else
 			$this->createEmptyContent();
@@ -658,35 +658,35 @@ 
 	{
 		$this->reset();
 
-		$keys=$this->getDataKeys();
+		$keys = $this->getDataKeys();
 		$keys->clear();
-		$keyField=$this->getDataKeyField();
+		$keyField = $this->getDataKeyField();
 
-		$items=$this->getItems();
-		$itemIndex=0;
-		$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
-		foreach($data as $key=>$dataItem)
+		$items = $this->getItems();
+		$itemIndex = 0;
+		$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
+		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);
-			$itemType=$itemIndex%2==0?TListItemType::Item : TListItemType::AlternatingItem;
-			$items->add($this->createItemWithDataInternal($itemIndex,$itemType,$dataItem));
+			if ($itemIndex === 0)
+				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
+			if ($hasSeparator && $itemIndex > 0)
+				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
+			$itemType = $itemIndex % 2 == 0 ? TListItemType::Item : TListItemType::AlternatingItem;
+			$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);
 	}
 
 	/**
@@ -698,9 +698,9 @@ 
 	 * @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 TRepeaterCommandEventParameter)
+		if ($param instanceof TRepeaterCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			return true;
@@ -721,7 +721,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -735,7 +735,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -754,7 +754,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -768,9 +768,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 }
 
@@ -791,7 +791,7 @@ 
 	 * The repeater item control responsible for the event.
 	 * @var TControl
 	 */
-	private $_item=null;
+	private $_item = null;
 
 	/**
 	 * Constructor.
@@ -799,7 +799,7 @@ 
 	 */
 	public function __construct($item)
 	{
-		$this->_item=$item;
+		$this->_item = $item;
 	}
 
 	/**
@@ -830,11 +830,11 @@ 
 	/**
 	 * @var TControl the repeater 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.
@@ -842,11 +842,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());
 	}
 
 	/**
@@ -909,7 +909,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType = TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -929,7 +929,7 @@ 
 	 */
 	public function setItemIndex($value)
 	{
-		$this->_itemIndex=TPropertyValue::ensureInteger($value);
+		$this->_itemIndex = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -947,7 +947,7 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data=$value;
+		$this->_data = $value;
 	}
 
 	/**
@@ -977,11 +977,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 TRepeaterCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TRepeaterCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -1008,10 +1008,10 @@ 
 	 * @param TControl new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a control.
 	 */
-	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('repeateritemcollection_item_invalid');
 	}

Braces +87 added lines, -71 removed lines

@@ -298,10 +298,11 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_itemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required','ItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_itemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required','ItemTemplate');
+		}
 	}
 
 	/**
@@ -318,10 +319,11 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_alternatingItemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required','AlternatingItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_alternatingItemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required','AlternatingItemTemplate');
+		}
 	}
 
 	/**
@@ -338,10 +340,11 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_headerTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required','HeaderTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_headerTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required','HeaderTemplate');
+		}
 	}
 
 	/**
@@ -358,10 +361,11 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_footerTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required','FooterTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_footerTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required','FooterTemplate');
+		}
 	}
 
 	/**
@@ -378,10 +382,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_emptyTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required','EmptyTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_emptyTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required','EmptyTemplate');
+		}
 	}
 
 	/**
@@ -398,10 +403,11 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_separatorTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required','SeparatorTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_separatorTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required','SeparatorTemplate');
+		}
 	}
 
 	/**
@@ -425,8 +431,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=new TRepeaterItemCollection;
+		if(!$this->_items) {
+					$this->_items=new TRepeaterItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -474,9 +481,9 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -492,16 +499,17 @@ 
 		if(($item=$this->createItem($itemIndex,$itemType))!==null)
 		{
 			$param=new TRepeaterItemEventParameter($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;
 	}
 
 	/**
@@ -550,16 +558,15 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		else if($template!==null)
+		} else if($template!==null)
 		{
 			$item=new TRepeaterItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
+		} else {
+					$item=null;
 		}
-		else
-			$item=null;
 
 		return $item;
 	}
@@ -569,10 +576,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);
+		}
 	}
 
 	/**
@@ -583,8 +591,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
-			$this->renderContents($writer);
+		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='') {
+					$this->renderContents($writer);
+		}
 	}
 
 	/**
@@ -594,10 +603,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');
+		}
 	}
 
 	/**
@@ -607,8 +617,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
-			$this->restoreItemsFromViewState();
+		if(!$this->getIsDataBound()) {
+					$this->restoreItemsFromViewState();
+		}
 		$this->clearViewState('ItemCount');
 	}
 
@@ -636,15 +647,16 @@ 
 			$this->_header=$this->createItemInternal(-1,TListItemType::Header);
 			for($i=0;$i<$itemCount;++$i)
 			{
-				if($hasSeparator && $i>0)
-					$this->createItemInternal($i-1,TListItemType::Separator);
+				if($hasSeparator && $i>0) {
+									$this->createItemInternal($i-1,TListItemType::Separator);
+				}
 				$itemType=$i%2==0?TListItemType::Item : TListItemType::AlternatingItem;
 				$items->add($this->createItemInternal($i,$itemType,false,null));
 			}
 			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
+		} else {
+					$this->createEmptyContent();
 		}
-		else
-			$this->createEmptyContent();
 		$this->clearChildState();
 	}
 
@@ -667,21 +679,24 @@ 
 		$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
 		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($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);
+			}
 			$itemType=$itemIndex%2==0?TListItemType::Item : TListItemType::AlternatingItem;
 			$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();
@@ -704,9 +719,9 @@ 
 		{
 			$this->onItemCommand($param);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -983,9 +998,9 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TRepeaterCommandEventParameter($this,$sender,$param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -1010,10 +1025,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TControl)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('repeateritemcollection_item_invalid');
+		if($item instanceof TControl) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('repeateritemcollection_item_invalid');
+		}
 	}
 }
 

framework/Web/UI/WebControls/TRepeatInfo.php

Doc Comments +7 added lines

@@ -49,6 +49,7 @@ 
 	 * @param TRepeatInfo repeat information
 	 * @param string item type
 	 * @param integer zero-based index of the item being rendered
+	 * @return void
 	 */
 	public function renderItem($writer,$repeatInfo,$itemType,$index);
 }
@@ -218,6 +219,7 @@ 
 	 * Renders contents in raw format.
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
+	 * @param IRepeatInfoUser $user
 	 */
 	protected function renderRawContents($writer,$user)
 	{
@@ -241,6 +243,7 @@ 
 	 * Renders contents in horizontal repeat direction.
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
+	 * @param IRepeatInfoUser $user
 	 */
 	protected function renderHorizontalContents($writer,$user)
 	{
@@ -323,6 +326,7 @@ 
 	 * Renders contents in veritcal repeat direction.
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
+	 * @param IRepeatInfoUser $user
 	 */
 	protected function renderVerticalContents($writer,$user)
 	{
@@ -456,6 +460,8 @@ 
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
 	 * @param boolean if a line break is needed at the end
+	 * @param boolean $tableLayout
+	 * @param boolean $needBreak
 	 */
 	protected function renderHeader($writer,$user,$tableLayout,$columns,$needBreak)
 	{
@@ -489,6 +495,7 @@ 
 	 * @param IRepeatInfoUser repeat information user
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
+	 * @param boolean $tableLayout
 	 */
 	protected function renderFooter($writer,$user,$tableLayout,$columns)
 	{

Spacing +147 added lines, -147 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param integer zero-based index of the current rendering item.
 	 * @return TStyle CSS style used for rendering items (including header, footer and separators)
 	 */
-	public function generateItemStyle($itemType,$index);
+	public function generateItemStyle($itemType, $index);
 	/**
 	 * Renders an item.
 	 * @param THtmlWriter writer for the rendering purpose
@@ -50,7 +50,7 @@ 
 	 * @param string item type
 	 * @param integer zero-based index of the item being rendered
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index);
+	public function renderItem($writer, $repeatInfo, $itemType, $index);
 }
 
 /**
@@ -76,23 +76,23 @@ 
 	/**
 	 * @var string caption of the table used to organize the repeated items
 	 */
-	private $_caption='';
+	private $_caption = '';
 	/**
 	 * @var TTableCaptionAlign alignment of the caption of the table used to organize the repeated items
 	 */
-	private $_captionAlign=TTableCaptionAlign::NotSet;
+	private $_captionAlign = TTableCaptionAlign::NotSet;
 	/**
 	 * @var integer number of columns that the items should be arranged in
 	 */
-	private $_repeatColumns=0;
+	private $_repeatColumns = 0;
 	/**
 	 * @var TRepeatDirection direction of the repetition
 	 */
-	private $_repeatDirection=TRepeatDirection::Vertical;
+	private $_repeatDirection = TRepeatDirection::Vertical;
 	/**
 	 * @var TRepeatLayout layout of the repeated items
 	 */
-	private $_repeatLayout=TRepeatLayout::Table;
+	private $_repeatLayout = TRepeatLayout::Table;
 
 	/**
 	 * @return string caption of the table layout
@@ -107,7 +107,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->_caption=$value;
+		$this->_caption = $value;
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->_captionAlign=TPropertyValue::ensureEnum($value,'TTableCaptionAlign');
+		$this->_captionAlign = TPropertyValue::ensureEnum($value, 'TTableCaptionAlign');
 	}
 
 	/**
@@ -139,9 +139,9 @@ 
 	 */
 	public function setRepeatColumns($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
-		$this->_repeatColumns=$value;
+		$this->_repeatColumns = $value;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setRepeatDirection($value)
 	{
-		$this->_repeatDirection=TPropertyValue::ensureEnum($value,'TRepeatDirection');
+		$this->_repeatDirection = TPropertyValue::ensureEnum($value, 'TRepeatDirection');
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		$this->_repeatLayout=TPropertyValue::ensureEnum($value,'TRepeatLayout');
+		$this->_repeatLayout = TPropertyValue::ensureEnum($value, 'TRepeatLayout');
 	}
 
 	/**
@@ -183,33 +183,33 @@ 
 	 */
 	public function renderRepeater($writer, IRepeatInfoUser $user)
 	{
-		if($this->_repeatLayout===TRepeatLayout::Table)
+		if ($this->_repeatLayout === TRepeatLayout::Table)
 		{
-			$control=new TTable;
-			if($this->_caption!=='')
+			$control = new TTable;
+			if ($this->_caption !== '')
 			{
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
 		}
-		else if($this->_repeatLayout===TRepeatLayout::Raw)
+		else if ($this->_repeatLayout === TRepeatLayout::Raw)
 		{
-			$this->renderRawContents($writer,$user);
+			$this->renderRawContents($writer, $user);
 			return;
 		}
 		else
-			$control=new TWebControl;
+			$control = new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
-		if($user->getHasStyle())
+		if ($user->getHasStyle())
 			$control->getStyle()->copyFrom($user->getStyle());
 		$control->renderBeginTag($writer);
 		$writer->writeLine();
 
-		if($this->_repeatDirection===TRepeatDirection::Vertical)
-			$this->renderVerticalContents($writer,$user);
+		if ($this->_repeatDirection === TRepeatDirection::Vertical)
+			$this->renderVerticalContents($writer, $user);
 		else
-			$this->renderHorizontalContents($writer,$user);
+			$this->renderHorizontalContents($writer, $user);
 
 		$control->renderEndTag($writer);
 	}
@@ -219,22 +219,22 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderRawContents($writer,$user)
+	protected function renderRawContents($writer, $user)
 	{
-		if($user->getHasHeader())
-			$user->renderItem($writer,$this,'Header',-1);
+		if ($user->getHasHeader())
+			$user->renderItem($writer, $this, 'Header', -1);
 
 		// render items
-		$hasSeparators=$user->getHasSeparators();
-		$itemCount=$user->getItemCount();
-		for($i=0;$i<$itemCount;++$i)
+		$hasSeparators = $user->getHasSeparators();
+		$itemCount = $user->getItemCount();
+		for ($i = 0; $i < $itemCount; ++$i)
 		{
-			$user->renderItem($writer,$this,'Item',$i);
-			if($hasSeparators && $i!=$itemCount-1)
-				$user->renderItem($writer,$this,'Separator',$i);
+			$user->renderItem($writer, $this, 'Item', $i);
+			if ($hasSeparators && $i != $itemCount - 1)
+				$user->renderItem($writer, $this, 'Separator', $i);
 		}
-		if($user->getHasFooter())
-			$user->renderItem($writer,$this,'Footer',-1);
+		if ($user->getHasFooter())
+			$user->renderItem($writer, $this, 'Footer', -1);
 	}
 
 	/**
@@ -242,81 +242,81 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderHorizontalContents($writer,$user)
+	protected function renderHorizontalContents($writer, $user)
 	{
-		$tableLayout=($this->_repeatLayout===TRepeatLayout::Table);
-		$hasSeparators=$user->getHasSeparators();
-		$itemCount=$user->getItemCount();
-		$columns=$this->_repeatColumns===0?$itemCount:$this->_repeatColumns;
-		$totalColumns=$hasSeparators?$columns+$columns:$columns;
-		$needBreak=$columns<$itemCount;
+		$tableLayout = ($this->_repeatLayout === TRepeatLayout::Table);
+		$hasSeparators = $user->getHasSeparators();
+		$itemCount = $user->getItemCount();
+		$columns = $this->_repeatColumns === 0 ? $itemCount : $this->_repeatColumns;
+		$totalColumns = $hasSeparators ? $columns + $columns : $columns;
+		$needBreak = $columns < $itemCount;
 
-		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,$needBreak);
+		if ($user->getHasHeader())
+			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, $needBreak);
 
 		// render items
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
-			$column=0;
-			for($i=0;$i<$itemCount;++$i)
+			$column = 0;
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
-				if($column==0)
+				if ($column == 0)
 					$writer->renderBeginTag('tr');
-				if(($style=$user->generateItemStyle('Item',$i))!==null)
+				if (($style = $user->generateItemStyle('Item', $i)) !== null)
 					$style->addAttributesToRender($writer);
 				$writer->renderBeginTag('td');
-				$user->renderItem($writer,$this,'Item',$i);
+				$user->renderItem($writer, $this, 'Item', $i);
 				$writer->renderEndTag();
 				$writer->writeLine();
-				if($hasSeparators && $i!=$itemCount-1)
+				if ($hasSeparators && $i != $itemCount - 1)
 				{
-					if(($style=$user->generateItemStyle('Separator',$i))!==null)
+					if (($style = $user->generateItemStyle('Separator', $i)) !== null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
-					$user->renderItem($writer,$this,'Separator',$i);
+					$user->renderItem($writer, $this, 'Separator', $i);
 					$writer->renderEndTag();
 					$writer->writeLine();
 				}
 				$column++;
-				if($i==$itemCount-1)
+				if ($i == $itemCount - 1)
 				{
-					$restColumns=$columns-$column;
-					if($hasSeparators)
-						$restColumns=$restColumns?$restColumns+$restColumns+1:1;
-					for($j=0;$j<$restColumns;++$j)
+					$restColumns = $columns - $column;
+					if ($hasSeparators)
+						$restColumns = $restColumns ? $restColumns + $restColumns + 1 : 1;
+					for ($j = 0; $j < $restColumns; ++$j)
 						$writer->write("<td></td>\n");
 				}
-				if($column==$columns || $i==$itemCount-1)
+				if ($column == $columns || $i == $itemCount - 1)
 				{
 					$writer->renderEndTag();
 					$writer->writeLine();
-					$column=0;
+					$column = 0;
 				}
 			}
 			$writer->renderEndTag();
 		}
 		else
 		{
-			$column=0;
-			for($i=0;$i<$itemCount;++$i)
+			$column = 0;
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
-				$user->renderItem($writer,$this,'Item',$i);
-				if($hasSeparators && $i!=$itemCount-1)
-					$user->renderItem($writer,$this,'Separator',$i);
+				$user->renderItem($writer, $this, 'Item', $i);
+				if ($hasSeparators && $i != $itemCount - 1)
+					$user->renderItem($writer, $this, 'Separator', $i);
 				$column++;
-				if($column==$columns || $i==$itemCount-1)
+				if ($column == $columns || $i == $itemCount - 1)
 				{
-					if($needBreak)
+					if ($needBreak)
 						$writer->writeBreak();
-					$column=0;
+					$column = 0;
 				}
 				$writer->writeLine();
 			}
 		}
 
-		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,$needBreak);
+		if ($user->getHasFooter())
+			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, $needBreak);
 	}
 
 	/**
@@ -324,83 +324,83 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderVerticalContents($writer,$user)
+	protected function renderVerticalContents($writer, $user)
 	{
-		$tableLayout=($this->_repeatLayout===TRepeatLayout::Table);
-		$hasSeparators=$user->getHasSeparators();
-		$itemCount=$user->getItemCount();
-		if($this->_repeatColumns<=1)
+		$tableLayout = ($this->_repeatLayout === TRepeatLayout::Table);
+		$hasSeparators = $user->getHasSeparators();
+		$itemCount = $user->getItemCount();
+		if ($this->_repeatColumns <= 1)
 		{
-			$rows=$itemCount;
-			$columns=1;
-			$lastColumns=1;
+			$rows = $itemCount;
+			$columns = 1;
+			$lastColumns = 1;
 		}
 		else
 		{
-			$columns=$this->_repeatColumns;
-			$rows=(int)(($itemCount+$columns-1)/$columns);
-			if($rows==0 && $itemCount>0)
-				$rows=1;
-			if(($lastColumns=$itemCount%$columns)==0)
-				$lastColumns=$columns;
+			$columns = $this->_repeatColumns;
+			$rows = (int) (($itemCount + $columns - 1) / $columns);
+			if ($rows == 0 && $itemCount > 0)
+				$rows = 1;
+			if (($lastColumns = $itemCount % $columns) == 0)
+				$lastColumns = $columns;
 		}
-		$totalColumns=$hasSeparators?$columns+$columns:$columns;
+		$totalColumns = $hasSeparators ? $columns + $columns : $columns;
 
-		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,false);
+		if ($user->getHasHeader())
+			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, false);
 
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
-			$renderedItems=0;
-			for($row=0;$row<$rows;++$row)
+			$renderedItems = 0;
+			for ($row = 0; $row < $rows; ++$row)
 			{
-				$index=$row;
+				$index = $row;
 				$writer->renderBeginTag('tr');
-				for($col=0;$col<$columns;++$col)
+				for ($col = 0; $col < $columns; ++$col)
 				{
-					if($renderedItems>=$itemCount)
+					if ($renderedItems >= $itemCount)
 						break;
-					if($col>0)
+					if ($col > 0)
 					{
-						$index+=$rows;
-						if($col-1>=$lastColumns)
+						$index += $rows;
+						if ($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index>=$itemCount)
+					if ($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					if(($style=$user->generateItemStyle('Item',$index))!==null)
+					if (($style = $user->generateItemStyle('Item', $index)) !== null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
-					$user->renderItem($writer,$this,'Item',$index);
+					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->renderEndTag();
 					$writer->writeLine();
-					if(!$hasSeparators)
+					if (!$hasSeparators)
 						continue;
-					if($renderedItems<$itemCount-1)
+					if ($renderedItems < $itemCount - 1)
 					{
-						if($columns==1)
+						if ($columns == 1)
 						{
 							$writer->renderEndTag();
 							$writer->renderBeginTag('tr');
 						}
-						if(($style=$user->generateItemStyle('Separator',$index))!==null)
+						if (($style = $user->generateItemStyle('Separator', $index)) !== null)
 							$style->addAttributesToRender($writer);
 						$writer->renderBeginTag('td');
-						$user->renderItem($writer,$this,'Separator',$index);
+						$user->renderItem($writer, $this, 'Separator', $index);
 						$writer->renderEndTag();
 						$writer->writeLine();
 					}
-					else if($columns>1)
+					else if ($columns > 1)
 						$writer->write("<td></td>\n");
 				}
-				if($row==$rows-1)
+				if ($row == $rows - 1)
 				{
-					$restColumns=$columns-$lastColumns;
-					if($hasSeparators)
-						$restColumns+=$restColumns;
-					for($col=0;$col<$restColumns;++$col)
+					$restColumns = $columns - $lastColumns;
+					if ($hasSeparators)
+						$restColumns += $restColumns;
+					for ($col = 0; $col < $restColumns; ++$col)
 						$writer->write("<td></td>\n");
 				}
 				$writer->renderEndTag();
@@ -410,42 +410,42 @@ 
 		}
 		else
 		{
-			$renderedItems=0;
-			for($row=0;$row<$rows;++$row)
+			$renderedItems = 0;
+			for ($row = 0; $row < $rows; ++$row)
 			{
-				$index=$row;
-				for($col=0;$col<$columns;++$col)
+				$index = $row;
+				for ($col = 0; $col < $columns; ++$col)
 				{
-					if($renderedItems>=$itemCount)
+					if ($renderedItems >= $itemCount)
 						break;
-					if($col>0)
+					if ($col > 0)
 					{
-						$index+=$rows;
-						if($col-1>=$lastColumns)
+						$index += $rows;
+						if ($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index>=$itemCount)
+					if ($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					$user->renderItem($writer,$this,'Item',$index);
+					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->writeLine();
-					if(!$hasSeparators)
+					if (!$hasSeparators)
 						continue;
-					if($renderedItems<$itemCount-1)
+					if ($renderedItems < $itemCount - 1)
 					{
-						if($columns==1)
+						if ($columns == 1)
 							$writer->writeBreak();
-						$user->renderItem($writer,$this,'Separator',$index);
+						$user->renderItem($writer, $this, 'Separator', $index);
 					}
 					$writer->writeLine();
 				}
-				if($row<$rows-1 || $user->getHasFooter())
+				if ($row < $rows - 1 || $user->getHasFooter())
 					$writer->writeBreak();
 			}
 		}
 
-		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,false);
+		if ($user->getHasFooter())
+			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, false);
 
 	}
 
@@ -457,27 +457,27 @@ 
 	 * @param integer number of columns to be rendered
 	 * @param boolean if a line break is needed at the end
 	 */
-	protected function renderHeader($writer,$user,$tableLayout,$columns,$needBreak)
+	protected function renderHeader($writer, $user, $tableLayout, $columns, $needBreak)
 	{
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('thead');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			$writer->addAttribute('scope','col');
-			if(($style=$user->generateItemStyle('Header',-1))!==null)
+			if ($columns > 1)
+				$writer->addAttribute('colspan', "$columns");
+			$writer->addAttribute('scope', 'col');
+			if (($style = $user->generateItemStyle('Header', -1)) !== null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('th');
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 		}
 		else
 		{
-			$user->renderItem($writer,$this,'Header',-1);
-			if($needBreak)
+			$user->renderItem($writer, $this, 'Header', -1);
+			if ($needBreak)
 				$writer->writeBreak();
 		}
 		$writer->writeLine();
@@ -490,24 +490,24 @@ 
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
 	 */
-	protected function renderFooter($writer,$user,$tableLayout,$columns)
+	protected function renderFooter($writer, $user, $tableLayout, $columns)
 	{
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('tfoot');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			if(($style=$user->generateItemStyle('Footer',-1))!==null)
+			if ($columns > 1)
+				$writer->addAttribute('colspan', "$columns");
+			if (($style = $user->generateItemStyle('Footer', -1)) !== null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('td');
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 		}
 		else
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 		$writer->writeLine();
 	}
 }
@@ -528,8 +528,8 @@ 
  */
 class TRepeatDirection extends TEnumerable
 {
-	const Vertical='Vertical';
-	const Horizontal='Horizontal';
+	const Vertical = 'Vertical';
+	const Horizontal = 'Horizontal';
 }
 
 /**
@@ -548,8 +548,8 @@ 
  */
 class TRepeatLayout extends TEnumerable
 {
-	const Table='Table';
-	const Flow='Flow';
-	const Raw='Raw';
+	const Table = 'Table';
+	const Flow = 'Flow';
+	const Raw = 'Raw';
 }
 

Braces +127 added lines, -94 removed lines

@@ -139,8 +139,9 @@ 
 	 */
 	public function setRepeatColumns($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
+		}
 		$this->_repeatColumns=$value;
 	}
 
@@ -191,25 +192,26 @@ 
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
-		}
-		else if($this->_repeatLayout===TRepeatLayout::Raw)
+		} else if($this->_repeatLayout===TRepeatLayout::Raw)
 		{
 			$this->renderRawContents($writer,$user);
 			return;
+		} else {
+					$control=new TWebControl;
 		}
-		else
-			$control=new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
-		if($user->getHasStyle())
-			$control->getStyle()->copyFrom($user->getStyle());
+		if($user->getHasStyle()) {
+					$control->getStyle()->copyFrom($user->getStyle());
+		}
 		$control->renderBeginTag($writer);
 		$writer->writeLine();
 
-		if($this->_repeatDirection===TRepeatDirection::Vertical)
-			$this->renderVerticalContents($writer,$user);
-		else
-			$this->renderHorizontalContents($writer,$user);
+		if($this->_repeatDirection===TRepeatDirection::Vertical) {
+					$this->renderVerticalContents($writer,$user);
+		} else {
+					$this->renderHorizontalContents($writer,$user);
+		}
 
 		$control->renderEndTag($writer);
 	}
@@ -221,8 +223,9 @@ 
 	 */
 	protected function renderRawContents($writer,$user)
 	{
-		if($user->getHasHeader())
-			$user->renderItem($writer,$this,'Header',-1);
+		if($user->getHasHeader()) {
+					$user->renderItem($writer,$this,'Header',-1);
+		}
 
 		// render items
 		$hasSeparators=$user->getHasSeparators();
@@ -230,11 +233,13 @@ 
 		for($i=0;$i<$itemCount;++$i)
 		{
 			$user->renderItem($writer,$this,'Item',$i);
-			if($hasSeparators && $i!=$itemCount-1)
-				$user->renderItem($writer,$this,'Separator',$i);
+			if($hasSeparators && $i!=$itemCount-1) {
+							$user->renderItem($writer,$this,'Separator',$i);
+			}
+		}
+		if($user->getHasFooter()) {
+					$user->renderItem($writer,$this,'Footer',-1);
 		}
-		if($user->getHasFooter())
-			$user->renderItem($writer,$this,'Footer',-1);
 	}
 
 	/**
@@ -251,8 +256,9 @@ 
 		$totalColumns=$hasSeparators?$columns+$columns:$columns;
 		$needBreak=$columns<$itemCount;
 
-		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,$needBreak);
+		if($user->getHasHeader()) {
+					$this->renderHeader($writer,$user,$tableLayout,$totalColumns,$needBreak);
+		}
 
 		// render items
 		if($tableLayout)
@@ -261,18 +267,21 @@ 
 			$column=0;
 			for($i=0;$i<$itemCount;++$i)
 			{
-				if($column==0)
-					$writer->renderBeginTag('tr');
-				if(($style=$user->generateItemStyle('Item',$i))!==null)
-					$style->addAttributesToRender($writer);
+				if($column==0) {
+									$writer->renderBeginTag('tr');
+				}
+				if(($style=$user->generateItemStyle('Item',$i))!==null) {
+									$style->addAttributesToRender($writer);
+				}
 				$writer->renderBeginTag('td');
 				$user->renderItem($writer,$this,'Item',$i);
 				$writer->renderEndTag();
 				$writer->writeLine();
 				if($hasSeparators && $i!=$itemCount-1)
 				{
-					if(($style=$user->generateItemStyle('Separator',$i))!==null)
-						$style->addAttributesToRender($writer);
+					if(($style=$user->generateItemStyle('Separator',$i))!==null) {
+											$style->addAttributesToRender($writer);
+					}
 					$writer->renderBeginTag('td');
 					$user->renderItem($writer,$this,'Separator',$i);
 					$writer->renderEndTag();
@@ -282,10 +291,12 @@ 
 				if($i==$itemCount-1)
 				{
 					$restColumns=$columns-$column;
-					if($hasSeparators)
-						$restColumns=$restColumns?$restColumns+$restColumns+1:1;
-					for($j=0;$j<$restColumns;++$j)
-						$writer->write("<td></td>\n");
+					if($hasSeparators) {
+											$restColumns=$restColumns?$restColumns+$restColumns+1:1;
+					}
+					for($j=0;$j<$restColumns;++$j) {
+											$writer->write("<td></td>\n");
+					}
 				}
 				if($column==$columns || $i==$itemCount-1)
 				{
@@ -295,28 +306,30 @@ 
 				}
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$column=0;
 			for($i=0;$i<$itemCount;++$i)
 			{
 				$user->renderItem($writer,$this,'Item',$i);
-				if($hasSeparators && $i!=$itemCount-1)
-					$user->renderItem($writer,$this,'Separator',$i);
+				if($hasSeparators && $i!=$itemCount-1) {
+									$user->renderItem($writer,$this,'Separator',$i);
+				}
 				$column++;
 				if($column==$columns || $i==$itemCount-1)
 				{
-					if($needBreak)
-						$writer->writeBreak();
+					if($needBreak) {
+											$writer->writeBreak();
+					}
 					$column=0;
 				}
 				$writer->writeLine();
 			}
 		}
 
-		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,$needBreak);
+		if($user->getHasFooter()) {
+					$this->renderFooter($writer,$user,$tableLayout,$totalColumns,$needBreak);
+		}
 	}
 
 	/**
@@ -334,20 +347,22 @@ 
 			$rows=$itemCount;
 			$columns=1;
 			$lastColumns=1;
-		}
-		else
+		} else
 		{
 			$columns=$this->_repeatColumns;
 			$rows=(int)(($itemCount+$columns-1)/$columns);
-			if($rows==0 && $itemCount>0)
-				$rows=1;
-			if(($lastColumns=$itemCount%$columns)==0)
-				$lastColumns=$columns;
+			if($rows==0 && $itemCount>0) {
+							$rows=1;
+			}
+			if(($lastColumns=$itemCount%$columns)==0) {
+							$lastColumns=$columns;
+			}
 		}
 		$totalColumns=$hasSeparators?$columns+$columns:$columns;
 
-		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,false);
+		if($user->getHasHeader()) {
+					$this->renderHeader($writer,$user,$tableLayout,$totalColumns,false);
+		}
 
 		if($tableLayout)
 		{
@@ -359,25 +374,30 @@ 
 				$writer->renderBeginTag('tr');
 				for($col=0;$col<$columns;++$col)
 				{
-					if($renderedItems>=$itemCount)
-						break;
+					if($renderedItems>=$itemCount) {
+											break;
+					}
 					if($col>0)
 					{
 						$index+=$rows;
-						if($col-1>=$lastColumns)
-							$index--;
+						if($col-1>=$lastColumns) {
+													$index--;
+						}
+					}
+					if($index>=$itemCount) {
+											continue;
 					}
-					if($index>=$itemCount)
-						continue;
 					$renderedItems++;
-					if(($style=$user->generateItemStyle('Item',$index))!==null)
-						$style->addAttributesToRender($writer);
+					if(($style=$user->generateItemStyle('Item',$index))!==null) {
+											$style->addAttributesToRender($writer);
+					}
 					$writer->renderBeginTag('td');
 					$user->renderItem($writer,$this,'Item',$index);
 					$writer->renderEndTag();
 					$writer->writeLine();
-					if(!$hasSeparators)
-						continue;
+					if(!$hasSeparators) {
+											continue;
+					}
 					if($renderedItems<$itemCount-1)
 					{
 						if($columns==1)
@@ -385,30 +405,32 @@ 
 							$writer->renderEndTag();
 							$writer->renderBeginTag('tr');
 						}
-						if(($style=$user->generateItemStyle('Separator',$index))!==null)
-							$style->addAttributesToRender($writer);
+						if(($style=$user->generateItemStyle('Separator',$index))!==null) {
+													$style->addAttributesToRender($writer);
+						}
 						$writer->renderBeginTag('td');
 						$user->renderItem($writer,$this,'Separator',$index);
 						$writer->renderEndTag();
 						$writer->writeLine();
+					} else if($columns>1) {
+											$writer->write("<td></td>\n");
 					}
-					else if($columns>1)
-						$writer->write("<td></td>\n");
 				}
 				if($row==$rows-1)
 				{
 					$restColumns=$columns-$lastColumns;
-					if($hasSeparators)
-						$restColumns+=$restColumns;
-					for($col=0;$col<$restColumns;++$col)
-						$writer->write("<td></td>\n");
+					if($hasSeparators) {
+											$restColumns+=$restColumns;
+					}
+					for($col=0;$col<$restColumns;++$col) {
+											$writer->write("<td></td>\n");
+					}
 				}
 				$writer->renderEndTag();
 				$writer->writeLine();
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$renderedItems=0;
 			for($row=0;$row<$rows;++$row)
@@ -416,36 +438,43 @@ 
 				$index=$row;
 				for($col=0;$col<$columns;++$col)
 				{
-					if($renderedItems>=$itemCount)
-						break;
+					if($renderedItems>=$itemCount) {
+											break;
+					}
 					if($col>0)
 					{
 						$index+=$rows;
-						if($col-1>=$lastColumns)
-							$index--;
+						if($col-1>=$lastColumns) {
+													$index--;
+						}
+					}
+					if($index>=$itemCount) {
+											continue;
 					}
-					if($index>=$itemCount)
-						continue;
 					$renderedItems++;
 					$user->renderItem($writer,$this,'Item',$index);
 					$writer->writeLine();
-					if(!$hasSeparators)
-						continue;
+					if(!$hasSeparators) {
+											continue;
+					}
 					if($renderedItems<$itemCount-1)
 					{
-						if($columns==1)
-							$writer->writeBreak();
+						if($columns==1) {
+													$writer->writeBreak();
+						}
 						$user->renderItem($writer,$this,'Separator',$index);
 					}
 					$writer->writeLine();
 				}
-				if($row<$rows-1 || $user->getHasFooter())
-					$writer->writeBreak();
+				if($row<$rows-1 || $user->getHasFooter()) {
+									$writer->writeBreak();
+				}
 			}
 		}
 
-		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,false);
+		if($user->getHasFooter()) {
+					$this->renderFooter($writer,$user,$tableLayout,$totalColumns,false);
+		}
 
 	}
 
@@ -463,22 +492,24 @@ 
 		{
 			$writer->renderBeginTag('thead');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
+			if($columns>1) {
+							$writer->addAttribute('colspan',"$columns");
+			}
 			$writer->addAttribute('scope','col');
-			if(($style=$user->generateItemStyle('Header',-1))!==null)
-				$style->addAttributesToRender($writer);
+			if(($style=$user->generateItemStyle('Header',-1))!==null) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('th');
 			$user->renderItem($writer,$this,'Header',-1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$user->renderItem($writer,$this,'Header',-1);
-			if($needBreak)
-				$writer->writeBreak();
+			if($needBreak) {
+							$writer->writeBreak();
+			}
 		}
 		$writer->writeLine();
 	}
@@ -496,18 +527,20 @@ 
 		{
 			$writer->renderBeginTag('tfoot');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			if(($style=$user->generateItemStyle('Footer',-1))!==null)
-				$style->addAttributesToRender($writer);
+			if($columns>1) {
+							$writer->addAttribute('colspan',"$columns");
+			}
+			if(($style=$user->generateItemStyle('Footer',-1))!==null) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('td');
 			$user->renderItem($writer,$this,'Footer',-1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
+		} else {
+					$user->renderItem($writer,$this,'Footer',-1);
 		}
-		else
-			$user->renderItem($writer,$this,'Footer',-1);
 		$writer->writeLine();
 	}
 }