pradosoft / prado

framework/Web/UI/WebControls/TCompareValidator.php

Doc Comments +2 added lines

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

Indentation +3 added lines, -3 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -163,8 +163,7 @@ 
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath,$dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -287,8 +286,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);

Spacing +14 added lines, -14 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType',TValidationDataType::String);
+		return $this->getViewState('DataType', TValidationDataType::String);
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TValidationDataType'),TValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TValidationDataType'), TValidationDataType::String);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function getControlToCompare()
 	{
-		return $this->getViewState('ControlToCompare','');
+		return $this->getViewState('ControlToCompare', '');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setControlToCompare($value)
 	{
-		$this->setViewState('ControlToCompare',$value,'');
+		$this->setViewState('ControlToCompare', $value, '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function getValueToCompare()
 	{
-		return $this->getViewState('ValueToCompare','');
+		return $this->getViewState('ValueToCompare', '');
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function setValueToCompare($value)
 	{
-		$this->setViewState('ValueToCompare',$value,'');
+		$this->setViewState('ValueToCompare', $value, '');
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function getOperator()
 	{
-		return $this->getViewState('Operator',TValidationCompareOperator::Equal);
+		return $this->getViewState('Operator', TValidationCompareOperator::Equal);
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setOperator($value)
 	{
-		$this->setViewState('Operator',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TValidationCompareOperator'),TValidationCompareOperator::Equal);
+		$this->setViewState('Operator', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TValidationCompareOperator'), TValidationCompareOperator::Equal);
 	}
 
 	/**
@@ -163,13 +163,13 @@ 
 		else
 			$value2=$this->getValueToCompare();
 
-		$values = $this->getComparisonValues($value, $value2);
+		$values=$this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
-				return $values[0] == $values[1];
+				return $values[0]==$values[1];
 			case TValidationCompareOperator::NotEqual:
-				return $values[0] != $values[1];
+				return $values[0]!=$values[1];
 			case TValidationCompareOperator::GreaterThan:
 				return $values[0] > $values[1];
 			case TValidationCompareOperator::GreaterThanEqual:
@@ -198,10 +198,10 @@ 
 			case TValidationDataType::Float:
 				return array(floatval($value1), floatval($value2));
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
+				$dateFormat=$this->getDateFormat();
 				if($dateFormat!=='')
 				{
-					$formatter = new TSimpleDateFormatter($dateFormat);
+					$formatter=new TSimpleDateFormatter($dateFormat);
 					return array($formatter->parse($value1), $formatter->parse($value2));
 				}
 				else
@@ -216,7 +216,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		if(($name=$this->getControlToCompare())!=='')
 		{
 			if(($control=$this->findControl($name))!==null)

framework/Web/UI/WebControls/TDataGridColumn.php

Doc Comments +4 added lines

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

Braces +8 added lines, -16 removed lines

@@ -432,8 +432,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -446,8 +445,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('\\Prado\\Web\\UI\\WebControls\\TLinkButton');
 				$button->setText($text);
@@ -455,11 +453,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -468,8 +464,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -503,8 +498,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		else if($text!=='')
+		} else if($text!=='')
 			$cell->setText($text);
 		else
 			$cell->setText(' ');
@@ -534,13 +528,11 @@ 
 				if(eval("\$result=$expression;")===false)
 					throw new Exception('');
 				return $result;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage());
 			}
-		}
-		else
+		} else
 			return sprintf($formatString,$value);
 	}
 }
\ No newline at end of file

Spacing +41 added lines, -41 removed lines

@@ -88,8 +88,8 @@ 
 	 */
 	public function setID($value)
 	{
-		if(!preg_match(TControl::ID_FORMAT,$value))
-			throw new TInvalidDataValueException('datagridcolumn_id_invalid',get_class($this),$value);
+		if(!preg_match(TControl::ID_FORMAT, $value))
+			throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
 		$this->_id=$value;
 	}
 
@@ -98,7 +98,7 @@ 
 	 */
 	public function getHeaderText()
 	{
-		return $this->getViewState('HeaderText','');
+		return $this->getViewState('HeaderText', '');
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function setHeaderText($value)
 	{
-		$this->setViewState('HeaderText',$value,'');
+		$this->setViewState('HeaderText', $value, '');
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function getHeaderImageUrl()
 	{
-		return $this->getViewState('HeaderImageUrl','');
+		return $this->getViewState('HeaderImageUrl', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setHeaderImageUrl($value)
 	{
-		$this->setViewState('HeaderImageUrl',$value,'');
+		$this->setViewState('HeaderImageUrl', $value, '');
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
@@ -155,10 +155,10 @@ 
 	 */
 	public function getHeaderStyle($createStyle=true)
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null && $createStyle)
+		if(($style=$this->getViewState('HeaderStyle', null))===null && $createStyle)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -168,7 +168,7 @@ 
 	 */
 	public function getFooterText()
 	{
-		return $this->getViewState('FooterText','');
+		return $this->getViewState('FooterText', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setFooterText($value)
 	{
-		$this->setViewState('FooterText',$value,'');
+		$this->setViewState('FooterText', $value, '');
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 */
 	public function getFooterStyle($createStyle=true)
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null && $createStyle)
+		if(($style=$this->getViewState('FooterStyle', null))===null && $createStyle)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -223,10 +223,10 @@ 
 	 */
 	public function getItemStyle($createStyle=true)
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null && $createStyle)
+		if(($style=$this->getViewState('ItemStyle', null))===null && $createStyle)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -236,7 +236,7 @@ 
 	 */
 	public function getSortExpression()
 	{
-		return $this->getViewState('SortExpression','');
+		return $this->getViewState('SortExpression', '');
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	public function setSortExpression($value)
 	{
-		$this->setViewState('SortExpression',$value,'');
+		$this->setViewState('SortExpression', $value, '');
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function getEnableCellGrouping()
 	{
-		return $this->getViewState('EnableCellGrouping',false);
+		return $this->getViewState('EnableCellGrouping', false);
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 */
 	public function setEnableCellGrouping($value)
 	{
-		$this->setViewState('EnableCellGrouping',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('EnableCellGrouping', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function getVisible($checkParents=true)
 	{
-		return $this->getViewState('Visible',true);
+		return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -288,9 +288,9 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	protected function getViewState($key,$defaultValue=null)
+	protected function getViewState($key, $defaultValue=null)
 	{
-		return isset($this->_viewState[$key])?$this->_viewState[$key]:$defaultValue;
+		return isset($this->_viewState[$key]) ? $this->_viewState[$key] : $defaultValue;
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	protected function setViewState($key,$value,$defaultValue=null)
+	protected function setViewState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_viewState[$key]);
@@ -364,9 +364,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data or the field is invalid.
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 
 
@@ -381,12 +381,12 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Header)
-			$this->initializeHeaderCell($cell,$columnIndex);
+			$this->initializeHeaderCell($cell, $columnIndex);
 		else if($itemType===TListItemType::Footer)
-			$this->initializeFooterCell($cell,$columnIndex);
+			$this->initializeFooterCell($cell, $columnIndex);
 	}
 
 	/**
@@ -414,7 +414,7 @@ 
 	 * @param TTableCell the cell to be initialized
 	 * @param integer the index to the Columns property that the cell resides in.
 	 */
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -438,7 +438,7 @@ 
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
-				$button= new TImageButton;
+				$button=new TImageButton;
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
@@ -449,7 +449,7 @@ 
 			}
 			else if($text!=='')
 			{
-				$button= new TLinkButton;
+				$button=new TLinkButton;
 				$button->setText($text);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
@@ -463,7 +463,7 @@ 
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
-				$image= new TImage;
+				$image=new TImage;
 				$image->setImageUrl($url);
 				if($text!=='')
 					$image->setAlternateText($text);
@@ -486,7 +486,7 @@ 
 	 * @param TTableCell the cell to be initialized
 	 * @param integer the index to the Columns property that the cell resides in.
 	 */
-	protected function initializeFooterCell($cell,$columnIndex)
+	protected function initializeFooterCell($cell, $columnIndex)
 	{
 		$text=$this->getFooterText();
 		if(($classPath=$this->getFooterRenderer())!=='')
@@ -522,13 +522,13 @@ 
 	 * @param mixed the data to be formatted
 	 * @return string the formatted result
 	 */
-	protected function formatDataValue($formatString,$value)
+	protected function formatDataValue($formatString, $value)
 	{
 		if($formatString==='')
 			return TPropertyValue::ensureString($value);
 		else if($formatString[0]==='#')
 		{
-			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
+			$expression=strtr(substr($formatString, 1), array('{0}'=>'$value'));
 			try
 			{
 				if(eval("\$result=$expression;")===false)
@@ -537,10 +537,10 @@ 
 			}
 			catch(Exception $e)
 			{
-				throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage());
+				throw new TInvalidDataValueException('datagridcolumn_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}
 		}
 		else
-			return sprintf($formatString,$value);
+			return sprintf($formatString, $value);
 	}
 }
\ No newline at end of file

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

@@ -62,7 +62,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',
@@ -120,7 +120,7 @@ 
 	/**
 	 * @var array list of default plugins to load, override using getAvailablePlugins();
 	 */
-	private static $_plugins = array(
+	private static $_plugins=array(
 		'advlist',
 		'anchor',
 		'autolink',
@@ -164,7 +164,7 @@ 
 	/**
 	 * @var array default themes to load
 	 */
-	private static $_themes = array(
+	private static $_themes=array(
 		'modern',
 	);
 
@@ -211,7 +211,7 @@ 
 	 */
 	public function getEnableVisualEdit()
 	{
-		return $this->getViewState('EnableVisualEdit',true);
+		return $this->getViewState('EnableVisualEdit', true);
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	 */
 	public function setEnableVisualEdit($value)
 	{
-		$this->setViewState('EnableVisualEdit',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableVisualEdit', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -305,7 +305,7 @@ 
 	{
 		if($this->getEnableVisualEdit() && $this->getEnabled(true))
 		{
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 			$this->registerEditorClientScript($writer);
 		}
 
@@ -340,7 +340,7 @@ 
 
 	protected function loadJavascriptLibrary()
 	{
-		$scripts = $this->getPage()->getClientScript();
+		$scripts=$this->getPage()->getClientScript();
 		$scripts->registerPradoScript('htmlarea4');
 		$this->copyCustomPlugins();
 	}
@@ -351,25 +351,25 @@ 
 	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);
 	}
 
 	protected function copyCustomPlugins()
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if($plugins=$this->getCustomPluginPath())
 		{
-			$basepath = $this->getPage()->getClientScript()->getPradoScriptAssetPath('tinymce');
-			$assets = $this->getApplication()->getAssetManager();
-			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
-			$name = basename($path);
-			$dest = $basepath.'/plugins/'.$name;
+			$basepath=$this->getPage()->getClientScript()->getPradoScriptAssetPath('tinymce');
+			$assets=$this->getApplication()->getAssetManager();
+			$path=is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
+			$name=basename($path);
+			$dest=$basepath.'/plugins/'.$name;
 			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
@@ -381,26 +381,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;
 	}
 
@@ -410,20 +410,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;
@@ -434,12 +434,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/TListBox.php

Doc Comments +1 added lines, -1 removed lines

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

Braces +4 added lines, -8 removed lines

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

Indentation +2 added lines, -2 removed lines

@@ -225,13 +225,13 @@
 	 */
 	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);
 	}
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

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

framework/Web/UI/WebControls/TPager.php

Doc Comments +6 added lines

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

Spacing +88 added lines, -88 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public function getControlToPaginate()
 	{
-		return $this->getViewState('ControlToPaginate','');
+		return $this->getViewState('ControlToPaginate', '');
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setControlToPaginate($value)
 	{
-		$this->setViewState('ControlToPaginate',$value,'');
+		$this->setViewState('ControlToPaginate', $value, '');
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getButtonCssClass()
 	{
-		return $this->getViewState('ButtonCssClass','');
+		return $this->getViewState('ButtonCssClass', '');
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function setButtonCssClass($value)
 	{
-		$this->setViewState('ButtonCssClass',TPropertyValue::ensureString($value,''),'');
+		$this->setViewState('ButtonCssClass', TPropertyValue::ensureString($value, ''), '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function getMode()
 	{
-		return $this->getViewState('Mode',TPagerMode::NextPrev);
+		return $this->getViewState('Mode', TPagerMode::NextPrev);
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->setViewState('Mode',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TPagerMode'),TPagerMode::NextPrev);
+		$this->setViewState('Mode', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TPagerMode'), TPagerMode::NextPrev);
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TPagerButtonType::LinkButton);
+		return $this->getViewState('ButtonType', TPagerButtonType::LinkButton);
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TPagerButtonType'),TPagerButtonType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TPagerButtonType'), TPagerButtonType::LinkButton);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getNextPageText()
 	{
-		return $this->getViewState('NextPageText','>');
+		return $this->getViewState('NextPageText', '>');
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 	 */
 	public function setNextPageText($value)
 	{
-		$this->setViewState('NextPageText',$value,'>');
+		$this->setViewState('NextPageText', $value, '>');
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	public function getPrevPageText()
 	{
-		return $this->getViewState('PrevPageText','<');
+		return $this->getViewState('PrevPageText', '<');
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public function setPrevPageText($value)
 	{
-		$this->setViewState('PrevPageText',$value,'<');
+		$this->setViewState('PrevPageText', $value, '<');
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 */
 	public function getFirstPageText()
 	{
-		return $this->getViewState('FirstPageText','<<');
+		return $this->getViewState('FirstPageText', '<<');
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 */
 	public function setFirstPageText($value)
 	{
-		$this->setViewState('FirstPageText',$value,'<<');
+		$this->setViewState('FirstPageText', $value, '<<');
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	 */
 	public function getLastPageText()
 	{
-		return $this->getViewState('LastPageText','>>');
+		return $this->getViewState('LastPageText', '>>');
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 */
 	public function setLastPageText($value)
 	{
-		$this->setViewState('LastPageText',$value,'>>');
+		$this->setViewState('LastPageText', $value, '>>');
 	}
 
 	/**
@@ -219,7 +219,7 @@ 
 	 */
 	public function getFirstPageImageUrl()
 	{
-		return $this->getViewState('FirstPageImageUrl','');
+		return $this->getViewState('FirstPageImageUrl', '');
 	}
 
 	/**
@@ -228,7 +228,7 @@ 
 	 */
 	public function setFirstPageImageUrl($value)
 	{
-		$this->setViewState('FirstPageImageUrl',$value);
+		$this->setViewState('FirstPageImageUrl', $value);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function getLastPageImageUrl()
 	{
-		return $this->getViewState('LastPageImageUrl','');
+		return $this->getViewState('LastPageImageUrl', '');
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 	 */
 	public function setLastPageImageUrl($value)
 	{
-		$this->setViewState('LastPageImageUrl',$value);
+		$this->setViewState('LastPageImageUrl', $value);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function getNextPageImageUrl()
 	{
-		return $this->getViewState('NextPageImageUrl','');
+		return $this->getViewState('NextPageImageUrl', '');
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setNextPageImageUrl($value)
 	{
-		$this->setViewState('NextPageImageUrl',$value);
+		$this->setViewState('NextPageImageUrl', $value);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 */
 	public function getPrevPageImageUrl()
 	{
-		return $this->getViewState('PrevPageImageUrl','');
+		return $this->getViewState('PrevPageImageUrl', '');
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 */
 	public function setPrevPageImageUrl($value)
 	{
-		$this->setViewState('PrevPageImageUrl',$value);
+		$this->setViewState('PrevPageImageUrl', $value);
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	 */
 	public function getNumericPageImageUrl()
 	{
-		return $this->getViewState('NumericPageImageUrl','');
+		return $this->getViewState('NumericPageImageUrl', '');
 	}
 
 	/**
@@ -306,7 +306,7 @@ 
 	 */
 	public function setNumericPageImageUrl($value)
 	{
-		$this->setViewState('NumericPageImageUrl',$value);
+		$this->setViewState('NumericPageImageUrl', $value);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	public function getPageButtonCount()
 	{
-		return $this->getViewState('PageButtonCount',10);
+		return $this->getViewState('PageButtonCount', 10);
 	}
 
 	/**
@@ -323,9 +323,9 @@ 
 	 */
 	public function setPageButtonCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<1)
+		if(($value=TPropertyValue::ensureInteger($value)) < 1)
 			throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
-		$this->setViewState('PageButtonCount',$value,10);
+		$this->setViewState('PageButtonCount', $value, 10);
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	 */
 	public function getCurrentPageIndex()
 	{
-		return $this->getViewState('CurrentPageIndex',0);
+		return $this->getViewState('CurrentPageIndex', 0);
 	}
 
 	/**
@@ -342,9 +342,9 @@ 
 	 */
 	protected function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('pager_currentpageindex_invalid');
-		$this->setViewState('CurrentPageIndex',$value,0);
+		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 	 */
 	public function getPageCount()
 	{
-		return $this->getViewState('PageCount',0);
+		return $this->getViewState('PageCount', 0);
 	}
 
 	/**
@@ -361,9 +361,9 @@ 
 	 */
 	protected function setPageCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('pager_pagecount_invalid');
-		$this->setViewState('PageCount',$value,0);
+		$this->setViewState('PageCount', $value, 0);
 	}
 
 	/**
@@ -379,7 +379,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->getCurrentPageIndex()===$this->getPageCount()-1;
+		return $this->getCurrentPageIndex()===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -394,7 +394,7 @@ 
 
 		$controlID=$this->getControlToPaginate();
 		if(($targetControl=$this->getNamingContainer()->findControl($controlID))===null || !($targetControl instanceof TDataBoundControl))
-			throw new TConfigurationException('pager_controltopaginate_invalid',$controlID);
+			throw new TConfigurationException('pager_controltopaginate_invalid', $controlID);
 
 		if($targetControl->getAllowPaging())
 		{
@@ -416,7 +416,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_pageCount>1)
+		if($this->_pageCount > 1)
 			parent::render($writer);
 	}
 
@@ -453,7 +453,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
 		if($buttonType===TPagerButtonType::LinkButton)
 		{
@@ -472,7 +472,7 @@ 
 			if($buttonType===TPagerButtonType::ImageButton)
 			{
 				$button=new TImageButton;
-				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
+				$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			}
 			else
 				$button=new TButton;
@@ -492,13 +492,13 @@ 
 	 * @param string the command name associated with the image button
 	 * @since 3.1.1
 	 */
-	protected function getPageImageUrl($text,$commandName)
+	protected function getPageImageUrl($text, $commandName)
 	{
 		switch($commandName)
 		{
 			case self::CMD_PAGE:
 				$url=$this->getNumericPageImageUrl();
-				return str_replace('{0}',$text,$url);
+				return str_replace('{0}', $text, $url);
 			case self::CMD_PAGE_NEXT:
 				return $this->getNextPageImageUrl();
 			case self::CMD_PAGE_PREV:
@@ -523,44 +523,44 @@ 
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
-				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_FIRST,'');
+				$label=$this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($label);
 				$controls->add("\n");
 			}
-			$label=$this->createPagerButton($buttonType,false,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
+			$label=$this->createPagerButton($buttonType, false, $this->getPrevPageText(), self::CMD_PAGE_PREV, '');
 			$controls->add($label);
 		}
 		else
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_FIRST,'');
+				$button=$this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$button=$this->createPagerButton($buttonType,true,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
+			$button=$this->createPagerButton($buttonType, true, $this->getPrevPageText(), self::CMD_PAGE_PREV, '');
 			$controls->add($button);
 		}
 		$controls->add("\n");
 		if($this->getIsLastPage())
 		{
-			$label=$this->createPagerButton($buttonType,false,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
+			$label=$this->createPagerButton($buttonType, false, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($label);
 			if(($text=$this->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_LAST,'');
+				$label=$this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($label);
 			}
 		}
 		else
 		{
-			$button=$this->createPagerButton($buttonType,true,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
+			$button=$this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($button);
 			if(($text=$this->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_LAST,'');
+				$button=$this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($button);
 			}
 		}
@@ -574,63 +574,63 @@ 
 		$buttonType=$this->getButtonType();
 		$controls=$this->getControls();
 		$pageCount=$this->getPageCount();
-		$pageIndex=$this->getCurrentPageIndex()+1;
+		$pageIndex=$this->getCurrentPageIndex() + 1;
 		$maxButtonCount=$this->getPageButtonCount();
-		$buttonCount=$maxButtonCount>$pageCount?$pageCount:$maxButtonCount;
+		$buttonCount=$maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
 		$startPageIndex=1;
 		$endPageIndex=$buttonCount;
-		if($pageIndex>$endPageIndex)
+		if($pageIndex > $endPageIndex)
 		{
-			$startPageIndex=((int)(($pageIndex-1)/$maxButtonCount))*$maxButtonCount+1;
-			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount)
+			$startPageIndex=((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if(($endPageIndex=$startPageIndex + $maxButtonCount - 1) > $pageCount)
 				$endPageIndex=$pageCount;
-			if($endPageIndex-$startPageIndex+1<$maxButtonCount)
+			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1)
+				if(($startPageIndex=$endPageIndex - $maxButtonCount + 1) < 1)
 					$startPageIndex=1;
 			}
 		}
 
-		if($startPageIndex>1)
+		if($startPageIndex > 1)
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_FIRST,'');
+				$button=$this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$prevPageIndex=$startPageIndex-1;
-			$button=$this->createPagerButton($buttonType,true,$this->getPrevPageText(),self::CMD_PAGE,"$prevPageIndex");
+			$prevPageIndex=$startPageIndex - 1;
+			$button=$this->createPagerButton($buttonType, true, $this->getPrevPageText(), self::CMD_PAGE, "$prevPageIndex");
 			$controls->add($button);
 			$controls->add("\n");
 		}
 
-		for($i=$startPageIndex;$i<=$endPageIndex;++$i)
+		for($i=$startPageIndex; $i <= $endPageIndex; ++$i)
 		{
 			if($i===$pageIndex)
 			{
-				$label=$this->createPagerButton($buttonType,false,"$i",self::CMD_PAGE,'');
+				$label=$this->createPagerButton($buttonType, false, "$i", self::CMD_PAGE, '');
 				$controls->add($label);
 			}
 			else
 			{
-				$button=$this->createPagerButton($buttonType,true,"$i",self::CMD_PAGE,"$i");
+				$button=$this->createPagerButton($buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i<$endPageIndex)
+			if($i < $endPageIndex)
 				$controls->add("\n");
 		}
 
-		if($pageCount>$endPageIndex)
+		if($pageCount > $endPageIndex)
 		{
 			$controls->add("\n");
-			$nextPageIndex=$endPageIndex+1;
-			$button=$this->createPagerButton($buttonType,true,$this->getNextPageText(),self::CMD_PAGE,"$nextPageIndex");
+			$nextPageIndex=$endPageIndex + 1;
+			$button=$this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
 			if(($text=$this->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($buttonType,true,$text,self::CMD_PAGE_LAST,'');
+				$button=$this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($button);
 			}
 		}
@@ -643,11 +643,11 @@ 
 	{
 		$list=new TDropDownList;
 		$this->getControls()->add($list);
-		$list->setDataSource(range(1,$this->getPageCount()));
+		$list->setDataSource(range(1, $this->getPageCount()));
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
+		$list->attachEventHandler('OnSelectedIndexChanged', array($this, 'listIndexChanged'));
 	}
 
 	/**
@@ -656,10 +656,10 @@ 
 	 * @param TDropDownList the dropdown list control raising the event
 	 * @param TEventParameter event parameter
 	 */
-	public function listIndexChanged($sender,$param)
+	public function listIndexChanged($sender, $param)
 	{
 		$pageIndex=$sender->getSelectedIndex();
-		$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+		$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 	}
 
 	/**
@@ -668,7 +668,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -679,37 +679,37 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_PAGE)===0)
+			if(strcasecmp($command, self::CMD_PAGE)===0)
 			{
-				$pageIndex=TPropertyValue::ensureInteger($param->getCommandParameter())-1;
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+				$pageIndex=TPropertyValue::ensureInteger($param->getCommandParameter()) - 1;
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
+			else if(strcasecmp($command, self::CMD_PAGE_NEXT)===0)
 			{
-				$pageIndex=$this->getCurrentPageIndex()+1;
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+				$pageIndex=$this->getCurrentPageIndex() + 1;
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
+			else if(strcasecmp($command, self::CMD_PAGE_PREV)===0)
 			{
-				$pageIndex=$this->getCurrentPageIndex()-1;
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
+				$pageIndex=$this->getCurrentPageIndex() - 1;
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
+			else if(strcasecmp($command, self::CMD_PAGE_FIRST)===0)
 			{
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,0));
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, 0));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
+			else if(strcasecmp($command, self::CMD_PAGE_LAST)===0)
 			{
-				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$this->getPageCount()-1));
+				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $this->getPageCount() - 1));
 				return true;
 			}
 			return false;

Braces +11 added lines, -22 removed lines

@@ -403,8 +403,7 @@ 
 			$this->setPageCount($targetControl->getPageCount());
 			$this->setCurrentPageIndex($targetControl->getCurrentPageIndex());
 			$this->buildPager();
-		}
-		else
+		} else
 			$this->_pageCount=0;
 	}
 
@@ -466,15 +465,13 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			if($buttonType===TPagerButtonType::ImageButton)
 			{
 				$button=new TImageButton;
 				$button->setImageUrl($this->getPageImageUrl($text,$commandName));
-			}
-			else
+			} else
 				$button=new TButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -529,8 +526,7 @@ 
 			}
 			$label=$this->createPagerButton($buttonType,false,$this->getPrevPageText(),self::CMD_PAGE_PREV,'');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$this->getFirstPageText())!=='')
 			{
@@ -552,8 +548,7 @@ 
 				$label=$this->createPagerButton($buttonType,false,$text,self::CMD_PAGE_LAST,'');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button=$this->createPagerButton($buttonType,true,$this->getNextPageText(),self::CMD_PAGE_NEXT,'');
 			$controls->add($button);
@@ -611,8 +606,7 @@ 
 			{
 				$label=$this->createPagerButton($buttonType,false,"$i",self::CMD_PAGE,'');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button=$this->createPagerButton($buttonType,true,"$i",self::CMD_PAGE,"$i");
 				$controls->add($button);
@@ -689,32 +683,27 @@ 
 				$pageIndex=TPropertyValue::ensureInteger($param->getCommandParameter())-1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_NEXT)===0)
 			{
 				$pageIndex=$this->getCurrentPageIndex()+1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_PREV)===0)
 			{
 				$pageIndex=$this->getCurrentPageIndex()-1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$pageIndex));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_FIRST)===0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,0));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE_LAST)===0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender,$this->getPageCount()-1));
 				return true;
 			}
 			return false;
-		}
-		else
+		} else
 			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TRangeValidator.php

Doc Comments +6 added lines

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

Indentation +7 added lines, -7 removed lines

@@ -129,9 +129,9 @@ 
 	}
 
 	/**
-     * Sets the date format for a date validation
-     * @param string the date format value
-     */
+	 * Sets the date format for a date validation
+	 * @param string the date format value
+	 */
 	public function setDateFormat($value)
 	{
 		$this->setViewState('DateFormat', $value, '');
@@ -189,10 +189,10 @@ 
 	}
 
 	/**
-	* Determine if the value is within the integer range.
-	* @param string value to validate true
-	* @return boolean true if within integer range.
-	*/
+	 * Determine if the value is within the integer range.
+	 * @param string value to validate true
+	 * @return boolean true if within integer range.
+	 */
 	protected function isValidInteger($value)
 	{
 		$minValue=$this->getMinValue();

Braces +1 added lines, -2 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -65,7 +65,7 @@ 
 	 */
 	public function getMinValue()
 	{
-		return $this->getViewState('MinValue','');
+		return $this->getViewState('MinValue', '');
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function setMinValue($value)
 	{
-		$this->setViewState('MinValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('MinValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function getMaxValue()
 	{
-		return $this->getViewState('MaxValue','');
+		return $this->getViewState('MaxValue', '');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setMaxValue($value)
 	{
-		$this->setViewState('MaxValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('MaxValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setStrictComparison($value)
 	{
-		$this->setViewState('StrictComparison', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('StrictComparison', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType',TRangeValidationDataType::String);
+		return $this->getViewState('DataType', TRangeValidationDataType::String);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TRangeValidationDataType'),TRangeValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TRangeValidationDataType'), TRangeValidationDataType::String);
 	}
 
 	/**
@@ -198,16 +198,16 @@ 
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
 
-		$valid=preg_match('/^[-+]?[0-9]+$/',trim($value));
+		$valid=preg_match('/^[-+]?[0-9]+$/', trim($value));
 		$value=intval($value);
 		if($minValue!=='')
 			$valid=$valid && $this->isGreaterThan($value, intval($minValue));
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,intval($maxValue));
+			$valid=$valid && $this->isLessThan($value, intval($maxValue));
 		return $valid;
 	}
 
-	protected function isLessThan($left,$right)
+	protected function isLessThan($left, $right)
 	{
 		return $this->getStrictComparison() ? $left < $right : $left <= $right;
 	}
@@ -227,12 +227,12 @@ 
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
 
-		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
+		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 		$value=floatval($value);
 		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value,floatval($minValue));
+			$valid=$valid && $this->isGreaterThan($value, floatval($minValue));
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,floatval($maxValue));
+			$valid=$valid && $this->isLessThan($value, floatval($maxValue));
 		return $valid;
 	}
 
@@ -249,24 +249,24 @@ 
 
 		$valid=true;
 
-		$dateFormat = $this->getDateFormat();
+		$dateFormat=$this->getDateFormat();
 		if($dateFormat!=='')
 		{
-			$formatter= new TSimpleDateFormatter($dateFormat);
-			$value = $formatter->parse($value);
+			$formatter=new TSimpleDateFormatter($dateFormat);
+			$value=$formatter->parse($value);
 			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,$formatter->parse($minValue));
+				$valid=$valid && $this->isGreaterThan($value, $formatter->parse($minValue));
 			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
+				$valid=$valid && $this->isLessThan($value, $formatter->parse($maxValue));
 			return $valid;
 		}
 		else
 		{
 			$value=strtotime($value);
 			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,strtotime($minValue));
+				$valid=$valid && $this->isGreaterThan($value, strtotime($minValue));
 			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,strtotime($maxValue));
+				$valid=$valid && $this->isLessThan($value, strtotime($maxValue));
 			return $valid;
 		}
 	}
@@ -284,9 +284,9 @@ 
 
 		$valid=true;
 		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan(strcmp($value,$minValue),0);
+			$valid=$valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan(strcmp($value,$maxValue),0);
+			$valid=$valid && $this->isLessThan(strcmp($value, $maxValue), 0);
 		return $valid;
 	}
 
@@ -300,20 +300,20 @@ 
 		$maxValue=$this->getMaxValue();
 
 		$valid=true;
-		$charset = $this->getCharset();
+		$charset=$this->getCharset();
 		if($charset==='')
 		{
-			$app= $this->getApplication()->getGlobalization();
-			$charset = $app ? $app->getCharset() : null;
+			$app=$this->getApplication()->getGlobalization();
+			$charset=$app ? $app->getCharset() : null;
 			if(!$charset)
-				$charset = 'UTF-8';
+				$charset='UTF-8';
 		}
 
-		$length = iconv_strlen($value, $charset);
+		$length=iconv_strlen($value, $charset);
 		if($minValue!=='')
-			$valid = $valid && $this->isGreaterThan($length,intval($minValue));
+			$valid=$valid && $this->isGreaterThan($length, intval($minValue));
 		if($maxValue!=='')
-			$valid = $valid && $this->isLessThan($length,intval($maxValue));
+			$valid=$valid && $this->isLessThan($length, intval($maxValue));
 		return $valid;
 	}