pradosoft / prado

framework/Web/UI/WebControls/TRequiredFieldValidator.php

Doc Comments +9 added lines

@@ -98,6 +98,9 @@ 
 			return $this->validateStandardControl($control);
 	}
 
+	/**
+	 * @param TListControl $control
+	 */
 	private function validateListControl($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -110,6 +113,9 @@ 
 		return $count > 0;
 	}
 
+	/**
+	 * @param TRadioButton $control
+	 */
 	private function validateRadioButtonGroup($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -126,6 +132,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param TControl $control
+	 */
 	private function validateStandardControl($control)
 	{
 		$initial = trim($this->getInitialValue());

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 	 */
 	public function getInitialValue()
 	{
-		return $this->getViewState('InitialValue',$this->getControlPromptValue());
+		return $this->getViewState('InitialValue', $this->getControlPromptValue());
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	protected function getControlPromptValue()
 	{
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
 			return $control->getPromptValue();
 		return '';
@@ -73,7 +73,7 @@ 
 	 */
 	public function setInitialValue($value)
 	{
-		$this->setViewState('InitialValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('InitialValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
 			return $this->validateListControl($control);
 		else if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
@@ -100,11 +100,11 @@ 
 
 	private function validateListControl($control)
 	{
-		$initial = trim($this->getInitialValue());
-		$count = 0;
+		$initial=trim($this->getInitialValue());
+		$count=0;
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected() && $item->getValue() != $initial)
+			if($item->getSelected() && $item->getValue()!=$initial)
 				$count++;
 		}
 		return $count > 0;
@@ -112,13 +112,13 @@ 
 
 	private function validateRadioButtonGroup($control)
 	{
-		$initial = trim($this->getInitialValue());
+		$initial=trim($this->getInitialValue());
 		foreach($control->getRadioButtonsInGroup() as $radio)
 		{
 			if($radio->getChecked())
 			{
-				if(strlen($value = $radio->getValue()) > 0)
-					return $value !== $initial;
+				if(strlen($value=$radio->getValue()) > 0)
+					return $value!==$initial;
 				else
 					return true;
 			}
@@ -128,7 +128,7 @@ 
 
 	private function validateStandardControl($control)
 	{
-		$initial = trim($this->getInitialValue());
+		$initial=trim($this->getInitialValue());
 		$value=$this->getValidationValue($control);
 		return (is_bool($value) && $value) || trim($value)!==$initial;
 	}
@@ -139,13 +139,13 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['InitialValue']=$this->getInitialValue();
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
-			$options['TotalItems'] = $control->getItemCount();
+			$options['TotalItems']=$control->getItemCount();
 		if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
-			$options['GroupName'] = $control->getGroupName();
+			$options['GroupName']=$control->getGroupName();
 		return $options;
 	}
 }

framework/Web/UI/WebControls/TSlider.php

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 	 * Returns the value of the TSlider control.
 	 * This method is required by {@link IDataRenderer}.
 	 * It is the same as {@link getValue()}.
-	 * @return string the value of the TSlider control.
+	 * @return double the value of the TSlider control.
 	 * @see getValue
 	 */
 	public function getData()

Spacing +48 added lines, -48 removed lines

@@ -73,7 +73,7 @@ 
 	 */
 	public function setDirection($value)
 	{
-		$this->setViewState('Direction', TPropertyValue::ensureEnum($value,'TSliderDirection'),TSliderDirection::Horizontal);
+		$this->setViewState('Direction', TPropertyValue::ensureEnum($value, 'TSliderDirection'), TSliderDirection::Horizontal);
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	public function getCssUrl()
 	{
-		return $this->getViewState('CssUrl','');
+		return $this->getViewState('CssUrl', '');
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	 */
 	public function setCssUrl($value)
 	{
-		$this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CssUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function getMaxValue()
 	{
-		return $this->getViewState('MaxValue',100.0);
+		return $this->getViewState('MaxValue', 100.0);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setMaxValue($value)
 	{
-		$this->setViewState('MaxValue', TPropertyValue::ensureFloat($value),100.0);
+		$this->setViewState('MaxValue', TPropertyValue::ensureFloat($value), 100.0);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function getMinValue()
 	{
-		return $this->getViewState('MinValue',0.0);
+		return $this->getViewState('MinValue', 0.0);
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setMinValue($value)
 	{
-		$this->setViewState('MinValue', TPropertyValue::ensureFloat($value),0.0);
+		$this->setViewState('MinValue', TPropertyValue::ensureFloat($value), 0.0);
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	/**
 	 * @return boolean wether to display a progress indicator or not. Defaults to true.
 	 */
-	public function getProgressIndicator ()
+	public function getProgressIndicator()
 	{
 		return $this->getViewState('ProgressIndicator', true);
 	}
@@ -155,7 +155,7 @@ 
 	/**
 	 * @param boolean wether to display a progress indicator or not. Defaults to true.
 	 */
-	public function setProgressIndicator ($value)
+	public function setProgressIndicator($value)
 	{
 		$this->setViewState('ProgressIndicator', TPropertyValue::ensureBoolean($value), true);
 	}
@@ -164,7 +164,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value',0.0);
+		return $this->getViewState('Value', 0.0);
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value', TPropertyValue::ensureFloat($value),0.0);
+		$this->setViewState('Value', TPropertyValue::ensureFloat($value), 0.0);
 	}
 
 	/**
@@ -224,7 +224,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function onValueChanged($param)
 	{
-		$this->raiseEvent('OnValueChanged',$this,$param);
+		$this->raiseEvent('OnValueChanged', $this, $param);
 	}
 
 	/**
@@ -290,9 +290,9 @@ 
 	 * @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)
 	{
-		$value=(float)$values[$this->getClientID().'_1'];
+		$value=(float) $values[$this->getClientID().'_1'];
 		if($this->getValue()!==$value)
 		{
 			$this->setValue($value);
@@ -316,7 +316,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -331,7 +331,7 @@ 
 	/**
 	 * @return string the HTML tag name for slider. Defaults to div.
 	 */
-	public function getTagName ()
+	public function getTagName()
 	{
 		return "div";
 	}
@@ -343,10 +343,10 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
-		if ($this->getCssClass()==='')
+		$writer->addAttribute('id', $this->getClientID());
+		if($this->getCssClass()==='')
 		{
-			$class=($this->getDirection()==TSliderDirection::Horizontal)?'HorizontalSlider':'VerticalSlider';
+			$class=($this->getDirection()==TSliderDirection::Horizontal) ? 'HorizontalSlider' : 'VerticalSlider';
 			$writer->addAttribute('class', 'Slider '.$class);
 		}
 
@@ -362,7 +362,7 @@ 
 		$writer->addAttribute('id', $this->getClientID().'_track');
 		$writer->renderBeginTag('div');
 		// Render the 'Progress Indicator'
-		if ($this->getProgressIndicator())
+		if($this->getProgressIndicator())
 		{
 			$writer->addAttribute('class', 'Progress');
 			$writer->addAttribute('id', $this->getClientID().'_progress');
@@ -399,7 +399,7 @@ 
 	 * This method is invoked right before the control rendering, if the control is visible.
 	 * @param mixed event parameter
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->registerStyleSheet();
@@ -421,7 +421,7 @@ 
 			$url=$manager->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'TSlider');
 			$url.='/TSlider.css';
 		}
-		$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
+		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
 
 	/**
@@ -430,12 +430,12 @@ 
 	protected function registerSliderClientScript()
 	{
 		$page=$this->getPage();
-		$cs = $page->getClientScript();
+		$cs=$page->getClientScript();
 		$cs->registerPradoScript("slider");
 		$id=$this->getClientID();
-		$cs->registerHiddenField($id.'_1',$this->getValue());
+		$cs->registerHiddenField($id.'_1', $this->getValue());
 		$page->registerRequiresPostData($this);
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getSliderOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getSliderOptions());
 	}
 
 	/**
@@ -445,30 +445,30 @@ 
 	protected function getSliderOptions()
 	{
 		// PostBack Options :
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['AutoPostBack']=$this->getAutoPostBack();
 
 		// Slider Control options
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
-		$options['axis'] = strtolower($this->getDirection());
-		$options['maximum'] = $maxValue;
-		$options['minimum'] = $minValue;
-		$options['range'] = array($minValue, $maxValue);
-		$options['sliderValue'] = $this->getValue();
-		$options['disabled'] = !$this->getEnabled();
+		$options['axis']=strtolower($this->getDirection());
+		$options['maximum']=$maxValue;
+		$options['minimum']=$minValue;
+		$options['range']=array($minValue, $maxValue);
+		$options['sliderValue']=$this->getValue();
+		$options['disabled']=!$this->getEnabled();
 		$values=$this->getValues();
-		if (!empty($values))
+		if(!empty($values))
 		{
 			// Values are provided. Check if min/max are present in them
-			if (!in_array($minValue, $values)) $values[]=$minValue;
-			if (!in_array($maxValue, $values)) $values[]=$maxValue;
+			if(!in_array($minValue, $values)) $values[]=$minValue;
+			if(!in_array($maxValue, $values)) $values[]=$maxValue;
 			// Remove all values outsize the range [min..max]
-			foreach ($values as $idx=>$value)
+			foreach($values as $idx=>$value)
 			{
-				if ($value < $minValue) unset ($values[$idx]);
-				if ($value > $maxValue) unset ($values[$idx]);
+				if($value < $minValue) unset ($values[$idx]);
+				if($value > $maxValue) unset ($values[$idx]);
 			}
 		}
 		else
@@ -476,19 +476,19 @@ 
 			// Values are not provided, generate automatically using stepsize
 			$step=$this->getStepSize();
 			// We want at most self::MAX_STEPS values, so, change the step if necessary
-			if (($maxValue-$minValue)/$step > self::MAX_STEPS)
+			if(($maxValue - $minValue) / $step > self::MAX_STEPS)
 			{
-				$step=($maxValue-$minValue)/self::MAX_STEPS;
+				$step=($maxValue - $minValue) / self::MAX_STEPS;
 			}
 			$values=array();
-			for ($i=$minValue;$i<=$maxValue;$i+=$step)
+			for($i=$minValue; $i <= $maxValue; $i+=$step)
 				$values[]=$i;
 			// Add max if it's not in the array because of step
-			if (!in_array($maxValue, $values)) $values[]=$maxValue;
+			if(!in_array($maxValue, $values)) $values[]=$maxValue;
 		}
-		$options['values'] = $values;
+		$options['values']=$values;
 		if($this->_clientScript!==null)
-			$options = array_merge($options,$this->_clientScript->getOptions()->toArray());
+			$options=array_merge($options, $this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
 }

Braces +2 added lines, -4 removed lines

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

framework/Web/UI/WebControls/TStyle.php

Doc Comments +6 added lines, -3 removed lines

@@ -229,7 +229,7 @@ 
 	}
 
 	/**
-	 * @return TDisplayStyle display style
+	 * @return string display style
 	 */
 	public function getDisplayStyle()
 	{
@@ -286,6 +286,7 @@ 
 	 * Sets custom style fields from a string.
 	 * Custom style fields will be overwritten by style fields explicitly defined.
 	 * @param string the custom style of the control
+	 * @param string $value
 	 */
 	public function setCustomStyle($value)
 	{
@@ -305,6 +306,8 @@ 
 	 * Style fields set by this method will overwrite those set by {@link setCustomStyle}.
 	 * @param string style field name
 	 * @param string style field value
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function setStyleField($name,$value)
 	{
@@ -695,7 +698,7 @@ 
 
 
 	/**
-	 * @return boolean whether the table borders should be collapsed. Defaults to false.
+	 * @return boolean|null whether the table borders should be collapsed. Defaults to false.
 	 */
 	public function getBorderCollapse()
 	{
@@ -858,7 +861,7 @@ 
 	}
 
 	/**
-	 * @return boolean whether the content wraps within the table item. Defaults to true.
+	 * @return boolean|null whether the content wraps within the table item. Defaults to true.
 	 */
 	public function getWrap()
 	{

Spacing +78 added lines, -78 removed lines

@@ -55,16 +55,16 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0TStyle\0_fields";
+		if($this->_fields===array())
+			$exprops[]="\0TStyle\0_fields";
 		if($this->_font===null)
-			$exprops[] = "\0TStyle\0_font";
+			$exprops[]="\0TStyle\0_font";
 		if($this->_class===null)
-			$exprops[] = "\0TStyle\0_class";
-		if ($this->_customStyle===null)
-			$exprops[] = "\0TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
-			$exprops[] = "\0TStyle\0_displayStyle";
+			$exprops[]="\0TStyle\0_class";
+		if($this->_customStyle===null)
+			$exprops[]="\0TStyle\0_customStyle";
+		if($this->_displayStyle==='Fixed')
+			$exprops[]="\0TStyle\0_displayStyle";
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	public function __clone()
 	{
 		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+			$this->_font=clone($this->_font);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class===null ? '' : $this->_class;
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	 */
 	public function hasFont()
 	{
-		return $this->_font !== null;
+		return $this->_font!==null;
 	}
 
 	/**
@@ -210,20 +210,20 @@ 
 	 */
 	public function setDisplayStyle($value)
 	{
-		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'TDisplayStyle');
+		$this->_displayStyle=TPropertyValue::ensureEnum($value, 'TDisplayStyle');
 		switch($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
-				$this->_fields['display'] = 'none';
+				$this->_fields['display']='none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; //remove the display property
+				$this->_fields['display']=''; //remove the display property
 				break;
 			case TDisplayStyle::Fixed:
-				$this->_fields['visibility'] = 'visible';
+				$this->_fields['visibility']='visible';
 				break;
 			case TDisplayStyle::Hidden:
-				$this->_fields['visibility'] = 'hidden';
+				$this->_fields['visibility']='hidden';
 				break;
 		}
 	}
@@ -241,7 +241,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle===null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
 
 	/**
@@ -306,7 +306,7 @@ 
 	 * @param string style field name
 	 * @param string style field value
 	 */
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
 		$this->_fields[$name]=$value;
 	}
@@ -333,7 +333,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 
 	/**
@@ -365,7 +365,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
+			$this->_fields=array_merge($this->_fields, $style->_fields);
 			if($style->_class!==null)
 				$this->_class=$style->_class;
 			if($style->_customStyle!==null)
@@ -385,7 +385,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
+			$this->_fields=array_merge($style->_fields, $this->_fields);
 			if($this->_class===null)
 				$this->_class=$style->_class;
 			if($this->_customStyle===null)
@@ -403,18 +403,18 @@ 
 	{
 		if($this->_customStyle!==null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach(explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
+				$arr=explode(':', $style, 2);
 				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
 		if($this->_font!==null)
 			$this->_font->addAttributesToRender($writer);
 		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+			$writer->addAttribute('class', $this->_class);
 	}
 
 	/**
@@ -492,18 +492,18 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_backImageUrl===null)
-			$exprops[] = "\0TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding===null)
-			$exprops[] = "\0TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing===null)
-			$exprops[] = "\0TTableStyle\0_cellSpacing";
-		if ($this->_gridLines===null)
-			$exprops[] = "\0TTableStyle\0_gridLines";
-		if ($this->_borderCollapse===null)
-			$exprops[] = "\0TTableStyle\0_borderCollapse";
+		if($this->_backImageUrl===null)
+			$exprops[]="\0TTableStyle\0_backImageUrl";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0TTableStyle\0_horizontalAlign";
+		if($this->_cellPadding===null)
+			$exprops[]="\0TTableStyle\0_cellPadding";
+		if($this->_cellSpacing===null)
+			$exprops[]="\0TTableStyle\0_cellSpacing";
+		if($this->_gridLines===null)
+			$exprops[]="\0TTableStyle\0_gridLines";
+		if($this->_borderCollapse===null)
+			$exprops[]="\0TTableStyle\0_borderCollapse";
 	}
 
 	/**
@@ -582,25 +582,25 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
+			$writer->addStyleAttribute('background-image', 'url('.$url.')');
 
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
+			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
 
-		if(($cellPadding=$this->getCellPadding())>=0)
-			$writer->addAttribute('cellpadding',"$cellPadding");
+		if(($cellPadding=$this->getCellPadding()) >= 0)
+			$writer->addAttribute('cellpadding', "$cellPadding");
 
-		if(($cellSpacing=$this->getCellSpacing())>=0)
-			$writer->addAttribute('cellspacing',"$cellSpacing");
+		if(($cellSpacing=$this->getCellSpacing()) >= 0)
+			$writer->addAttribute('cellspacing', "$cellSpacing");
 
 		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse','collapse');
+			$writer->addStyleAttribute('border-collapse', 'collapse');
 
 		switch($this->getGridLines())
 		{
-			case TTableGridLines::Horizontal : $writer->addAttribute('rules','rows'); break;
-			case TTableGridLines::Vertical : $writer->addAttribute('rules','cols'); break;
-			case TTableGridLines::Both : $writer->addAttribute('rules','all'); break;
+			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
+			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
+			case TTableGridLines::Both : $writer->addAttribute('rules', 'all'); break;
 		}
 
 		parent::addAttributesToRender($writer);
@@ -611,7 +611,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl===null?'':$this->_backImageUrl;
+		return $this->_backImageUrl===null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -628,7 +628,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -637,7 +637,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 
 	/**
@@ -645,7 +645,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		return $this->_cellPadding===null?-1:$this->_cellPadding;
+		return $this->_cellPadding===null ?-1 : $this->_cellPadding;
 	}
 
 	/**
@@ -654,7 +654,7 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellPadding=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 
@@ -663,7 +663,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing===null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing===null ?-1 : $this->_cellSpacing;
 	}
 
 	/**
@@ -672,7 +672,7 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 
@@ -681,7 +681,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		return $this->_gridLines===null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines===null ? TTableGridLines::None : $this->_gridLines;
 	}
 
 	/**
@@ -690,7 +690,7 @@ 
 	 */
 	public function setGridLines($value)
 	{
-		$this->_gridLines=TPropertyValue::ensureEnum($value,'TTableGridLines');
+		$this->_gridLines=TPropertyValue::ensureEnum($value, 'TTableGridLines');
 	}
 
 
@@ -699,7 +699,7 @@ 
 	 */
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse===null?false:$this->_borderCollapse;
+		return $this->_borderCollapse===null ? false : $this->_borderCollapse;
 	}
 
 	/**
@@ -743,12 +743,12 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0TTableItemStyle\0_horizontalAlign";
-		if ($this->_verticalAlign===null)
-			$exprops[] = "\0TTableItemStyle\0_verticalAlign";
-		if ($this->_wrap===null)
-			$exprops[] = "\0TTableItemStyle\0_wrap";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0TTableItemStyle\0_horizontalAlign";
+		if($this->_verticalAlign===null)
+			$exprops[]="\0TTableItemStyle\0_verticalAlign";
+		if($this->_wrap===null)
+			$exprops[]="\0TTableItemStyle\0_wrap";
 	}
 
 	/**
@@ -812,13 +812,13 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
+			$writer->addStyleAttribute('white-space', 'nowrap');
 
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
+			$writer->addAttribute('align', strtolower($horizontalAlign));
 
 		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+			$writer->addAttribute('valign', strtolower($verticalAlign));
 
 		parent::addAttributesToRender($writer);
 	}
@@ -828,7 +828,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -837,7 +837,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 
 	/**
@@ -845,7 +845,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		return $this->_verticalAlign===null?TVerticalAlign::NotSet:$this->_verticalAlign;
+		return $this->_verticalAlign===null ? TVerticalAlign::NotSet : $this->_verticalAlign;
 	}
 
 	/**
@@ -854,7 +854,7 @@ 
 	 */
 	public function setVerticalAlign($value)
 	{
-		$this->_verticalAlign=TPropertyValue::ensureEnum($value,'TVerticalAlign');
+		$this->_verticalAlign=TPropertyValue::ensureEnum($value, 'TVerticalAlign');
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->_wrap===null?true:$this->_wrap;
+		return $this->_wrap===null ? true : $this->_wrap;
 	}
 
 	/**

framework/Web/UI/WebControls/TTable.php

Doc Comments +2 added lines

@@ -144,6 +144,7 @@ 
 
 	/**
 	 * @param string table caption
+	 * @param string $value
 	 */
 	public function setCaption($value)
 	{
@@ -160,6 +161,7 @@ 
 
 	/**
 	 * @param TTableCaptionAlign table caption alignment.
+	 * @param TTableCaptionAlign $value
 	 */
 	public function setCaptionAlign($value)
 	{

Braces +4 added lines, -8 removed lines

@@ -306,8 +306,7 @@ 
 					{
 						if($index===0 && $currentSection===TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
-					}
-					else
+					} else
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
@@ -318,8 +317,7 @@ 
 							else
 								$writer->renderBeginTag('tfoot');
 							$currentSection=$section;
-						}
-						else if($currentSection===TTableRowSection::Body)
+						} else if($currentSection===TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
 							if($section===TTableRowSection::Footer)
@@ -327,16 +325,14 @@ 
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
 							$currentSection=$section;
-						}
-						else // Footer
+						} else // Footer
 							throw new TConfigurationException('table_tablesection_outoforder');
 					}
 					$row->renderControl($writer);
 					$writer->writeLine();
 				}
 				$writer->renderEndTag();
-			}
-			else
+			} else
 			{
 				$writer->writeLine();
 				foreach($this->getControls() as $row)

Spacing +10 added lines, -10 removed lines

@@ -110,10 +110,10 @@ 
 				if(($border=$this->getBorderWidth())==='')
 					$border=1;
 				else
-					$border=(int)$border;
+					$border=(int) $border;
 			}
 		}
-		$writer->addAttribute('border',"$border");
+		$writer->addAttribute('border', "$border");
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',$value,'');
+		$this->setViewState('Caption', $value, '');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function getCaptionAlign()
 	{
-		return $this->getViewState('CaptionAlign',TTableCaptionAlign::NotSet);
+		return $this->getViewState('CaptionAlign', TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->setViewState('CaptionAlign',TPropertyValue::ensureEnum($value,'TTableCaptionAlign'),TTableCaptionAlign::NotSet);
+		$this->setViewState('CaptionAlign', TPropertyValue::ensureEnum($value, 'TTableCaptionAlign'), TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 		if(($caption=$this->getCaption())!=='')
 		{
 			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -311,7 +311,7 @@ 
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
-							if($index>0)
+							if($index > 0)
 								$writer->renderEndTag();
 							if($section===TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');
@@ -369,10 +369,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TTableRow object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TTableRow)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tablerowcollection_tablerow_required');
 	}

framework/Web/UI/WebControls/TTabPanel.php

Doc Comments +2 added lines, -1 removed lines

@@ -546,7 +546,7 @@ 
 	private $_active=false;
 
 	/**
-	 * @return the tag name for the view element
+	 * @return string tag name for the view element
 	 */
 	protected function getTagName()
 	{
@@ -714,6 +714,7 @@ 
 	/**
 	 * Finds the index of the tab view whose ID is the same as the one being looked for.
 	 * @param string the explicit ID of the tab view to be looked for
+	 * @param string $id
 	 * @return integer the index of the tab view found, -1 if not found.
 	 */
 	public function findIndexByID($id)

Indentation +104 added lines, -104 removed lines

@@ -81,9 +81,9 @@ 
 	}
 
 	/**
-     * Returns the index of the active tab view.
-     * Note, this property may not return the correct index.
-     * To ensure the correctness, call {@link getActiveView()} first.
+	 * Returns the index of the active tab view.
+	 * Note, this property may not return the correct index.
+	 * To ensure the correctness, call {@link getActiveView()} first.
 	 * @return integer the zero-based index of the active tab view. If -1, it means no active tab view. Default is 0 (the first view is active).
 	 */
 	public function getActiveViewIndex()
@@ -100,24 +100,24 @@ 
 		$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
 	}
 
-    /**
-     * Returns the ID of the active tab view.
-     * Note, this property may not return the correct ID.
-     * To ensure the correctness, call {@link getActiveView()} first.
-     * @return string The ID of the active tab view. Defaults to '', meaning not set.
-     */
-    public function getActiveViewID()
-    {
+	/**
+	 * Returns the ID of the active tab view.
+	 * Note, this property may not return the correct ID.
+	 * To ensure the correctness, call {@link getActiveView()} first.
+	 * @return string The ID of the active tab view. Defaults to '', meaning not set.
+	 */
+	public function getActiveViewID()
+	{
 		return $this->getViewState('ActiveViewID','');
-    }
+	}
 
-    /**
-     * @param string The ID of the active tab view.
-     */
-    public function setActiveViewID($value)
-    {
+	/**
+	 * @param string The ID of the active tab view.
+	 */
+	public function setActiveViewID($value)
+	{
 		$this->setViewState('ActiveViewID',$value,'');
-    }
+	}
 
 	/**
 	 * Returns the currently active view.
@@ -172,63 +172,63 @@ 
 			throw new TInvalidOperationException('tabpanel_view_inexistent');
 	}
 
-    /**
-     * @return bool status of automatic tab switch on hover
-     */
-    public function getAutoSwitch()
-    {
-        return TPropertyValue::ensureBoolean($this->getViewState('AutoSwitch'));
-    }
-
-    /**
-     * @param bool whether to enable automatic tab switch on hover
-     */
-    public function setAutoSwitch($value)
-    {
-        $this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
-    }
-
-
-    /**
-     * @return string URL for the CSS file including all relevant CSS class definitions. Defaults to ''.
-     */
-    public function getCssUrl()
-    {
-        return $this->getViewState('CssUrl','default');
-    }
-
-    /**
-     * @param string URL for the CSS file including all relevant CSS class definitions.
-     */
-    public function setCssUrl($value)
-    {
-        $this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
-    }
-
-    /**
-     * @return string CSS class for the whole tab control div. Defaults to 'tab-panel'.
-     */
-    public function getCssClass()
-    {
-    	$cssClass=parent::getCssClass();
-    	return $cssClass===''?'tab-panel':$cssClass;
-    }
-
-    /**
-     * @return string CSS class for the currently displayed view div. Defaults to 'tab-view'.
-     */
-    public function getViewCssClass()
-    {
-        return $this->getViewStyle()->getCssClass();
-    }
-
-    /**
-     * @param string CSS class for the currently displayed view div.
-     */
-    public function setViewCssClass($value)
-    {
-        $this->getViewStyle()->setCssClass($value);
-    }
+	/**
+	 * @return bool status of automatic tab switch on hover
+	 */
+	public function getAutoSwitch()
+	{
+		return TPropertyValue::ensureBoolean($this->getViewState('AutoSwitch'));
+	}
+
+	/**
+	 * @param bool whether to enable automatic tab switch on hover
+	 */
+	public function setAutoSwitch($value)
+	{
+		$this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
+	}
+
+
+	/**
+	 * @return string URL for the CSS file including all relevant CSS class definitions. Defaults to ''.
+	 */
+	public function getCssUrl()
+	{
+		return $this->getViewState('CssUrl','default');
+	}
+
+	/**
+	 * @param string URL for the CSS file including all relevant CSS class definitions.
+	 */
+	public function setCssUrl($value)
+	{
+		$this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+	}
+
+	/**
+	 * @return string CSS class for the whole tab control div. Defaults to 'tab-panel'.
+	 */
+	public function getCssClass()
+	{
+		$cssClass=parent::getCssClass();
+		return $cssClass===''?'tab-panel':$cssClass;
+	}
+
+	/**
+	 * @return string CSS class for the currently displayed view div. Defaults to 'tab-view'.
+	 */
+	public function getViewCssClass()
+	{
+		return $this->getViewStyle()->getCssClass();
+	}
+
+	/**
+	 * @param string CSS class for the currently displayed view div.
+	 */
+	public function setViewCssClass($value)
+	{
+		$this->getViewStyle()->setCssClass($value);
+	}
 
 	/**
 	 * @return TStyle the style for all the view div
@@ -244,21 +244,21 @@ 
 		return $style;
 	}
 
-    /**
-     * @return string CSS class for non-active tabs. Defaults to 'tab-normal'.
-     */
-    public function getTabCssClass()
-    {
-        return $this->getTabStyle()->getCssClass();
-    }
+	/**
+	 * @return string CSS class for non-active tabs. Defaults to 'tab-normal'.
+	 */
+	public function getTabCssClass()
+	{
+		return $this->getTabStyle()->getCssClass();
+	}
 
-    /**
-     * @param string CSS class for non-active tabs.
-     */
-    public function setTabCssClass($value)
-    {
-        $this->getTabStyle()->setCssClass($value);
-    }
+	/**
+	 * @param string CSS class for non-active tabs.
+	 */
+	public function setTabCssClass($value)
+	{
+		$this->getTabStyle()->setCssClass($value);
+	}
 
 	/**
 	 * @return TStyle the style for all the inactive tab div
@@ -274,21 +274,21 @@ 
 		return $style;
 	}
 
-    /**
-     * @return string CSS class for the active tab. Defaults to 'tab-active'.
-     */
-    public function getActiveTabCssClass()
-    {
-        return $this->getActiveTabStyle()->getCssClass();
-    }
-
-    /**
-     * @param string CSS class for the active tab.
-     */
-    public function setActiveTabCssClass($value)
-    {
-        $this->getActiveTabStyle()->setCssClass($value);
-    }
+	/**
+	 * @return string CSS class for the active tab. Defaults to 'tab-active'.
+	 */
+	public function getActiveTabCssClass()
+	{
+		return $this->getActiveTabStyle()->getCssClass();
+	}
+
+	/**
+	 * @param string CSS class for the active tab.
+	 */
+	public function setActiveTabCssClass($value)
+	{
+		$this->getActiveTabStyle()->setCssClass($value);
+	}
 
 	/**
 	 * @return TStyle the style for the active tab div

Braces +3 added lines, -6 removed lines

@@ -136,15 +136,13 @@ 
 				$activeView=$views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
-		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		} else if(($index=$this->getActiveViewIndex())>=0)
 		{
 			if($index<$views->getCount())
 				$activeView=$views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
-		}
-		else
+		} else
 		{
 			foreach($views as $index=>$view)
 			{
@@ -320,8 +318,7 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
-			}
-			else
+			} else
 				$v->setActive(false);
 		}
 	}

Spacing +53 added lines, -53 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		return $this->getViewState('ActiveViewIndex',0);
+		return $this->getViewState('ActiveViewIndex', 0);
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('ActiveViewIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 
     /**
@@ -108,7 +108,7 @@ 
      */
     public function getActiveViewID()
     {
-		return $this->getViewState('ActiveViewID','');
+		return $this->getViewState('ActiveViewID', '');
     }
 
     /**
@@ -116,7 +116,7 @@ 
      */
     public function setActiveViewID($value)
     {
-		$this->setViewState('ActiveViewID',$value,'');
+		$this->setViewState('ActiveViewID', $value, '');
     }
 
 	/**
@@ -132,17 +132,17 @@ 
 		$views=$this->getViews();
 		if(($id=$this->getActiveViewID())!=='')
 		{
-			if(($index=$views->findIndexByID($id))>=0)
+			if(($index=$views->findIndexByID($id)) >= 0)
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
+				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid', $id);
 		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		else if(($index=$this->getActiveViewIndex()) >= 0)
 		{
-			if($index<$views->getCount())
+			if($index < $views->getCount())
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
+				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
 		}
 		else
 		{
@@ -166,7 +166,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view)>=0)
+		if($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('tabpanel_view_inexistent');
@@ -185,7 +185,7 @@ 
      */
     public function setAutoSwitch($value)
     {
-        $this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
+        $this->setViewState('AutoSwitch', TPropertyValue::ensureBoolean($value));
     }
 
 
@@ -194,7 +194,7 @@ 
      */
     public function getCssUrl()
     {
-        return $this->getViewState('CssUrl','default');
+        return $this->getViewState('CssUrl', 'default');
     }
 
     /**
@@ -202,7 +202,7 @@ 
      */
     public function setCssUrl($value)
     {
-        $this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+        $this->setViewState('CssUrl', TPropertyValue::ensureString($value), '');
     }
 
     /**
@@ -211,7 +211,7 @@ 
     public function getCssClass()
     {
     	$cssClass=parent::getCssClass();
-    	return $cssClass===''?'tab-panel':$cssClass;
+    	return $cssClass==='' ? 'tab-panel' : $cssClass;
     }
 
     /**
@@ -235,11 +235,11 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style=$this->getViewState('ViewStyle',null))===null)
+		if(($style=$this->getViewState('ViewStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-view');
-			$this->setViewState('ViewStyle',$style,null);
+			$this->setViewState('ViewStyle', $style, null);
 		}
 		return $style;
 	}
@@ -265,11 +265,11 @@ 
 	 */
 	public function getTabStyle()
 	{
-		if(($style=$this->getViewState('TabStyle',null))===null)
+		if(($style=$this->getViewState('TabStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-normal');
-			$this->setViewState('TabStyle',$style,null);
+			$this->setViewState('TabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -295,11 +295,11 @@ 
 	 */
 	public function getActiveTabStyle()
 	{
-		if(($style=$this->getViewState('ActiveTabStyle',null))===null)
+		if(($style=$this->getViewState('ActiveTabStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-active');
-			$this->setViewState('ActiveTabStyle',$style,null);
+			$this->setViewState('ActiveTabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -333,11 +333,11 @@ 
 	 * @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(($index=$values[$this->getClientID().'_1'])!==null)
 		{
-			$index=(int)$index;
+			$index=(int) $index;
 			$currentIndex=$this->getActiveViewIndex();
 			if($currentIndex!==$index)
 			{
@@ -377,7 +377,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->setCssClass($this->getCssClass());
 		parent::addAttributesToRender($writer);
 	}
@@ -390,7 +390,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 
 		$page=$this->getPage();
@@ -405,17 +405,17 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		$url = $this->getCssUrl();
+		$url=$this->getCssUrl();
 
-		if($url === '') {
+		if($url==='') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
+		if($url==='default') {
+			$url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
 		}
 
-		if($url !== '') {
+		if($url!=='') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -433,7 +433,7 @@ 
 		$code="new $className($options);";
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
-		$index = $this->getActiveViewIndex();
+		$index=$this->getActiveViewIndex();
 		if(!$this->getViews()->itemAt($index)->Visible)
 			$index=0;
 		$cs->registerHiddenField($id.'_1', $index);
@@ -454,19 +454,19 @@ 
 	 */
 	protected function getClientOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ActiveCssClass'] = $this->getActiveTabCssClass();
-		$options['NormalCssClass'] = $this->getTabCssClass();
-		$viewIDs = array();
-		$viewVis = array();
+		$options['ID']=$this->getClientID();
+		$options['ActiveCssClass']=$this->getActiveTabCssClass();
+		$options['NormalCssClass']=$this->getTabCssClass();
+		$viewIDs=array();
+		$viewVis=array();
 		foreach($this->getViews() as $view)
 		{
-			$viewIDs[] = $view->getClientID();
-			$viewVis[] = $view->getVisible();
+			$viewIDs[]=$view->getClientID();
+			$viewVis[]=$view->getVisible();
 		}
-		$options['Views'] = $viewIDs;
-		$options['ViewsVis'] = $viewVis;
-		$options['AutoSwitch'] = $this->getAutoSwitch();
+		$options['Views']=$viewIDs;
+		$options['ViewsVis']=$viewVis;
+		$options['AutoSwitch']=$this->getAutoSwitch();
 
 		return $options;
 	}
@@ -501,7 +501,7 @@ 
 	public function renderContents($writer)
 	{
 		$views=$this->getViews();
-		if($views->getCount()>0)
+		if($views->getCount() > 0)
 		{
 			$writer->writeLine();
 			// render tab bar
@@ -560,13 +560,13 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
-			$this->getStyle()->setStyleField('display','none');
+			$this->getStyle()->setStyleField('display', 'none');
 
 		$this->getStyle()->mergeWith($this->getParent()->getViewStyle());
 
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -582,7 +582,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Caption', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -590,7 +590,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -600,7 +600,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('NavigateUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -608,7 +608,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -618,7 +618,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -657,9 +657,9 @@ 
 	{
 		if($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
 		{
-			$writer->addAttribute('id',$this->getClientID().'_0');
+			$writer->addAttribute('id', $this->getClientID().'_0');
 
-			$style=$this->getActive()?$this->getParent()->getActiveTabStyle():$this->getParent()->getTabStyle();
+			$style=$this->getActive() ? $this->getParent()->getActiveTabStyle() : $this->getParent()->getTabStyle();
 			$style->addAttributesToRender($writer);
 
 			$writer->renderBeginTag($this->getTagName());
@@ -703,10 +703,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a {@link TTabView} object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TTabView)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
 	}

framework/Web/UI/WebControls/TTemplateColumn.php

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	}
 
 	/**
-	 * @return ITemplate the item template
+	 * @return string the item template
 	 */
 	public function getItemTemplate()
 	{

Braces +4 added lines, -8 removed lines

@@ -197,8 +197,7 @@ 
 					$classPath=$this->getItemRenderer();
 					$template=$this->_itemTemplate;
 				}
-			}
-			else
+			} else
 			{
 				$template=$this->_itemTemplate;
 				$classPath=$this->getItemRenderer();
@@ -214,13 +213,11 @@ 
 				}
 				if($control instanceof IDataRenderer)
 					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-			}
-			else if($template!==null)
+			} else if($template!==null)
 				$template->instantiateIn($cell);
 			else if($itemType!==TListItemType::EditItem)
 				$cell->setText(' ');
-		}
-		else if($itemType===TListItemType::Header)
+		} else if($itemType===TListItemType::Header)
 		{
 			if(($classPath=$this->getHeaderRenderer())!=='')
 				$this->initializeHeaderCell($cell,$columnIndex);
@@ -228,8 +225,7 @@ 
 				$this->_headerTemplate->instantiateIn($cell);
 			else
 				$this->initializeHeaderCell($cell,$columnIndex);
-		}
-		else if($itemType===TListItemType::Footer)
+		} else if($itemType===TListItemType::Footer)
 		{
 			if(($classPath=$this->getFooterRenderer())!=='')
 				$this->initializeFooterCell($cell,$columnIndex);

Spacing +15 added lines, -15 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_editItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','EditItemTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_itemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_headerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_footerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
@@ -213,7 +213,7 @@ 
 					$control->setItemType($itemType);
 				}
 				if($control instanceof IDataRenderer)
-					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+					$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			}
 			else if($template!==null)
 				$template->instantiateIn($cell);
@@ -223,20 +223,20 @@ 
 		else if($itemType===TListItemType::Header)
 		{
 			if(($classPath=$this->getHeaderRenderer())!=='')
-				$this->initializeHeaderCell($cell,$columnIndex);
+				$this->initializeHeaderCell($cell, $columnIndex);
 			else if($this->_headerTemplate!==null)
 				$this->_headerTemplate->instantiateIn($cell);
 			else
-				$this->initializeHeaderCell($cell,$columnIndex);
+				$this->initializeHeaderCell($cell, $columnIndex);
 		}
 		else if($itemType===TListItemType::Footer)
 		{
 			if(($classPath=$this->getFooterRenderer())!=='')
-				$this->initializeFooterCell($cell,$columnIndex);
+				$this->initializeFooterCell($cell, $columnIndex);
 			else if($this->_footerTemplate!==null)
 				$this->_footerTemplate->instantiateIn($cell);
 			else
-				$this->initializeFooterCell($cell,$columnIndex);
+				$this->initializeFooterCell($cell, $columnIndex);
 		}
 	}
 
@@ -245,7 +245,7 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$sender->setData($item->getData());

framework/Web/UI/WebControls/TTextBox.php

Doc Comments +3 added lines, -1 removed lines

@@ -237,7 +237,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()
 	{
@@ -342,6 +342,7 @@ 
 	 * An automatic postback to the server will occur whenever the user
 	 * modifies the text in the TTextBox control and then tabs out of the component.
 	 * @param boolean the value indicating if postback automatically
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -425,6 +426,7 @@ 
 
 	/**
 	 * @param boolean whether the textbox is read only
+	 * @param boolean $value
 	 */
 	public function setReadOnly($value)
 	{

Indentation +4 added lines, -4 removed lines

@@ -251,14 +251,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);
 	}
 
 	/**
@@ -329,8 +329,8 @@ 
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user modifies the text in the TTextBox control and
-     * then tabs out of the component. Defaults to false.
+	 * will occur whenever the user modifies the text in the TTextBox control and
+	 * then tabs out of the component. Defaults to false.
 	 */
 	public function getAutoPostBack()
 	{

Spacing +67 added lines, -67 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		return ($this->getTextMode()==='MultiLine')?'textarea':'input';
+		return ($this->getTextMode()==='MultiLine') ? 'textarea' : 'input';
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -101,66 +101,66 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 		if(($uid=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uid);
+			$writer->addAttribute('name', $uid);
 		if(($textMode=$this->getTextMode())===TTextBoxMode::MultiLine)
 		{
-			if(($rows=$this->getRows())<=0)
+			if(($rows=$this->getRows()) <= 0)
 				$rows=self::DEFAULT_ROWS;
-			if(($cols=$this->getColumns())<=0)
+			if(($cols=$this->getColumns()) <= 0)
 				$cols=self::DEFAULT_COLUMNS;
-			$writer->addAttribute('rows',"$rows");
-			$writer->addAttribute('cols',"$cols");
+			$writer->addAttribute('rows', "$rows");
+			$writer->addAttribute('cols', "$cols");
 			if(!$this->getWrap())
-				$writer->addAttribute('wrap','off');
+				$writer->addAttribute('wrap', 'off');
 		}
 		else
 		{
 			if($textMode===TTextBoxMode::SingleLine)
 			{
-				$writer->addAttribute('type','text');
+				$writer->addAttribute('type', 'text');
 				if(($text=$this->getText())!=='')
-					$writer->addAttribute('value',$text);
+					$writer->addAttribute('value', $text);
 			}
 			else
 			{
 				if($this->getPersistPassword() && ($text=$this->getText())!=='')
-					$writer->addAttribute('value',$text);
-				$writer->addAttribute('type','password');
+					$writer->addAttribute('value', $text);
+				$writer->addAttribute('type', 'password');
 			}
 
 			if(($act=$this->getAutoCompleteType())!=='None')
 			{
 				if($act==='Disabled')
-					$writer->addAttribute('autocomplete','off');
+					$writer->addAttribute('autocomplete', 'off');
 				else if($act==='Search')
-					$writer->addAttribute('vcard_name','search');
+					$writer->addAttribute('vcard_name', 'search');
 				else if($act==='HomeCountryRegion')
-					$writer->addAttribute('vcard_name','HomeCountry');
+					$writer->addAttribute('vcard_name', 'HomeCountry');
 				else if($act==='BusinessCountryRegion')
-					$writer->addAttribute('vcard_name','BusinessCountry');
+					$writer->addAttribute('vcard_name', 'BusinessCountry');
 				else
 				{
-					if(strpos($act,'Business')===0)
-						$act='Business'.'.'.substr($act,8);
-					else if(strpos($act,'Home')===0)
-						$act='Home'.'.'.substr($act,4);
-					$writer->addAttribute('vcard_name','vCard.'.$act);
+					if(strpos($act, 'Business')===0)
+						$act='Business'.'.'.substr($act, 8);
+					else if(strpos($act, 'Home')===0)
+						$act='Home'.'.'.substr($act, 4);
+					$writer->addAttribute('vcard_name', 'vCard.'.$act);
 				}
 			}
 
-			if(($cols=$this->getColumns())>0)
-				$writer->addAttribute('size',"$cols");
-			if(($maxLength=$this->getMaxLength())>0)
-				$writer->addAttribute('maxlength',"$maxLength");
+			if(($cols=$this->getColumns()) > 0)
+				$writer->addAttribute('size', "$cols");
+			if(($maxLength=$this->getMaxLength()) > 0)
+				$writer->addAttribute('maxlength', "$maxLength");
 		}
 		if($this->getReadOnly())
-			$writer->addAttribute('readonly','readonly');
+			$writer->addAttribute('readonly', 'readonly');
 		$isEnabled=$this->getEnabled(true);
 		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		if($isEnabled
 			&& $this->getEnableClientScript()
-			&& ( $this->getAutoPostBack() || $textMode===TTextBoxMode::SingleLine)
+			&& ($this->getAutoPostBack() || $textMode===TTextBoxMode::SingleLine)
 			&& $page->getClientSupportsJavaScript())
 		{
 			$this->renderClientControlScript($writer);
@@ -173,9 +173,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -194,12 +194,12 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['TextMode'] = $this->getTextMode();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['TextMode']=$this->getTextMode();
 		return $options;
 	}
 
@@ -210,7 +210,7 @@ 
 	 * @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)
 	{
 		$value=$values[$key];
 		if($this->getAutoTrim())
@@ -271,7 +271,7 @@ 
 	 */
 	public function onTextChanged($param)
 	{
-		$this->raiseEvent('OnTextChanged',$this,$param);
+		$this->raiseEvent('OnTextChanged', $this, $param);
 	}
 
 	/**
@@ -315,7 +315,7 @@ 
 	 */
 	public function getAutoCompleteType()
 	{
-		return $this->getViewState('AutoCompleteType',TTextBoxAutoCompleteType::None);
+		return $this->getViewState('AutoCompleteType', TTextBoxAutoCompleteType::None);
 	}
 
 	/**
@@ -324,7 +324,7 @@ 
 	 */
 	public function setAutoCompleteType($value)
 	{
-		$this->setViewState('AutoCompleteType',TPropertyValue::ensureEnum($value,'TTextBoxAutoCompleteType'),TTextBoxAutoCompleteType::None);
+		$this->setViewState('AutoCompleteType', TPropertyValue::ensureEnum($value, 'TTextBoxAutoCompleteType'), TTextBoxAutoCompleteType::None);
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -345,7 +345,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 	 */
 	public function getAutoTrim()
 	{
-		return $this->getViewState('AutoTrim',false);
+		return $this->getViewState('AutoTrim', false);
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	 */
 	public function setAutoTrim($value)
 	{
-		$this->setViewState('AutoTrim',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoTrim', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -370,7 +370,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -378,7 +378,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -386,7 +386,7 @@ 
 	 */
 	public function getColumns()
 	{
-		return $this->getViewState('Columns',0);
+		return $this->getViewState('Columns', 0);
 	}
 
 	/**
@@ -395,7 +395,7 @@ 
 	 */
 	public function setColumns($value)
 	{
-		$this->setViewState('Columns',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Columns', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -403,7 +403,7 @@ 
 	 */
 	public function getMaxLength()
 	{
-		return $this->getViewState('MaxLength',0);
+		return $this->getViewState('MaxLength', 0);
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 	 */
 	public function setMaxLength($value)
 	{
-		$this->setViewState('MaxLength',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('MaxLength', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -428,7 +428,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -436,7 +436,7 @@ 
 	 */
 	public function getRows()
 	{
-		return $this->getViewState('Rows',self::DEFAULT_ROWS);
+		return $this->getViewState('Rows', self::DEFAULT_ROWS);
 	}
 
 	/**
@@ -445,7 +445,7 @@ 
 	 */
 	public function setRows($value)
 	{
-		$this->setViewState('Rows',TPropertyValue::ensureInteger($value),self::DEFAULT_ROWS);
+		$this->setViewState('Rows', TPropertyValue::ensureInteger($value), self::DEFAULT_ROWS);
 	}
 
 	/**
@@ -453,7 +453,7 @@ 
 	 */
 	public function getPersistPassword()
 	{
-		return $this->getViewState('PersistPassword',false);
+		return $this->getViewState('PersistPassword', false);
 	}
 
 	/**
@@ -461,7 +461,7 @@ 
 	 */
 	public function setPersistPassword($value)
 	{
-		$this->setViewState('PersistPassword',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('PersistPassword', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -469,7 +469,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -478,8 +478,8 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
-		$this->_safeText = null;
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
+		$this->_safeText=null;
 	}
 
 	/**
@@ -533,7 +533,7 @@ 
 	 */
 	public function getTextMode()
 	{
-		return $this->getViewState('TextMode',TTextBoxMode::SingleLine);
+		return $this->getViewState('TextMode', TTextBoxMode::SingleLine);
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	public function setTextMode($value)
 	{
-		$this->setViewState('TextMode',TPropertyValue::ensureEnum($value,'TTextBoxMode'),TTextBoxMode::SingleLine);
+		$this->setViewState('TextMode', TPropertyValue::ensureEnum($value, 'TTextBoxMode'), TTextBoxMode::SingleLine);
 	}
 
 	/**
@@ -551,7 +551,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -559,7 +559,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->getViewState('Wrap',true);
+		return $this->getViewState('Wrap', true);
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	 */
 	public function setWrap($value)
 	{
-		$this->setViewState('Wrap',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Wrap', TPropertyValue::ensureBoolean($value), true);
 	}
 }
 

Braces +3 added lines, -6 removed lines

@@ -323,8 +323,7 @@ 
 				$writer->addAttributes($attributes);
 			if($value!==null)
 				$attributes->add('value',$value);
-		}
-		else
+		} else
 			$onclick='';
     if($needspan=$this->getSpanNeeded())
     {
@@ -338,14 +337,12 @@ 
 			{
 				$this->renderLabel($writer,$clientID,$text);
 				$this->renderInputTag($writer,$clientID,$onclick);
-			}
-			else
+			} else
 			{
 				$this->renderInputTag($writer,$clientID,$onclick);
 				$this->renderLabel($writer,$clientID,$text);
 			}
-		}
-		else
+		} else
 			$this->renderInputTag($writer,$clientID,$onclick);
 		if($needspan)
 			$writer->renderEndTag();

framework/Web/UI/WebControls/TTextHighlighter.php

Doc Comments +1 added lines

@@ -157,6 +157,7 @@
 	 * Processes a text string.
 	 * This method is required by the parent class.
 	 * @param string text string to be processed
+	 * @param string $text
 	 * @return string the processed text result
 	 */
 	public function processText($text)

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 		try
 		{
 			$highlighter=Text_Highlighter::factory($this->getLanguage());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$highlighter=false;
 		}

Spacing +8 added lines, -8 removed lines

@@ -9,8 +9,8 @@ 
  * @package System.Web.UI.WebControls
  */
 
-Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter',false);
-Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter.Renderer.Html',false);
+Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter', false);
+Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter.Renderer.Html', false);
 Prado::using('System.Web.UI.WebControls.TTextProcessor');
 
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function setLineNumberStyle($value)
 	{
-		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value,'TTextHighlighterLineNumberStyle'));
+		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value, 'TTextHighlighterLineNumberStyle'));
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	protected function registerStyleSheet()
 	{
 		$cs=$this->getPage()->getClientScript();
-		$cssFile=Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight','.css');
+		$cssFile=Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight', '.css');
 		$cssKey='prado:TTextHighlighter:'.$cssFile;
 		if(!$cs->isStyleSheetFileRegistered($cssKey))
 			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
@@ -173,9 +173,9 @@ 
 			return ('<pre>'.htmlentities(trim($text)).'</pre>');
 
 		$options["use_language"]=true;
-		$options["tabsize"] = $this->getTabSize();
-		if ($this->getShowLineNumbers())
-			$options["numbers"] = self::$_lineNumberStyle[$this->getLineNumberStyle()];
+		$options["tabsize"]=$this->getTabSize();
+		if($this->getShowLineNumbers())
+			$options["numbers"]=self::$_lineNumberStyle[$this->getLineNumberStyle()];
 		$highlighter->setRenderer(new Text_Highlighter_Renderer_Html($options));
 		return $highlighter->highlight(trim($text));
 	}
@@ -185,7 +185,7 @@ 
 	 */
 	protected function getHeaderTemplate()
 	{
-		$id = $this->getClientID();
+		$id=$this->getClientID();
 		return TJavaScript::renderScriptBlock("new Prado.WebUI.TTextHighlighter('{$id}');");
 	}
 

framework/Web/UI/WebControls/TWebControl.php

Doc Comments +6 added lines, -2 removed lines

@@ -55,6 +55,7 @@ 
 	 * control does work with javascript and your class wants to flag that it requires an id
 	 * to operate properly.  Once set to true, it stays that way.
 	 * @param boolean pass true to enable enforcement of the tag attribute id.
+	 * @param boolean $value
 	 */
 	public function setEnsureId($value)
 	{
@@ -62,7 +63,7 @@ 
 	}
 
 	/**
-	 * @return whether this web control must have an id
+	 * @return boolean this web control must have an id
 	 */
 	public function getEnsureId()
 	{
@@ -215,6 +216,7 @@ 
 
 	/**
 	 * @param string the foreground color of the control
+	 * @param string $value
 	 */
 	public function setForeColor($value)
 	{
@@ -241,7 +243,7 @@ 
 	}
 
 	/**
-	 * @return TDisplayStyle display style of the control, default is TDisplayStyle::Fixed
+	 * @return string display style of the control, default is TDisplayStyle::Fixed
 	 */
 	public function getDisplay()
 	{
@@ -269,6 +271,7 @@ 
 
 	/**
 	 * @param string the height of the control
+	 * @param string $value
 	 */
 	public function setHeight($value)
 	{
@@ -390,6 +393,7 @@ 
 
 	/**
 	 * @param string the width of the control
+	 * @param string $value
 	 */
 	public function setWidth($value)
 	{

Spacing +33 added lines, -33 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function setEnsureId($value)
 	{
-		$this->_ensureid |= TPropertyValue::ensureBoolean($value);
+		$this->_ensureid|=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	public function getDecorator($create=true)
 	{
 		if($create && !$this->_decorator)
-			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
+			$this->_decorator=Prado::createComponent('TWebControlDecorator', $this);
 		return $this->_decorator;
 	}
 
@@ -101,7 +101,7 @@ 
 	 */
 	public function getAccessKey()
 	{
-		return $this->getViewState('AccessKey','');
+		return $this->getViewState('AccessKey', '');
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 */
 	public function setAccessKey($value)
 	{
-		if(strlen($value)>1)
-			throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
-		$this->setViewState('AccessKey',$value,'');
+		if(strlen($value) > 1)
+			throw new TInvalidDataValueException('webcontrol_accesskey_invalid', get_class($this), $value);
+		$this->setViewState('AccessKey', $value, '');
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBackColor();
 		else
 			return '';
@@ -142,7 +142,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderColor();
 		else
 			return '';
@@ -161,7 +161,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderStyle();
 		else
 			return '';
@@ -180,7 +180,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderWidth();
 		else
 			return '';
@@ -207,7 +207,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getForeColor();
 		else
 			return '';
@@ -226,7 +226,7 @@ 
 	 */
 	public function getHeight()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getHeight();
 		else
 			return '';
@@ -261,7 +261,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getCssClass();
 		else
 			return '';
@@ -280,7 +280,7 @@ 
 	 */
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style',null)!==null;
+		return $this->getViewState('Style', null)!==null;
 	}
 
 	/**
@@ -298,12 +298,12 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style;
 		else
 		{
 			$style=$this->createStyle();
-			$this->setViewState('Style',$style,null);
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
@@ -319,7 +319,7 @@ 
 		if(is_string($value))
 			$this->getStyle()->setCustomStyle($value);
 		else
-			throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+			throw new TInvalidDataValueException('webcontrol_style_invalid', get_class($this));
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 	 */
 	public function getTabIndex()
 	{
-		return $this->getViewState('TabIndex',0);
+		return $this->getViewState('TabIndex', 0);
 	}
 
 	/**
@@ -345,7 +345,7 @@ 
 	 */
 	public function setTabIndex($value)
 	{
-		$this->setViewState('TabIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	 */
 	public function getToolTip()
 	{
-		return $this->getViewState('ToolTip','');
+		return $this->getViewState('ToolTip', '');
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function setToolTip($value)
 	{
-		$this->setViewState('ToolTip',$value,'');
+		$this->setViewState('ToolTip', $value, '');
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function getWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getWidth();
 		else
 			return '';
@@ -404,7 +404,7 @@ 
 	 * @param TEventParameter event parameter to be passed to the event handlers
 	 */
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
+		if($decorator=$this->getDecorator(false))
 			$decorator->instantiate();
 
 		parent::onPreRender($param);
@@ -420,21 +420,21 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
+			$writer->addAttribute('accesskey', $accessKey);
 		if(!$this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		if(($tabIndex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabIndex");
+			$writer->addAttribute('disabled', 'disabled');
+		if(($tabIndex=$this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabIndex");
 		if(($toolTip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$toolTip);
-		if($style=$this->getViewState('Style',null))
+			$writer->addAttribute('title', $toolTip);
+		if($style=$this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 		if($this->getHasAttributes())
 		{
 			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+				$writer->addAttribute($name, $value);
 		}
 	}
 
@@ -460,7 +460,7 @@ 
 	 */
 	public function renderBeginTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPreTagText($writer);
 			$this->addAttributesToRender($writer);
 			$writer->renderBeginTag($this->getTagName());
@@ -488,7 +488,7 @@ 
 	 */
 	public function renderEndTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);