pradosoft / prado

framework/Web/UI/WebControls/TLinkButton.php

Doc Comments +2 added lines

@@ -281,6 +281,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -322,6 +323,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
 	}
 

Spacing +27 added lines, -27 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		// We call parent implementation here because some attributes
 		// may be overwritten in the following
@@ -100,7 +100,7 @@ 
 			$this->renderClientControlScript($writer);
 		}
 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -109,8 +109,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//".$this->getClientID();
+		$nop="javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -157,11 +157,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['StopEvent'] = true;
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['StopEvent']=true;
 
 		return $options;
 	}
@@ -185,7 +185,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -276,7 +276,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -325,8 +325,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 }
 

framework/Web/UI/WebControls/TListBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Indentation +2 added lines, -2 removed lines

@@ -463,14 +463,14 @@
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Spacing +12 added lines, -12 removed lines

@@ -47,11 +47,11 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$rows=$this->getRows();
-		$writer->addAttribute('size',"$rows");
+		$writer->addAttribute('size', "$rows");
 		if($this->getSelectionMode()===TListSelectionMode::Multiple)
-			$writer->addAttribute('name',$this->getUniqueID().'[]');
+			$writer->addAttribute('name', $this->getUniqueID().'[]');
 		else
-			$writer->addAttribute('name',$this->getUniqueID());
+			$writer->addAttribute('name', $this->getUniqueID());
 		parent::addAttributesToRender($writer);
 	}
 
@@ -84,19 +84,19 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if(!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selections=isset($values[$key])?$values[$key]:null;
+		$selections=isset($values[$key]) ? $values[$key] : null;
 		if($selections!==null)
 		{
 			$items=$this->getItems();
 			if($this->getSelectionMode()===TListSelectionMode::Single)
 			{
-				$selection=is_array($selections)?$selections[0]:$selections;
-				$index=$items->findIndexByValue($selection,false);
+				$selection=is_array($selections) ? $selections[0] : $selections;
+				$index=$items->findIndexByValue($selection, false);
 				if($this->getSelectedIndex()!==$index)
 				{
 					$this->setSelectedIndex($index);
@@ -109,14 +109,14 @@ 
 				$selections=array($selections);
 			$list=array();
 			foreach($selections as $selection)
-				$list[]=$items->findIndexByValue($selection,false);
+				$list[]=$items->findIndexByValue($selection, false);
 			$list2=$this->getSelectedIndices();
 			$n=count($list);
 			$flag=false;
 			if($n===count($list2))
 			{
-				sort($list,SORT_NUMERIC);
-				for($i=0;$i<$n;++$i)
+				sort($list, SORT_NUMERIC);
+				for($i=0; $i < $n; ++$i)
 				{
 					if($list[$i]!==$list2[$i])
 					{
@@ -189,7 +189,7 @@ 
 	public function setRows($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value<=0)
+		if($value <= 0)
 			$value=4;
 		$this->setViewState('Rows', $value, 4);
 	}
@@ -207,7 +207,7 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		$this->setViewState('SelectionMode',TPropertyValue::ensureEnum($value,'TListSelectionMode'),TListSelectionMode::Single);
+		$this->setViewState('SelectionMode', TPropertyValue::ensureEnum($value, 'TListSelectionMode'), TListSelectionMode::Single);
 	}
 
 	/**

Braces +4 added lines, -8 removed lines

@@ -101,8 +101,7 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged=true;
-				}
-				else
+				} else
 					return false;
 			}
 			if(!is_array($selections))
@@ -124,8 +123,7 @@ 
 						break;
 					}
 				}
-			}
-			else
+			} else
 				$flag=true;
 			if($flag)
 			{
@@ -133,13 +131,11 @@ 
 				$this->_dataChanged=true;
 			}
 			return $flag;
-		}
-		else if($this->getSelectedIndex()!==-1)
+		} else if($this->getSelectedIndex()!==-1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

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 +36 added lines, -36 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)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
-		$this->setViewState('MinSelection',$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)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
-		$this->setViewState('MaxSelection',$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, '');
 	}
 
 	/**
@@ -135,28 +135,28 @@ 
 	{
 		$control=$this->getValidationTarget();
 
-		$exists = true;
-		$values = $this->getSelection($control);
-		$count = count($values);
-		$required = $this->getRequiredValues();
+		$exists=true;
+		$values=$this->getSelection($control);
+		$count=count($values);
+		$required=$this->getRequiredValues();
 
 		//if required, check the values
 		if(!empty($required))
 		{
-			if($count < count($required) )
+			if($count < count($required))
 				return false;
 			foreach($required as $require)
-				$exists = $exists && in_array($require, $values);
+				$exists=$exists && in_array($require, $values);
 		}
 
-		$min = $this->getMinSelection();
-		$max = $this->getMaxSelection();
+		$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;
@@ -168,13 +168,13 @@ 
 	 */
 	protected function getSelection($control)
 	{
-		$values = array();
+		$values=array();
 
 		//get the data
 		foreach($control->getItems() as $item)
 		{
 			if($item->getSelected())
-				$values[] = $item->getValue();
+				$values[]=$item->getValue();
 		}
 		return $values;
 	}
@@ -184,10 +184,10 @@ 
 	 */
 	protected function getRequiredValues()
 	{
-		$required = array();
-		$string = $this->getRequiredSelections();
+		$required=array();
+		$string=$this->getRequiredSelections();
 		if(!empty($string))
-			$required = preg_split('/,\s*/', $string);
+			$required=preg_split('/,\s*/', $string);
 		return $required;
 	}
 
@@ -197,26 +197,26 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$control = $this->getValidationTarget();
+		$options=parent::getClientScriptOptions();
+		$control=$this->getValidationTarget();
 
 		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;
-		$required = $this->getRequiredSelections();
+		$min=$this->getMinSelection();
+		$max=$this->getMaxSelection();
+		if($min!==-1)
+			$options['Min']=$min;
+		if($max!==-1)
+			$options['Max']=$max;
+		$required=$this->getRequiredSelections();
 		if(strlen($required) > 0)
-			$options['Required']= $required;
-		$options['TotalItems'] = $control->getItemCount();
+			$options['Required']=$required;
+		$options['TotalItems']=$control->getItemCount();
 
 		return $options;
 	}

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TListControlValidator class file
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.WebControls
- */
+	 * TListControlValidator class file
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.WebControls
+	 */
 
 /**
  * Using TBaseValidator class

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)

Braces +3 added lines, -6 removed lines

@@ -97,8 +97,7 @@ 
 			$this->_cachedActiveViewIndex=-1;
 			if($index>=0)
 				$this->activateView($views->itemAt($index),true);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
 	}
 
@@ -153,8 +152,7 @@ 
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
-			}
-			else if($v->getActive())
+			} else if($v->getActive())
 			{
 				$v->setActive(false);
 				if($triggerEvent)
@@ -232,8 +230,7 @@ 
 					{
 						$this->setActiveView($view);
 						return true;
-					}
-					else
+					} else
 						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 				case self::CMD_SWITCHVIEWINDEX:
 					$index=TPropertyValue::ensureInteger($param->getCommandParameter());

Spacing +27 added lines, -27 removed lines

@@ -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)
+		if(($index=TPropertyValue::ensureInteger($value)) < 0)
 			$index=-1;
 		$views=$this->getViews();
 		$count=$views->getCount();
-		if($count===0 && $this->getControlStage()<TControl::CS_CHILD_INITIALIZED)
+		if($count===0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
 			$this->_cachedActiveViewIndex=$index;
-		else if($index<$count)
+		else if($index < $count)
 		{
-			$this->setControlState('ActiveViewIndex',$index,-1);
+			$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);
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
 	/**
@@ -110,13 +110,13 @@ 
 	{
 		$index=$this->getActiveViewIndex();
 		$views=$this->getViews();
-		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
-		if($index<0)
+		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);
+			$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,11 +138,11 @@ 
 	 * @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())
 			return;
-		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage()>=TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
+		$triggerEvent=$triggerViewChangedEvent && ($this->getControlStage() >= TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
 		foreach($this->getViews() as $v)
 		{
 			if($v===$view)
@@ -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,21 +210,21 @@ 
 	 * @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))
 		{
 			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());
@@ -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);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('viewcollection_view_required');
 	}
@@ -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);
 	}
 
 	/**

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 +23 added lines, -23 removed lines

@@ -101,13 +101,13 @@ 
 		if(!$this->_cacheChecked)
 		{
 			$this->_cacheChecked=true;
-			if($this->_duration>0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
+			if($this->_duration > 0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
 			{
 				if($this->_cacheModuleID!=='')
 				{
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
 					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
 				}
 				else
 					$this->_cache=$this->getApplication()->getCache();
@@ -118,14 +118,14 @@ 
 					if(is_array($data))
 					{
 						$param=new TOutputCacheCheckDependencyEventParameter;
-						$param->setCacheTime(isset($data[3])?$data[3]:0);
+						$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;
+						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime)=$data;
 				}
 			}
 		}
@@ -183,11 +183,11 @@ 
 		foreach($this->_actions as $action)
 		{
 			if($action[0]==='Page.ClientScript')
-				call_user_func_array(array($cs,$action[1]),$action[2]);
+				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]);
+				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]);
 		}
 	}
 
@@ -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);
+		parent::loadStateRecursive($st, $needViewState);
 	}
 
 	/**
@@ -255,9 +255,9 @@ 
 	 * @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()
@@ -286,7 +286,7 @@ 
 		{
 			$params=array();
 			$request=$this->getRequest();
-			foreach(explode(',',$this->_varyByParam) as $name)
+			foreach(explode(',', $this->_varyByParam) as $name)
 			{
 				$name=trim($name);
 				$params[$name]=$request->itemAt($name);
@@ -378,8 +378,8 @@ 
 	 */
 	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;
 	}
 
@@ -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);
 	}
 
 	/**
@@ -476,9 +476,9 @@ 
 			$writer->write($this->_contents);
 		else if($this->_cacheAvailable)
 		{
-			$textwriter = new TTextWriter();
-			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
-			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
+			$textwriter=new TTextWriter();
+			$multiwriter=new TOutputCacheTextWriterMulti(array($writer->getWriter(), $textwriter));
+			$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
 
 			$stack=$this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -486,8 +486,8 @@ 
 			$stack->pop();
 
 			$content=$textwriter->flush();
-			$data=array($content,$this->_state,$this->_actions,time());
-			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
+			$data=array($content, $this->_state, $this->_actions, time());
+			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
 		}
 		else
 			parent::render($writer);
@@ -597,7 +597,7 @@ 
 	public function __construct(Array $writers)
 	{
 		//parent::__construct();
-		$this->_writers = $writers;
+		$this->_writers=$writers;
 	}
 
 	public function write($s)
@@ -609,7 +609,7 @@ 
 	public function flush()
 	{
 		foreach($this->_writers as $writer)
-			$s = $writer->flush();
+			$s=$writer->flush();
 		return $s;
 	}
 }

Braces +6 added lines, -12 removed lines

@@ -108,8 +108,7 @@ 
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
 					if(!($this->_cache instanceof ICache))
 						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
-				}
-				else
+				} else
 					$this->_cache=$this->getApplication()->getCache();
 				if($this->_cache!==null)
 				{
@@ -121,8 +120,7 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached=$param->getIsValid();
-					}
-					else
+					} else
 						$this->_dataCached=false;
 					if($this->_dataCached)
 						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
@@ -146,8 +144,7 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
-		}
-		else
+		} else
 			parent::initRecursive($namingContainer);
 	}
 
@@ -167,8 +164,7 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
 			if($this->_dataCached)
 				$this->performActions();
@@ -206,8 +202,7 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 			parent::preRenderRecursive();
 	}
 
@@ -488,8 +483,7 @@ 
 			$content=$textwriter->flush();
 			$data=array($content,$this->_state,$this->_actions,time());
 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }

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-2016 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-2016 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)
 	{

Braces +11 added lines, -22 removed lines

@@ -398,8 +398,7 @@ 
 			$this->setPageCount($targetControl->getPageCount());
 			$this->setCurrentPageIndex($targetControl->getCurrentPageIndex());
 			$this->buildPager();
-		}
-		else
+		} else
 			$this->_pageCount=0;
 	}
 
@@ -461,15 +460,13 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			if($buttonType===TPagerButtonType::ImageButton)
 			{
 				$button=new TImageButton;
 				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
-			}
-			else
+			} else
 				$button=new TButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -524,8 +521,7 @@ 
 			}
 			$label=$this->createPagerButton($buttonType,false,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
@@ -547,8 +543,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);
@@ -606,8 +601,7 @@ 
 			{
 				$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);
@@ -684,32 +678,27 @@ 
 				$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
+		} else
 			return false;
 	}
 }

Spacing +89 added lines, -89 removed lines

@@ -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);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->getCurrentPageIndex()===$this->getPageCount()-1;
+		return $this->getCurrentPageIndex()===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 
 		$controlID=$this->getControlToPaginate();
 		if(($targetControl=$this->getNamingContainer()->findControl($controlID))===null || !($targetControl instanceof TDataBoundControl))
-			throw new TConfigurationException('pager_controltopaginate_invalid',$controlID);
+			throw new TConfigurationException('pager_controltopaginate_invalid', $controlID);
 
 		if($targetControl->getAllowPaging())
 		{
@@ -411,7 +411,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_pageCount>1)
+		if($this->_pageCount > 1)
 			parent::render($writer);
 	}
 
@@ -448,7 +448,7 @@ 
 	 * @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)
 		{
@@ -467,7 +467,7 @@ 
 			if($buttonType===TPagerButtonType::ImageButton)
 			{
 				$button=new TImageButton;
-				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+				$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			}
 			else
 				$button=new TButton;
@@ -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)
 		{
 			case self::CMD_PAGE:
 				$url=$this->getNumericPageImageUrl();
-				return str_replace('{0}',$text,$url);
+				return str_replace('{0}', $text, $url);
 			case self::CMD_PAGE_NEXT:
 				return $this->getNextPageImageUrl();
 			case self::CMD_PAGE_PREV:
@@ -518,44 +518,44 @@ 
 		{
 			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())!=='')
 			{
-				$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())
 		{
-			$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())!=='')
 			{
 				$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())!=='')
 			{
 				$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);
 			}
 		}
@@ -569,63 +569,63 @@ 
 		$buttonType=$this->getButtonType();
 		$controls=$this->getControls();
 		$pageCount=$this->getPageCount();
-		$pageIndex=$this->getCurrentPageIndex()+1;
+		$pageIndex=$this->getCurrentPageIndex() + 1;
 		$maxButtonCount=$this->getPageButtonCount();
-		$buttonCount=$maxButtonCount>$pageCount?$pageCount:$maxButtonCount;
+		$buttonCount=$maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
 		$startPageIndex=1;
 		$endPageIndex=$buttonCount;
-		if($pageIndex>$endPageIndex)
+		if($pageIndex > $endPageIndex)
 		{
-			$startPageIndex=((int)(($pageIndex-1)/$maxButtonCount))*$maxButtonCount+1;
-			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount)
+			$startPageIndex=((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if(($endPageIndex=$startPageIndex + $maxButtonCount - 1) > $pageCount)
 				$endPageIndex=$pageCount;
-			if($endPageIndex-$startPageIndex+1<$maxButtonCount)
+			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1)
+				if(($startPageIndex=$endPageIndex - $maxButtonCount + 1) < 1)
 					$startPageIndex=1;
 			}
 		}
 
-		if($startPageIndex>1)
+		if($startPageIndex > 1)
 		{
 			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)
 			{
-				$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())!=='')
 			{
 				$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);
 			}
 		}
@@ -638,11 +638,11 @@ 
 	{
 		$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));
+		$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)
 		{
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_PAGE)===0)
+			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;
@@ -744,7 +744,7 @@ 
 	 * @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;

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)

Indentation +7 added lines, -7 removed lines

@@ -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();

Braces +1 added lines, -2 removed lines

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

Spacing +28 added lines, -28 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);
 	}
 
 	/**
@@ -198,16 +198,16 @@ 
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
 
-		$valid=preg_match('/^[-+]?[0-9]+$/',trim($value));
+		$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));
+			$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;
 	}
@@ -227,12 +227,12 @@ 
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
 
-		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
+		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 		$value=floatval($value);
 		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value,floatval($minValue));
+			$valid=$valid && $this->isGreaterThan($value, floatval($minValue));
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,floatval($maxValue));
+			$valid=$valid && $this->isLessThan($value, floatval($maxValue));
 		return $valid;
 	}
 
@@ -249,24 +249,24 @@ 
 
 		$valid=true;
 
-		$dateFormat = $this->getDateFormat();
+		$dateFormat=$this->getDateFormat();
 		if($dateFormat!=='')
 		{
 			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
-			$value = $formatter->parse($value);
+			$value=$formatter->parse($value);
 			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,$formatter->parse($minValue));
+				$valid=$valid && $this->isGreaterThan($value, $formatter->parse($minValue));
 			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
+				$valid=$valid && $this->isLessThan($value, $formatter->parse($maxValue));
 			return $valid;
 		}
 		else
 		{
 			$value=strtotime($value);
 			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,strtotime($minValue));
+				$valid=$valid && $this->isGreaterThan($value, strtotime($minValue));
 			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,strtotime($maxValue));
+				$valid=$valid && $this->isLessThan($value, strtotime($maxValue));
 			return $valid;
 		}
 	}
@@ -284,9 +284,9 @@ 
 
 		$valid=true;
 		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan(strcmp($value,$minValue),0);
+			$valid=$valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan(strcmp($value,$maxValue),0);
+			$valid=$valid && $this->isLessThan(strcmp($value, $maxValue), 0);
 		return $valid;
 	}
 
@@ -300,20 +300,20 @@ 
 		$maxValue=$this->getMaxValue();
 
 		$valid=true;
-		$charset = $this->getCharset();
+		$charset=$this->getCharset();
 		if($charset==='')
 		{
-			$app= $this->getApplication()->getGlobalization();
-			$charset = $app ? $app->getCharset() : null;
+			$app=$this->getApplication()->getGlobalization();
+			$charset=$app ? $app->getCharset() : null;
 			if(!$charset)
-				$charset = 'UTF-8';
+				$charset='UTF-8';
 		}
 
-		$length = iconv_strlen($value, $charset);
+		$length=iconv_strlen($value, $charset);
 		if($minValue!=='')
-			$valid = $valid && $this->isGreaterThan($length,intval($minValue));
+			$valid=$valid && $this->isGreaterThan($length, intval($minValue));
 		if($maxValue!=='')
-			$valid = $valid && $this->isLessThan($length,intval($maxValue));
+			$valid=$valid && $this->isLessThan($length, intval($maxValue));
 		return $valid;
 	}
 

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 +32 added lines, -32 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var array list of published rating images.
 	 */
-	private $_ratingImages = array();
+	private $_ratingImages=array();
 
 	/**
 	 * Sets the default repeat direction to horizontal.
@@ -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);
 	}
 
 	/**
@@ -106,9 +106,9 @@ 
 	 */
 	public function getRating()
 	{
-		$rating = $this->getViewState('Rating', null);
-		if ($rating === null)
-			return $this->getSelectedIndex()+1;
+		$rating=$this->getViewState('Rating', null);
+		if($rating===null)
+			return $this->getSelectedIndex() + 1;
 		else
 			return $rating;
 	}
@@ -118,15 +118,15 @@ 
 	 */
 	public function setRating($value)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->setViewState('Rating', $value, null);
-		$index = $this->getRatingIndex($value);
+		$index=$this->getRatingIndex($value);
 		parent::setSelectedIndex($index);
 	}
 
 	public function setSelectedIndex($value)
 	{
-		$this->setRating($value+1);
+		$this->setRating($value + 1);
 		parent::setSelectedIndex($value);
 	}
 
@@ -136,10 +136,10 @@ 
 	 */
 	protected function getRatingIndex($rating)
 	{
-		$interval = $this->getHalfRatingInterval();
-		$base = intval($rating)-1;
-		$remainder = $rating-$base-1;
-		return $remainder > $interval[1] ? $base+1 : $base;
+		$interval=$this->getHalfRatingInterval();
+		$base=intval($rating) - 1;
+		$remainder=$rating - $base - 1;
+		return $remainder > $interval[1] ? $base + 1 : $base;
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$value = $this->getRating();
-		$value = TPropertyValue::ensureInteger($value);
+		$value=$this->getRating();
+		$value=TPropertyValue::ensureInteger($value);
 		$this->setRating($value);
 		parent::onSelectedIndexChanged($param);
 	}
@@ -179,7 +179,7 @@ 
 				return $control;
 		}
 		throw new TInvalidDataValueException(
-			'ratinglist_invalid_caption_id',$id,$this->getID());
+			'ratinglist_invalid_caption_id', $id, $this->getID());
 	}
 
 	/**
@@ -246,14 +246,14 @@ 
 	 */
 	protected function getPostBackOptions()
  	{
-		$options = parent::getPostBackOptions();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['ReadOnly'] = $this->getReadOnly();
-		$options['Style'] = $this->getRatingStyleCssClass();
-		$options['CaptionID'] = $this->getCaptionControlID();
-		$options['SelectedIndex'] = $this->getSelectedIndex();
-		$options['Rating'] = $this->getRating();
-		$options['HalfRating'] = $this->getHalfRatingInterval();
+		$options=parent::getPostBackOptions();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['ReadOnly']=$this->getReadOnly();
+		$options['Style']=$this->getRatingStyleCssClass();
+		$options['CaptionID']=$this->getCaptionControlID();
+		$options['SelectedIndex']=$this->getSelectedIndex();
+		$options['Rating']=$this->getRating();
+		$options['HalfRating']=$this->getHalfRatingInterval();
 		return $options;
  	}
 
@@ -282,7 +282,7 @@ 
  	{
 		parent::onPreRender($param);
 		$this->publishStyle($this->getRatingStyle());
-		$this->_ratingImages = $this->publishImages($this->getRatingStyle());
+		$this->_ratingImages=$this->publishImages($this->getRatingStyle());
  		$this->registerClientScript();
 	}
 
@@ -292,8 +292,8 @@ 
 	 */
 	protected function publishStyle($style)
  	{
-		$cs = $this->getPage()->getClientScript();
-		$url = $this->getAssetUrl($style.'.css');
+		$cs=$this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($style.'.css');
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -306,10 +306,10 @@ 
 	 */
 	protected function publishImages($style, $fileExt='.gif')
  	{
-		$types = array('blank', 'selected', 'half', 'combined');
-		$files = array();
+		$types=array('blank', 'selected', 'half', 'combined');
+		$files=array();
 		foreach($types as $type)
-			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+			$files[$type]=$this->getAssetUrl("{$style}_{$type}{$fileExt}");
 		return $files;
  	}
 
@@ -328,7 +328,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
  	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		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 +1 added lines, -2 removed lines

@@ -158,8 +158,7 @@
 				$e->setAttribute('maxOccurs','unbounded');
 				$sequence->appendChild($e);
 				$complexType->appendChild($sequence);
-			}
-			else
+			} else
 			{
 				$all = $dom->createElementNS('http://www.w3.org/2001/XMLSchema', 'xsd:all');
 				foreach($elements as $elem)

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)
 	{

Braces +7 added lines, -14 removed lines

@@ -474,8 +474,7 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -499,8 +498,7 @@ 
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -550,15 +548,13 @@ 
 				$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
+		} else
 			$item=null;
 
 		return $item;
@@ -642,8 +638,7 @@ 
 				$items->add($this->createItemInternal($i,$itemType,false,null));
 			}
 			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
-		}
-		else
+		} else
 			$this->createEmptyContent();
 		$this->clearChildState();
 	}
@@ -704,8 +699,7 @@ 
 		{
 			$this->onItemCommand($param);
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -983,8 +977,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TRepeaterCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 }

Spacing +59 added lines, -59 removed lines

@@ -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, '');
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_itemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('repeater_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_alternatingItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('repeater_template_required','AlternatingItemTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'AlternatingItemTemplate');
 	}
 
 	/**
@@ -341,7 +341,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_headerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('repeater_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -361,7 +361,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_footerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('repeater_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -381,7 +381,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_emptyTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('repeater_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -401,7 +401,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_separatorTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('repeater_template_required','SeparatorTemplate');
+			throw new TInvalidDataTypeException('repeater_template_required', 'SeparatorTemplate');
 	}
 
 	/**
@@ -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);
+			$this->setViewState('DataKeys', $dataKeys, null);
 		}
 		return $dataKeys;
 	}
@@ -466,9 +466,9 @@ 
 	 * @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);
 			$this->onItemCreated($param);
@@ -487,9 +487,9 @@ 
 	 * @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)
@@ -510,7 +510,7 @@ 
 	 * @param TListItemType item type
 	 * @return TControl created repeater item
 	 */
-	protected function createItem($itemIndex,$itemType)
+	protected function createItem($itemIndex, $itemType)
 	{
 		$template=null;
 		$classPath=null;
@@ -540,7 +540,7 @@ 
 				$template=$this->_separatorTemplate;
 				break;
 			default:
-				throw new TInvalidDataValueException('repeater_itemtype_unknown',$itemType);
+				throw new TInvalidDataValueException('repeater_itemtype_unknown', $itemType);
 		}
 		if($classPath!=='')
 		{
@@ -595,7 +595,7 @@ 
 	{
 		parent::saveState();
 		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
 	}
@@ -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)
+			$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();
@@ -668,25 +668,25 @@ 
 		foreach($data as $key=>$dataItem)
 		{
 			if($keyField!=='')
-				$keys->add($this->getDataFieldValue($dataItem,$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));
+				$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,7 +698,7 @@ 
 	 * @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)
 		{
@@ -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);
 	}
 }
 
@@ -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());
+		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');
 	}
 
 	/**
@@ -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)
 		{
-			$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);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('repeateritemcollection_item_invalid');
 	}