pradosoft / prado

framework/Web/UI/WebControls/TDataList.php

Doc Comments +11 added lines

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

Braces +13 added lines, -26 removed lines

@@ -924,23 +924,19 @@ 
 					$this->setSelectedItemIndex($item->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			} else if(strcasecmp($command,self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			} else if(strcasecmp($command,self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			} else if(strcasecmp($command,self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			} else if(strcasecmp($command,self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -1078,8 +1074,7 @@ 
 			$style=$item->getStyle();
 			$item->clearStyle();
 			return $style;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1141,8 +1136,7 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1166,8 +1160,7 @@ 
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -1187,8 +1180,7 @@ 
 				return array($this->getItemRenderer(),$this->_itemTemplate);
 			else
 				return $this->getAlternatingItemDisplay();
-		}
-		else
+		} else
 			return array($classPath,$this->_selectedItemTemplate);
 	}
 
@@ -1248,15 +1240,13 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		else if($template!==null)
+		} else if($template!==null)
 		{
 			$item=new TDataListItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
-		}
-		else
+		} else
 			$item=null;
 
 		return $item;
@@ -1415,8 +1405,7 @@ 
 				$items->add($this->createItemInternal($i,$itemType));
 			}
 			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
-		}
-		else
+		} else
 			$this->createEmptyContent();
 		$this->clearChildState();
 	}
@@ -1481,8 +1470,7 @@ 
 				$this->applyItemStyles();
 				$repeatInfo=$this->getRepeatInfo();
 				$repeatInfo->renderRepeater($writer,$this);
-			}
-			else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
+			} else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
 				parent::render($writer);
 		}
 	}
@@ -1725,8 +1713,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 }

Spacing +131 added lines, -131 removed lines

@@ -198,7 +198,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -231,7 +231,7 @@ 
 	 */
 	public function getAlternatingItemRenderer()
 	{
-		return $this->getViewState('AlternatingItemRenderer','');
+		return $this->getViewState('AlternatingItemRenderer', '');
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 	 */
 	public function setAlternatingItemRenderer($value)
 	{
-		$this->setViewState('AlternatingItemRenderer',$value,'');
+		$this->setViewState('AlternatingItemRenderer', $value, '');
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getSelectedItemRenderer()
 	{
-		return $this->getViewState('SelectedItemRenderer','');
+		return $this->getViewState('SelectedItemRenderer', '');
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 */
 	public function setSelectedItemRenderer($value)
 	{
-		$this->setViewState('SelectedItemRenderer',$value,'');
+		$this->setViewState('SelectedItemRenderer', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getSeparatorRenderer()
 	{
-		return $this->getViewState('SeparatorRenderer','');
+		return $this->getViewState('SeparatorRenderer', '');
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function setSeparatorRenderer($value)
 	{
-		$this->setViewState('SeparatorRenderer',$value,'');
+		$this->setViewState('SeparatorRenderer', $value, '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -342,7 +342,7 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 */
 	public function getEmptyRenderer()
 	{
-		return $this->getViewState('EmptyRenderer','');
+		return $this->getViewState('EmptyRenderer', '');
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	 */
 	public function setEmptyRenderer($value)
 	{
-		$this->setViewState('EmptyRenderer',$value,'');
+		$this->setViewState('EmptyRenderer', $value, '');
 	}
 
 	/**
@@ -411,7 +411,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_itemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -419,10 +419,10 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null)
+		if(($style=$this->getViewState('ItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -444,7 +444,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_alternatingItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','AlternatingItemType');
+			throw new TInvalidDataTypeException('datalist_template_required', 'AlternatingItemType');
 	}
 
 	/**
@@ -452,10 +452,10 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style=$this->getViewState('AlternatingItemStyle',null))===null)
+		if(($style=$this->getViewState('AlternatingItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('AlternatingItemStyle',$style,null);
+			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -477,7 +477,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_selectedItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','SelectedItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'SelectedItemTemplate');
 	}
 
 	/**
@@ -485,10 +485,10 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style=$this->getViewState('SelectedItemStyle',null))===null)
+		if(($style=$this->getViewState('SelectedItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('SelectedItemStyle',$style,null);
+			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -510,7 +510,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_editItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','EditItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'EditItemTemplate');
 	}
 
 	/**
@@ -518,10 +518,10 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style=$this->getViewState('EditItemStyle',null))===null)
+		if(($style=$this->getViewState('EditItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('EditItemStyle',$style,null);
+			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -543,7 +543,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_headerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -551,10 +551,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -584,7 +584,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_footerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -592,10 +592,10 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null)
+		if(($style=$this->getViewState('FooterStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -625,7 +625,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_emptyTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -645,7 +645,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_separatorTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','SeparatorTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'SeparatorTemplate');
 	}
 
 	/**
@@ -653,10 +653,10 @@ 
 	 */
 	public function getSeparatorStyle()
 	{
-		if(($style=$this->getViewState('SeparatorStyle',null))===null)
+		if(($style=$this->getViewState('SeparatorStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('SeparatorStyle',$style,null);
+			$this->setViewState('SeparatorStyle', $style, null);
 		}
 		return $style;
 	}
@@ -667,7 +667,7 @@ 
 	 */
 	public function getSelectedItemIndex()
 	{
-		return $this->getViewState('SelectedItemIndex',-1);
+		return $this->getViewState('SelectedItemIndex', -1);
 	}
 
 	/**
@@ -679,20 +679,20 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
-			$this->setViewState('SelectedItemIndex',$value,-1);
+			$this->setViewState('SelectedItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
+			if($current >= 0 && $current < $itemCount)
 			{
 				$item=$items->itemAt($current);
 				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
+					$item->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value>=0 && $value<$itemCount)
+			if($value >= 0 && $value < $itemCount)
 			{
 				$item=$items->itemAt($value);
 				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
@@ -708,7 +708,7 @@ 
 	{
 		$index=$this->getSelectedItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -724,7 +724,7 @@ 
 			throw new TInvalidOperationException('datalist_datakeyfield_required');
 		$index=$this->getSelectedItemIndex();
 		$dataKeys=$this->getDataKeys();
-		if($index>=0 && $index<$dataKeys->getCount())
+		if($index >= 0 && $index < $dataKeys->getCount())
 			return $dataKeys->itemAt($index);
 		else
 			return null;
@@ -736,7 +736,7 @@ 
 	 */
 	public function getEditItemIndex()
 	{
-		return $this->getViewState('EditItemIndex',-1);
+		return $this->getViewState('EditItemIndex', -1);
 	}
 
 	/**
@@ -747,16 +747,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getEditItemIndex())!==$value)
 		{
-			$this->setViewState('EditItemIndex',$value,-1);
+			$this->setViewState('EditItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
+			if($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
+			if($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -768,7 +768,7 @@ 
 	{
 		$index=$this->getEditItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -779,7 +779,7 @@ 
 	 */
 	public function getShowHeader()
 	{
-		return $this->getViewState('ShowHeader',true);
+		return $this->getViewState('ShowHeader', true);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 */
 	public function setShowHeader($value)
 	{
-		$this->setViewState('ShowHeader',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowHeader', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -795,7 +795,7 @@ 
 	 */
 	public function getShowFooter()
 	{
-		return $this->getViewState('ShowFooter',true);
+		return $this->getViewState('ShowFooter', true);
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 	 */
 	public function setShowFooter($value)
 	{
-		$this->setViewState('ShowFooter',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowFooter', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -811,10 +811,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if(($repeatInfo=$this->getViewState('RepeatInfo', null))===null)
 		{
 			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -912,35 +912,35 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TDataListCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_SELECT)===0)
+			if(strcasecmp($command, self::CMD_SELECT)===0)
 			{
 				if(($item=$param->getItem()) instanceof IItemDataRenderer)
 					$this->setSelectedItemIndex($item->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			else if(strcasecmp($command, self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			else if(strcasecmp($command, self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			else if(strcasecmp($command, self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			else if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -962,7 +962,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -976,7 +976,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -987,7 +987,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -998,7 +998,7 @@ 
 	 */
 	public function onEditCommand($param)
 	{
-		$this->raiseEvent('OnEditCommand',$this,$param);
+		$this->raiseEvent('OnEditCommand', $this, $param);
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 	 */
 	public function onDeleteCommand($param)
 	{
-		$this->raiseEvent('OnDeleteCommand',$this,$param);
+		$this->raiseEvent('OnDeleteCommand', $this, $param);
 	}
 
 	/**
@@ -1020,7 +1020,7 @@ 
 	 */
 	public function onUpdateCommand($param)
 	{
-		$this->raiseEvent('OnUpdateCommand',$this,$param);
+		$this->raiseEvent('OnUpdateCommand', $this, $param);
 	}
 
 	/**
@@ -1031,7 +1031,7 @@ 
 	 */
 	public function onCancelCommand($param)
 	{
-		$this->raiseEvent('OnCancelCommand',$this,$param);
+		$this->raiseEvent('OnCancelCommand', $this, $param);
 	}
 
 	/**
@@ -1071,9 +1071,9 @@ 
 	 * @param integer index of the item being rendered
 	 * @return TStyle item style
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
-		if(($item=$this->getItem($itemType,$index))!==null && ($item instanceof IStyleable) && $item->getHasStyle())
+		if(($item=$this->getItem($itemType, $index))!==null && ($item instanceof IStyleable) && $item->getHasStyle())
 		{
 			$style=$item->getStyle();
 			$item->clearStyle();
@@ -1091,9 +1091,9 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
-		$item=$this->getItem($itemType,$index);
+		$item=$this->getItem($itemType, $index);
 		if($repeatInfo->getRepeatLayout()===TRepeatLayout::Raw && get_class($item)==='TDataListItem')
 			$item->setTagName('div');
 		$item->renderControl($writer);
@@ -1104,7 +1104,7 @@ 
 	 * @param integer item index
 	 * @return TControl data list item with the specified item type and index
 	 */
-	private function getItem($itemType,$index)
+	private function getItem($itemType, $index)
 	{
 		switch($itemType)
 		{
@@ -1116,9 +1116,9 @@ 
 			case TListItemType::Header:
 				return $this->getControls()->itemAt(0);
 			case TListItemType::Footer:
-				return $this->getControls()->itemAt($this->getControls()->getCount()-1);
+				return $this->getControls()->itemAt($this->getControls()->getCount() - 1);
 			case TListItemType::Separator:
-				$i=$index+$index+1;
+				$i=$index + $index + 1;
 				if($this->_headerTemplate!==null || $this->getHeaderRenderer()!=='')
 					$i++;
 				return $this->getControls()->itemAt($i);
@@ -1133,9 +1133,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 TDataListItemEventParameter($item);
 			$this->onItemCreated($param);
@@ -1154,9 +1154,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 TDataListItemEventParameter($item);
 			if($item instanceof IDataRenderer)
@@ -1174,22 +1174,22 @@ 
 	private function getAlternatingItemDisplay()
 	{
 		if(($classPath=$this->getAlternatingItemRenderer())==='' && $this->_alternatingItemTemplate===null)
-			return array($this->getItemRenderer(),$this->_itemTemplate);
+			return array($this->getItemRenderer(), $this->_itemTemplate);
 		else
-			return array($classPath,$this->_alternatingItemTemplate);
+			return array($classPath, $this->_alternatingItemTemplate);
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
 		if(($classPath=$this->getSelectedItemRenderer())==='' && $this->_selectedItemTemplate===null)
 		{
-			if($itemIndex%2===0)
-				return array($this->getItemRenderer(),$this->_itemTemplate);
+			if($itemIndex % 2===0)
+				return array($this->getItemRenderer(), $this->_itemTemplate);
 			else
 				return $this->getAlternatingItemDisplay();
 		}
 		else
-			return array($classPath,$this->_selectedItemTemplate);
+			return array($classPath, $this->_selectedItemTemplate);
 	}
 
 	private function getEditItemDisplay($itemIndex)
@@ -1197,7 +1197,7 @@ 
 		if(($classPath=$this->getEditItemRenderer())==='' && $this->_editItemTemplate===null)
 			return $this->getSelectedItemDisplay($itemIndex);
 		else
-			return array($classPath,$this->_editItemTemplate);
+			return array($classPath, $this->_editItemTemplate);
 	}
 
 	/**
@@ -1206,7 +1206,7 @@ 
 	 * @param TListItemType item type
 	 * @return TControl created datalist item
 	 */
-	protected function createItem($itemIndex,$itemType)
+	protected function createItem($itemIndex, $itemType)
 	{
 		$template=null;
 		$classPath=null;
@@ -1217,13 +1217,13 @@ 
 				$template=$this->_itemTemplate;
 				break;
 			case TListItemType::AlternatingItem :
-				list($classPath,$template)=$this->getAlternatingItemDisplay();
+				list($classPath, $template)=$this->getAlternatingItemDisplay();
 				break;
 			case TListItemType::SelectedItem:
-				list($classPath,$template)=$this->getSelectedItemDisplay($itemIndex);
+				list($classPath, $template)=$this->getSelectedItemDisplay($itemIndex);
 				break;
 			case TListItemType::EditItem:
-				list($classPath,$template)=$this->getEditItemDisplay($itemIndex);
+				list($classPath, $template)=$this->getEditItemDisplay($itemIndex);
 				break;
 			case TListItemType::Header :
 				$classPath=$this->getHeaderRenderer();
@@ -1238,7 +1238,7 @@ 
 				$template=$this->_separatorTemplate;
 				break;
 			default:
-				throw new TInvalidDataValueException('datalist_itemtype_unknown',$itemType);
+				throw new TInvalidDataValueException('datalist_itemtype_unknown', $itemType);
 		}
 		if($classPath!=='')
 		{
@@ -1286,9 +1286,9 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle=$this->getViewState('ItemStyle',null);
+		$itemStyle=$this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
+		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle!==null)
 		{
 			if($alternatingItemStyle===null)
@@ -1297,9 +1297,9 @@ 
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
+		$selectedItemStyle=$this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle=$this->getViewState('EditItemStyle',null);
+		$editItemStyle=$this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle!==null)
 		{
 			if($editItemStyle===null)
@@ -1311,14 +1311,14 @@ 
 		// apply header style if any
 		if($this->_header!==null && $this->_header instanceof IStyleable)
 		{
-			if($headerStyle=$this->getViewState('HeaderStyle',null))
+			if($headerStyle=$this->getViewState('HeaderStyle', null))
 				$this->_header->getStyle()->mergeWith($headerStyle);
 		}
 
 		// apply footer style if any
 		if($this->_footer!==null && $this->_footer instanceof IStyleable)
 		{
-			if($footerStyle=$this->getViewState('FooterStyle',null))
+			if($footerStyle=$this->getViewState('FooterStyle', null))
 				$this->_footer->getStyle()->mergeWith($footerStyle);
 		}
 
@@ -1332,7 +1332,7 @@ 
 				$style=$editItemStyle;
 			else if($index===$selectedIndex)
 				$style=$selectedItemStyle;
-			else if($index%2===0)
+			else if($index % 2===0)
 				$style=$itemStyle;
 			else
 				$style=$alternatingItemStyle;
@@ -1341,11 +1341,11 @@ 
 		}
 
 		// apply separator style if any
-		if(($separatorStyle=$this->getViewState('SeparatorStyle',null))!==null && $this->getHasSeparators())
+		if(($separatorStyle=$this->getViewState('SeparatorStyle', null))!==null && $this->getHasSeparators())
 		{
 			$controls=$this->getControls();
 			$count=$controls->getCount();
-			for($i=$this->_header?2:1;$i<$count;$i+=2)
+			for($i=$this->_header ? 2 : 1; $i < $count; $i+=2)
 			{
 				if(($separator=$controls->itemAt($i)) instanceof IStyleable)
 					$separator->getStyle()->mergeWith($separatorStyle);
@@ -1361,7 +1361,7 @@ 
 	{
 		parent::saveState();
 		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
 	}
@@ -1395,26 +1395,26 @@ 
 	protected function restoreItemsFromViewState()
 	{
 		$this->reset();
-		if(($itemCount=$this->getViewState('ItemCount',0))>0)
+		if(($itemCount=$this->getViewState('ItemCount', 0)) > 0)
 		{
 			$items=$this->getItems();
 			$selectedIndex=$this->getSelectedItemIndex();
 			$editIndex=$this->getEditItemIndex();
 			$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
-			$this->_header=$this->createItemInternal(-1,TListItemType::Header);
-			for($i=0;$i<$itemCount;++$i)
+			$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);
 				if($i===$editIndex)
 					$itemType=TListItemType::EditItem;
 				else if($i===$selectedIndex)
 					$itemType=TListItemType::SelectedItem;
 				else
-					$itemType=$i%2?TListItemType::AlternatingItem : TListItemType::Item;
-				$items->add($this->createItemInternal($i,$itemType));
+					$itemType=$i % 2 ? TListItemType::AlternatingItem : TListItemType::Item;
+				$items->add($this->createItemInternal($i, $itemType));
 			}
-			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
+			$this->_footer=$this->createItemInternal(-1, TListItemType::Footer);
 		}
 		else
 			$this->createEmptyContent();
@@ -1441,30 +1441,30 @@ 
 		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);
+				$this->_header=$this->createItemWithDataInternal(-1, TListItemType::Header, null);
+			if($hasSeparator && $itemIndex > 0)
+				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
 			if($itemIndex===$editIndex)
 				$itemType=TListItemType::EditItem;
 			else if($itemIndex===$selectedIndex)
 				$itemType=TListItemType::SelectedItem;
 			else
-				$itemType=$itemIndex%2?TListItemType::AlternatingItem : TListItemType::Item;
-			$items->add($this->createItemWithDataInternal($itemIndex,$itemType,$dataItem));
+				$itemType=$itemIndex % 2 ? TListItemType::AlternatingItem : TListItemType::Item;
+			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex>0)
-			$this->_footer=$this->createItemWithDataInternal(-1,TListItemType::Footer,null);
+		if($itemIndex > 0)
+			$this->_footer=$this->createItemWithDataInternal(-1, TListItemType::Footer, null);
 		else
 		{
 			$this->createEmptyContent();
 			$this->dataBindChildren();
 		}
-		$this->setViewState('ItemCount',$itemIndex,0);
+		$this->setViewState('ItemCount', $itemIndex, 0);
 	}
 
 	/**
@@ -1476,11 +1476,11 @@ 
 	{
 		if($this->getHasControls())
 		{
-			if($this->getItemCount()>0)
+			if($this->getItemCount() > 0)
 			{
 				$this->applyItemStyles();
 				$repeatInfo=$this->getRepeatInfo();
-				$repeatInfo->renderRepeater($writer,$this);
+				$repeatInfo->renderRepeater($writer, $this);
 			}
 			else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
 				parent::render($writer);
@@ -1557,11 +1557,11 @@ 
 	 * @param TControl original event sender
 	 * @param TCommandEventParameter original event parameter
 	 */
-	public function __construct($item,$source,TCommandEventParameter $param)
+	public function __construct($item, $source, TCommandEventParameter $param)
 	{
 		$this->_item=$item;
 		$this->_source=$source;
-		parent::__construct($param->getCommandName(),$param->getCommandParameter());
+		parent::__construct($param->getCommandName(), $param->getCommandParameter());
 	}
 
 	/**
@@ -1653,7 +1653,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType=TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -1719,11 +1719,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -1749,10 +1749,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TControl descendant.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TControl)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datalistitemcollection_datalistitem_required');
 	}

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TDataList 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
- */
+	 * TDataList 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
+	 */
 
 /**
  * Includes TBaseDataList class

framework/Web/UI/WebControls/TDataSourceControl.php

Doc Comments +7 added lines

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

Spacing +3 added lines, -3 removed lines

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

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * IDataSource, TDataSourceControl, TReadOnlyDataSource 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
- */
+	 * IDataSource, TDataSourceControl, TReadOnlyDataSource 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
+	 */
 
 /**
  * IDataSource class

framework/Web/UI/WebControls/TDatePicker.php

Doc Comments +4 added lines

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

Spacing +100 added lines, -100 removed lines

@@ -80,7 +80,7 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'prado/datepicker';
+	const SCRIPT_PATH='prado/datepicker';
 
 	/**
 	 * @var TDatePickerClientScript validator client-script options.
@@ -100,7 +100,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getShowCalendar()
 	{
-		return $this->getViewState('ShowCalendar',true);
+		return $this->getViewState('ShowCalendar', true);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setShowCalendar($value)
 	{
-		$this->setViewState('ShowCalendar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowCalendar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function setFromYear($value)
 	{
-		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))-5);
+		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 */
 	public function getFromYear()
 	{
-		return $this->getViewState('FromYear', intval(@date('Y'))-5);
+		return $this->getViewState('FromYear', intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setUpToYear($value)
 	{
-		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))+10);
+		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 */
 	public function getUpToYear()
 	{
-		return $this->getViewState('UpToYear', intval(@date('Y'))+10);
+		return $this->getViewState('UpToYear', intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -312,8 +312,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -373,7 +373,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -392,10 +392,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 	/**
@@ -416,7 +416,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -439,7 +439,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			switch ($this->getMode())
+			switch($this->getMode())
 			{
 				case TDatePickerMode::Button:
 					$this->renderButtonDatePicker($writer);
@@ -459,11 +459,11 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 			return parent::loadPostData($key, $values);
-		$value = $this->getDateFromPostData($key, $values);
+		$value=$this->getDateFromPostData($key, $values);
 		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
@@ -481,30 +481,30 @@ 
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
-		$date = @getdate();
+		$date=@getdate();
 
 		if(isset($values[$key.'$day']))
-			$day = intval($values[$key.'$day']);
+			$day=intval($values[$key.'$day']);
 		else
-			$day = $date['mday'];
+			$day=$date['mday'];
 
 		if(isset($values[$key.'$month']))
-			$month = intval($values[$key.'$month']) + 1;
+			$month=intval($values[$key.'$month']) + 1;
 		else
-			$month = $date['mon'];
+			$month=$date['mon'];
 
 		if(isset($values[$key.'$year']))
-			$year = intval($values[$key.'$year']);
+			$year=intval($values[$key.'$year']);
 		else
-			$year = $date['year'];
+			$year=$date['year'];
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
-		$date = $s->getTimeStamp(0, 0, 0, $month, $day, $year);
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
+		$date=$s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->format($date);
 	}
 
@@ -514,31 +514,31 @@ 
 	 */
 	protected function getDatePickerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['InputMode'] = $this->getInputMode();
-		$options['Format'] = $this->getDateFormat();
-		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
+		$options['ID']=$this->getClientID();
+		$options['InputMode']=$this->getInputMode();
+		$options['Format']=$this->getDateFormat();
+		$options['FirstDayOfWeek']=$this->getFirstDayOfWeek();
 		if(($cssClass=$this->getCssClass())!=='')
-			$options['ClassName'] = $cssClass;
-		$options['CalendarStyle'] = $this->getCalendarStyle();
-		$options['FromYear'] = $this->getFromYear();
-		$options['UpToYear'] = $this->getUpToYear();
+			$options['ClassName']=$cssClass;
+		$options['CalendarStyle']=$this->getCalendarStyle();
+		$options['FromYear']=$this->getFromYear();
+		$options['UpToYear']=$this->getUpToYear();
 		switch($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
 			case TDatePickerMode::Clickable:
-				$options['TriggerEvent'] = "click";
+				$options['TriggerEvent']="click";
 				break;
 			default:
-				$options['Trigger'] = $this->getDatePickerButtonID();
+				$options['Trigger']=$this->getDatePickerButtonID();
 				break;
 		}
-		$options['PositionMode'] = $this->getPositionMode();
+		$options['PositionMode']=$this->getPositionMode();
 
-		$options = array_merge($options, $this->getCulturalOptions());
+		$options=array_merge($options, $this->getCulturalOptions());
 		if($this->_clientScript!==null)
-			$options = array_merge($options,
+			$options=array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
@@ -549,13 +549,13 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if($this->getCurrentCulture()=='en')
 			return array();
 
-		$date = $this->getLocalizedCalendarInfo();
-		$options['MonthNames'] = $date->getMonthNames();
-		$options['AbbreviatedMonthNames'] = $date->getAbbreviatedMonthNames();
-		$options['ShortWeekDayNames'] = $date->getAbbreviatedDayNames();
+		$date=$this->getLocalizedCalendarInfo();
+		$options['MonthNames']=$date->getMonthNames();
+		$options['AbbreviatedMonthNames']=$date->getAbbreviatedMonthNames();
+		$options['ShortWeekDayNames']=$date->getAbbreviatedDayNames();
 
 		return $options;
 	}
@@ -565,8 +565,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -576,9 +576,9 @@ 
 	protected function getLocalizedCalendarInfo()
 	{
 		//expensive operations
-		$culture = $this->getCurrentCulture();
+		$culture=$this->getCurrentCulture();
 		Prado::using('System.I18N.core.DateTimeFormatInfo');
-		$info = Prado::createComponent('System.I18N.core.CultureInfo', $culture);
+		$info=Prado::createComponent('System.I18N.core.CultureInfo', $culture);
 		return $info->getDateTimeFormat();
 	}
 
@@ -587,19 +587,19 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
+		if($this->getMode()==TDatePickerMode::Basic)
 			$this->setMode(TDatePickerMode::ImageButton);
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
+		if(strlen($class=$this->getCssClass()) > 0)
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
-		$date = $s->getDate($this->getTimeStampFromText());
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
+		$date=$s->getDate($this->getTimeStampFromText());
 		//$date = @getdate($this->getTimeStampFromText());
 
 		$this->renderCalendarSelections($writer, $date);
@@ -616,7 +616,7 @@ 
 
 	protected function hasDayPattern()
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 		return ($formatter->getDayPattern()!==null);
 	}
@@ -628,17 +628,17 @@ 
 	 */
 	protected function renderCalendarSelections($writer, $date)
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer,$date['mday']);
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer,$date['mon']);
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer,$date['year']);
+			if($type=='day')
+				$this->renderCalendarDayOptions($writer, $date['mday']);
+			elseif($type=='month')
+				$this->renderCalendarMonthOptions($writer, $date['mon']);
+			elseif($type=='year')
+				$this->renderCalendarYearOptions($writer, $date['year']);
 		}
 	}
 
@@ -648,9 +648,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -660,12 +660,12 @@ 
 	 * @param array list of selection options
 	 * @param mixed selected key.
 	 */
-	private function renderDropDownListOptions($writer,$options,$selected=null)
+	private function renderDropDownListOptions($writer, $options, $selected=null)
 	{
 		foreach($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
+			if($k==$selected)
 				$writer->addAttribute('selected', 'selected');
 			$writer->renderBeginTag('option');
 			$writer->write($v);
@@ -680,7 +680,7 @@ 
 	 */
 	protected function renderCalendarDayOptions($writer, $selected=null)
 	{
-		$days = $this->getDropDownDayOptions();
+		$days=$this->getDropDownDayOptions();
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
@@ -696,13 +696,13 @@ 
 	 */
 	protected function getDropDownDayOptions()
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
-		$days = array();
-		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i=1;$i<=31;$i++)
+		$days=array();
+		$requiresPadding=$formatter->getDayPattern()==='dd';
+		for($i=1; $i <= 31; $i++)
 		{
-			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
+			$days[$i]=$requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
 		return $days;
 	}
@@ -714,7 +714,7 @@ 
 	 */
 	protected function renderCalendarMonthOptions($writer, $selected=null)
 	{
-		$info = $this->getLocalizedCalendarInfo();
+		$info=$this->getLocalizedCalendarInfo();
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
@@ -722,7 +722,7 @@ 
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
-					$this->getLocalizedMonthNames($info), $selected-1);
+					$this->getLocalizedMonthNames($info), $selected - 1);
 		$writer->renderEndTag();
 	}
 
@@ -735,18 +735,18 @@ 
 	 */
 	protected function getLocalizedMonthNames($info)
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 		switch($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
-				$array = array();
-				for($i=1;$i<=12;$i++)
-						$array[$i-1] = $i < 10 ? '0'.$i : $i;
+				$array=array();
+				for($i=1; $i <= 12; $i++)
+						$array[$i - 1]=$i < 10 ? '0'.$i : $i;
 				return $array;
 			case 'M':
-				$array = array(); for($i=1;$i<=12;$i++) $array[$i-1] = $i;
+				$array=array(); for($i=1; $i <= 12; $i++) $array[$i - 1]=$i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -759,9 +759,9 @@ 
 	 */
 	protected function renderCalendarYearOptions($writer, $selected=null)
 	{
-		$years = array();
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
+		$years=array();
+		for($i=$this->getFromYear(); $i <= $this->getUpToYear(); $i++)
+			$years[$i]=$i;
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
@@ -790,7 +790,7 @@ 
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
 		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
-		$writer->addAttribute('value',$this->getButtonText());
+		$writer->addAttribute('value', $this->getButtonText());
 		if(!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag("input");
@@ -803,8 +803,8 @@ 
 	 */
 	 protected function renderImageButtonDatePicker($writer)
 	{
-		$url = $this->getButtonImageUrl();
-		$url = empty($url) ? $this->getAssetUrl('calendar.png') : $url;
+		$url=$this->getButtonImageUrl();
+		$url=empty($url) ? $this->getAssetUrl('calendar.png') : $url;
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
@@ -823,7 +823,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -833,8 +833,8 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
-		$cs = $this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($this->getCalendarStyle().'.css');
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -847,7 +847,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -857,7 +857,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
 		}
 	}
@@ -866,16 +866,16 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
-				$spacer = $this->getAssetUrl('spacer.gif');
-				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
+				$spacer=$this->getAssetUrl('spacer.gif');
+				$code="Prado.WebUI.TDatePicker.spacer = '$spacer';";
 				$cs->registerEndScript('TDatePicker.spacer', $code);
 			}
 
-			$options = TJavaScript::encode($this->getDatePickerOptions());
-			$code = "new Prado.WebUI.TDatePicker($options);";
+			$options=TJavaScript::encode($this->getDatePickerOptions());
+			$code="new Prado.WebUI.TDatePicker($options);";
 			$cs->registerEndScript("prado:".$this->getClientID(), $code);
 		}
 	}

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TEditCommandColumn.php

Doc Comments +5 added lines, -1 removed lines

@@ -234,7 +234,11 @@
 	 * @param string button caption
 	 * @param boolean whether the button should cause validation
 	 * @param string the validation group that the button belongs to
-	 * @return mixed the newly created button.
+	 * @param string $commandName
+	 * @param string $text
+	 * @param boolean $causesValidation
+	 * @param string $validationGroup
+	 * @return TComponent the newly created button.
 	 */
 	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
 	{

Braces +2 added lines, -4 removed lines

@@ -211,8 +211,7 @@ 
 			$button=$this->createButton('Edit',$this->getEditText(),false,'');
 			$cell->getControls()->add($button);
 			$cell->registerObject('EditButton',$button);
-		}
-		else if($itemType===TListItemType::EditItem)
+		} else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
 			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
@@ -222,8 +221,7 @@ 
 			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
 			$controls->add($button);
 			$cell->registerObject('CancelButton',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 

Spacing +29 added lines, -29 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonColumnType::LinkButton);
+		return $this->getViewState('ButtonType', TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'TButtonColumnType'),TButtonColumnType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'TButtonColumnType'), TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function getEditText()
 	{
-		return $this->getViewState('EditText','Edit');
+		return $this->getViewState('EditText', 'Edit');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 */
 	public function setEditText($value)
 	{
-		$this->setViewState('EditText',$value,'Edit');
+		$this->setViewState('EditText', $value, 'Edit');
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function getEditImageUrl()
 	{
-		return $this->getViewState('EditImageUrl','');
+		return $this->getViewState('EditImageUrl', '');
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setEditImageUrl($value)
 	{
-		$this->setViewState('EditImageUrl',$value,'');
+		$this->setViewState('EditImageUrl', $value, '');
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function getUpdateText()
 	{
-		return $this->getViewState('UpdateText','Update');
+		return $this->getViewState('UpdateText', 'Update');
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function setUpdateText($value)
 	{
-		$this->setViewState('UpdateText',$value,'Update');
+		$this->setViewState('UpdateText', $value, 'Update');
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function getUpdateImageUrl()
 	{
-		return $this->getViewState('UpdateImageUrl','');
+		return $this->getViewState('UpdateImageUrl', '');
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function setUpdateImageUrl($value)
 	{
-		$this->setViewState('UpdateImageUrl',$value,'');
+		$this->setViewState('UpdateImageUrl', $value, '');
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 */
 	public function getCancelText()
 	{
-		return $this->getViewState('CancelText','Cancel');
+		return $this->getViewState('CancelText', 'Cancel');
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 */
 	public function setCancelText($value)
 	{
-		$this->setViewState('CancelText',$value,'Cancel');
+		$this->setViewState('CancelText', $value, 'Cancel');
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 */
 	public function getCancelImageUrl()
 	{
-		return $this->getViewState('CancelImageUrl','');
+		return $this->getViewState('CancelImageUrl', '');
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	public function setCancelImageUrl($value)
 	{
-		$this->setViewState('CancelImageUrl',$value,'');
+		$this->setViewState('CancelImageUrl', $value, '');
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -204,27 +204,27 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 		{
-			$button=$this->createButton('Edit',$this->getEditText(),false,'');
+			$button=$this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
-			$cell->registerObject('EditButton',$button);
+			$cell->registerObject('EditButton', $button);
 		}
 		else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
-			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
+			$button=$this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
 			$controls->add($button);
-			$cell->registerObject('UpdateButton',$button);
+			$cell->registerObject('UpdateButton', $button);
 			$controls->add(' ');
-			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
+			$button=$this->createButton('Cancel', $this->getCancelText(), false, '');
 			$controls->add($button);
-			$cell->registerObject('CancelButton',$button);
+			$cell->registerObject('CancelButton', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 * @param string the validation group that the button belongs to
 	 * @return mixed the newly created button.
 	 */
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
 			$button=Prado::createComponent('System.Web.UI.WebControls.TLinkButton');
@@ -245,9 +245,9 @@ 
 		else	// image buttons
 		{
 			$button=Prado::createComponent('System.Web.UI.WebControls.TImageButton');
-			if(strcasecmp($commandName,'Update')===0)
+			if(strcasecmp($commandName, 'Update')===0)
 				$url=$this->getUpdateImageUrl();
-			else if(strcasecmp($commandName,'Cancel')===0)
+			else if(strcasecmp($commandName, 'Cancel')===0)
 				$url=$this->getCancelImageUrl();
 			else
 				$url=$this->getEditImageUrl();

framework/Web/UI/WebControls/TEmailAddressValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 	/**
 	 * Returns an array of javascript validator options.
-	 * @return array javascript validator options.
+	 * @return boolean javascript validator options.
 	 */
 	public function evaluateIsValid()
 	{

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 				{
 					$domain=substr($value,$pos+1);
 					return $domain===''?false:checkdnsrr($domain,'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

Spacing +7 added lines, -7 removed lines

@@ -50,7 +50,7 @@ 
 	public function getRegularExpression()
 	{
 		$regex=parent::getRegularExpression();
-		return $regex===''?self::EMAIL_REGEXP:$regex;
+		return $regex==='' ? self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -60,16 +60,16 @@ 
 	public function evaluateIsValid()
 	{
 		$value=$this->getValidationValue($this->getValidationTarget());
-		$valid=$valid=is_string($value) && strlen($value)<=254 && parent::evaluateIsValid();
+		$valid=$valid=is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
 
 		if($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
 		{
 			if($value!=='')
 			{
-				if(($pos=strpos($value,'@'))!==false)
+				if(($pos=strpos($value, '@'))!==false)
 				{
-					$domain=substr($value,$pos+1);
-					return $domain===''?false:checkdnsrr($domain,'MX');
+					$domain=substr($value, $pos + 1);
+					return $domain==='' ? false : checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;
@@ -83,7 +83,7 @@ 
 	 */
 	public function getCheckMXRecord()
 	{
-		return $this->getViewState('CheckMXRecord',false);
+		return $this->getViewState('CheckMXRecord', false);
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function setCheckMXRecord($value)
 	{
-		$this->setViewState('CheckMXRecord',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('CheckMXRecord', TPropertyValue::ensureBoolean($value), false);
 	}
 }
 

framework/Web/UI/WebControls/TFileUpload.php

Doc Comments +3 added lines, -1 removed lines

@@ -177,6 +177,7 @@ 
 	 * @param string the file name used to save the uploaded file
 	 * @param boolean whether to delete the temporary file after saving.
 	 * If true, you will not be able to save the uploaded file again.
+	 * @param string $fileName
 	 * @return boolean true if the file saving is successful
 	 */
 	public function saveAs($fileName,$deleteTempFile=true)
@@ -199,6 +200,7 @@ 
 	 * This method is primarly used by framework developers.
 	 * @param string the key that can be used to retrieve data from the input data collection
 	 * @param array the input data collection
+	 * @param boolean $key
 	 * @return boolean whether the data of the control has been changed
 	 */
 	public function loadPostData($key,$values)
@@ -251,7 +253,7 @@ 
 	/**
 	 * Returns the original file name as the property value to be validated.
 	 * This method is required by IValidatable property.
-	 * @return mixed the property value to be validated
+	 * @return string the property value 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);
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +11 added lines, -11 removed lines

@@ -76,11 +76,11 @@ 
 	{
 		$this->getPage()->ensureRenderInForm($this);
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('type','file');
-		$writer->addAttribute('name',$this->getUniqueID());
+		$writer->addAttribute('type', 'file');
+		$writer->addAttribute('name', $this->getUniqueID());
 		$isEnabled=$this->getEnabled(true);
 		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 		parent::onPreRender($param);
 		if(($form=$this->getPage()->getForm())!==null)
 			$form->setEnctype('multipart/form-data');
-		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE',$this->getMaxFileSize());
+		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
 		if($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
@@ -104,7 +104,7 @@ 
 	 */
 	public function getMaxFileSize()
 	{
-		return $this->getViewState('MaxFileSize',self::MAX_FILE_SIZE);
+		return $this->getViewState('MaxFileSize', self::MAX_FILE_SIZE);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function setMaxFileSize($size)
 	{
-		$this->setViewState('MaxFileSize',TPropertyValue::ensureInteger($size),self::MAX_FILE_SIZE);
+		$this->setViewState('MaxFileSize', TPropertyValue::ensureInteger($size), self::MAX_FILE_SIZE);
 	}
 
 	/**
@@ -179,14 +179,14 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName,$deleteTempFile=true)
+	public function saveAs($fileName, $deleteTempFile=true)
 	{
 		if($this->_errorCode===UPLOAD_ERR_OK)
 		{
 			if($deleteTempFile)
-				return move_uploaded_file($this->_localName,$fileName);
+				return move_uploaded_file($this->_localName, $fileName);
 			else if(is_uploaded_file($this->_localName))
-				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
+				return file_put_contents($fileName, file_get_contents($this->_localName))!==false;
 			else
 				return false;
 		}
@@ -201,7 +201,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if(isset($_FILES[$key]))
 		{
@@ -235,7 +235,7 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		$this->raiseEvent('OnFileUpload',$this,$param);
+		$this->raiseEvent('OnFileUpload', $this, $param);
 	}
 
 	/**

framework/Web/UI/WebControls/TFlushOutput.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	}
 
 	/**
-	 * @return Tells whether buffering of output can continue after this point
+	 * @return boolean whether buffering of output can continue after this point
 	 */
 	public function getContinueBuffering()
 	{

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->EnableViewState = false;
+		$this->EnableViewState=false;
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	public function setContinueBuffering($value)
 	{
-		$this->_continueBuffering = TPropertyValue::ensureBoolean($value);
+		$this->_continueBuffering=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 //$writer->write('<!-- flush -->');
 		// ajax responses can't be parsed by the client side before loaded and returned completely,
 		// so don't bother with flushing output somewhere mid-page if refreshing in a callback
-		if (!$this->Page->IsCallback)
+		if(!$this->Page->IsCallback)
 		{
 			$this->Page->flushWriter();
 //			$this->Application->flushOutput($this->ContinueBuffering);

framework/Web/UI/WebControls/THtmlArea4.php

Doc Comments +2 added lines

@@ -422,6 +422,7 @@ 
 
 	/**
 	 * Parse additional options set in the Options property.
+	 * @param string $string
 	 * @return array additional custom options
 	 */
 	protected function parseEditorOptions($string)
@@ -446,6 +447,7 @@ 
 	}
 
 	/**
+	 * @param string $culture
 	 * @return string localized editor interface language extension.
 	 */
 	protected function getLanguageSuffix($culture)

Spacing +43 added lines, -43 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var array list of locale => language file pairs.
 	 */
-	private static $_langs = array(
+	private static $_langs=array(
 			'ar' => 'ar',
 			'bg_BG' => 'bg_BG',
 			'bs' => 'bs',
@@ -118,7 +118,7 @@ 
 	/**
 	 * @var array list of default plugins to load, override using getAvailablePlugins();
 	 */
-	private static $_plugins = array(
+	private static $_plugins=array(
 		'advlist',
 		'anchor',
 		'autolink',
@@ -162,7 +162,7 @@ 
 	/**
 	 * @var array default themes to load
 	 */
-	private static $_themes = array(
+	private static $_themes=array(
 		'modern',
 	);
 
@@ -209,7 +209,7 @@ 
 	 */
 	public function getEnableVisualEdit()
 	{
-		return $this->getViewState('EnableVisualEdit',true);
+		return $this->getViewState('EnableVisualEdit', true);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 */
 	public function setEnableVisualEdit($value)
 	{
-		$this->setViewState('EnableVisualEdit',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableVisualEdit', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	{
 		if($this->getEnableVisualEdit() && $this->getEnabled(true))
 		{
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 			$this->registerEditorClientScript($writer);
 		}
 
@@ -338,7 +338,7 @@ 
 
 	protected function loadJavascriptLibrary()
 	{
-		$scripts = $this->getPage()->getClientScript();
+		$scripts=$this->getPage()->getClientScript();
 		$scripts->registerPradoScript('htmlarea4');
 		$scripts->registerScriptFile('prado:THtmlArea4', $this->getScriptUrl());
 	}
@@ -349,14 +349,14 @@ 
 	protected function registerEditorClientScript($writer)
 	{
 		$this->loadJavascriptLibrary();
-		$scripts = $this->getPage()->getClientScript();
-		$options = array(
+		$scripts=$this->getPage()->getClientScript();
+		$options=array(
 			'EditorOptions' => $this->getEditorOptions()
 		);
 
-		$options = TJavaScript::encode($options,true,true);
-		$script = "new {$this->getClientClassName()}($options)";
-		$scripts->registerEndScript('prado:THtmlArea4'.$this->ClientID,$script);
+		$options=TJavaScript::encode($options, true, true);
+		$script="new {$this->getClientClassName()}($options)";
+		$scripts->registerEndScript('prado:THtmlArea4'.$this->ClientID, $script);
 	}
 
 	/**
@@ -373,19 +373,19 @@ 
 	 */
 	protected function getScriptDeploymentPath()
 	{
-		$basedir = Prado::getPathOfNamespace('System.Web.Javascripts.source.tinymce-405');
-		$url = $this->getApplication()->getAssetManager()->publishFilePath($basedir);
+		$basedir=Prado::getPathOfNamespace('System.Web.Javascripts.source.tinymce-405');
+		$url=$this->getApplication()->getAssetManager()->publishFilePath($basedir);
 		$this->copyCustomPlugins($url);
 		return $url;
 	}
 
 	protected function copyCustomPlugins($url)
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if($plugins=$this->getCustomPluginPath())
 		{
-			$assets = $this->getApplication()->getAssetManager();
-			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
-			$dest = $assets->getBasePath().'/'.basename($url).'/plugins/';
+			$assets=$this->getApplication()->getAssetManager();
+			$path=is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
+			$dest=$assets->getBasePath().'/'.basename($url).'/plugins/';
 			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
@@ -397,26 +397,26 @@ 
 	 */
 	protected function getEditorOptions()
 	{
-		$options['mode'] = 'exact';
-		$options['elements'] = $this->getClientID();
-		$options['language'] = $this->getLanguageSuffix($this->getCulture());
+		$options['mode']='exact';
+		$options['elements']=$this->getClientID();
+		$options['language']=$this->getLanguageSuffix($this->getCulture());
 		//$options['theme'] = 'modern'; //default
 		// mimic previous (tinyMCE3) sizing behaviour
-		$options['width'] = $this->getWidth();
-		$options['height'] = $this->getHeight();
-		$options['resize'] = 'both';
-		$options['menubar'] = false;
+		$options['width']=$this->getWidth();
+		$options['height']=$this->getHeight();
+		$options['resize']='both';
+		$options['menubar']=false;
 		if($this->getReadOnly())
 		{
-			$options['readonly'] = true;
-			$options['toolbar'] = false;
-			$options['menubar'] = false;
-			$options['statusbar'] = false;
+			$options['readonly']=true;
+			$options['toolbar']=false;
+			$options['menubar']=false;
+			$options['statusbar']=false;
 		}
 
-		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
+		$options['extended_valid_elements']='a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
 
-		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
+		$options=array_merge($options, $this->parseEditorOptions($this->getOptions()));
 		return $options;
 	}
 
@@ -426,20 +426,20 @@ 
 	 */
 	protected function parseEditorOptions($string)
 	{
-		$options = array();
-		$substrings = preg_split('/,\s*\n|\n/', trim($string));
+		$options=array();
+		$substrings=preg_split('/,\s*\n|\n/', trim($string));
 		foreach($substrings as $bits)
 		{
-			$option = explode(":",$bits,2);
+			$option=explode(":", $bits, 2);
 
-			if(count($option) == 2)
+			if(count($option)==2)
 			{
-				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false')
+				$value=trim(trim($option[1]), "'\"");
+				if(($s=strtolower($value))==='false')
 					$value=false;
-				elseif ($s==='true')
+				elseif($s==='true')
 					$value=true;
-				$options[trim($option[0])] = $value;
+				$options[trim($option[0])]=$value;
 			}
 		}
 		return $options;
@@ -450,12 +450,12 @@ 
 	 */
 	protected function getLanguageSuffix($culture)
 	{
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 		if(empty($culture) && ($app!==null))
-			$culture = $app->getCulture();
-		$variants = array();
+			$culture=$app->getCulture();
+		$variants=array();
 		if($app!==null)
-			$variants = $app->getCultureVariants($culture);
+			$variants=$app->getCultureVariants($culture);
 
 		foreach($variants as $variant)
 		{

framework/Web/UI/WebControls/THyperLink.php

Doc Comments +2 added lines

@@ -147,6 +147,7 @@ 
 	/**
 	 * Sets the height of the image in the THyperLink
 	 * @param string height of the image in the THyperLink
+	 * @param string $value
 	 */
 	public function setImageHeight($value)
 	{
@@ -181,6 +182,7 @@ 
 	/**
 	 * Sets the width of the image in the THyperLink
 	 * @param string width of the image
+	 * @param string $value
 	 */
 	public function setImageWidth($value)
 	{

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

@@ -46,12 +46,12 @@ 
 	{
 		$isEnabled=$this->getEnabled(true);
 		if($this->getEnabled() && !$isEnabled)
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 		if(($url=$this->getNavigateUrl())!=='' && $isEnabled)
-			$writer->addAttribute('href',$url);
+			$writer->addAttribute('href', $url);
 		if(($target=$this->getTarget())!=='')
-			$writer->addAttribute('target',$target);
+			$writer->addAttribute('target', $target);
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getImageAlign()
 	{
-		return $this->getViewState('ImageAlign','');
+		return $this->getViewState('ImageAlign', '');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		$this->setViewState('ImageAlign',$value,'');
+		$this->setViewState('ImageAlign', $value, '');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getImageHeight()
 	{
-		return $this->getViewState('ImageHeight','');
+		return $this->getViewState('ImageHeight', '');
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setImageHeight($value)
 	{
-		$this->setViewSTate('ImageHeight',$value,'');
+		$this->setViewSTate('ImageHeight', $value, '');
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->getViewState('ImageUrl','');
+		return $this->getViewState('ImageUrl', '');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->setViewState('ImageUrl',$value,'');
+		$this->setViewState('ImageUrl', $value, '');
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function getImageWidth()
 	{
-		return $this->getViewState('ImageWidth','');
+		return $this->getViewState('ImageWidth', '');
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function setImageWidth($value)
 	{
-		$this->setViewState('ImageWidth',$value,'');
+		$this->setViewState('ImageWidth', $value, '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',$value,'');
+		$this->setViewState('NavigateUrl', $value, '');
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 }