pradosoft / prado

framework/Web/UI/WebControls/TDataBoundControl.php

Doc Comments +6 added lines

@@ -156,6 +156,7 @@ 
 
 	/**
 	 * @param boolean if databind has been invoked in this page request
+	 * @param boolean $value
 	 */
 	protected function setIsDataBound($value)
 	{
@@ -216,6 +217,7 @@ 
 
 	/**
 	 * @param integer the zero-based index of the current page
+	 * @param integer $value
 	 * @throws TInvalidDataValueException if the value is less than 0
 	 */
 	public function setCurrentPageIndex($value)
@@ -278,6 +280,7 @@ 
 	 * If true and the control has been prerendered while it uses the data source
 	 * specified by {@link setDataSourceID}, a databind call will be called by this method.
 	 * @param boolean whether a databind call is required.
+	 * @param boolean $value
 	 */
 	protected function setRequiresDataBinding($value)
 	{
@@ -410,6 +413,9 @@ 
 		return $this->_currentDataSource;
 	}
 
+	/**
+	 * @param \Traversable $data
+	 */
 	abstract protected function performDataBinding($data);
 
 	/**

Spacing +54 added lines, -54 removed lines

@@ -49,18 +49,18 @@ 
  */
 abstract class TDataBoundControl extends \Prado\Web\UI\WebControls\TWebControl
 {
-	private $_initialized = false;
+	private $_initialized=false;
 	private $_dataSource;
-	private $_requiresBindToNull = false;
-	private $_requiresDataBinding = false;
-	private $_prerendered = false;
+	private $_requiresBindToNull=false;
+	private $_requiresDataBinding=false;
+	private $_prerendered=false;
 	private $_currentView;
 	private $_currentDataSource;
-	private $_currentViewValid = false;
-	private $_currentDataSourceValid = false;
-	private $_currentViewIsFromDataSourceID = false;
+	private $_currentViewValid=false;
+	private $_currentDataSourceValid=false;
+	private $_currentViewIsFromDataSourceID=false;
 	private $_parameters;
-	private $_isDataBound = false;
+	private $_isDataBound=false;
 
 	/**
 	 * @return Traversable data source object, defaults to null.
@@ -79,7 +79,7 @@ 
 	 */
 	public function setDataSource($value)
 	{
-		$this->_dataSource = $this->validateDataSource($value);
+		$this->_dataSource=$this->validateDataSource($value);
 		$this->onDataSourceChanged();
 	}
 
@@ -97,9 +97,9 @@ 
 	 */
 	public function setDataSourceID($value)
 	{
-		$dsid = $this->getViewState('DataSourceID', '');
-		if($dsid !== '' && $value === '')
-			$this->_requiresBindToNull = true;
+		$dsid=$this->getViewState('DataSourceID', '');
+		if($dsid!=='' && $value==='')
+			$this->_requiresBindToNull=true;
 		$this->setViewState('DataSourceID', $value, '');
 		$this->onDataSourceChanged();
 	}
@@ -111,7 +111,7 @@ 
 	 */
 	protected function getUsingDataSourceID()
 	{
-		return $this->getDataSourceID() !== '';
+		return $this->getDataSourceID()!=='';
 	}
 
 	/**
@@ -120,8 +120,8 @@ 
 	 */
 	public function onDataSourceChanged()
 	{
-		$this->_currentViewValid = false;
-		$this->_currentDataSourceValid = false;
+		$this->_currentViewValid=false;
+		$this->_currentDataSourceValid=false;
 		if($this->getInitialized())
 			$this->setRequiresDataBinding(true);
 	}
@@ -144,7 +144,7 @@ 
 	 */
 	protected function setInitialized($value)
 	{
-		$this->_initialized = TPropertyValue::ensureBoolean($value);
+		$this->_initialized=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	protected function setIsDataBound($value)
 	{
-		$this->_isDataBound = $value;
+		$this->_isDataBound=$value;
 	}
 
 	/**
@@ -221,8 +221,8 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=0;
 		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
@@ -240,7 +240,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 1)
+		if(($value=TPropertyValue::ensureInteger($value)) < 1)
 			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid', get_class($this));
 		$this->setViewState('PageSize', TPropertyValue::ensureInteger($value), 10);
 	}
@@ -269,7 +269,7 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid', get_class($this));
 		$this->setViewState('VirtualItemCount', $value, 0);
 	}
@@ -282,14 +282,14 @@ 
 	 */
 	protected function setRequiresDataBinding($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
+		$value=TPropertyValue::ensureBoolean($value);
 		if($value && $this->_prerendered)
 		{
-			$this->_requiresDataBinding = true;
+			$this->_requiresDataBinding=true;
 			$this->ensureDataBound();
 		}
 		else
-			$this->_requiresDataBinding = $value;
+			$this->_requiresDataBinding=$value;
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 		if($this->_requiresDataBinding && ($this->getUsingDataSourceID() || $this->_requiresBindToNull))
 		{
 			$this->dataBind();
-			$this->_requiresBindToNull = false;
+			$this->_requiresBindToNull=false;
 		}
 	}
 
@@ -312,7 +312,7 @@ 
 	 */
 	protected function createPagedDataSource()
 	{
-		$ds = new TPagedDataSource;
+		$ds=new TPagedDataSource;
 		$ds->setCurrentPageIndex($this->getCurrentPageIndex());
 		$ds->setPageSize($this->getPageSize());
 		$ds->setAllowPaging($this->getAllowPaging());
@@ -333,16 +333,16 @@ 
 		$this->dataBindProperties();
 		$this->onDataBinding(null);
 
-		if(($view = $this->getDataSourceView()) !== null)
-			$data = $view->select($this->getSelectParameters());
+		if(($view=$this->getDataSourceView())!==null)
+			$data=$view->select($this->getSelectParameters());
 		else
-			$data = null;
+			$data=null;
 
 		if($data instanceof \Traversable)
 		{
 			if($this->getAllowPaging())
 			{
-				$ds = $this->createPagedDataSource();
+				$ds=$this->createPagedDataSource();
 				$ds->setDataSource($data);
 				$this->setViewState('PageCount', $ds->getPageCount());
 				if($ds->getCurrentPageIndex() >= $ds->getPageCount())
@@ -373,18 +373,18 @@ 
 		if(!$this->_currentViewValid)
 		{
 			if($this->_currentView && $this->_currentViewIsFromDataSourceID)
-				$this->_currentView->detachEventHandler('DataSourceViewChanged', [$this,'dataSourceViewChanged']);
-			if(($dataSource = $this->determineDataSource()) !== null)
+				$this->_currentView->detachEventHandler('DataSourceViewChanged', [$this, 'dataSourceViewChanged']);
+			if(($dataSource=$this->determineDataSource())!==null)
 			{
-				if(($view = $dataSource->getView($this->getDataMember())) === null)
+				if(($view=$dataSource->getView($this->getDataMember()))===null)
 					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid', $this->getDataMember());
-				if($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID())
-					$view->attachEventHandler('OnDataSourceViewChanged', [$this,'dataSourceViewChanged']);
-				$this->_currentView = $view;
+				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID())
+					$view->attachEventHandler('OnDataSourceViewChanged', [$this, 'dataSourceViewChanged']);
+				$this->_currentView=$view;
 			}
 			else
-				$this->_currentView = null;
-			$this->_currentViewValid = true;
+				$this->_currentView=null;
+			$this->_currentViewValid=true;
 		}
 		return $this->_currentView;
 	}
@@ -393,20 +393,20 @@ 
 	{
 		if(!$this->_currentDataSourceValid)
 		{
-			if(($dsid = $this->getDataSourceID()) !== '')
+			if(($dsid=$this->getDataSourceID())!=='')
 			{
-				if(($dataSource = $this->getNamingContainer()->findControl($dsid)) === null)
+				if(($dataSource=$this->getNamingContainer()->findControl($dsid))===null)
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent', $dsid);
 				elseif(!($dataSource instanceof IDataSource))
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
 				else
-					$this->_currentDataSource = $dataSource;
+					$this->_currentDataSource=$dataSource;
 			}
-			elseif(($dataSource = $this->getDataSource()) !== null)
-				$this->_currentDataSource = new TReadOnlyDataSource($dataSource, $this->getDataMember());
+			elseif(($dataSource=$this->getDataSource())!==null)
+				$this->_currentDataSource=new TReadOnlyDataSource($dataSource, $this->getDataMember());
 			else
-				$this->_currentDataSource = null;
-			$this->_currentDataSourceValid = true;
+				$this->_currentDataSource=null;
+			$this->_currentDataSourceValid=true;
 		}
 		return $this->_currentDataSource;
 	}
@@ -433,8 +433,8 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		$page = $this->getPage();
-		$page->attachEventHandler('OnPreLoad', [$this,'pagePreLoad']);
+		$page=$this->getPage();
+		$page->attachEventHandler('OnPreLoad', [$this, 'pagePreLoad']);
 	}
 
 	/**
@@ -445,8 +445,8 @@ 
 	 */
 	public function pagePreLoad($sender, $param)
 	{
-		$this->_initialized = true;
-		$isPostBack = $this->getPage()->getIsPostBack();
+		$this->_initialized=true;
+		$isPostBack=$this->getPage()->getIsPostBack();
 		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
 			$this->setRequiresDataBinding(true);
 	}
@@ -458,7 +458,7 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$this->_prerendered = true;
+		$this->_prerendered=true;
 		$this->ensureDataBound();
 		parent::onPreRender($param);
 	}
@@ -474,13 +474,13 @@ 
 	{
 		if(is_string($value))
 		{
-			$list = new TList;
+			$list=new TList;
 			foreach(TPropertyValue::ensureArray($value) as $key => $value)
 			{
 				if(is_array($value))
 					$list->add($value);
 				else
-					$list->add([$value,is_string($key)?$key:$value]);
+					$list->add([$value, is_string($key) ? $key : $value]);
 			}
 			return $list;
 		}
@@ -490,7 +490,7 @@ 
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
 		}
-		elseif(($value instanceof \Traversable) || $value === null)
+		elseif(($value instanceof \Traversable) || $value===null)
 			return $value;
 		else
 			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));
@@ -509,7 +509,7 @@ 
 	public function getSelectParameters()
 	{
 		if(!$this->_parameters)
-			$this->_parameters = new TDataSourceSelectParameters;
+			$this->_parameters=new TDataSourceSelectParameters;
 		return $this->_parameters;
 	}
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -287,8 +287,7 @@ 
 		{
 			$this->_requiresDataBinding = true;
 			$this->ensureDataBound();
-		}
-		else
+		} else
 			$this->_requiresDataBinding = $value;
 	}
 
@@ -351,8 +350,7 @@ 
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
-			}
-			else
+			} else
 			{
 				$this->clearViewState('PageCount');
 				$this->performDataBinding($data);
@@ -381,8 +379,7 @@ 
 				if($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID())
 					$view->attachEventHandler('OnDataSourceViewChanged', [$this,'dataSourceViewChanged']);
 				$this->_currentView = $view;
-			}
-			else
+			} else
 				$this->_currentView = null;
 			$this->_currentViewValid = true;
 		}
@@ -401,8 +398,7 @@ 
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
 				else
 					$this->_currentDataSource = $dataSource;
-			}
-			elseif(($dataSource = $this->getDataSource()) !== null)
+			} elseif(($dataSource = $this->getDataSource()) !== null)
 				$this->_currentDataSource = new TReadOnlyDataSource($dataSource, $this->getDataMember());
 			else
 				$this->_currentDataSource = null;
@@ -483,14 +479,12 @@ 
 					$list->add([$value,is_string($key)?$key:$value]);
 			}
 			return $list;
-		}
-		elseif(is_array($value))
+		} elseif(is_array($value))
 			return new TMap($value);
 		elseif($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
-		}
-		elseif(($value instanceof \Traversable) || $value === null)
+		} elseif(($value instanceof \Traversable) || $value === null)
 			return $value;
 		else
 			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));

framework/Web/UI/WebControls/TDataGridItem.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	}
 
 	/**
-	 * @return TListItemType item type.
+	 * @return string item type.
 	 */
 	public function getItemType()
 	{

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -37,16 +37,16 @@ 
 	/**
 	 * @var integer index of the data item in the Items collection of datagrid
 	 */
-	private $_itemIndex = '';
+	private $_itemIndex='';
 	/**
 	 * @var integer index of the item from the bound data source
 	 */
-	private $_dataSourceIndex = 0;
+	private $_dataSourceIndex=0;
 	/**
 	 * type of the TDataGridItem
 	 * @var string
 	 */
-	private $_itemType = '';
+	private $_itemType='';
 	/**
 	 * value of the data item
 	 * @var mixed
@@ -60,12 +60,12 @@ 
 	 */
 	public function __construct($itemIndex, $dataSourceIndex, $itemType)
 	{
-		$this->_itemIndex = $itemIndex;
-		$this->_dataSourceIndex = $dataSourceIndex;
+		$this->_itemIndex=$itemIndex;
+		$this->_dataSourceIndex=$dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType === TListItemType::Header)
+		if($itemType===TListItemType::Header)
 			$this->setTableSection(TTableRowSection::Header);
-		elseif($itemType === TListItemType::Footer)
+		elseif($itemType===TListItemType::Footer)
 			$this->setTableSection(TTableRowSection::Footer);
 	}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType = TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TListItemType');
+		$this->_itemType=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TListItemType');
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	public function setData($value)
 	{
-		$this->_data = $value;
+		$this->_data=$value;
 	}
 
 	/**

framework/Web/UI/WebControls/TDataGridPager.php

Doc Comments +1 added lines

@@ -32,6 +32,7 @@
 	/**
 	 * Constructor.
 	 * @param TDataGrid datagrid object
+	 * @param TDataGrid $dataGrid
 	 */
 	public function __construct($dataGrid)
 	{

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function __construct($dataGrid)
 	{
-		$this->_dataGrid = $dataGrid;
+		$this->_dataGrid=$dataGrid;
 	}
 
 	/**

framework/Web/UI/WebControls/TDataListItemEventParameter.php

Doc Comments +1 added lines

@@ -34,6 +34,7 @@
 	/**
 	 * Constructor.
 	 * @param TControl DataList item related with the corresponding event
+	 * @param \Prado\TComponent $item
 	 */
 	public function __construct($item)
 	{

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 */
 	public function __construct($item)
 	{
-		$this->_item = $item;
+		$this->_item=$item;
 	}
 
 	/**

framework/Web/UI/WebControls/TFont.php

Doc Comments +2 added lines

@@ -230,6 +230,7 @@ 
 	 * If a font field is not set in the font, it will be overwritten with
 	 * the new one.
 	 * @param TFont the new font
+	 * @param TFont $font
 	 */
 	public function mergeWith($font)
 	{
@@ -256,6 +257,7 @@ 
 	 * If a font field is set in the new font, the corresponding field
 	 * in this font will be overwritten.
 	 * @param TFont the new font
+	 * @param TFont $font
 	 */
 	public function copyFrom($font)
 	{

Spacing +76 added lines, -76 removed lines

@@ -27,35 +27,35 @@ 
 	/**
 	 * Bits indicating the font states.
 	 */
-	const IS_BOLD = 0x01;
-	const IS_ITALIC = 0x02;
-	const IS_OVERLINE = 0x04;
-	const IS_STRIKEOUT = 0x08;
-	const IS_UNDERLINE = 0x10;
+	const IS_BOLD=0x01;
+	const IS_ITALIC=0x02;
+	const IS_OVERLINE=0x04;
+	const IS_STRIKEOUT=0x08;
+	const IS_UNDERLINE=0x10;
 
 	/**
 	 * Bits indicating whether particular font states are changed.
 	 */
-	const IS_SET_BOLD = 0x01000;
-	const IS_SET_ITALIC = 0x02000;
-	const IS_SET_OVERLINE = 0x04000;
-	const IS_SET_STRIKEOUT = 0x08000;
-	const IS_SET_UNDERLINE = 0x10000;
-	const IS_SET_SIZE = 0x20000;
-	const IS_SET_NAME = 0x40000;
+	const IS_SET_BOLD=0x01000;
+	const IS_SET_ITALIC=0x02000;
+	const IS_SET_OVERLINE=0x04000;
+	const IS_SET_STRIKEOUT=0x08000;
+	const IS_SET_UNDERLINE=0x10000;
+	const IS_SET_SIZE=0x20000;
+	const IS_SET_NAME=0x40000;
 
 	/**
 	 * @var integer bits representing various states
 	 */
-	private $_flags = 0;
+	private $_flags=0;
 	/**
 	 * @var string font name
 	 */
-	private $_name = '';
+	private $_name='';
 	/**
 	 * @var string font size
 	 */
-	private $_size = '';
+	private $_size='';
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -66,12 +66,12 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_flags === 0)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_flags";
-		if ($this->_name === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_name";
-		if ($this->_size === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_size";
+		if($this->_flags===0)
+			$exprops[]="\0Prado\Web\UI\WebControls\TFont\0_flags";
+		if($this->_name==='')
+			$exprops[]="\0Prado\Web\UI\WebControls\TFont\0_name";
+		if($this->_size==='')
+			$exprops[]="\0Prado\Web\UI\WebControls\TFont\0_size";
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function getBold()
 	{
-		return ($this->_flags & self::IS_BOLD) !== 0;
+		return ($this->_flags & self::IS_BOLD)!==0;
 	}
 
 	/**
@@ -87,11 +87,11 @@ 
 	 */
 	public function setBold($value)
 	{
-		$this->_flags |= self::IS_SET_BOLD;
+		$this->_flags|=self::IS_SET_BOLD;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
+			$this->_flags|=self::IS_BOLD;
 		else
-			$this->_flags &= ~self::IS_BOLD;
+			$this->_flags&=~self::IS_BOLD;
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function getItalic()
 	{
-		return ($this->_flags & self::IS_ITALIC) !== 0;
+		return ($this->_flags & self::IS_ITALIC)!==0;
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 	 */
 	public function setItalic($value)
 	{
-		$this->_flags |= self::IS_SET_ITALIC;
+		$this->_flags|=self::IS_SET_ITALIC;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
+			$this->_flags|=self::IS_ITALIC;
 		else
-			$this->_flags &= ~self::IS_ITALIC;
+			$this->_flags&=~self::IS_ITALIC;
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getOverline()
 	{
-		return ($this->_flags & self::IS_OVERLINE) !== 0;
+		return ($this->_flags & self::IS_OVERLINE)!==0;
 	}
 
 	/**
@@ -127,11 +127,11 @@ 
 	 */
 	public function setOverline($value)
 	{
-		$this->_flags |= self::IS_SET_OVERLINE;
+		$this->_flags|=self::IS_SET_OVERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
+			$this->_flags|=self::IS_OVERLINE;
 		else
-			$this->_flags &= ~self::IS_OVERLINE;
+			$this->_flags&=~self::IS_OVERLINE;
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	 */
 	public function setSize($value)
 	{
-		$this->_flags |= self::IS_SET_SIZE;
-		$this->_size = $value;
+		$this->_flags|=self::IS_SET_SIZE;
+		$this->_size=$value;
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getStrikeout()
 	{
-		return ($this->_flags & self::IS_STRIKEOUT) !== 0;
+		return ($this->_flags & self::IS_STRIKEOUT)!==0;
 	}
 
 	/**
@@ -164,11 +164,11 @@ 
 	 */
 	public function setStrikeout($value)
 	{
-		$this->_flags |= self::IS_SET_STRIKEOUT;
+		$this->_flags|=self::IS_SET_STRIKEOUT;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
+			$this->_flags|=self::IS_STRIKEOUT;
 		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+			$this->_flags&=~self::IS_STRIKEOUT;
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function getUnderline()
 	{
-		return ($this->_flags & self::IS_UNDERLINE) !== 0;
+		return ($this->_flags & self::IS_UNDERLINE)!==0;
 	}
 
 	/**
@@ -184,11 +184,11 @@ 
 	 */
 	public function setUnderline($value)
 	{
-		$this->_flags |= self::IS_SET_UNDERLINE;
+		$this->_flags|=self::IS_SET_UNDERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
+			$this->_flags|=self::IS_UNDERLINE;
 		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+			$this->_flags&=~self::IS_UNDERLINE;
 	}
 
 	/**
@@ -204,8 +204,8 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_flags |= self::IS_SET_NAME;
-		$this->_name = $value;
+		$this->_flags|=self::IS_SET_NAME;
+		$this->_name=$value;
 	}
 
 	/**
@@ -221,9 +221,9 @@ 
 	 */
 	public function reset()
 	{
-		$this->_flags = 0;
-		$this->_name = '';
-		$this->_size = '';
+		$this->_flags=0;
+		$this->_name='';
+		$this->_size='';
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	public function mergeWith($font)
 	{
-		if($font === null || $font->_flags === 0)
+		if($font===null || $font->_flags===0)
 			return;
 		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
 			$this->setBold($font->getBold());
@@ -260,7 +260,7 @@ 
 	 */
 	public function copyFrom($font)
 	{
-		if($font === null || $font->_flags === 0)
+		if($font===null || $font->_flags===0)
 			return;
 		if($font->_flags & self::IS_SET_BOLD)
 			$this->setBold($font->getBold());
@@ -283,27 +283,27 @@ 
 	 */
 	public function toString()
 	{
-		if($this->_flags === 0)
+		if($this->_flags===0)
 			return '';
-		$str = '';
+		$str='';
 		if($this->_flags & self::IS_SET_BOLD)
-			$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+			$str.='font-weight:'.(($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
 		if($this->_flags & self::IS_SET_ITALIC)
-			$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
-		$textDec = '';
+			$str.='font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
+		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
-			$textDec .= 'underline';
+			$textDec.='underline';
 		if($this->_flags & self::IS_OVERLINE)
-			$textDec .= ' overline';
+			$textDec.=' overline';
 		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec .= ' line-through';
-		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$str .= 'text-decoration:' . $textDec . ';';
-		if($this->_size !== '')
-			$str .= 'font-size:' . $this->_size . ';';
-		if($this->_name !== '')
-			$str .= 'font-family:' . $this->_name . ';';
+			$textDec.=' line-through';
+		$textDec=ltrim($textDec);
+		if($textDec!=='')
+			$str.='text-decoration:'.$textDec.';';
+		if($this->_size!=='')
+			$str.='font-size:'.$this->_size.';';
+		if($this->_name!=='')
+			$str.='font-family:'.$this->_name.';';
 		return $str;
 	}
 
@@ -313,25 +313,25 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags === 0)
+		if($this->_flags===0)
 			return;
 		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
 		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
-		$textDec = '';
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
+		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
-			$textDec .= 'underline';
+			$textDec.='underline';
 		if($this->_flags & self::IS_OVERLINE)
-			$textDec .= ' overline';
+			$textDec.=' overline';
 		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec .= ' line-through';
-		$textDec = ltrim($textDec);
-		if($textDec !== '')
+			$textDec.=' line-through';
+		$textDec=ltrim($textDec);
+		if($textDec!=='')
 			$writer->addStyleAttribute('text-decoration', $textDec);
-		if($this->_size !== '')
+		if($this->_size!=='')
 			$writer->addStyleAttribute('font-size', $this->_size);
-		if($this->_name !== '')
+		if($this->_name!=='')
 			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }

framework/Web/UI/WebControls/THtmlArea.php

Doc Comments +5 added lines

@@ -438,6 +438,9 @@ 
 		return $url;
 	}
 
+	/**
+	 * @param string $url
+	 */
 	protected function copyCustomPlugins($url)
 	{
 		if($plugins = $this->getCustomPluginPath())
@@ -481,6 +484,7 @@ 
 
 	/**
 	 * Parse additional options set in the Options property.
+	 * @param string $string
 	 * @return array additional custom options
 	 */
 	protected function parseEditorOptions($string)
@@ -505,6 +509,7 @@ 
 	}
 
 	/**
+	 * @param string $culture
 	 * @return string localized editor interface language extension.
 	 */
 	protected function getLanguageSuffix($culture)

Spacing +49 added lines, -49 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var array list of locale => language file pairs.
 	 */
-	private static $_langs = [
+	private static $_langs=[
 			'ar' => 'ar',
 			'az' => 'az',
 			'be' => 'be',
@@ -145,7 +145,7 @@ 
 	/**
 	 * @var array list of default plugins to load, override using getAvailablePlugins();
 	 */
-	private static $_plugins = [
+	private static $_plugins=[
 		'advhr',
 		'advimage',
 		'advlink',
@@ -189,7 +189,7 @@ 
 	/**
 	 * @var array default themes to load
 	 */
-	private static $_themes = [
+	private static $_themes=[
 		'simple',
 		'advanced'
 	];
@@ -340,7 +340,7 @@ 
 
 	protected function loadJavascriptLibrary()
 	{
-		$scripts = $this->getPage()->getClientScript();
+		$scripts=$this->getPage()->getClientScript();
 		$scripts->registerPradoScript('htmlarea');
 		$scripts->registerScriptFile('prado:THtmlArea', $this->getScriptUrl());
 	}
@@ -351,14 +351,14 @@ 
 	protected function registerEditorClientScript($writer)
 	{
 		$this->loadJavascriptLibrary();
-		$scripts = $this->getPage()->getClientScript();
-		$options = [
+		$scripts=$this->getPage()->getClientScript();
+		$options=[
 			'EditorOptions' => $this->getEditorOptions()
 		];
 
-		$options = TJavaScript::encode($options, true, true);
-		$script = "new {$this->getClientClassName()}($options)";
-		$scripts->registerEndScript('prado:THtmlArea' . $this->ClientID, $script);
+		$options=TJavaScript::encode($options, true, true);
+		$script="new {$this->getClientClassName()}($options)";
+		$scripts->registerEndScript('prado:THtmlArea'.$this->ClientID, $script);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	protected function getScriptUrl()
 	{
-		return $this->getScriptDeploymentPath() . '/tiny_mce/tiny_mce.js';
+		return $this->getScriptDeploymentPath().'/tiny_mce/tiny_mce.js';
 	}
 
 	/**
@@ -375,23 +375,23 @@ 
 	 */
 	protected function getScriptDeploymentPath()
 	{
-		$tarfile = Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.tar');
-		$md5sum = Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.md5');
-		if($tarfile === null || $md5sum === null)
+		$tarfile=Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.tar');
+		$md5sum=Prado::getPathOfNamespace('Vendor.pradosoft.prado-tinymce3.tiny_mce', '.md5');
+		if($tarfile===null || $md5sum===null)
 			throw new TConfigurationException('htmlarea_tarfile_invalid');
-		$url = $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
+		$url=$this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
 		$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) . '/tiny_mce/plugins/' . basename($path);
-			if(!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$assets=$this->getApplication()->getAssetManager();
+			$path=is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
+			$dest=$assets->getBasePath().'/'.basename($url).'/tiny_mce/plugins/'.basename($path);
+			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
 	}
@@ -402,26 +402,26 @@ 
 	 */
 	protected function getEditorOptions()
 	{
-		$options['mode'] = 'exact';
-		$options['elements'] = $this->getClientID();
-		$options['language'] = $this->getLanguageSuffix($this->getCulture());
-		$options['theme'] = 'advanced';
+		$options['mode']='exact';
+		$options['elements']=$this->getClientID();
+		$options['language']=$this->getLanguageSuffix($this->getCulture());
+		$options['theme']='advanced';
 
 		//make it basic advanced to fit into 1 line of buttons.
 		//$options['theme_advanced_buttons1'] = 'bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright, justifyfull,separator,bullist,numlist,separator,undo,redo,separator,link,unlink,separator,charmap,separator,code,help';
 		//$options['theme_advanced_buttons2'] = ' ';
-		$options['theme_advanced_buttons1'] = 'formatselect,fontselect,fontsizeselect,separator,bold,italic,underline,strikethrough,sub,sup';
-		$options['theme_advanced_buttons2'] = 'justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,outdent,indent,separator,forecolor,backcolor,separator,hr,link,unlink,image,charmap,separator,removeformat,code,help';
-		$options['theme_advanced_buttons3'] = '';
-
-		$options['theme_advanced_toolbar_location'] = 'top';
-		$options['theme_advanced_toolbar_align'] = 'left';
-		$options['theme_advanced_path_location'] = 'bottom';
-		$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['theme_advanced_buttons1']='formatselect,fontselect,fontsizeselect,separator,bold,italic,underline,strikethrough,sub,sup';
+		$options['theme_advanced_buttons2']='justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,outdent,indent,separator,forecolor,backcolor,separator,hr,link,unlink,image,charmap,separator,removeformat,code,help';
+		$options['theme_advanced_buttons3']='';
+
+		$options['theme_advanced_toolbar_location']='top';
+		$options['theme_advanced_toolbar_align']='left';
+		$options['theme_advanced_path_location']='bottom';
+		$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]';
 		if($this->getReadOnly())
-			$options['readonly'] = true;
+			$options['readonly']=true;
 
-		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
+		$options=array_merge($options, $this->parseEditorOptions($this->getOptions()));
 		return $options;
 	}
 
@@ -431,20 +431,20 @@ 
 	 */
 	protected function parseEditorOptions($string)
 	{
-		$options = [];
-		$substrings = preg_split('/,\s*\n|\n/', trim($string));
+		$options=[];
+		$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 = false;
-				elseif ($s === 'true')
-					$value = true;
-				$options[trim($option[0])] = $value;
+				$value=trim(trim($option[1]), "'\"");
+				if(($s=strtolower($value))==='false')
+					$value=false;
+				elseif($s==='true')
+					$value=true;
+				$options[trim($option[0])]=$value;
 			}
 		}
 		return $options;
@@ -455,12 +455,12 @@ 
 	 */
 	protected function getLanguageSuffix($culture)
 	{
-		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app !== null))
-			$culture = $app->getCulture();
-		$variants = [];
-		if($app !== null)
-			$variants = $app->getCultureVariants($culture);
+		$app=$this->getApplication()->getGlobalization();
+		if(empty($culture) && ($app!==null))
+			$culture=$app->getCulture();
+		$variants=[];
+		if($app!==null)
+			$variants=$app->getCultureVariants($culture);
 
 		foreach($variants as $variant)
 		{

framework/Web/UI/WebControls/TImageMap.php

Doc Comments +1 added lines

@@ -210,6 +210,7 @@
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageMapEventParameter event parameter to be passed to the event handlers
+	 * @param TImageMapEventParameter $param
 	 */
 	public function onClick($param)
 	{

Spacing +34 added lines, -34 removed lines

@@ -36,7 +36,7 @@ 
  */
 class TImageMap extends TImage implements \Prado\Web\UI\IPostBackEventHandler
 {
-	const MAP_NAME_PREFIX = 'ImageMap';
+	const MAP_NAME_PREFIX='ImageMap';
 
 	/**
 	 * Processes an object that is created during parsing template.
@@ -60,7 +60,7 @@ 
 		parent::addAttributesToRender($writer);
 		if($this->getHotSpots()->getCount() > 0)
 		{
-			$writer->addAttribute('usemap', '#' . self::MAP_NAME_PREFIX . $this->getClientID());
+			$writer->addAttribute('usemap', '#'.self::MAP_NAME_PREFIX.$this->getClientID());
 			$writer->addAttribute('id', $this->getUniqueID());
 		}
 		if($this->getEnabled() && !$this->getEnabled(true))
@@ -75,38 +75,38 @@ 
 	{
 		parent::render($writer);
 
-		$hotspots = $this->getHotSpots();
+		$hotspots=$this->getHotSpots();
 
 		if($hotspots->getCount() > 0)
 		{
-			$clientID = $this->getClientID();
-			$cs = $this->getPage()->getClientScript();
+			$clientID=$this->getClientID();
+			$cs=$this->getPage()->getClientScript();
 			$writer->writeLine();
-			$writer->addAttribute('name', self::MAP_NAME_PREFIX . $clientID);
+			$writer->addAttribute('name', self::MAP_NAME_PREFIX.$clientID);
 			$writer->renderBeginTag('map');
 			$writer->writeLine();
-			if(($mode = $this->getHotSpotMode()) === THotSpotMode::NotSet)
-				$mode = THotSpotMode::Navigate;
-			$target = $this->getTarget();
-			$i = 0;
-			$options['EventTarget'] = $this->getUniqueID();
-			$options['StopEvent'] = true;
-			$cs = $this->getPage()->getClientScript();
+			if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet)
+				$mode=THotSpotMode::Navigate;
+			$target=$this->getTarget();
+			$i=0;
+			$options['EventTarget']=$this->getUniqueID();
+			$options['StopEvent']=true;
+			$cs=$this->getPage()->getClientScript();
 			foreach($hotspots as $hotspot)
 			{
-				if($hotspot->getHotSpotMode() === THotSpotMode::NotSet)
+				if($hotspot->getHotSpotMode()===THotSpotMode::NotSet)
 					$hotspot->setHotSpotMode($mode);
-				if($target !== '' && $hotspot->getTarget() === '')
+				if($target!=='' && $hotspot->getTarget()==='')
 					$hotspot->setTarget($target);
-				if($hotspot->getHotSpotMode() === THotSpotMode::PostBack)
+				if($hotspot->getHotSpotMode()===THotSpotMode::PostBack)
 				{
-					$id = $clientID . '_' . $i;
+					$id=$clientID.'_'.$i;
 					$writer->addAttribute('id', $id);
-					$writer->addAttribute('href', '#' . $id); //create unique no-op url references
-					$options['ID'] = $id;
-					$options['EventParameter'] = "$i";
-					$options['CausesValidation'] = $hotspot->getCausesValidation();
-					$options['ValidationGroup'] = $hotspot->getValidationGroup();
+					$writer->addAttribute('href', '#'.$id); //create unique no-op url references
+					$options['ID']=$id;
+					$options['EventParameter']="$i";
+					$options['CausesValidation']=$hotspot->getCausesValidation();
+					$options['ValidationGroup']=$hotspot->getValidationGroup();
 					$cs->registerPostBackControl($this->getClientClassName(), $options);
 				}
 				$hotspot->render($writer);
@@ -135,25 +135,25 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		$postBackValue = null;
-		if($param !== '')
+		$postBackValue=null;
+		if($param!=='')
 		{
-			$index = TPropertyValue::ensureInteger($param);
-			$hotspots = $this->getHotSpots();
+			$index=TPropertyValue::ensureInteger($param);
+			$hotspots=$this->getHotSpots();
 			if($index >= 0 && $index < $hotspots->getCount())
 			{
-				$hotspot = $hotspots->itemAt($index);
-				if(($mode = $hotspot->getHotSpotMode()) === THotSpotMode::NotSet)
-					$mode = $this->getHotSpotMode();
-				if($mode === THotSpotMode::PostBack)
+				$hotspot=$hotspots->itemAt($index);
+				if(($mode=$hotspot->getHotSpotMode())===THotSpotMode::NotSet)
+					$mode=$this->getHotSpotMode();
+				if($mode===THotSpotMode::PostBack)
 				{
-					$postBackValue = $hotspot->getPostBackValue();
+					$postBackValue=$hotspot->getPostBackValue();
 					if($hotspot->getCausesValidation())
 						$this->getPage()->validate($hotspot->getValidationGroup());
 				}
 			}
 		}
-		if($postBackValue !== null)
+		if($postBackValue!==null)
 			$this->onClick(new TImageMapEventParameter($postBackValue));
 	}
 
@@ -181,9 +181,9 @@ 
 	 */
 	public function getHotSpots()
 	{
-		if(($hotspots = $this->getViewState('HotSpots', null)) === null)
+		if(($hotspots=$this->getViewState('HotSpots', null))===null)
 		{
-			$hotspots = new THotSpotCollection;
+			$hotspots=new THotSpotCollection;
 			$this->setViewState('HotSpots', $hotspots);
 		}
 		return $hotspots;

framework/Web/UI/WebControls/TListControlValidator.php

Doc Comments +1 added lines

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

Spacing +31 added lines, -31 removed lines

@@ -84,8 +84,8 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
 		$this->setViewState('MinSelection', $value, -1);
 	}
 
@@ -102,8 +102,8 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
 		$this->setViewState('MaxSelection', $value, -1);
 	}
 
@@ -133,12 +133,12 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$control = $this->getValidationTarget();
+		$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))
@@ -146,17 +146,17 @@ 
 			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;
-		elseif($min === -1 && $max !== -1)
+		elseif($min===-1 && $max!==-1)
 			return $exists && $count <= $max;
-		elseif($min !== -1 && $max === -1)
+		elseif($min!==-1 && $max===-1)
 			return $exists && $count >= $min;
 		else
 			return $exists;
@@ -168,13 +168,13 @@ 
 	 */
 	protected function getSelection($control)
 	{
-		$values = [];
+		$values=[];
 
 		//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 = [];
-		$string = $this->getRequiredSelections();
+		$required=[];
+		$string=$this->getRequiredSelections();
 		if(!empty($string))
-			$required = preg_split('/,\s*/', $string);
+			$required=preg_split('/,\s*/', $string);
 		return $required;
 	}
 
@@ -197,8 +197,8 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$control = $this->getValidationTarget();
+		$options=parent::getClientScriptOptions();
+		$control=$this->getValidationTarget();
 
 		if(!$control instanceof TListControl)
 		{
@@ -207,16 +207,16 @@ 
 				$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;
 	}

framework/Web/UI/WebControls/TListItem.php

Doc Comments +3 added lines

@@ -97,6 +97,7 @@ 
 
 	/**
 	 * @param boolean whether the item is enabled
+	 * @param boolean $value
 	 */
 	public function setEnabled($value)
 	{
@@ -113,6 +114,7 @@ 
 
 	/**
 	 * @param boolean whether the item is selected
+	 * @param boolean $value
 	 */
 	public function setSelected($value)
 	{
@@ -145,6 +147,7 @@ 
 
 	/**
 	 * @param string value of the item
+	 * @param string $value
 	 */
 	public function setValue($value)
 	{

Spacing +25 added lines, -25 removed lines

@@ -38,19 +38,19 @@ 
 	/**
 	 * @var string text of the item
 	 */
-	private $_text = '';
+	private $_text='';
 	/**
 	 * @var string value of the item
 	 */
-	private $_value = '';
+	private $_value='';
 	/**
 	 * @var boolean whether the item is enabled
 	 */
-	private $_enabled = true;
+	private $_enabled=true;
 	/**
 	 * @var boolean whether the item is selected
 	 */
-	private $_selected = false;
+	private $_selected=false;
 
 	/**
 	 * Constructor.
@@ -59,7 +59,7 @@ 
 	 * @param boolean whether the item is enabled
 	 * @param boolean whether the item is selected
 	 */
-	public function __construct($text = '', $value = '', $enabled = true, $selected = false)
+	public function __construct($text='', $value='', $enabled=true, $selected=false)
 	{
 		$this->setText($text);
 		$this->setValue($value);
@@ -76,16 +76,16 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_attributes === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
-		if($this->_text === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
-		if($this->_value === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
-		if ($this->_enabled === true)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
-		if ($this->_selected === false)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_selected";
+		if($this->_attributes===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TListItem\0_attributes";
+		if($this->_text==='')
+			$exprops[]="\0Prado\Web\UI\WebControls\TListItem\0_text";
+		if($this->_value==='')
+			$exprops[]="\0Prado\Web\UI\WebControls\TListItem\0_value";
+		if($this->_enabled===true)
+			$exprops[]="\0Prado\Web\UI\WebControls\TListItem\0_enabled";
+		if($this->_selected===false)
+			$exprops[]="\0Prado\Web\UI\WebControls\TListItem\0_selected";
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled = TPropertyValue::ensureBoolean($value);
+		$this->_enabled=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function setSelected($value)
 	{
-		$this->_selected = TPropertyValue::ensureBoolean($value);
+		$this->_selected=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text === ''?$this->_value:$this->_text;
+		return $this->_text==='' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->_text = TPropertyValue::ensureString($value);
+		$this->_text=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value === ''?$this->_text:$this->_value;
+		return $this->_value==='' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = TPropertyValue::ensureString($value);
+		$this->_value=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	public function getAttributes()
 	{
 		if(!$this->_attributes)
-			$this->_attributes = new TAttributeCollection;
+			$this->_attributes=new TAttributeCollection;
 		return $this->_attributes;
 	}
 
@@ -176,7 +176,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }