pradosoft / prado

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

@@ -46,7 +46,7 @@ 
  */
 class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 {
-	const MAX_STEPS=200;
+	const MAX_STEPS = 200;
 	/**
 	 * @var TSliderHandle handle component
 	 */
@@ -54,11 +54,11 @@ 
 	/*
 	 * @var boolean Wether the data has changed during postback
 	 */
-	private $_dataChanged=false;
+	private $_dataChanged = false;
 	/**
 	 * @var TSliderClientScript Clients side javascripts
 	 */
-	private $_clientScript=null;
+	private $_clientScript = null;
 
 	/**
 	 * @return TSliderDirection Direction of slider (Horizontal or Vertical). Defaults to Horizontal.
@@ -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,13 +290,13 @@ 
 	 * @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'];
-		if($this->getValue()!==$value)
+		$value = (float) $values[$this->getClientID() . '_1'];
+		if ($this->getValue() !== $value)
 		{
 			$this->setValue($value);
-			return $this->_dataChanged=true;
+			return $this->_dataChanged = true;
 		}
 		else
 			return false;
@@ -315,7 +315,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript===null)
+		if ($this->_clientScript === null)
 			$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,11 +343,11 @@ 
 	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';
-			$writer->addAttribute('class', 'Slider '.$class);
+			$class = ($this->getDirection() == TSliderDirection::Horizontal) ? 'HorizontalSlider' : 'VerticalSlider';
+			$writer->addAttribute('class', 'Slider ' . $class);
 		}
 
 	}
@@ -359,13 +359,13 @@ 
 	{
 		// Render the 'Track'
 		$writer->addAttribute('class', 'Track');
-		$writer->addAttribute('id', $this->getClientID().'_track');
+		$writer->addAttribute('id', $this->getClientID() . '_track');
 		$writer->renderBeginTag('div');
 		// Render the 'Progress Indicator'
 		if ($this->getProgressIndicator())
 		{
 			$writer->addAttribute('class', 'Progress');
-			$writer->addAttribute('id', $this->getClientID().'_progress');
+			$writer->addAttribute('id', $this->getClientID() . '_progress');
 			$writer->renderBeginTag('div');
 			$writer->renderEndTag();
 		}
@@ -390,7 +390,7 @@ 
 
 		// Render the 'Handle'
 		$writer->addAttribute('class', 'Handle');
-		$writer->addAttribute('id', $this->getClientID().'_handle');
+		$writer->addAttribute('id', $this->getClientID() . '_handle');
 		$writer->renderBeginTag('div');
 		$writer->renderEndTag();
 	}
@@ -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();
@@ -414,14 +414,14 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		if(($url=$this->getCssUrl())==='')
+		if (($url = $this->getCssUrl()) === '')
 		{
-			$manager=$this->getApplication()->getAssetManager();
+			$manager = $this->getApplication()->getAssetManager();
 			// publish the assets
-			$url=$manager->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'TSlider');
-			$url.='/TSlider.css';
+			$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);
 	}
 
 	/**
@@ -429,13 +429,13 @@ 
 	 */
 	protected function registerSliderClientScript()
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$cs = $page->getClientScript();
 		$cs->registerPradoScript("slider");
-		$id=$this->getClientID();
-		$cs->registerHiddenField($id.'_1',$this->getValue());
+		$id = $this->getClientID();
+		$cs->registerHiddenField($id . '_1', $this->getValue());
 		$page->registerRequiresPostData($this);
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getSliderOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getSliderOptions());
 	}
 
 	/**
@@ -450,20 +450,20 @@ 
 		$options['AutoPostBack'] = $this->getAutoPostBack();
 
 		// Slider Control options
-		$minValue=$this->getMinValue();
-		$maxValue=$this->getMaxValue();
+		$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();
-		$values=$this->getValues();
+		$values = $this->getValues();
 		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)
 			{
@@ -474,21 +474,21 @@ 
 		else
 		{
 			// Values are not provided, generate automatically using stepsize
-			$step=$this->getStepSize();
+			$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)
-				$values[]=$i;
+			$values = array();
+			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;
-		if($this->_clientScript!==null)
-			$options = array_merge($options,$this->_clientScript->getOptions()->toArray());
+		if ($this->_clientScript !== null)
+			$options = array_merge($options, $this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
 }
@@ -517,7 +517,7 @@ 
 	 */
 	public function setOnChange($javascript)
 	{
-		$code=TJavascript::quoteJsLiteral("function (value) { {$javascript} }");
+		$code = TJavascript::quoteJsLiteral("function (value) { {$javascript} }");
 		$this->setFunction('onChange', $code);
 	}
 
@@ -534,7 +534,7 @@ 
 	 */
 	public function setOnSlide($javascript)
 	{
-		$code=TJavascript::quoteJsLiteral("function (value) { {$javascript} }");
+		$code = TJavascript::quoteJsLiteral("function (value) { {$javascript} }");
 		$this->setFunction('onSlide', $code);
 	}
 
@@ -563,8 +563,8 @@ 
  */
 class TSliderDirection extends TEnumerable
 {
-	const Horizontal='Horizontal';
-	const Vertical='Vertical';
+	const Horizontal = 'Horizontal';
+	const Vertical = 'Vertical';
 }
 
 

Braces +27 added lines, -15 removed lines

@@ -297,9 +297,9 @@ 
 		{
 			$this->setValue($value);
 			return $this->_dataChanged=true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -315,8 +315,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript===null) {
+					$this->_clientScript = $this->createClientScript();
+		}
 		return $this->_clientScript;
 	}
 
@@ -462,16 +463,23 @@ 
 		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)
 			{
-				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
+		} else
 		{
 			// Values are not provided, generate automatically using stepsize
 			$step=$this->getStepSize();
@@ -481,14 +489,18 @@ 
 				$step=($maxValue-$minValue)/self::MAX_STEPS;
 			}
 			$values=array();
-			for ($i=$minValue;$i<=$maxValue;$i+=$step)
-				$values[]=$i;
+			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;
-		if($this->_clientScript!==null)
-			$options = array_merge($options,$this->_clientScript->getOptions()->toArray());
+		if($this->_clientScript!==null) {
+					$options = array_merge($options,$this->_clientScript->getOptions()->toArray());
+		}
 		return $options;
 	}
 }

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

@@ -28,23 +28,23 @@ 
 	/**
 	 * @var array storage of CSS fields
 	 */
-	private $_fields=array();
+	private $_fields = array();
 	/**
 	 * @var TFont font object
 	 */
-	private $_font=null;
+	private $_font = null;
 	/**
 	 * @var string CSS class name
 	 */
-	private $_class=null;
+	private $_class = null;
 	/**
 	 * @var string CSS style string (those not represented by specific fields of TStyle)
 	 */
-	private $_customStyle=null;
+	private $_customStyle = null;
 	/**
 	 * @var string display style
 	 */
-	private $_displayStyle='Fixed';
+	private $_displayStyle = 'Fixed';
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -55,15 +55,15 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_fields===array())
+		if ($this->_fields === array())
 			$exprops[] = "\0TStyle\0_fields";
-		if($this->_font===null)
+		if ($this->_font === null)
 			$exprops[] = "\0TStyle\0_font";
-		if($this->_class===null)
+		if ($this->_class === null)
 			$exprops[] = "\0TStyle\0_class";
-		if ($this->_customStyle===null)
+		if ($this->_customStyle === null)
 			$exprops[] = "\0TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
+		if ($this->_displayStyle === 'Fixed')
 			$exprops[] = "\0TStyle\0_displayStyle";
 	}
 
@@ -71,9 +71,9 @@ 
 	 * Constructor.
 	 * @param TStyle style to copy from
 	 */
-	public function __construct($style=null)
+	public function __construct($style = null)
 	{
-		if($style!==null)
+		if ($style !== null)
 			$this->copyFrom($style);
 	}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function __clone()
 	{
-		if($this->_font!==null)
+		if ($this->_font !== null)
 			$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'] : '';
 	}
 
 	/**
@@ -99,10 +99,10 @@ 
 	 */
 	public function setBackColor($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['background-color']);
 		else
-			$this->_fields['background-color']=$value;
+			$this->_fields['background-color'] = $value;
 	}
 
 	/**
@@ -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'] : '';
 	}
 
 	/**
@@ -118,10 +118,10 @@ 
 	 */
 	public function setBorderColor($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['border-color']);
 		else
-			$this->_fields['border-color']=$value;
+			$this->_fields['border-color'] = $value;
 	}
 
 	/**
@@ -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'] : '';
 	}
 
 	/**
@@ -138,10 +138,10 @@ 
 	 */
 	public function setBorderStyle($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['border-style']);
 		else
-			$this->_fields['border-style']=$value;
+			$this->_fields['border-style'] = $value;
 	}
 
 	/**
@@ -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'] : '';
 	}
 
 	/**
@@ -157,10 +157,10 @@ 
 	 */
 	public function setBorderWidth($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['border-width']);
 		else
-			$this->_fields['border-width']=$value;
+			$this->_fields['border-width'] = $value;
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class === null ? '' : $this->_class;
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function hasCssClass()
 	{
-		return ($this->_class!==null);
+		return ($this->_class !== null);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function setCssClass($value)
 	{
-		$this->_class=$value;
+		$this->_class = $value;
 	}
 
 	/**
@@ -192,8 +192,8 @@ 
 	 */
 	public function getFont()
 	{
-		if($this->_font===null)
-			$this->_font=new TFont;
+		if ($this->_font === null)
+			$this->_font = new TFont;
 		return $this->_font;
 	}
 
@@ -211,7 +211,7 @@ 
 	public function setDisplayStyle($value)
 	{
 		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'TDisplayStyle');
-		switch($this->_displayStyle)
+		switch ($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
 				$this->_fields['display'] = 'none';
@@ -241,7 +241,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -249,10 +249,10 @@ 
 	 */
 	public function setForeColor($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['color']);
 		else
-			$this->_fields['color']=$value;
+			$this->_fields['color'] = $value;
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -268,10 +268,10 @@ 
 	 */
 	public function setHeight($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['height']);
 		else
-			$this->_fields['height']=$value;
+			$this->_fields['height'] = $value;
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle === null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -289,7 +289,7 @@ 
 	 */
 	public function setCustomStyle($value)
 	{
-		$this->_customStyle=$value;
+		$this->_customStyle = $value;
 	}
 
 	/**
@@ -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,9 +306,9 @@ 
 	 * @param string style field name
 	 * @param string style field value
 	 */
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
-		$this->_fields[$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'] : '';
 	}
 
 	/**
@@ -341,7 +341,7 @@ 
 	 */
 	public function setWidth($value)
 	{
-		$this->_fields['width']=$value;
+		$this->_fields['width'] = $value;
 	}
 
 	/**
@@ -349,10 +349,10 @@ 
 	 */
 	public function reset()
 	{
-		$this->_fields=array();
-		$this->_font=null;
-		$this->_class=null;
-		$this->_customStyle=null;
+		$this->_fields = array();
+		$this->_font = null;
+		$this->_class = null;
+		$this->_customStyle = null;
 	}
 
 	/**
@@ -363,14 +363,14 @@ 
 	 */
 	public function copyFrom($style)
 	{
-		if($style instanceof TStyle)
+		if ($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
-			if($style->_class!==null)
-				$this->_class=$style->_class;
-			if($style->_customStyle!==null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
+			$this->_fields = array_merge($this->_fields, $style->_fields);
+			if ($style->_class !== null)
+				$this->_class = $style->_class;
+			if ($style->_customStyle !== null)
+				$this->_customStyle = $style->_customStyle;
+			if ($style->_font !== null)
 				$this->getFont()->copyFrom($style->_font);
 		}
 	}
@@ -383,14 +383,14 @@ 
 	 */
 	public function mergeWith($style)
 	{
-		if($style instanceof TStyle)
+		if ($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
-			if($this->_class===null)
-				$this->_class=$style->_class;
-			if($this->_customStyle===null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
+			$this->_fields = array_merge($style->_fields, $this->_fields);
+			if ($this->_class === null)
+				$this->_class = $style->_class;
+			if ($this->_customStyle === null)
+				$this->_customStyle = $style->_customStyle;
+			if ($style->_font !== null)
 				$this->getFont()->mergeWith($style->_font);
 		}
 	}
@@ -401,20 +401,20 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_customStyle!==null)
+		if ($this->_customStyle !== null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach (explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
-				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+				$arr = explode(':', $style, 2);
+				if (isset($arr[1]) && trim($arr[0]) !== '')
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
-		if($this->_font!==null)
+		if ($this->_font !== null)
 			$this->_font->addAttributesToRender($writer);
-		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+		if ($this->_class !== null)
+			$writer->addAttribute('class', $this->_class);
 	}
 
 	/**
@@ -442,10 +442,10 @@ 
  */
 class TDisplayStyle extends TEnumerable
 {
-	const None='None';
-	const Dynamic='Dynamic';
-	const Fixed='Fixed';
-	const Hidden='Hidden';
+	const None = 'None';
+	const Dynamic = 'Dynamic';
+	const Fixed = 'Fixed';
+	const Hidden = 'Hidden';
 }
 
 /**
@@ -461,27 +461,27 @@ 
 	/**
 	 * @var TVerticalAlign the URL of the background image for the table
 	 */
-	private $_backImageUrl=null;
+	private $_backImageUrl = null;
 	/**
 	 * @var THorizontalAlign horizontal alignment of the contents within the table
 	 */
-	private $_horizontalAlign=null;
+	private $_horizontalAlign = null;
 	/**
 	 * @var integer cellpadding of the table
 	 */
-	private $_cellPadding=null;
+	private $_cellPadding = null;
 	/**
 	 * @var integer cellspacing of the table
 	 */
-	private $_cellSpacing=null;
+	private $_cellSpacing = null;
 	/**
 	 * @var TTableGridLines grid line setting of the table
 	 */
-	private $_gridLines=null;
+	private $_gridLines = null;
 	/**
 	 * @var boolean whether the table border should be collapsed
 	 */
-	private $_borderCollapse=null;
+	private $_borderCollapse = null;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -492,17 +492,17 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_backImageUrl===null)
+		if ($this->_backImageUrl === null)
 			$exprops[] = "\0TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign===null)
+		if ($this->_horizontalAlign === null)
 			$exprops[] = "\0TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding===null)
+		if ($this->_cellPadding === null)
 			$exprops[] = "\0TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing===null)
+		if ($this->_cellSpacing === null)
 			$exprops[] = "\0TTableStyle\0_cellSpacing";
-		if ($this->_gridLines===null)
+		if ($this->_gridLines === null)
 			$exprops[] = "\0TTableStyle\0_gridLines";
-		if ($this->_borderCollapse===null)
+		if ($this->_borderCollapse === null)
 			$exprops[] = "\0TTableStyle\0_borderCollapse";
 	}
 
@@ -513,12 +513,12 @@ 
 	 */
 	public function reset()
 	{
-		$this->_backImageUrl=null;
-		$this->_horizontalAlign=null;
-		$this->_cellPadding=null;
-		$this->_cellSpacing=null;
-		$this->_gridLines=null;
-		$this->_borderCollapse=null;
+		$this->_backImageUrl = null;
+		$this->_horizontalAlign = null;
+		$this->_cellPadding = null;
+		$this->_cellSpacing = null;
+		$this->_gridLines = null;
+		$this->_borderCollapse = null;
 	}
 
 	/**
@@ -530,20 +530,20 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableStyle)
+		if ($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+			if ($style->_backImageUrl !== null)
+				$this->_backImageUrl = $style->_backImageUrl;
+			if ($style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($style->_cellPadding !== null)
+				$this->_cellPadding = $style->_cellPadding;
+			if ($style->_cellSpacing !== null)
+				$this->_cellSpacing = $style->_cellSpacing;
+			if ($style->_gridLines !== null)
+				$this->_gridLines = $style->_gridLines;
+			if ($style->_borderCollapse !== null)
+				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
 
@@ -556,20 +556,20 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableStyle)
+		if ($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl===null && $style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_cellPadding===null && $style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($this->_cellSpacing===null && $style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($this->_gridLines===null && $style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($this->_borderCollapse===null && $style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+			if ($this->_backImageUrl === null && $style->_backImageUrl !== null)
+				$this->_backImageUrl = $style->_backImageUrl;
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($this->_cellPadding === null && $style->_cellPadding !== null)
+				$this->_cellPadding = $style->_cellPadding;
+			if ($this->_cellSpacing === null && $style->_cellSpacing !== null)
+				$this->_cellSpacing = $style->_cellSpacing;
+			if ($this->_gridLines === null && $style->_gridLines !== null)
+				$this->_gridLines = $style->_gridLines;
+			if ($this->_borderCollapse === null && $style->_borderCollapse !== null)
+				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
 
@@ -581,26 +581,26 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
+		if (($url = trim($this->getBackImageUrl())) !== '')
+			$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
 
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+			$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');
+		if ($this->getBorderCollapse())
+			$writer->addStyleAttribute('border-collapse', 'collapse');
 
-		switch($this->getGridLines())
+		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;
 	}
 
 	/**
@@ -620,7 +620,7 @@ 
 	 */
 	public function setBackImageUrl($value)
 	{
-		$this->_backImageUrl=$value;
+		$this->_backImageUrl = $value;
 	}
 
 	/**
@@ -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;
 	}
 
 	/**
@@ -707,7 +707,7 @@ 
 	 */
 	public function setBorderCollapse($value)
 	{
-		$this->_borderCollapse=TPropertyValue::ensureBoolean($value);
+		$this->_borderCollapse = TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -724,15 +724,15 @@ 
 	/**
 	 * @var THorizontalAlign horizontal alignment of the contents within the table item
 	 */
-	private $_horizontalAlign=null;
+	private $_horizontalAlign = null;
 	/**
 	 * @var TVerticalAlign vertical alignment of the contents within the table item
 	 */
-	private $_verticalAlign=null;
+	private $_verticalAlign = null;
 	/**
 	 * @var boolean whether the content wraps within the table item
 	 */
-	private $_wrap=null;
+	private $_wrap = null;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -743,11 +743,11 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_horizontalAlign===null)
+		if ($this->_horizontalAlign === null)
 			$exprops[] = "\0TTableItemStyle\0_horizontalAlign";
-		if ($this->_verticalAlign===null)
+		if ($this->_verticalAlign === null)
 			$exprops[] = "\0TTableItemStyle\0_verticalAlign";
-		if ($this->_wrap===null)
+		if ($this->_wrap === null)
 			$exprops[] = "\0TTableItemStyle\0_wrap";
 	}
 
@@ -759,9 +759,9 @@ 
 	public function reset()
 	{
 		parent::reset();
-		$this->_verticalAlign=null;
-		$this->_horizontalAlign=null;
-		$this->_wrap=null;
+		$this->_verticalAlign = null;
+		$this->_horizontalAlign = null;
+		$this->_wrap = null;
 	}
 
 	/**
@@ -773,14 +773,14 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableItemStyle)
+		if ($style instanceof TTableItemStyle)
 		{
-			if($this->_verticalAlign===null && $style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_wrap===null && $style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if ($this->_verticalAlign === null && $style->_verticalAlign !== null)
+				$this->_verticalAlign = $style->_verticalAlign;
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($this->_wrap === null && $style->_wrap !== null)
+				$this->_wrap = $style->_wrap;
 		}
 	}
 
@@ -793,14 +793,14 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableItemStyle)
+		if ($style instanceof TTableItemStyle)
 		{
-			if($style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if ($style->_verticalAlign !== null)
+				$this->_verticalAlign = $style->_verticalAlign;
+			if ($style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($style->_wrap !== null)
+				$this->_wrap = $style->_wrap;
 		}
 	}
 
@@ -811,14 +811,14 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
+		if (!$this->getWrap())
+			$writer->addStyleAttribute('white-space', 'nowrap');
 
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+			$writer->addAttribute('align', strtolower($horizontalAlign));
 
-		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+		if (($verticalAlign = $this->getVerticalAlign()) !== TVerticalAlign::NotSet)
+			$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;
 	}
 
 	/**
@@ -871,7 +871,7 @@ 
 	 */
 	public function setWrap($value)
 	{
-		$this->_wrap=TPropertyValue::ensureBoolean($value);
+		$this->_wrap = TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -892,11 +892,11 @@ 
  */
 class THorizontalAlign extends TEnumerable
 {
-	const NotSet='NotSet';
-	const Left='Left';
-	const Right='Right';
-	const Center='Center';
-	const Justify='Justify';
+	const NotSet = 'NotSet';
+	const Left = 'Left';
+	const Right = 'Right';
+	const Center = 'Center';
+	const Justify = 'Justify';
 }
 
 /**
@@ -915,10 +915,10 @@ 
  */
 class TVerticalAlign extends TEnumerable
 {
-	const NotSet='NotSet';
-	const Top='Top';
-	const Bottom='Bottom';
-	const Middle='Middle';
+	const NotSet = 'NotSet';
+	const Top = 'Top';
+	const Bottom = 'Bottom';
+	const Middle = 'Middle';
 }
 
 
@@ -938,9 +938,9 @@ 
  */
 class TTableGridLines extends TEnumerable
 {
-	const None='None';
-	const Horizontal='Horizontal';
-	const Vertical='Vertical';
-	const Both='Both';
+	const None = 'None';
+	const Horizontal = 'Horizontal';
+	const Vertical = 'Vertical';
+	const Both = 'Both';
 }
 

Braces +192 added lines, -132 removed lines

@@ -55,16 +55,21 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0TStyle\0_fields";
-		if($this->_font===null)
-			$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";
+		if ($this->_fields===array()) {
+					$exprops[] = "\0TStyle\0_fields";
+		}
+		if($this->_font===null) {
+					$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";
+		}
 	}
 
 	/**
@@ -73,8 +78,9 @@ 
 	 */
 	public function __construct($style=null)
 	{
-		if($style!==null)
-			$this->copyFrom($style);
+		if($style!==null) {
+					$this->copyFrom($style);
+		}
 	}
 
 	/**
@@ -82,8 +88,9 @@ 
 	 */
 	public function __clone()
 	{
-		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+		if($this->_font!==null) {
+					$this->_font = clone($this->_font);
+		}
 	}
 
 	/**
@@ -99,10 +106,11 @@ 
 	 */
 	public function setBackColor($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['background-color']);
-		else
-			$this->_fields['background-color']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['background-color']);
+		} else {
+					$this->_fields['background-color']=$value;
+		}
 	}
 
 	/**
@@ -118,10 +126,11 @@ 
 	 */
 	public function setBorderColor($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['border-color']);
-		else
-			$this->_fields['border-color']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['border-color']);
+		} else {
+					$this->_fields['border-color']=$value;
+		}
 	}
 
 	/**
@@ -138,10 +147,11 @@ 
 	 */
 	public function setBorderStyle($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['border-style']);
-		else
-			$this->_fields['border-style']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['border-style']);
+		} else {
+					$this->_fields['border-style']=$value;
+		}
 	}
 
 	/**
@@ -157,10 +167,11 @@ 
 	 */
 	public function setBorderWidth($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['border-width']);
-		else
-			$this->_fields['border-width']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['border-width']);
+		} else {
+					$this->_fields['border-width']=$value;
+		}
 	}
 
 	/**
@@ -192,8 +203,9 @@ 
 	 */
 	public function getFont()
 	{
-		if($this->_font===null)
-			$this->_font=new TFont;
+		if($this->_font===null) {
+					$this->_font=new TFont;
+		}
 		return $this->_font;
 	}
 
@@ -249,10 +261,11 @@ 
 	 */
 	public function setForeColor($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['color']);
-		else
-			$this->_fields['color']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['color']);
+		} else {
+					$this->_fields['color']=$value;
+		}
 	}
 
 	/**
@@ -268,10 +281,11 @@ 
 	 */
 	public function setHeight($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['height']);
-		else
-			$this->_fields['height']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['height']);
+		} else {
+					$this->_fields['height']=$value;
+		}
 	}
 
 	/**
@@ -366,12 +380,15 @@ 
 		if($style instanceof TStyle)
 		{
 			$this->_fields=array_merge($this->_fields,$style->_fields);
-			if($style->_class!==null)
-				$this->_class=$style->_class;
-			if($style->_customStyle!==null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
-				$this->getFont()->copyFrom($style->_font);
+			if($style->_class!==null) {
+							$this->_class=$style->_class;
+			}
+			if($style->_customStyle!==null) {
+							$this->_customStyle=$style->_customStyle;
+			}
+			if($style->_font!==null) {
+							$this->getFont()->copyFrom($style->_font);
+			}
 		}
 	}
 
@@ -386,12 +403,15 @@ 
 		if($style instanceof TStyle)
 		{
 			$this->_fields=array_merge($style->_fields,$this->_fields);
-			if($this->_class===null)
-				$this->_class=$style->_class;
-			if($this->_customStyle===null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
-				$this->getFont()->mergeWith($style->_font);
+			if($this->_class===null) {
+							$this->_class=$style->_class;
+			}
+			if($this->_customStyle===null) {
+							$this->_customStyle=$style->_customStyle;
+			}
+			if($style->_font!==null) {
+							$this->getFont()->mergeWith($style->_font);
+			}
 		}
 	}
 
@@ -406,15 +426,18 @@ 
 			foreach(explode(';',$this->_customStyle) as $style)
 			{
 				$arr=explode(':',$style,2);
-				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+				if(isset($arr[1]) && trim($arr[0])!=='') {
+									$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);
+		if($this->_font!==null) {
+					$this->_font->addAttributesToRender($writer);
+		}
+		if($this->_class!==null) {
+					$writer->addAttribute('class',$this->_class);
+		}
 	}
 
 	/**
@@ -492,18 +515,24 @@ 
 	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";
+		}
 	}
 
 	/**
@@ -532,18 +561,24 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+			if($style->_backImageUrl!==null) {
+							$this->_backImageUrl=$style->_backImageUrl;
+			}
+			if($style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($style->_cellPadding!==null) {
+							$this->_cellPadding=$style->_cellPadding;
+			}
+			if($style->_cellSpacing!==null) {
+							$this->_cellSpacing=$style->_cellSpacing;
+			}
+			if($style->_gridLines!==null) {
+							$this->_gridLines=$style->_gridLines;
+			}
+			if($style->_borderCollapse!==null) {
+							$this->_borderCollapse=$style->_borderCollapse;
+			}
 		}
 	}
 
@@ -558,18 +593,24 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl===null && $style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_cellPadding===null && $style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($this->_cellSpacing===null && $style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($this->_gridLines===null && $style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($this->_borderCollapse===null && $style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+			if($this->_backImageUrl===null && $style->_backImageUrl!==null) {
+							$this->_backImageUrl=$style->_backImageUrl;
+			}
+			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($this->_cellPadding===null && $style->_cellPadding!==null) {
+							$this->_cellPadding=$style->_cellPadding;
+			}
+			if($this->_cellSpacing===null && $style->_cellSpacing!==null) {
+							$this->_cellSpacing=$style->_cellSpacing;
+			}
+			if($this->_gridLines===null && $style->_gridLines!==null) {
+							$this->_gridLines=$style->_gridLines;
+			}
+			if($this->_borderCollapse===null && $style->_borderCollapse!==null) {
+							$this->_borderCollapse=$style->_borderCollapse;
+			}
 		}
 	}
 
@@ -581,20 +622,25 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
+		if(($url=trim($this->getBackImageUrl()))!=='') {
+					$writer->addStyleAttribute('background-image','url('.$url.')');
+		}
 
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
+		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet) {
+					$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');
+		if($this->getBorderCollapse()) {
+					$writer->addStyleAttribute('border-collapse','collapse');
+		}
 
 		switch($this->getGridLines())
 		{
@@ -654,8 +700,9 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
-			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1) {
+					throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		}
 	}
 
 	/**
@@ -672,8 +719,9 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
-			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1) {
+					throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		}
 	}
 
 	/**
@@ -743,12 +791,15 @@ 
 	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";
+		}
 	}
 
 	/**
@@ -775,12 +826,15 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableItemStyle)
 		{
-			if($this->_verticalAlign===null && $style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_wrap===null && $style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if($this->_verticalAlign===null && $style->_verticalAlign!==null) {
+							$this->_verticalAlign=$style->_verticalAlign;
+			}
+			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($this->_wrap===null && $style->_wrap!==null) {
+							$this->_wrap=$style->_wrap;
+			}
 		}
 	}
 
@@ -795,12 +849,15 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableItemStyle)
 		{
-			if($style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if($style->_verticalAlign!==null) {
+							$this->_verticalAlign=$style->_verticalAlign;
+			}
+			if($style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($style->_wrap!==null) {
+							$this->_wrap=$style->_wrap;
+			}
 		}
 	}
 
@@ -811,14 +868,17 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
+		if(!$this->getWrap()) {
+					$writer->addStyleAttribute('white-space','nowrap');
+		}
 
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
+		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet) {
+					$writer->addAttribute('align',strtolower($horizontalAlign));
+		}
 
-		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet) {
+					$writer->addAttribute('valign',strtolower($verticalAlign));
+		}
 
 		parent::addAttributesToRender($writer);
 	}

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

Spacing +46 added lines, -46 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTableRow)
+		if ($object instanceof TTableRow)
 			$this->getRows()->add($object);
 	}
 
@@ -102,18 +102,18 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$border=0;
-		if($this->getHasStyle())
+		$border = 0;
+		if ($this->getHasStyle())
 		{
-			if($this->getGridLines()!==TTableGridLines::None)
+			if ($this->getGridLines() !== TTableGridLines::None)
 			{
-				if(($border=$this->getBorderWidth())==='')
-					$border=1;
+				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);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellSpacing();
 		else
 			return -1;
@@ -190,7 +190,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellPadding();
 		else
 			return -1;
@@ -209,7 +209,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getHorizontalAlign();
 		else
 			return THorizontalAlign::NotSet;
@@ -228,7 +228,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getGridLines();
 		else
 			return TTableGridLines::None;
@@ -247,7 +247,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getBackImageUrl();
 		else
 			return '';
@@ -269,10 +269,10 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($caption=$this->getCaption())!=='')
+		if (($caption = $this->getCaption()) !== '')
 		{
-			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+			if (($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -285,48 +285,48 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			$renderTableSection=false;
-			foreach($this->getControls() as $row)
+			$renderTableSection = false;
+			foreach ($this->getControls() as $row)
 			{
-				if($row->getTableSection()!==TTableRowSection::Body)
+				if ($row->getTableSection() !== TTableRowSection::Body)
 				{
-					$renderTableSection=true;
+					$renderTableSection = true;
 					break;
 				}
 			}
-			if($renderTableSection)
+			if ($renderTableSection)
 			{
-				$currentSection=TTableRowSection::Header;
+				$currentSection = TTableRowSection::Header;
 				$writer->writeLine();
-				foreach($this->getControls() as $index=>$row)
+				foreach ($this->getControls() as $index=>$row)
 				{
-					if(($section=$row->getTableSection())===$currentSection)
+					if (($section = $row->getTableSection()) === $currentSection)
 					{
-						if($index===0 && $currentSection===TTableRowSection::Header)
+						if ($index === 0 && $currentSection === TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
 					}
 					else
 					{
-						if($currentSection===TTableRowSection::Header)
+						if ($currentSection === TTableRowSection::Header)
 						{
-							if($index>0)
+							if ($index > 0)
 								$writer->renderEndTag();
-							if($section===TTableRowSection::Body)
+							if ($section === TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');
 							else
 								$writer->renderBeginTag('tfoot');
-							$currentSection=$section;
+							$currentSection = $section;
 						}
-						else if($currentSection===TTableRowSection::Body)
+						else if ($currentSection === TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
-							if($section===TTableRowSection::Footer)
+							if ($section === TTableRowSection::Footer)
 								$writer->renderBeginTag('tfoot');
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
-							$currentSection=$section;
+							$currentSection = $section;
 						}
 						else // Footer
 							throw new TConfigurationException('table_tablesection_outoforder');
@@ -339,7 +339,7 @@ 
 			else
 			{
 				$writer->writeLine();
-				foreach($this->getControls() as $row)
+				foreach ($this->getControls() as $row)
 				{
 					$row->renderControl($writer);
 					$writer->writeLine();
@@ -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);
+		if ($item instanceof TTableRow)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tablerowcollection_tablerow_required');
 	}
@@ -397,10 +397,10 @@ 
  */
 class TTableCaptionAlign extends TEnumerable
 {
-	const NotSet='NotSet';
-	const Top='Top';
-	const Bottom='Bottom';
-	const Left='Left';
-	const Right='Right';
+	const NotSet = 'NotSet';
+	const Top = 'Top';
+	const Bottom = 'Bottom';
+	const Left = 'Left';
+	const Right = 'Right';
 }
 

Braces +63 added lines, -52 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTableRow)
-			$this->getRows()->add($object);
+		if($object instanceof TTableRow) {
+					$this->getRows()->add($object);
+		}
 	}
 
 	/**
@@ -107,10 +108,11 @@ 
 		{
 			if($this->getGridLines()!==TTableGridLines::None)
 			{
-				if(($border=$this->getBorderWidth())==='')
-					$border=1;
-				else
-					$border=(int)$border;
+				if(($border=$this->getBorderWidth())==='') {
+									$border=1;
+				} else {
+									$border=(int)$border;
+				}
 			}
 		}
 		$writer->addAttribute('border',"$border");
@@ -171,10 +173,11 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellSpacing();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellSpacing();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -190,10 +193,11 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellPadding();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellPadding();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -209,10 +213,11 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getHorizontalAlign();
-		else
-			return THorizontalAlign::NotSet;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getHorizontalAlign();
+		} else {
+					return THorizontalAlign::NotSet;
+		}
 	}
 
 	/**
@@ -228,10 +233,11 @@ 
 	 */
 	public function getGridLines()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getGridLines();
-		else
-			return TTableGridLines::None;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getGridLines();
+		} else {
+					return TTableGridLines::None;
+		}
 	}
 
 	/**
@@ -247,10 +253,11 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getBackImageUrl();
-		else
-			return '';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getBackImageUrl();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -271,8 +278,9 @@ 
 		parent::renderBeginTag($writer);
 		if(($caption=$this->getCaption())!=='')
 		{
-			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet) {
+							$writer->addAttribute('align',strtolower($align));
+			}
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -304,39 +312,41 @@ 
 				{
 					if(($section=$row->getTableSection())===$currentSection)
 					{
-						if($index===0 && $currentSection===TTableRowSection::Header)
-							$writer->renderBeginTag('thead');
-					}
-					else
+						if($index===0 && $currentSection===TTableRowSection::Header) {
+													$writer->renderBeginTag('thead');
+						}
+					} else
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
-							if($index>0)
-								$writer->renderEndTag();
-							if($section===TTableRowSection::Body)
-								$writer->renderBeginTag('tbody');
-							else
-								$writer->renderBeginTag('tfoot');
+							if($index>0) {
+															$writer->renderEndTag();
+							}
+							if($section===TTableRowSection::Body) {
+															$writer->renderBeginTag('tbody');
+							} else {
+															$writer->renderBeginTag('tfoot');
+							}
 							$currentSection=$section;
-						}
-						else if($currentSection===TTableRowSection::Body)
+						} else if($currentSection===TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
-							if($section===TTableRowSection::Footer)
-								$writer->renderBeginTag('tfoot');
-							else
-								throw new TConfigurationException('table_tablesection_outoforder');
+							if($section===TTableRowSection::Footer) {
+															$writer->renderBeginTag('tfoot');
+							} 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)
@@ -371,10 +381,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TTableRow)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('tablerowcollection_tablerow_required');
+		if($item instanceof TTableRow) {
+					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

Spacing +89 added lines, -89 removed lines

@@ -58,7 +58,7 @@ 
  */
 class TTabPanel extends TWebControl implements IPostBackDataHandler
 {
-	private $_dataChanged=false;
+	private $_dataChanged = false;
 
 	/**
 	 * @return string tag name for the control
@@ -76,7 +76,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTabView)
+		if ($object instanceof TTabView)
 			$this->getControls()->add($object);
 	}
 
@@ -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, '');
     }
 
 	/**
@@ -128,34 +128,34 @@ 
 	 */
 	public function getActiveView()
 	{
-		$activeView=null;
-		$views=$this->getViews();
-		if(($id=$this->getActiveViewID())!=='')
+		$activeView = null;
+		$views = $this->getViews();
+		if (($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index=$views->findIndexByID($id))>=0)
-				$activeView=$views->itemAt($index);
+			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())
-				$activeView=$views->itemAt($index);
+			if ($index < $views->getCount())
+				$activeView = $views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
+				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
 		}
 		else
 		{
-			foreach($views as $index=>$view)
+			foreach ($views as $index=>$view)
 			{
-				if($view->getActive())
+				if ($view->getActive())
 				{
-					$activeView=$view;
+					$activeView = $view;
 					break;
 				}
 			}
 		}
-		if($activeView!==null)
+		if ($activeView !== null)
 			$this->activateView($activeView);
 		return $activeView;
 	}
@@ -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), '');
     }
 
     /**
@@ -210,8 +210,8 @@ 
      */
     public function getCssClass()
     {
-    	$cssClass=parent::getCssClass();
-    	return $cssClass===''?'tab-panel':$cssClass;
+    	$cssClass = parent::getCssClass();
+    	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 = 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 = 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 = new TStyle;
 			$style->setCssClass('tab-active');
-			$this->setViewState('ActiveTabStyle',$style,null);
+			$this->setViewState('ActiveTabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -313,9 +313,9 @@ 
 	{
 		$this->setActiveViewIndex(-1);
 		$this->setActiveViewID('');
-		foreach($this->getViews() as $index=>$v)
+		foreach ($this->getViews() as $index=>$v)
 		{
-			if($view===$v)
+			if ($view === $v)
 			{
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
@@ -333,17 +333,17 @@ 
 	 * @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)
+		if (($index = $values[$this->getClientID() . '_1']) !== null)
 		{
-			$index=(int)$index;
-			$currentIndex=$this->getActiveViewIndex();
-			if($currentIndex!==$index)
+			$index = (int) $index;
+			$currentIndex = $this->getActiveViewIndex();
+			if ($currentIndex !== $index)
 			{
 				$this->setActiveViewID(''); // clear up view ID
 				$this->setActiveViewIndex($index);
-				return $this->_dataChanged=true;
+				return $this->_dataChanged = true;
 			}
 		}
 		return false;
@@ -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,12 +390,12 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$page->registerRequiresPostData($this);
-		$page->registerRequiresPostData($this->getClientID()."_1");
+		$page->registerRequiresPostData($this->getClientID() . "_1");
 	}
 
 	/**
@@ -407,15 +407,15 @@ 
 	{
 		$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);
 		}
 	}
@@ -425,18 +425,18 @@ 
 	 */
 	protected function registerClientScript()
 	{
-		$id=$this->getClientID();
-		$options=TJavaScript::encode($this->getClientOptions());
-		$className=$this->getClientClassName();
-		$cs=$this->getPage()->getClientScript();
+		$id = $this->getClientID();
+		$options = TJavaScript::encode($this->getClientOptions());
+		$className = $this->getClientClassName();
+		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('tabpanel');
-		$code="new $className($options);";
+		$code = "new $className($options);";
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
-			$index=0;
-		$cs->registerHiddenField($id.'_1', $index);
+		if (!$this->getViews()->itemAt($index)->Visible)
+			$index = 0;
+		$cs->registerHiddenField($id . '_1', $index);
 	}
 
 	/**
@@ -459,7 +459,7 @@ 
 		$options['NormalCssClass'] = $this->getTabCssClass();
 		$viewIDs = array();
 		$viewVis = array();
-		foreach($this->getViews() as $view)
+		foreach ($this->getViews() as $view)
 		{
 			$viewIDs[] = $view->getClientID();
 			$viewVis[] = $view->getVisible();
@@ -500,18 +500,18 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		$views=$this->getViews();
-		if($views->getCount()>0)
+		$views = $this->getViews();
+		if ($views->getCount() > 0)
 		{
 			$writer->writeLine();
 			// render tab bar
-			foreach($views as $view)
+			foreach ($views as $view)
 			{
 				$view->renderTab($writer);
 				$writer->writeLine();
 			}
 			// render tab views
-			foreach($views as $view)
+			foreach ($views as $view)
 			{
 				$view->renderControl($writer);
 				$writer->writeLine();
@@ -543,7 +543,7 @@ 
  */
 class TTabView extends TWebControl
 {
-	private $_active=false;
+	private $_active = false;
 
 	/**
 	 * @return the tag name for the view element
@@ -559,14 +559,14 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
-			$this->getStyle()->setStyleField('display','none');
+		if (!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
+			$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), '');
 	}
 
 	/**
@@ -634,7 +634,7 @@ 
 	 */
 	public function setActive($value)
 	{
-		$this->_active=TPropertyValue::ensureBoolean($value);
+		$this->_active = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -643,9 +643,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())!=='')
+		if (($text = $this->getText()) !== '')
 			$writer->write($text);
-		else if($this->getHasControls())
+		else if ($this->getHasControls())
 			parent::renderContents($writer);
 	}
 
@@ -655,11 +655,11 @@ 
 	 */
 	public function renderTab($writer)
 	{
-		if($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
+		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());
@@ -677,10 +677,10 @@ 
 	 */
 	protected function renderTabContent($writer)
 	{
-		if(($url=$this->getNavigateUrl())==='')
-			$url='javascript://';
-		if(($caption=$this->getCaption())==='')
-			$caption='&nbsp;';
+		if (($url = $this->getNavigateUrl()) === '')
+			$url = 'javascript://';
+		if (($caption = $this->getCaption()) === '')
+			$caption = '&nbsp;';
 		$writer->write("<a href=\"{$url}\">{$caption}</a>");
 	}
 }
@@ -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);
+		if ($item instanceof TTabView)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
 	}
@@ -718,9 +718,9 @@ 
 	 */
 	public function findIndexByID($id)
 	{
-		foreach($this as $index=>$view)
+		foreach ($this as $index=>$view)
 		{
-			if($view->getID(false)===$id)
+			if ($view->getID(false) === $id)
 				return $index;
 		}
 		return -1;

Braces +50 added lines, -40 removed lines

@@ -76,8 +76,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTabView)
-			$this->getControls()->add($object);
+		if($object instanceof TTabView) {
+					$this->getControls()->add($object);
+		}
 	}
 
 	/**
@@ -132,19 +133,19 @@ 
 		$views=$this->getViews();
 		if(($id=$this->getActiveViewID())!=='')
 		{
-			if(($index=$views->findIndexByID($id))>=0)
-				$activeView=$views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
-		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+			if(($index=$views->findIndexByID($id))>=0) {
+							$activeView=$views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
+			}
+		} else if(($index=$this->getActiveViewIndex())>=0)
 		{
-			if($index<$views->getCount())
-				$activeView=$views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
-		}
-		else
+			if($index<$views->getCount()) {
+							$activeView=$views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
+			}
+		} else
 		{
 			foreach($views as $index=>$view)
 			{
@@ -155,8 +156,9 @@ 
 				}
 			}
 		}
-		if($activeView!==null)
-			$this->activateView($activeView);
+		if($activeView!==null) {
+					$this->activateView($activeView);
+		}
 		return $activeView;
 	}
 
@@ -166,10 +168,11 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view)>=0)
-			$this->activateView($view);
-		else
-			throw new TInvalidOperationException('tabpanel_view_inexistent');
+		if($this->getViews()->indexOf($view)>=0) {
+					$this->activateView($view);
+		} else {
+					throw new TInvalidOperationException('tabpanel_view_inexistent');
+		}
 	}
 
     /**
@@ -320,9 +323,9 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
+			} else {
+							$v->setActive(false);
 			}
-			else
-				$v->setActive(false);
 		}
 	}
 
@@ -434,8 +437,9 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
-			$index=0;
+		if(!$this->getViews()->itemAt($index)->Visible) {
+					$index=0;
+		}
 		$cs->registerHiddenField($id.'_1', $index);
 	}
 
@@ -559,8 +563,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
-			$this->getStyle()->setStyleField('display','none');
+		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript()) {
+					$this->getStyle()->setStyleField('display','none');
+		}
 
 		$this->getStyle()->mergeWith($this->getParent()->getViewStyle());
 
@@ -643,10 +648,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())!=='')
-			$writer->write($text);
-		else if($this->getHasControls())
-			parent::renderContents($writer);
+		if(($text=$this->getText())!=='') {
+					$writer->write($text);
+		} else if($this->getHasControls()) {
+					parent::renderContents($writer);
+		}
 	}
 
 	/**
@@ -677,10 +683,12 @@ 
 	 */
 	protected function renderTabContent($writer)
 	{
-		if(($url=$this->getNavigateUrl())==='')
-			$url='javascript://';
-		if(($caption=$this->getCaption())==='')
-			$caption='&nbsp;';
+		if(($url=$this->getNavigateUrl())==='') {
+					$url='javascript://';
+		}
+		if(($caption=$this->getCaption())==='') {
+					$caption='&nbsp;';
+		}
 		$writer->write("<a href=\"{$url}\">{$caption}</a>");
 	}
 }
@@ -705,10 +713,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TTabView)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		if($item instanceof TTabView) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		}
 	}
 
 	/**
@@ -720,8 +729,9 @@ 
 	{
 		foreach($this as $index=>$view)
 		{
-			if($view->getID(false)===$id)
-				return $index;
+			if($view->getID(false)===$id) {
+							return $index;
+			}
 		}
 		return -1;
 	}

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

Spacing +47 added lines, -47 removed lines

@@ -42,10 +42,10 @@ 
 	 * Various item templates
 	 * @var string
 	 */
-	private $_itemTemplate=null;
-	private $_editItemTemplate=null;
-	private $_headerTemplate=null;
-	private $_footerTemplate=null;
+	private $_itemTemplate = null;
+	private $_editItemTemplate = null;
+	private $_headerTemplate = null;
+	private $_footerTemplate = null;
 
 	/**
 	 * @return string the class name for the item cell renderer. Defaults to empty, meaning not set.
@@ -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, '');
 	}
 
 	/**
@@ -111,10 +111,10 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_editItemTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_editItemTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','EditItemTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
 	}
 
 	/**
@@ -131,10 +131,10 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_itemTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_itemTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -151,10 +151,10 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_headerTemplate=$value;
+		if ($value instanceof ITemplate || $value === null)
+			$this->_headerTemplate = $value;
 		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -171,10 +171,10 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_footerTemplate=$value;
+		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,57 +186,57 @@ 
 	 * @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)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
-			if($itemType===TListItemType::EditItem)
+			if ($itemType === TListItemType::EditItem)
 			{
-				if(($classPath=$this->getEditItemRenderer())==='' && ($template=$this->_editItemTemplate)===null)
+				if (($classPath = $this->getEditItemRenderer()) === '' && ($template = $this->_editItemTemplate) === null)
 				{
-					$classPath=$this->getItemRenderer();
-					$template=$this->_itemTemplate;
+					$classPath = $this->getItemRenderer();
+					$template = $this->_itemTemplate;
 				}
 			}
 			else
 			{
-				$template=$this->_itemTemplate;
-				$classPath=$this->getItemRenderer();
+				$template = $this->_itemTemplate;
+				$classPath = $this->getItemRenderer();
 			}
-			if($classPath!=='')
+			if ($classPath !== '')
 			{
-				$control=Prado::createComponent($classPath);
+				$control = Prado::createComponent($classPath);
 				$cell->getControls()->add($control);
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$control->setItemIndex($cell->getParent()->getItemIndex());
 					$control->setItemType($itemType);
 				}
-				if($control instanceof IDataRenderer)
-					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				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)
+			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);
-			else if($this->_headerTemplate!==null)
+			if (($classPath = $this->getHeaderRenderer()) !== '')
+				$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)
+		else if ($itemType === TListItemType::Footer)
 		{
-			if(($classPath=$this->getFooterRenderer())!=='')
-				$this->initializeFooterCell($cell,$columnIndex);
-			else if($this->_footerTemplate!==null)
+			if (($classPath = $this->getFooterRenderer()) !== '')
+				$this->initializeFooterCell($cell, $columnIndex);
+			else if ($this->_footerTemplate !== null)
 				$this->_footerTemplate->instantiateIn($cell);
 			else
-				$this->initializeFooterCell($cell,$columnIndex);
+				$this->initializeFooterCell($cell, $columnIndex);
 		}
 	}
 
@@ -245,9 +245,9 @@ 
 	 * 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();
+		$item = $sender->getNamingContainer();
 		$sender->setData($item->getData());
 	}
 }

Braces +44 added lines, -40 removed lines

@@ -111,10 +111,11 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_editItemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','EditItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_editItemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required','EditItemTemplate');
+		}
 	}
 
 	/**
@@ -131,10 +132,11 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_itemTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','ItemTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_itemTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required','ItemTemplate');
+		}
 	}
 
 	/**
@@ -151,10 +153,11 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_headerTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','HeaderTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_headerTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required','HeaderTemplate');
+		}
 	}
 
 	/**
@@ -171,10 +174,11 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value===null)
-			$this->_footerTemplate=$value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required','FooterTemplate');
+		if($value instanceof ITemplate || $value===null) {
+					$this->_footerTemplate=$value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required','FooterTemplate');
+		}
 	}
 
 	/**
@@ -197,8 +201,7 @@ 
 					$classPath=$this->getItemRenderer();
 					$template=$this->_itemTemplate;
 				}
-			}
-			else
+			} else
 			{
 				$template=$this->_itemTemplate;
 				$classPath=$this->getItemRenderer();
@@ -212,31 +215,32 @@ 
 					$control->setItemIndex($cell->getParent()->getItemIndex());
 					$control->setItemType($itemType);
 				}
-				if($control instanceof IDataRenderer)
-					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				if($control instanceof IDataRenderer) {
+									$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				}
+			} else if($template!==null) {
+							$template->instantiateIn($cell);
+			} else if($itemType!==TListItemType::EditItem) {
+							$cell->setText(' ');
 			}
-			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);
-			else if($this->_headerTemplate!==null)
-				$this->_headerTemplate->instantiateIn($cell);
-			else
-				$this->initializeHeaderCell($cell,$columnIndex);
-		}
-		else if($itemType===TListItemType::Footer)
+			if(($classPath=$this->getHeaderRenderer())!=='') {
+							$this->initializeHeaderCell($cell,$columnIndex);
+			} else if($this->_headerTemplate!==null) {
+							$this->_headerTemplate->instantiateIn($cell);
+			} else {
+							$this->initializeHeaderCell($cell,$columnIndex);
+			}
+		} else if($itemType===TListItemType::Footer)
 		{
-			if(($classPath=$this->getFooterRenderer())!=='')
-				$this->initializeFooterCell($cell,$columnIndex);
-			else if($this->_footerTemplate!==null)
-				$this->_footerTemplate->instantiateIn($cell);
-			else
-				$this->initializeFooterCell($cell,$columnIndex);
+			if(($classPath=$this->getFooterRenderer())!=='') {
+							$this->initializeFooterCell($cell,$columnIndex);
+			} else if($this->_footerTemplate!==null) {
+							$this->_footerTemplate->instantiateIn($cell);
+			} else {
+							$this->initializeFooterCell($cell,$columnIndex);
+			}
 		}
 	}
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TTemplateColumn class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.WebControls
- */
+	 * TTemplateColumn class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.WebControls
+	 */
 
 /**
  * TDataGridColumn class file

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

@@ -51,28 +51,28 @@ 
 	/**
 	 * Default number of rows (for MultiLine text box)
 	 */
-	const DEFAULT_ROWS=4;
+	const DEFAULT_ROWS = 4;
 	/**
 	 * Default number of columns (for MultiLine text box)
 	 */
-	const DEFAULT_COLUMNS=20;
+	const DEFAULT_COLUMNS = 20;
 	/**
 	 * @var mixed safe text parser
 	 */
-	private static $_safeTextParser=null;
+	private static $_safeTextParser = null;
 	/**
 	 * @var string safe textbox content with javascript stripped off
 	 */
 	private $_safeText;
-	private $_dataChanged=false;
-	private $_isValid=true;
+	private $_dataChanged = false;
+	private $_isValid = true;
 
 	/**
 	 * @return string tag name of the textbox
 	 */
 	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);
 	}
 
 	/**
@@ -98,69 +98,69 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		if(($uid=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uid);
-		if(($textMode=$this->getTextMode())===TTextBoxMode::MultiLine)
+		if (($uid = $this->getUniqueID()) !== '')
+			$writer->addAttribute('name', $uid);
+		if (($textMode = $this->getTextMode()) === TTextBoxMode::MultiLine)
 		{
-			if(($rows=$this->getRows())<=0)
-				$rows=self::DEFAULT_ROWS;
-			if(($cols=$this->getColumns())<=0)
-				$cols=self::DEFAULT_COLUMNS;
-			$writer->addAttribute('rows',"$rows");
-			$writer->addAttribute('cols',"$cols");
-			if(!$this->getWrap())
-				$writer->addAttribute('wrap','off');
+			if (($rows = $this->getRows()) <= 0)
+				$rows = self::DEFAULT_ROWS;
+			if (($cols = $this->getColumns()) <= 0)
+				$cols = self::DEFAULT_COLUMNS;
+			$writer->addAttribute('rows', "$rows");
+			$writer->addAttribute('cols', "$cols");
+			if (!$this->getWrap())
+				$writer->addAttribute('wrap', 'off');
 		}
 		else
 		{
-			if($textMode===TTextBoxMode::SingleLine)
+			if ($textMode === TTextBoxMode::SingleLine)
 			{
-				$writer->addAttribute('type','text');
-				if(($text=$this->getText())!=='')
-					$writer->addAttribute('value',$text);
+				$writer->addAttribute('type', 'text');
+				if (($text = $this->getText()) !== '')
+					$writer->addAttribute('value', $text);
 			}
 			else
 			{
-				if($this->getPersistPassword() && ($text=$this->getText())!=='')
-					$writer->addAttribute('value',$text);
-				$writer->addAttribute('type','password');
+				if ($this->getPersistPassword() && ($text = $this->getText()) !== '')
+					$writer->addAttribute('value', $text);
+				$writer->addAttribute('type', 'password');
 			}
 
-			if(($act=$this->getAutoCompleteType())!=='None')
+			if (($act = $this->getAutoCompleteType()) !== 'None')
 			{
-				if($act==='Disabled')
-					$writer->addAttribute('autocomplete','off');
-				else if($act==='Search')
-					$writer->addAttribute('vcard_name','search');
-				else if($act==='HomeCountryRegion')
-					$writer->addAttribute('vcard_name','HomeCountry');
-				else if($act==='BusinessCountryRegion')
-					$writer->addAttribute('vcard_name','BusinessCountry');
+				if ($act === 'Disabled')
+					$writer->addAttribute('autocomplete', 'off');
+				else if ($act === 'Search')
+					$writer->addAttribute('vcard_name', 'search');
+				else if ($act === 'HomeCountryRegion')
+					$writer->addAttribute('vcard_name', 'HomeCountry');
+				else if ($act === 'BusinessCountryRegion')
+					$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');
-		$isEnabled=$this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
-		if($isEnabled
+		if ($this->getReadOnly())
+			$writer->addAttribute('readonly', 'readonly');
+		$isEnabled = $this->getEnabled(true);
+		if (!$isEnabled && $this->getEnabled())  // in this case parent will not render '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());
+		$writer->addAttribute('id', $this->getClientID());
 		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -210,15 +210,15 @@ 
 	 * @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())
-			$value=trim($value);
-		if(!$this->getReadOnly() && $this->getText()!==$value)
+		$value = $values[$key];
+		if ($this->getAutoTrim())
+			$value = trim($value);
+		if (!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
-			return $this->_dataChanged=true;
+			return $this->_dataChanged = true;
 		}
 		else
 			return false;
@@ -258,7 +258,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	    $this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function onTextChanged($param)
 	{
-		$this->raiseEvent('OnTextChanged',$this,$param);
+		$this->raiseEvent('OnTextChanged', $this, $param);
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onTextChanged(null);
 	}
@@ -294,7 +294,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getTextMode()==='MultiLine')
+		if ($this->getTextMode() === 'MultiLine')
 			$writer->write(THttpUtility::htmlEncode($this->getText()));
 	}
 
@@ -306,7 +306,7 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if($this->getTextMode()==='MultiLine')
+		if ($this->getTextMode() === 'MultiLine')
 			$writer->write("\n");
 	}
 
@@ -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,7 +478,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 		$this->_safeText = null;
 	}
 
@@ -513,8 +513,8 @@ 
 	 */
 	public function getSafeText()
 	{
-		if($this->_safeText===null)
-			$this->_safeText=$this->getSafeTextParser()->parse($this->getText());
+		if ($this->_safeText === null)
+			$this->_safeText = $this->getSafeTextParser()->parse($this->getText());
 		return $this->_safeText;
 	}
 
@@ -523,8 +523,8 @@ 
 	 */
 	protected function getSafeTextParser()
 	{
-		if(!self::$_safeTextParser)
-			self::$_safeTextParser=Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
+		if (!self::$_safeTextParser)
+			self::$_safeTextParser = Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
 		return self::$_safeTextParser;
 	}
 
@@ -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);
 	}
 }
 
@@ -596,9 +596,9 @@ 
  */
 class TTextBoxMode extends TEnumerable
 {
-	const SingleLine='SingleLine';
-	const MultiLine='MultiLine';
-	const Password='Password';
+	const SingleLine = 'SingleLine';
+	const MultiLine = 'MultiLine';
+	const Password = 'Password';
 }
 
 /**
@@ -612,37 +612,37 @@ 
  */
 class TTextBoxAutoCompleteType extends TEnumerable
 {
-	const BusinessCity='BusinessCity';
-	const BusinessCountryRegion='BusinessCountryRegion';
-	const BusinessFax='BusinessFax';
-	const BusinessPhone='BusinessPhone';
-	const BusinessState='BusinessState';
-	const BusinessStreetAddress='BusinessStreetAddress';
-	const BusinessUrl='BusinessUrl';
-	const BusinessZipCode='BusinessZipCode';
-	const Cellular='Cellular';
-	const Company='Company';
-	const Department='Department';
-	const Disabled='Disabled';
-	const DisplayName='DisplayName';
-	const Email='Email';
-	const FirstName='FirstName';
-	const Gender='Gender';
-	const HomeCity='HomeCity';
-	const HomeCountryRegion='HomeCountryRegion';
-	const HomeFax='HomeFax';
-	const Homepage='Homepage';
-	const HomePhone='HomePhone';
-	const HomeState='HomeState';
-	const HomeStreetAddress='HomeStreetAddress';
-	const HomeZipCode='HomeZipCode';
-	const JobTitle='JobTitle';
-	const LastName='LastName';
-	const MiddleName='MiddleName';
-	const None='None';
-	const Notes='Notes';
-	const Office='Office';
-	const Pager='Pager';
-	const Search='Search';
+	const BusinessCity = 'BusinessCity';
+	const BusinessCountryRegion = 'BusinessCountryRegion';
+	const BusinessFax = 'BusinessFax';
+	const BusinessPhone = 'BusinessPhone';
+	const BusinessState = 'BusinessState';
+	const BusinessStreetAddress = 'BusinessStreetAddress';
+	const BusinessUrl = 'BusinessUrl';
+	const BusinessZipCode = 'BusinessZipCode';
+	const Cellular = 'Cellular';
+	const Company = 'Company';
+	const Department = 'Department';
+	const Disabled = 'Disabled';
+	const DisplayName = 'DisplayName';
+	const Email = 'Email';
+	const FirstName = 'FirstName';
+	const Gender = 'Gender';
+	const HomeCity = 'HomeCity';
+	const HomeCountryRegion = 'HomeCountryRegion';
+	const HomeFax = 'HomeFax';
+	const Homepage = 'Homepage';
+	const HomePhone = 'HomePhone';
+	const HomeState = 'HomeState';
+	const HomeStreetAddress = 'HomeStreetAddress';
+	const HomeZipCode = 'HomeZipCode';
+	const JobTitle = 'JobTitle';
+	const LastName = 'LastName';
+	const MiddleName = 'MiddleName';
+	const None = 'None';
+	const Notes = 'Notes';
+	const Office = 'Office';
+	const Pager = 'Pager';
+	const Search = 'Search';
 }
 

Braces +66 added lines, -50 removed lines

@@ -100,64 +100,74 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		if(($uid=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uid);
+		if(($uid=$this->getUniqueID())!=='') {
+					$writer->addAttribute('name',$uid);
+		}
 		if(($textMode=$this->getTextMode())===TTextBoxMode::MultiLine)
 		{
-			if(($rows=$this->getRows())<=0)
-				$rows=self::DEFAULT_ROWS;
-			if(($cols=$this->getColumns())<=0)
-				$cols=self::DEFAULT_COLUMNS;
+			if(($rows=$this->getRows())<=0) {
+							$rows=self::DEFAULT_ROWS;
+			}
+			if(($cols=$this->getColumns())<=0) {
+							$cols=self::DEFAULT_COLUMNS;
+			}
 			$writer->addAttribute('rows',"$rows");
 			$writer->addAttribute('cols',"$cols");
-			if(!$this->getWrap())
-				$writer->addAttribute('wrap','off');
-		}
-		else
+			if(!$this->getWrap()) {
+							$writer->addAttribute('wrap','off');
+			}
+		} else
 		{
 			if($textMode===TTextBoxMode::SingleLine)
 			{
 				$writer->addAttribute('type','text');
-				if(($text=$this->getText())!=='')
-					$writer->addAttribute('value',$text);
-			}
-			else
+				if(($text=$this->getText())!=='') {
+									$writer->addAttribute('value',$text);
+				}
+			} else
 			{
-				if($this->getPersistPassword() && ($text=$this->getText())!=='')
-					$writer->addAttribute('value',$text);
+				if($this->getPersistPassword() && ($text=$this->getText())!=='') {
+									$writer->addAttribute('value',$text);
+				}
 				$writer->addAttribute('type','password');
 			}
 
 			if(($act=$this->getAutoCompleteType())!=='None')
 			{
-				if($act==='Disabled')
-					$writer->addAttribute('autocomplete','off');
-				else if($act==='Search')
-					$writer->addAttribute('vcard_name','search');
-				else if($act==='HomeCountryRegion')
-					$writer->addAttribute('vcard_name','HomeCountry');
-				else if($act==='BusinessCountryRegion')
-					$writer->addAttribute('vcard_name','BusinessCountry');
-				else
+				if($act==='Disabled') {
+									$writer->addAttribute('autocomplete','off');
+				} else if($act==='Search') {
+									$writer->addAttribute('vcard_name','search');
+				} else if($act==='HomeCountryRegion') {
+									$writer->addAttribute('vcard_name','HomeCountry');
+				} else if($act==='BusinessCountryRegion') {
+									$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);
+					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');
 		}
-		if($this->getReadOnly())
-			$writer->addAttribute('readonly','readonly');
 		$isEnabled=$this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+		if(!$isEnabled && $this->getEnabled()) {
+			// in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
+		}
 		if($isEnabled
 			&& $this->getEnableClientScript()
 			&& ( $this->getAutoPostBack() || $textMode===TTextBoxMode::SingleLine)
@@ -213,15 +223,16 @@ 
 	public function loadPostData($key,$values)
 	{
 		$value=$values[$key];
-		if($this->getAutoTrim())
-			$value=trim($value);
+		if($this->getAutoTrim()) {
+					$value=trim($value);
+		}
 		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
 			return $this->_dataChanged=true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -283,8 +294,9 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getAutoPostBack() && $this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onTextChanged(null);
 	}
 
@@ -294,8 +306,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getTextMode()==='MultiLine')
-			$writer->write(THttpUtility::htmlEncode($this->getText()));
+		if($this->getTextMode()==='MultiLine') {
+					$writer->write(THttpUtility::htmlEncode($this->getText()));
+		}
 	}
 
 	/**
@@ -306,8 +319,9 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if($this->getTextMode()==='MultiLine')
-			$writer->write("\n");
+		if($this->getTextMode()==='MultiLine') {
+					$writer->write("\n");
+		}
 	}
 
 	/**
@@ -513,8 +527,9 @@ 
 	 */
 	public function getSafeText()
 	{
-		if($this->_safeText===null)
-			$this->_safeText=$this->getSafeTextParser()->parse($this->getText());
+		if($this->_safeText===null) {
+					$this->_safeText=$this->getSafeTextParser()->parse($this->getText());
+		}
 		return $this->_safeText;
 	}
 
@@ -523,8 +538,9 @@ 
 	 */
 	protected function getSafeTextParser()
 	{
-		if(!self::$_safeTextParser)
-			self::$_safeTextParser=Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
+		if(!self::$_safeTextParser) {
+					self::$_safeTextParser=Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
+		}
 		return self::$_safeTextParser;
 	}
 

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)

Spacing +16 added lines, -16 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');
 
 
@@ -35,7 +35,7 @@ 
  */
 class TTextHighlighter extends TTextProcessor
 {
-	private static $_lineNumberStyle=array(TTextHighlighterLineNumberStyle::Li => HL_NUMBERS_LI, TTextHighlighterLineNumberStyle::Table => HL_NUMBERS_TABLE);
+	private static $_lineNumberStyle = array(TTextHighlighterLineNumberStyle::Li => HL_NUMBERS_LI, TTextHighlighterLineNumberStyle::Table => HL_NUMBERS_TABLE);
 
 	/**
 	 * @return string tag name of the panel
@@ -111,7 +111,7 @@ 
 	 */
 	public function setLineNumberStyle($value)
 	{
-		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value,'TTextHighlighterLineNumberStyle'));
+		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value, 'TTextHighlighterLineNumberStyle'));
 	}
 
 	/**
@@ -146,10 +146,10 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		$cs=$this->getPage()->getClientScript();
-		$cssFile=Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight','.css');
-		$cssKey='prado:TTextHighlighter:'.$cssFile;
-		if(!$cs->isStyleSheetFileRegistered($cssKey))
+		$cs = $this->getPage()->getClientScript();
+		$cssFile = Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight', '.css');
+		$cssKey = 'prado:TTextHighlighter:' . $cssFile;
+		if (!$cs->isStyleSheetFileRegistered($cssKey))
 			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
 	}
 
@@ -163,16 +163,16 @@ 
 	{
 		try
 		{
-			$highlighter=Text_Highlighter::factory($this->getLanguage());
+			$highlighter = Text_Highlighter::factory($this->getLanguage());
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			$highlighter=false;
+			$highlighter = false;
 		}
-		if($highlighter===false)
-			return ('<pre>'.htmlentities(trim($text)).'</pre>');
+		if ($highlighter === false)
+			return ('<pre>' . htmlentities(trim($text)) . '</pre>');
 
-		$options["use_language"]=true;
+		$options["use_language"] = true;
 		$options["tabsize"] = $this->getTabSize();
 		if ($this->getShowLineNumbers())
 			$options["numbers"] = self::$_lineNumberStyle[$this->getLineNumberStyle()];
@@ -205,6 +205,6 @@ 
  */
 class TTextHighlighterLineNumberStyle extends TEnumerable
 {
-	const Li='Li';
-	const Table='Table';
+	const Li = 'Li';
+	const Table = 'Table';
 }

Braces +10 added lines, -8 removed lines

@@ -149,8 +149,9 @@ 
 		$cs=$this->getPage()->getClientScript();
 		$cssFile=Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight','.css');
 		$cssKey='prado:TTextHighlighter:'.$cssFile;
-		if(!$cs->isStyleSheetFileRegistered($cssKey))
-			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
+		if(!$cs->isStyleSheetFileRegistered($cssKey)) {
+					$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
+		}
 	}
 
 	/**
@@ -164,18 +165,19 @@ 
 		try
 		{
 			$highlighter=Text_Highlighter::factory($this->getLanguage());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$highlighter=false;
 		}
-		if($highlighter===false)
-			return ('<pre>'.htmlentities(trim($text)).'</pre>');
+		if($highlighter===false) {
+					return ('<pre>'.htmlentities(trim($text)).'</pre>');
+		}
 
 		$options["use_language"]=true;
 		$options["tabsize"] = $this->getTabSize();
-		if ($this->getShowLineNumbers())
-			$options["numbers"] = self::$_lineNumberStyle[$this->getLineNumberStyle()];
+		if ($this->getShowLineNumbers()) {
+					$options["numbers"] = self::$_lineNumberStyle[$this->getLineNumberStyle()];
+		}
 		$highlighter->setRenderer(new Text_Highlighter_Renderer_Html($options));
 		return $highlighter->highlight(trim($text));
 	}

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

@@ -42,7 +42,7 @@ 
 	/**
 	 *	@var boolean ensures the inclusion the id in the tag rendering.
 	 */
-	private $_ensureid=false;
+	private $_ensureid = false;
 
 	/**
 	 *	@var TWebControlDecorator this render things before and after both the open and close tag
@@ -72,9 +72,9 @@ 
 	/**
 	 * @return TWebControlDecorator
 	 */
-	public function getDecorator($create=true)
+	public function getDecorator($create = true)
 	{
-		if($create && !$this->_decorator)
+		if ($create && !$this->_decorator)
 			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
 		return $this->_decorator;
 	}
@@ -90,9 +90,9 @@ 
 		$this->setAccessKey($control->getAccessKey());
 		$this->setToolTip($control->getToolTip());
 		$this->setTabIndex($control->getTabIndex());
-		if(!$control->getEnabled())
+		if (!$control->getEnabled())
 			$this->setEnabled(false);
-		if($control->getHasAttributes())
+		if ($control->getHasAttributes())
 			$this->getAttributes()->copyFrom($control->getAttributes());
 	}
 
@@ -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);
+			$style = $this->createStyle();
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
@@ -316,10 +316,10 @@ 
 	 */
 	public function setStyle($value)
 	{
-		if(is_string($value))
+		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);
@@ -419,22 +419,22 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
-		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
-		if(!$this->getEnabled())
-			$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))
+		if ($this->getID() !== '' || $this->getEnsureId())
+			$writer->addAttribute('id', $this->getClientID());
+		if (($accessKey = $this->getAccessKey()) !== '')
+			$writer->addAttribute('accesskey', $accessKey);
+		if (!$this->getEnabled())
+			$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))
 			$style->addAttributesToRender($writer);
-		if($this->getHasAttributes())
+		if ($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+			foreach ($this->getAttributes() as $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);

Braces +87 added lines, -65 removed lines

@@ -74,8 +74,9 @@ 
 	 */
 	public function getDecorator($create=true)
 	{
-		if($create && !$this->_decorator)
-			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
+		if($create && !$this->_decorator) {
+					$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
+		}
 		return $this->_decorator;
 	}
 
@@ -90,10 +91,12 @@ 
 		$this->setAccessKey($control->getAccessKey());
 		$this->setToolTip($control->getToolTip());
 		$this->setTabIndex($control->getTabIndex());
-		if(!$control->getEnabled())
-			$this->setEnabled(false);
-		if($control->getHasAttributes())
-			$this->getAttributes()->copyFrom($control->getAttributes());
+		if(!$control->getEnabled()) {
+					$this->setEnabled(false);
+		}
+		if($control->getHasAttributes()) {
+					$this->getAttributes()->copyFrom($control->getAttributes());
+		}
 	}
 
 	/**
@@ -113,8 +116,9 @@ 
 	 */
 	public function setAccessKey($value)
 	{
-		if(strlen($value)>1)
-			throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
+		if(strlen($value)>1) {
+					throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
+		}
 		$this->setViewState('AccessKey',$value,'');
 	}
 
@@ -123,10 +127,11 @@ 
 	 */
 	public function getBackColor()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBackColor();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBackColor();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -142,10 +147,11 @@ 
 	 */
 	public function getBorderColor()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBorderColor();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBorderColor();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -161,10 +167,11 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBorderStyle();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBorderStyle();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -180,10 +187,11 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBorderWidth();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBorderWidth();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -207,10 +215,11 @@ 
 	 */
 	public function getForeColor()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getForeColor();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getForeColor();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -226,10 +235,11 @@ 
 	 */
 	public function getHeight()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getHeight();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getHeight();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -261,10 +271,11 @@ 
 	 */
 	public function getCssClass()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getCssClass();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getCssClass();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -298,9 +309,9 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style;
-		else
+		if($style=$this->getViewState('Style',null)) {
+					return $style;
+		} else
 		{
 			$style=$this->createStyle();
 			$this->setViewState('Style',$style,null);
@@ -316,10 +327,11 @@ 
 	 */
 	public function setStyle($value)
 	{
-		if(is_string($value))
-			$this->getStyle()->setCustomStyle($value);
-		else
-			throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+		if(is_string($value)) {
+					$this->getStyle()->setCustomStyle($value);
+		} else {
+					throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+		}
 	}
 
 	/**
@@ -382,10 +394,11 @@ 
 	 */
 	public function getWidth()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getWidth();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getWidth();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -404,8 +417,9 @@ 
 	 * @param TEventParameter event parameter to be passed to the event handlers
 	 */
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
-			$decorator->instantiate();
+		if($decorator = $this->getDecorator(false)) {
+					$decorator->instantiate();
+		}
 
 		parent::onPreRender($param);
 	}
@@ -419,22 +433,29 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
-		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
-		if(!$this->getEnabled())
-			$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))
-			$style->addAttributesToRender($writer);
+		if($this->getID()!=='' || $this->getEnsureId()) {
+					$writer->addAttribute('id',$this->getClientID());
+		}
+		if(($accessKey=$this->getAccessKey())!=='') {
+					$writer->addAttribute('accesskey',$accessKey);
+		}
+		if(!$this->getEnabled()) {
+					$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)) {
+					$style->addAttributesToRender($writer);
+		}
 		if($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+			foreach($this->getAttributes() as $name=>$value) {
+							$writer->addAttribute($name,$value);
+			}
 		}
 	}
 
@@ -492,7 +513,8 @@ 
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
-		} else
-			$writer->renderEndTag($writer);
+		} else {
+					$writer->renderEndTag($writer);
+		}
 	}
 }

framework/Web/UI/WebControls/TWizard.php

Doc Comments +13 added lines

@@ -664,6 +664,7 @@ 
 	 * This event is raised when a cancel navigation button is clicked in the
 	 * current active step.
 	 * @param TEventParameter event parameter
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCancelButtonClick($param)
 	{
@@ -677,6 +678,7 @@ 
 	 * This event is raised when a finish navigation button is clicked in the
 	 * current active step.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onCompleteButtonClick($param)
 	{
@@ -690,6 +692,7 @@ 
 	 * This event is raised when a next navigation button is clicked in the
 	 * current active step.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onNextButtonClick($param)
 	{
@@ -701,6 +704,7 @@ 
 	 * This event is raised when a previous navigation button is clicked in the
 	 * current active step.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onPreviousButtonClick($param)
 	{
@@ -711,6 +715,7 @@ 
 	 * Raises <b>OnSideBarButtonClick</b> event.
 	 * This event is raised when a link button in the side bar is clicked.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onSideBarButtonClick($param)
 	{
@@ -739,6 +744,7 @@ 
 	 * This method should only be used by control developers.
 	 * It is invoked when a step is added into the step collection of the wizard.
 	 * @param TWizardStep wizard step to be added into multiview.
+	 * @param TWizardStep $step
 	 */
 	public function addedWizardStep($step)
 	{
@@ -1282,6 +1288,7 @@ 
 	 * Determines the index of the previous step based on history.
 	 * @param boolean whether the first item in the history stack should be popped
 	 * up after calling this method.
+	 * @param boolean $popStack
 	 */
 	protected function getPreviousStepIndex($popStack)
 	{
@@ -1325,6 +1332,7 @@ 
 
 	/**
 	 * @param integer index of the step
+	 * @param integer $index
 	 * @return boolean whether navigation to the specified step is allowed
 	 */
 	protected function allowNavigationToStep($index)
@@ -1837,6 +1845,7 @@ 
 	/**
 	 * Constructor.
 	 * @param integer current step index
+	 * @param integer $currentStep
 	 */
 	public function __construct($currentStep)
 	{
@@ -1878,6 +1887,7 @@ 
 
 	/**
 	 * @param boolean whether navigation to the next step should be canceled.
+	 * @param boolean $value
 	 */
 	public function setCancelNavigation($value)
 	{
@@ -1945,6 +1955,7 @@ 
 	/**
 	 * Constructor.
 	 * @param TWizard the wizard owning this template
+	 * @param TWizard $wizard
 	 */
 	public function __construct($wizard)
 	{
@@ -1975,6 +1986,8 @@ 
 	 * @param TWizardNavigationButtonStyle button style
 	 * @param boolean whether the button should cause validation
 	 * @param string command name for the button's OnCommand event
+	 * @param TWizardNavigationButtonStyle $buttonStyle
+	 * @param boolean $causesValidation
 	 * @throws TInvalidDataValueException if the button type is not recognized
 	 */
 	protected function createNavigationButton($buttonStyle,$causesValidation,$commandName)

Spacing +348 added lines, -348 removed lines

@@ -85,56 +85,56 @@ 
 	 * Wizard step types.
 	 * @deprecated deprecated since version 3.0.4 (use TWizardStepType constants instead)
 	 */
-	const ST_AUTO='Auto';
-	const ST_START='Start';
-	const ST_STEP='Step';
-	const ST_FINISH='Finish';
-	const ST_COMPLETE='Complete';
+	const ST_AUTO = 'Auto';
+	const ST_START = 'Start';
+	const ST_STEP = 'Step';
+	const ST_FINISH = 'Finish';
+	const ST_COMPLETE = 'Complete';
 	/**
 	 * Navigation commands.
 	 */
-	const CMD_PREVIOUS='PreviousStep';
-	const CMD_NEXT='NextStep';
-	const CMD_CANCEL='Cancel';
-	const CMD_COMPLETE='Complete';
-	const CMD_MOVETO='MoveTo';
+	const CMD_PREVIOUS = 'PreviousStep';
+	const CMD_NEXT = 'NextStep';
+	const CMD_CANCEL = 'Cancel';
+	const CMD_COMPLETE = 'Complete';
+	const CMD_MOVETO = 'MoveTo';
 	/**
 	 * Side bar button ID
 	 */
-	const ID_SIDEBAR_BUTTON='SideBarButton';
+	const ID_SIDEBAR_BUTTON = 'SideBarButton';
 	/**
 	 * Side bar data list
 	 */
-	const ID_SIDEBAR_LIST='SideBarList';
+	const ID_SIDEBAR_LIST = 'SideBarList';
 
 	/**
 	 * @var TMultiView multiview that contains the wizard steps
 	 */
-	private $_multiView=null;
+	private $_multiView = null;
 	/**
 	 * @var mixed navigation template for the start step.
 	 */
-	private $_startNavigationTemplate=null;
+	private $_startNavigationTemplate = null;
 	/**
 	 * @var mixed navigation template for internal steps.
 	 */
-	private $_stepNavigationTemplate=null;
+	private $_stepNavigationTemplate = null;
 	/**
 	 * @var mixed navigation template for the finish step.
 	 */
-	private $_finishNavigationTemplate=null;
+	private $_finishNavigationTemplate = null;
 	/**
 	 * @var mixed template for wizard header.
 	 */
-	private $_headerTemplate=null;
+	private $_headerTemplate = null;
 	/**
 	 * @var mixed template for the side bar.
 	 */
-	private $_sideBarTemplate=null;
+	private $_sideBarTemplate = null;
 	/**
 	 * @var TWizardStepCollection
 	 */
-	private $_wizardSteps=null;
+	private $_wizardSteps = null;
 	/**
 	 * @var TPanel container of the wizard header
 	 */
@@ -166,7 +166,7 @@ 
 	/**
 	 * @var boolean whether ActiveStepIndex was already set
 	 */
-	private $_activeStepIndexSet=false;
+	private $_activeStepIndexSet = false;
 	/**
 	 * @var TDataList side bar data list.
 	 */
@@ -174,7 +174,7 @@ 
 	/**
 	 * @var boolean whether navigation should be cancelled (a status set in OnSideBarButtonClick)
 	 */
-	private $_cancelNavigation=false;
+	private $_cancelNavigation = false;
 
 	/**
 	 * @return string tag name for the wizard
@@ -192,7 +192,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TWizardStep)
+		if ($object instanceof TWizardStep)
 			$this->getWizardSteps()->add($object);
 	}
 
@@ -210,7 +210,7 @@ 
 	 */
 	public function setActiveStep($step)
 	{
-		if(($index=$this->getWizardSteps()->indexOf($step))<0)
+		if (($index = $this->getWizardSteps()->indexOf($step)) < 0)
 			throw new TInvalidOperationException('wizard_step_invalid');
 		$this->setActiveStepIndex($index);
 	}
@@ -228,13 +228,13 @@ 
 	 */
 	public function setActiveStepIndex($value)
 	{
-		$value=TPropertyValue::ensureInteger($value);
-		$multiView=$this->getMultiView();
-		if($multiView->getActiveViewIndex()!==$value)
+		$value = TPropertyValue::ensureInteger($value);
+		$multiView = $this->getMultiView();
+		if ($multiView->getActiveViewIndex() !== $value)
 		{
 			$multiView->setActiveViewIndex($value);
-			$this->_activeStepIndexSet=true;
-			if($this->_sideBarDataList!==null && $this->getSideBarTemplate()!==null)
+			$this->_activeStepIndexSet = true;
+			if ($this->_sideBarDataList !== null && $this->getSideBarTemplate() !== null)
 			{
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -247,8 +247,8 @@ 
 	 */
 	public function getWizardSteps()
 	{
-		if($this->_wizardSteps===null)
-			$this->_wizardSteps=new TWizardStepCollection($this);
+		if ($this->_wizardSteps === null)
+			$this->_wizardSteps = new TWizardStepCollection($this);
 		return $this->_wizardSteps;
 	}
 
@@ -257,7 +257,7 @@ 
 	 */
 	public function getShowCancelButton()
 	{
-		return $this->getViewState('ShowCancelButton',false);
+		return $this->getViewState('ShowCancelButton', false);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function setShowCancelButton($value)
 	{
-		$this->setViewState('ShowCancelButton',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ShowCancelButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 */
 	public function getShowSideBar()
 	{
-		return $this->getViewState('ShowSideBar',true);
+		return $this->getViewState('ShowSideBar', true);
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 */
 	public function setShowSideBar($value)
 	{
-		$this->setViewState('ShowSideBar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowSideBar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	public function setStartNavigationTemplate($value)
 	{
-		$this->_startNavigationTemplate=$value;
+		$this->_startNavigationTemplate = $value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -314,7 +314,7 @@ 
 	 */
 	public function setStepNavigationTemplate($value)
 	{
-		$this->_stepNavigationTemplate=$value;
+		$this->_stepNavigationTemplate = $value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -331,7 +331,7 @@ 
 	 */
 	public function setFinishNavigationTemplate($value)
 	{
-		$this->_finishNavigationTemplate=$value;
+		$this->_finishNavigationTemplate = $value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -348,7 +348,7 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		$this->_headerTemplate=$value;
+		$this->_headerTemplate = $value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -365,7 +365,7 @@ 
 	 */
 	public function setSideBarTemplate($value)
 	{
-		$this->_sideBarTemplate=$value;
+		$this->_sideBarTemplate = $value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -374,7 +374,7 @@ 
 	 */
 	public function getHeaderText()
 	{
-		return $this->getViewState('HeaderText','');
+		return $this->getViewState('HeaderText', '');
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function setHeaderText($value)
 	{
-		$this->setViewState('HeaderText',TPropertyValue::ensureString($value),'');
+		$this->setViewState('HeaderText', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	 */
 	public function getCancelDestinationUrl()
 	{
-		return $this->getViewState('CancelDestinationUrl','');
+		return $this->getViewState('CancelDestinationUrl', '');
 	}
 
 	/**
@@ -400,7 +400,7 @@ 
 	 */
 	public function setCancelDestinationUrl($value)
 	{
-		$this->setViewState('CancelDestinationUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CancelDestinationUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	 */
 	public function getFinishDestinationUrl()
 	{
-		return $this->getViewState('FinishDestinationUrl','');
+		return $this->getViewState('FinishDestinationUrl', '');
 	}
 
 	/**
@@ -417,7 +417,7 @@ 
 	 */
 	public function setFinishDestinationUrl($value)
 	{
-		$this->setViewState('FinishDestinationUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('FinishDestinationUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -425,10 +425,10 @@ 
 	 */
 	public function getSideBarButtonStyle()
 	{
-		if(($style=$this->getViewState('SideBarButtonStyle',null))===null)
+		if (($style = $this->getViewState('SideBarButtonStyle', null)) === null)
 		{
-			$style=new TStyle;
-			$this->setViewState('SideBarButtonStyle',$style,null);
+			$style = new TStyle;
+			$this->setViewState('SideBarButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -438,10 +438,10 @@ 
 	 */
 	public function getNavigationButtonStyle()
 	{
-		if(($style=$this->getViewState('NavigationButtonStyle',null))===null)
+		if (($style = $this->getViewState('NavigationButtonStyle', null)) === null)
 		{
-			$style=new TStyle;
-			$this->setViewState('NavigationButtonStyle',$style,null);
+			$style = new TStyle;
+			$this->setViewState('NavigationButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -451,11 +451,11 @@ 
 	 */
 	public function getStartNextButtonStyle()
 	{
-		if(($style=$this->getViewState('StartNextButtonStyle',null))===null)
+		if (($style = $this->getViewState('StartNextButtonStyle', null)) === null)
 		{
-			$style=new TWizardNavigationButtonStyle;
+			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
-			$this->setViewState('StartNextButtonStyle',$style,null);
+			$this->setViewState('StartNextButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -465,11 +465,11 @@ 
 	 */
 	public function getStepNextButtonStyle()
 	{
-		if(($style=$this->getViewState('StepNextButtonStyle',null))===null)
+		if (($style = $this->getViewState('StepNextButtonStyle', null)) === null)
 		{
-			$style=new TWizardNavigationButtonStyle;
+			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
-			$this->setViewState('StepNextButtonStyle',$style,null);
+			$this->setViewState('StepNextButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -479,11 +479,11 @@ 
 	 */
 	public function getStepPreviousButtonStyle()
 	{
-		if(($style=$this->getViewState('StepPreviousButtonStyle',null))===null)
+		if (($style = $this->getViewState('StepPreviousButtonStyle', null)) === null)
 		{
-			$style=new TWizardNavigationButtonStyle;
+			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
-			$this->setViewState('StepPreviousButtonStyle',$style,null);
+			$this->setViewState('StepPreviousButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -493,11 +493,11 @@ 
 	 */
 	public function getFinishCompleteButtonStyle()
 	{
-		if(($style=$this->getViewState('FinishCompleteButtonStyle',null))===null)
+		if (($style = $this->getViewState('FinishCompleteButtonStyle', null)) === null)
 		{
-			$style=new TWizardNavigationButtonStyle;
+			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Complete');
-			$this->setViewState('FinishCompleteButtonStyle',$style,null);
+			$this->setViewState('FinishCompleteButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -507,11 +507,11 @@ 
 	 */
 	public function getFinishPreviousButtonStyle()
 	{
-		if(($style=$this->getViewState('FinishPreviousButtonStyle',null))===null)
+		if (($style = $this->getViewState('FinishPreviousButtonStyle', null)) === null)
 		{
-			$style=new TWizardNavigationButtonStyle;
+			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
-			$this->setViewState('FinishPreviousButtonStyle',$style,null);
+			$this->setViewState('FinishPreviousButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -521,11 +521,11 @@ 
 	 */
 	public function getCancelButtonStyle()
 	{
-		if(($style=$this->getViewState('CancelButtonStyle',null))===null)
+		if (($style = $this->getViewState('CancelButtonStyle', null)) === null)
 		{
-			$style=new TWizardNavigationButtonStyle;
+			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Cancel');
-			$this->setViewState('CancelButtonStyle',$style,null);
+			$this->setViewState('CancelButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -535,10 +535,10 @@ 
 	 */
 	public function getSideBarStyle()
 	{
-		if(($style=$this->getViewState('SideBarStyle',null))===null)
+		if (($style = $this->getViewState('SideBarStyle', null)) === null)
 		{
-			$style=new TPanelStyle;
-			$this->setViewState('SideBarStyle',$style,null);
+			$style = new TPanelStyle;
+			$this->setViewState('SideBarStyle', $style, null);
 		}
 		return $style;
 	}
@@ -548,10 +548,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
-			$style=new TPanelStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$style = new TPanelStyle;
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -561,10 +561,10 @@ 
 	 */
 	public function getStepStyle()
 	{
-		if(($style=$this->getViewState('StepStyle',null))===null)
+		if (($style = $this->getViewState('StepStyle', null)) === null)
 		{
-			$style=new TPanelStyle;
-			$this->setViewState('StepStyle',$style,null);
+			$style = new TPanelStyle;
+			$this->setViewState('StepStyle', $style, null);
 		}
 		return $style;
 	}
@@ -574,10 +574,10 @@ 
 	 */
 	public function getNavigationStyle()
 	{
-		if(($style=$this->getViewState('NavigationStyle',null))===null)
+		if (($style = $this->getViewState('NavigationStyle', null)) === null)
 		{
-			$style=new TPanelStyle;
-			$this->setViewState('NavigationStyle',$style,null);
+			$style = new TPanelStyle;
+			$this->setViewState('NavigationStyle', $style, null);
 		}
 		return $style;
 	}
@@ -587,7 +587,7 @@ 
 	 */
 	public function getUseDefaultLayout()
 	{
-		return $this->getViewState('UseDefaultLayout',true);
+		return $this->getViewState('UseDefaultLayout', true);
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 */
 	public function setUseDefaultLayout($value)
 	{
-		$this->setViewState('UseDefaultLayout',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('UseDefaultLayout', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 */
 	public function onActiveStepChanged($param)
 	{
-		$this->raiseEvent('OnActiveStepChanged',$this,$param);
+		$this->raiseEvent('OnActiveStepChanged', $this, $param);
 	}
 
 	/**
@@ -667,8 +667,8 @@ 
 	 */
 	public function onCancelButtonClick($param)
 	{
-		$this->raiseEvent('OnCancelButtonClick',$this,$param);
-		if(($url=$this->getCancelDestinationUrl())!=='')
+		$this->raiseEvent('OnCancelButtonClick', $this, $param);
+		if (($url = $this->getCancelDestinationUrl()) !== '')
 			$this->getResponse()->redirect($url);
 	}
 
@@ -680,8 +680,8 @@ 
 	 */
 	public function onCompleteButtonClick($param)
 	{
-		$this->raiseEvent('OnCompleteButtonClick',$this,$param);
-		if(($url=$this->getFinishDestinationUrl())!=='')
+		$this->raiseEvent('OnCompleteButtonClick', $this, $param);
+		if (($url = $this->getFinishDestinationUrl()) !== '')
 			$this->getResponse()->redirect($url);
 	}
 
@@ -693,7 +693,7 @@ 
 	 */
 	public function onNextButtonClick($param)
 	{
-		$this->raiseEvent('OnNextButtonClick',$this,$param);
+		$this->raiseEvent('OnNextButtonClick', $this, $param);
 	}
 
 	/**
@@ -704,7 +704,7 @@ 
 	 */
 	public function onPreviousButtonClick($param)
 	{
-		$this->raiseEvent('OnPreviousButtonClick',$this,$param);
+		$this->raiseEvent('OnPreviousButtonClick', $this, $param);
 	}
 
 	/**
@@ -714,7 +714,7 @@ 
 	 */
 	public function onSideBarButtonClick($param)
 	{
-		$this->raiseEvent('OnSideBarButtonClick',$this,$param);
+		$this->raiseEvent('OnSideBarButtonClick', $this, $param);
 	}
 
 	/**
@@ -724,11 +724,11 @@ 
 	 */
 	public function getMultiView()
 	{
-		if($this->_multiView===null)
+		if ($this->_multiView === null)
 		{
-			$this->_multiView=new TMultiView;
+			$this->_multiView = new TMultiView;
 			$this->_multiView->setID('WizardMultiView');
-			$this->_multiView->attachEventHandler('OnActiveViewChanged',array($this,'onActiveStepChanged'));
+			$this->_multiView->attachEventHandler('OnActiveViewChanged', array($this, 'onActiveStepChanged'));
 			$this->_multiView->ignoreBubbleEvents();
 		}
 		return $this->_multiView;
@@ -742,7 +742,7 @@ 
 	 */
 	public function addedWizardStep($step)
 	{
-		if(($wizard=$step->getWizard())!==null)
+		if (($wizard = $step->getWizard()) !== null)
 			$wizard->getWizardSteps()->remove($step);
 		$step->setWizard($this);
 		$this->wizardStepsChanged();
@@ -770,7 +770,7 @@ 
 		parent::onInit($param);
 		$this->ensureChildControls();
 		$this->setEnsureId(true);
-		if($this->getActiveStepIndex()<0 && $this->getWizardSteps()->getCount()>0)
+		if ($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0)
 			$this->setActiveStepIndex(0);
 	}
 
@@ -780,9 +780,9 @@ 
 	 */
 	public function saveState()
 	{
-		$index=$this->getActiveStepIndex();
-		$history=$this->getHistory();
-		if(!$history->getCount() || $history->peek()!==$index)
+		$index = $this->getActiveStepIndex();
+		$history = $this->getHistory();
+		if (!$history->getCount() || $history->peek() !== $index)
 			$history->push($index);
 	}
 
@@ -791,7 +791,7 @@ 
 	 */
 	protected function requiresControlsRecreation()
 	{
-		if($this->getChildControlsCreated())
+		if ($this->getChildControlsCreated())
 			$this->setChildControlsCreated(false);
 	}
 
@@ -802,9 +802,9 @@ 
 	public function render($writer)
 	{
 		$this->ensureChildControls();
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this->getUseDefaultLayout())
+			if ($this->getUseDefaultLayout())
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -846,9 +846,9 @@ 
 	 */
 	protected function applyHeaderProperties()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))!==null)
+		if (($style = $this->getViewState('HeaderStyle', null)) !== null)
 			$this->_header->getStyle()->mergeWith($style);
-		if($this->getHeaderTemplate()===null)
+		if ($this->getHeaderTemplate() === null)
 		{
 			$this->_header->getControls()->clear();
 			$this->_header->getControls()->add($this->getHeaderText());
@@ -861,21 +861,21 @@ 
 	protected function applySideBarProperties()
 	{
 		$this->_sideBar->setVisible($this->getShowSideBar());
-		if($this->_sideBarDataList!==null && $this->getShowSideBar())
+		if ($this->_sideBarDataList !== null && $this->getShowSideBar())
 		{
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 			$this->_sideBarDataList->dataBind();
-			if(($style=$this->getViewState('SideBarButtonStyle',null))!==null)
+			if (($style = $this->getViewState('SideBarButtonStyle', null)) !== null)
 			{
-				foreach($this->_sideBarDataList->getItems() as $item)
+				foreach ($this->_sideBarDataList->getItems() as $item)
 				{
-					if(($button=$item->findControl('SideBarButton'))!==null)
+					if (($button = $item->findControl('SideBarButton')) !== null)
 						$button->getStyle()->mergeWith($style);
 				}
 			}
 		}
-		if(($style=$this->getViewState('SideBarStyle',null))!==null)
+		if (($style = $this->getViewState('SideBarStyle', null)) !== null)
 			$this->_sideBar->getStyle()->mergeWith($style);
 	}
 
@@ -884,7 +884,7 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style=$this->getViewState('StepStyle',null))!==null)
+		if (($style = $this->getViewState('StepStyle', null)) !== null)
 			$this->_stepContent->getStyle()->mergeWith($style);
 	}
 
@@ -893,116 +893,116 @@ 
 	 */
 	protected function applyNavigationProperties()
 	{
-		$wizardSteps=$this->getWizardSteps();
-		$activeStep=$this->getActiveStep();
-		$activeStepIndex=$this->getActiveStepIndex();
+		$wizardSteps = $this->getWizardSteps();
+		$activeStep = $this->getActiveStep();
+		$activeStepIndex = $this->getActiveStepIndex();
 
-		if(!$this->_navigation)
+		if (!$this->_navigation)
 			return;
-		else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		else if ($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
 		{
 			$this->_navigation->setVisible(false);
 			return;
 		}
 
 		// set visibility of different types of navigation panel
-		$showStandard=true;
-		foreach($wizardSteps as $step)
+		$showStandard = true;
+		foreach ($wizardSteps as $step)
 		{
-			if(($step instanceof TTemplatedWizardStep) && ($container=$step->getNavigationContainer())!==null)
+			if (($step instanceof TTemplatedWizardStep) && ($container = $step->getNavigationContainer()) !== null)
 			{
-				if($activeStep===$step)
+				if ($activeStep === $step)
 				{
 					$container->setVisible(true);
-					$showStandard=false;
+					$showStandard = false;
 				}
 				else
 					$container->setVisible(false);
 			}
 		}
-		$activeStepType=$this->getStepType($activeStep);
-		if($activeStepType===TWizardStepType::Complete)
+		$activeStepType = $this->getStepType($activeStep);
+		if ($activeStepType === TWizardStepType::Complete)
 		{
 			$this->_sideBar->setVisible(false);
 			$this->_header->setVisible(false);
 		}
-		$this->_startNavigation->setVisible($showStandard && $activeStepType===self::ST_START);
-		$this->_stepNavigation->setVisible($showStandard && $activeStepType===self::ST_STEP);
-		$this->_finishNavigation->setVisible($showStandard && $activeStepType===self::ST_FINISH);
+		$this->_startNavigation->setVisible($showStandard && $activeStepType === self::ST_START);
+		$this->_stepNavigation->setVisible($showStandard && $activeStepType === self::ST_STEP);
+		$this->_finishNavigation->setVisible($showStandard && $activeStepType === self::ST_FINISH);
 
-		if(($navigationStyle=$this->getViewState('NavigationStyle',null))!==null)
+		if (($navigationStyle = $this->getViewState('NavigationStyle', null)) !== null)
 			$this->_navigation->getStyle()->mergeWith($navigationStyle);
 
-		$displayCancelButton=$this->getShowCancelButton();
-		$cancelButtonStyle=$this->getCancelButtonStyle();
-		$buttonStyle=$this->getViewState('NavigationButtonStyle',null);
-		if($buttonStyle!==null)
+		$displayCancelButton = $this->getShowCancelButton();
+		$cancelButtonStyle = $this->getCancelButtonStyle();
+		$buttonStyle = $this->getViewState('NavigationButtonStyle', null);
+		if ($buttonStyle !== null)
 			$cancelButtonStyle->mergeWith($buttonStyle);
 
 		// apply styles to start navigation buttons
-		if(($cancelButton=$this->_startNavigation->getCancelButton())!==null)
+		if (($cancelButton = $this->_startNavigation->getCancelButton()) !== null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button=$this->_startNavigation->getNextButton())!==null)
+		if (($button = $this->_startNavigation->getNextButton()) !== null)
 		{
 			$button->setVisible(true);
-			$style=$this->getStartNextButtonStyle();
-			if($buttonStyle!==null)
+			$style = $this->getStartNextButtonStyle();
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType===TWizardStepType::Start)
+			if ($activeStepType === TWizardStepType::Start)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to finish navigation buttons
-		if(($cancelButton=$this->_finishNavigation->getCancelButton())!==null)
+		if (($cancelButton = $this->_finishNavigation->getCancelButton()) !== null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button=$this->_finishNavigation->getPreviousButton())!==null)
+		if (($button = $this->_finishNavigation->getPreviousButton()) !== null)
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
-			$style=$this->getFinishPreviousButtonStyle();
-			if($buttonStyle!==null)
+			$style = $this->getFinishPreviousButtonStyle();
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
 		}
-		if(($button=$this->_finishNavigation->getCompleteButton())!==null)
+		if (($button = $this->_finishNavigation->getCompleteButton()) !== null)
 		{
 			$button->setVisible(true);
-			$style=$this->getFinishCompleteButtonStyle();
-			if($buttonStyle!==null)
+			$style = $this->getFinishCompleteButtonStyle();
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType===TWizardStepType::Finish)
+			if ($activeStepType === TWizardStepType::Finish)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to step navigation buttons
-		if(($cancelButton=$this->_stepNavigation->getCancelButton())!==null)
+		if (($cancelButton = $this->_stepNavigation->getCancelButton()) !== null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button=$this->_stepNavigation->getPreviousButton())!==null)
+		if (($button = $this->_stepNavigation->getPreviousButton()) !== null)
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
-			$style=$this->getStepPreviousButtonStyle();
-			if($buttonStyle!==null)
+			$style = $this->getStepPreviousButtonStyle();
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
 		}
-		if(($button=$this->_stepNavigation->getNextButton())!==null)
+		if (($button = $this->_stepNavigation->getNextButton()) !== null)
 		{
 			$button->setVisible(true);
-			$style=$this->getStepNextButtonStyle();
-			if($buttonStyle!==null)
+			$style = $this->getStepNextButtonStyle();
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType===TWizardStepType::Step)
+			if ($activeStepType === TWizardStepType::Step)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 	}
@@ -1012,10 +1012,10 @@ 
 	 */
 	protected function getHistory()
 	{
-		if(($history=$this->getControlState('History',null))===null)
+		if (($history = $this->getControlState('History', null)) === null)
 		{
-			$history=new TStack;
-			$this->setControlState('History',$history);
+			$history = new TStack;
+			$this->setControlState('History', $history);
 		}
 		return $history;
 	}
@@ -1027,17 +1027,17 @@ 
 	 */
 	protected function getStepType($wizardStep)
 	{
-		if(($type=$wizardStep->getStepType())===TWizardStepType::Auto)
+		if (($type = $wizardStep->getStepType()) === TWizardStepType::Auto)
 		{
-			$steps=$this->getWizardSteps();
-			if(($index=$steps->indexOf($wizardStep))>=0)
+			$steps = $this->getWizardSteps();
+			if (($index = $steps->indexOf($wizardStep)) >= 0)
 			{
-				$stepCount=$steps->getCount();
-				if($stepCount===1 || ($index<$stepCount-1 && $steps->itemAt($index+1)->getStepType()===TWizardStepType::Complete))
+				$stepCount = $steps->getCount();
+				if ($stepCount === 1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType() === TWizardStepType::Complete))
 					return TWizardStepType::Finish;
-				else if($index===0)
+				else if ($index === 0)
 					return TWizardStepType::Start;
-				else if($index===$stepCount-1)
+				else if ($index === $stepCount - 1)
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
@@ -1055,14 +1055,14 @@ 
 	protected function reset()
 	{
 		$this->getControls()->clear();
-		$this->_header=null;
-		$this->_stepContent=null;
-		$this->_sideBar=null;
-		$this->_sideBarDataList=null;
-		$this->_navigation=null;
-		$this->_startNavigation=null;
-		$this->_stepNavigation=null;
-		$this->_finishNavigation=null;
+		$this->_header = null;
+		$this->_stepContent = null;
+		$this->_sideBar = null;
+		$this->_sideBarDataList = null;
+		$this->_navigation = null;
+		$this->_startNavigation = null;
+		$this->_stepNavigation = null;
+		$this->_finishNavigation = null;
 	}
 
 	/**
@@ -1083,8 +1083,8 @@ 
 	 */
 	protected function createHeader()
 	{
-		$this->_header=new TPanel;
-		if(($template=$this->getHeaderTemplate())!==null)
+		$this->_header = new TPanel;
+		if (($template = $this->getHeaderTemplate()) !== null)
 			$template->instantiateIn($this->_header);
 		else
 			$this->_header->getControls()->add($this->getHeaderText());
@@ -1096,18 +1096,18 @@ 
 	 */
 	protected function createSideBar()
 	{
-		if($this->getShowSideBar())
+		if ($this->getShowSideBar())
 		{
-			if(($template=$this->getSideBarTemplate())===null)
-				$template=new TWizardSideBarTemplate;
-			$this->_sideBar=new TPanel;
+			if (($template = $this->getSideBarTemplate()) === null)
+				$template = new TWizardSideBarTemplate;
+			$this->_sideBar = new TPanel;
 			$template->instantiateIn($this->_sideBar);
 			$this->getControls()->add($this->_sideBar);
 
-			if(($this->_sideBarDataList=$this->_sideBar->findControl(self::ID_SIDEBAR_LIST))!==null)
+			if (($this->_sideBarDataList = $this->_sideBar->findControl(self::ID_SIDEBAR_LIST)) !== null)
 			{
-				$this->_sideBarDataList->attachEventHandler('OnItemCommand',array($this,'dataListItemCommand'));
-				$this->_sideBarDataList->attachEventHandler('OnItemDataBound',array($this,'dataListItemDataBound'));
+				$this->_sideBarDataList->attachEventHandler('OnItemCommand', array($this, 'dataListItemCommand'));
+				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', array($this, 'dataListItemDataBound'));
 				$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -1115,7 +1115,7 @@ 
 		}
 		else
 		{
-			$this->_sideBar=new TPanel;
+			$this->_sideBar = new TPanel;
 			$this->getControls()->add($this->_sideBar);
 		}
 	}
@@ -1127,28 +1127,28 @@ 
 	 * @param mixed sender of the event
 	 * @param TDataListCommandEventParameter
 	 */
-	public function dataListItemCommand($sender,$param)
+	public function dataListItemCommand($sender, $param)
 	{
-		$item=$param->getItem();
-		if($param->getCommandName()===self::CMD_MOVETO)
+		$item = $param->getItem();
+		if ($param->getCommandName() === self::CMD_MOVETO)
 		{
-			$stepIndex=$this->getActiveStepIndex();
-			$newStepIndex=TPropertyValue::ensureInteger($param->getCommandParameter());
-			$navParam=new TWizardNavigationEventParameter($stepIndex);
+			$stepIndex = $this->getActiveStepIndex();
+			$newStepIndex = TPropertyValue::ensureInteger($param->getCommandParameter());
+			$navParam = new TWizardNavigationEventParameter($stepIndex);
 			$navParam->setNextStepIndex($newStepIndex);
 
 			// if the button clicked causes validation which fails,
 			// by default we will cancel navigation to the new step
-			$button=$param->getCommandSource();
-			if(($button instanceof IButtonControl) && $button->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
+			$button = $param->getCommandSource();
+			if (($button instanceof IButtonControl) && $button->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
 				$navParam->setCancelNavigation(true);
 
-			$this->_activeStepIndexSet=false;
+			$this->_activeStepIndexSet = false;
 			$this->onSideBarButtonClick($navParam);
-			$this->_cancelNavigation=$navParam->getCancelNavigation();
-			if(!$this->_cancelNavigation)
+			$this->_cancelNavigation = $navParam->getCancelNavigation();
+			if (!$this->_cancelNavigation)
 			{
-				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
+				if (!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
 					$this->setActiveStepIndex($newStepIndex);
 			}
 			else
@@ -1163,22 +1163,22 @@ 
 	 * @param mixed sender of the event
 	 * @param TDataListItemEventParameter
 	 */
-	public function dataListItemDataBound($sender,$param)
+	public function dataListItemDataBound($sender, $param)
 	{
-		$item=$param->getItem();
-		$itemType=$item->getItemType();
-		if($itemType==='Item' || $itemType==='AlternatingItem' || $itemType==='SelectedItem' || $itemType==='EditItem')
+		$item = $param->getItem();
+		$itemType = $item->getItemType();
+		if ($itemType === 'Item' || $itemType === 'AlternatingItem' || $itemType === 'SelectedItem' || $itemType === 'EditItem')
 		{
-			if(($button=$item->findControl(self::ID_SIDEBAR_BUTTON))!==null)
+			if (($button = $item->findControl(self::ID_SIDEBAR_BUTTON)) !== null)
 			{
-				$step=$item->getData();
-				if(($this->getStepType($step)===TWizardStepType::Complete))
+				$step = $item->getData();
+				if (($this->getStepType($step) === TWizardStepType::Complete))
 					$button->setEnabled(false);
-				if(($title=$step->getTitle())!=='')
+				if (($title = $step->getTitle()) !== '')
 					$button->setText($title);
 				else
 					$button->setText($step->getID(false));
-				$index=$this->getWizardSteps()->indexOf($step);
+				$index = $this->getWizardSteps()->indexOf($step);
 				$button->setCommandName(self::CMD_MOVETO);
 				$button->setCommandParameter("$index");
 			}
@@ -1190,16 +1190,16 @@ 
 	 */
 	protected function createStepContent()
 	{
-		foreach($this->getWizardSteps() as $step)
+		foreach ($this->getWizardSteps() as $step)
 		{
-			if($step instanceof TTemplatedWizardStep)
+			if ($step instanceof TTemplatedWizardStep)
 				$step->ensureChildControls();
 		}
-		$multiView=$this->getMultiView();
-		$this->_stepContent=new TPanel;
+		$multiView = $this->getMultiView();
+		$this->_stepContent = new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
-		if($multiView->getViews()->getCount())
+		if ($multiView->getViews()->getCount())
 			$multiView->setActiveViewIndex(0);
 	}
 
@@ -1208,23 +1208,23 @@ 
 	 */
 	protected function createNavigation()
 	{
-		$this->_navigation=new TPanel;
+		$this->_navigation = new TPanel;
 		$this->getControls()->add($this->_navigation);
-		$controls=$this->_navigation->getControls();
-		foreach($this->getWizardSteps() as $step)
+		$controls = $this->_navigation->getControls();
+		foreach ($this->getWizardSteps() as $step)
 		{
-			if($step instanceof TTemplatedWizardStep)
+			if ($step instanceof TTemplatedWizardStep)
 			{
 				$step->instantiateNavigationTemplate();
-				if(($panel=$step->getNavigationContainer())!==null)
+				if (($panel = $step->getNavigationContainer()) !== null)
 					$controls->add($panel);
 			}
 		}
-		$this->_startNavigation=$this->createStartNavigation();
+		$this->_startNavigation = $this->createStartNavigation();
 		$controls->add($this->_startNavigation);
-		$this->_stepNavigation=$this->createStepNavigation();
+		$this->_stepNavigation = $this->createStepNavigation();
 		$controls->add($this->_stepNavigation);
-		$this->_finishNavigation=$this->createFinishNavigation();
+		$this->_finishNavigation = $this->createFinishNavigation();
 		$controls->add($this->_finishNavigation);
 	}
 
@@ -1233,9 +1233,9 @@ 
 	 */
 	protected function createStartNavigation()
 	{
-		if(($template=$this->getStartNavigationTemplate())===null)
-			$template=new TWizardStartNavigationTemplate($this);
-		$navigation=new TWizardNavigationContainer;
+		if (($template = $this->getStartNavigationTemplate()) === null)
+			$template = new TWizardStartNavigationTemplate($this);
+		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
 	}
@@ -1245,9 +1245,9 @@ 
 	 */
 	protected function createStepNavigation()
 	{
-		if(($template=$this->getStepNavigationTemplate())===null)
-			$template=new TWizardStepNavigationTemplate($this);
-		$navigation=new TWizardNavigationContainer;
+		if (($template = $this->getStepNavigationTemplate()) === null)
+			$template = new TWizardStepNavigationTemplate($this);
+		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
 	}
@@ -1257,9 +1257,9 @@ 
 	 */
 	protected function createFinishNavigation()
 	{
-		if(($template=$this->getFinishNavigationTemplate())===null)
-			$template=new TWizardFinishNavigationTemplate($this);
-		$navigation=new TWizardNavigationContainer;
+		if (($template = $this->getFinishNavigationTemplate()) === null)
+			$template = new TWizardFinishNavigationTemplate($this);
+		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
 	}
@@ -1270,7 +1270,7 @@ 
 	 */
 	public function wizardStepsChanged()
 	{
-		if($this->_sideBarDataList!==null)
+		if ($this->_sideBarDataList !== null)
 		{
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
@@ -1285,28 +1285,28 @@ 
 	 */
 	protected function getPreviousStepIndex($popStack)
 	{
-		$history=$this->getHistory();
-		if($history->getCount()>=0)
+		$history = $this->getHistory();
+		if ($history->getCount() >= 0)
 		{
-			$activeStepIndex=$this->getActiveStepIndex();
-			$previousStepIndex=-1;
-			if($popStack)
+			$activeStepIndex = $this->getActiveStepIndex();
+			$previousStepIndex = -1;
+			if ($popStack)
 			{
-				$previousStepIndex=$history->pop();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
-					$previousStepIndex=$history->pop();
+				$previousStepIndex = $history->pop();
+				if ($activeStepIndex === $previousStepIndex && $history->getCount() > 0)
+					$previousStepIndex = $history->pop();
 			}
 			else
 			{
-				$previousStepIndex=$history->peek();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
+				$previousStepIndex = $history->peek();
+				if ($activeStepIndex === $previousStepIndex && $history->getCount() > 1)
 				{
-					$saveIndex=$history->pop();
-					$previousStepIndex=$history->peek();
+					$saveIndex = $history->pop();
+					$previousStepIndex = $history->peek();
 					$history->push($saveIndex);
 				}
 			}
-			return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex;
+			return $activeStepIndex === $previousStepIndex ? -1 : $previousStepIndex;
 		}
 		else
 			return -1;
@@ -1317,7 +1317,7 @@ 
 	 */
 	protected function allowNavigationToPreviousStep()
 	{
-		if(($index=$this->getPreviousStepIndex(false))!==-1)
+		if (($index = $this->getPreviousStepIndex(false)) !== -1)
 			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
 		else
 			return false;
@@ -1329,7 +1329,7 @@ 
 	 */
 	protected function allowNavigationToStep($index)
 	{
-		if($this->getHistory()->contains($index))
+		if ($this->getHistory()->contains($index))
 			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
 		else
 			return true;
@@ -1343,87 +1343,87 @@ 
 	 * @param TEventParameter event parameter
 	 * @throws TInvalidDataValueException if a navigation command is associated with an invalid parameter
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TCommandEventParameter)
+		if ($param instanceof TCommandEventParameter)
 		{
-			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_CANCEL)===0)
+			$command = $param->getCommandName();
+			if (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelButtonClick($param);
 				return true;
 			}
 
-			$type=$this->getStepType($this->getActiveStep());
-			$index=$this->getActiveStepIndex();
-			$navParam=new TWizardNavigationEventParameter($index);
-			if(($sender instanceof IButtonControl) && $sender->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
+			$type = $this->getStepType($this->getActiveStep());
+			$index = $this->getActiveStepIndex();
+			$navParam = new TWizardNavigationEventParameter($index);
+			if (($sender instanceof IButtonControl) && $sender->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
 				$navParam->setCancelNavigation(true);
 
-			$handled=false;
-			$movePrev=false;
-			$this->_activeStepIndexSet=false;
+			$handled = false;
+			$movePrev = false;
+			$this->_activeStepIndexSet = false;
 
-			if(strcasecmp($command,self::CMD_NEXT)===0)
+			if (strcasecmp($command, self::CMD_NEXT) === 0)
 			{
-				if($type!==self::ST_START && $type!==self::ST_STEP)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_NEXT);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+				if ($type !== self::ST_START && $type !== self::ST_STEP)
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
+				if ($index < $this->getWizardSteps()->getCount() - 1)
+					$navParam->setNextStepIndex($index + 1);
 				$this->onNextButtonClick($navParam);
-				$handled=true;
+				$handled = true;
 			}
-			else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
+			else if (strcasecmp($command, self::CMD_PREVIOUS) === 0)
 			{
-				if($type!==self::ST_FINISH && $type!==self::ST_STEP)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
-				$movePrev=true;
-				if(($prevIndex=$this->getPreviousStepIndex(false))>=0)
+				if ($type !== self::ST_FINISH && $type !== self::ST_STEP)
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
+				$movePrev = true;
+				if (($prevIndex = $this->getPreviousStepIndex(false)) >= 0)
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
-				$handled=true;
+				$handled = true;
 			}
-			else if(strcasecmp($command,self::CMD_COMPLETE)===0)
+			else if (strcasecmp($command, self::CMD_COMPLETE) === 0)
 			{
-				if($type!==self::ST_FINISH)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+				if ($type !== self::ST_FINISH)
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
+				if ($index < $this->getWizardSteps()->getCount() - 1)
+					$navParam->setNextStepIndex($index + 1);
 				$this->onCompleteButtonClick($navParam);
-				$handled=true;
+				$handled = true;
 			}
-			else if(strcasecmp($command,self::CMD_MOVETO)===0)
+			else if (strcasecmp($command, self::CMD_MOVETO) === 0)
 			{
-				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
+				if ($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
-				$requestedStep=$param->getCommandParameter();
+				$requestedStep = $param->getCommandParameter();
 				if (!is_numeric($requestedStep))
 				{
-					$requestedIndex=-1;
+					$requestedIndex = -1;
 					foreach ($this->getWizardSteps() as $index=>$step)
-						if ($step->getId()===$requestedStep)
+						if ($step->getId() === $requestedStep)
 						{
-							$requestedIndex=$index;
+							$requestedIndex = $index;
 							break;
 						}
-					if ($requestedIndex<0)
+					if ($requestedIndex < 0)
 						throw new TConfigurationException('wizard_step_invalid');
 				}
 				else
-					$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
+					$requestedIndex = TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
-				$handled=true;
+				$handled = true;
 			}
 
-			if($handled)
+			if ($handled)
 			{
-				if(!$navParam->getCancelNavigation())
+				if (!$navParam->getCancelNavigation())
 				{
-					$nextStepIndex=$navParam->getNextStepIndex();
-					if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
+					$nextStepIndex = $navParam->getNextStepIndex();
+					if (!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
 					{
-						if($movePrev)
-							$this->getPreviousStepIndex(true);  // pop out the previous move from history
+						if ($movePrev)
+							$this->getPreviousStepIndex(true); // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
 				}
@@ -1469,7 +1469,7 @@ 
 	 */
 	public function setWizard($wizard)
 	{
-		$this->_wizard=$wizard;
+		$this->_wizard = $wizard;
 	}
 
 	/**
@@ -1477,7 +1477,7 @@ 
 	 */
 	public function getTitle()
 	{
-		return $this->getViewState('Title','');
+		return $this->getViewState('Title', '');
 	}
 
 	/**
@@ -1485,8 +1485,8 @@ 
 	 */
 	public function setTitle($value)
 	{
-		$this->setViewState('Title',$value,'');
-		if($this->_wizard)
+		$this->setViewState('Title', $value, '');
+		if ($this->_wizard)
 			$this->_wizard->wizardStepsChanged();
 	}
 
@@ -1495,7 +1495,7 @@ 
 	 */
 	public function getAllowReturn()
 	{
-		return $this->getViewState('AllowReturn',true);
+		return $this->getViewState('AllowReturn', true);
 	}
 
 	/**
@@ -1503,7 +1503,7 @@ 
 	 */
 	public function setAllowReturn($value)
 	{
-		$this->setViewState('AllowReturn',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AllowReturn', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -1511,7 +1511,7 @@ 
 	 */
 	public function getStepType()
 	{
-		return $this->getViewState('StepType',TWizardStepType::Auto);
+		return $this->getViewState('StepType', TWizardStepType::Auto);
 	}
 
 	/**
@@ -1519,11 +1519,11 @@ 
 	 */
 	public function setStepType($type)
 	{
-		$type=TPropertyValue::ensureEnum($type,'TWizardStepType');
-		if($type!==$this->getStepType())
+		$type = TPropertyValue::ensureEnum($type, 'TWizardStepType');
+		if ($type !== $this->getStepType())
 		{
-			$this->setViewState('StepType',$type,TWizardStepType::Auto);
-			if($this->_wizard)
+			$this->setViewState('StepType', $type, TWizardStepType::Auto);
+			if ($this->_wizard)
 				$this->_wizard->wizardStepsChanged();
 		}
 	}
@@ -1578,15 +1578,15 @@ 
 	/**
 	 * @var ITemplate the template for displaying the navigation UI of a wizard step.
 	 */
-	private $_navigationTemplate=null;
+	private $_navigationTemplate = null;
 	/**
 	 * @var ITemplate the template for displaying the content within the wizard step.
 	 */
-	private $_contentTemplate=null;
+	private $_contentTemplate = null;
 	/**
 	 * @var TWizardNavigationContainer
 	 */
-	private $_navigationContainer=null;
+	private $_navigationContainer = null;
 
 	/**
 	 * Creates child controls.
@@ -1595,7 +1595,7 @@ 
 	public function createChildControls()
 	{
 		$this->getControls()->clear();
-		if($this->_contentTemplate)
+		if ($this->_contentTemplate)
 			$this->_contentTemplate->instantiateIn($this);
 	}
 
@@ -1622,7 +1622,7 @@ 
 	 */
 	public function setContentTemplate($value)
 	{
-		$this->_contentTemplate=$value;
+		$this->_contentTemplate = $value;
 	}
 
 	/**
@@ -1638,7 +1638,7 @@ 
 	 */
 	public function setNavigationTemplate($value)
 	{
-		$this->_navigationTemplate=$value;
+		$this->_navigationTemplate = $value;
 	}
 
 	/**
@@ -1655,9 +1655,9 @@ 
 	 */
 	public function instantiateNavigationTemplate()
 	{
-		if(!$this->_navigationContainer && $this->_navigationTemplate)
+		if (!$this->_navigationContainer && $this->_navigationTemplate)
 		{
-			$this->_navigationContainer=new TWizardNavigationContainer;
+			$this->_navigationContainer = new TWizardNavigationContainer;
 			$this->_navigationTemplate->instantiateIn($this->_navigationContainer);
 		}
 	}
@@ -1687,7 +1687,7 @@ 
 	 */
 	public function __construct(TWizard $wizard)
 	{
-		$this->_wizard=$wizard;
+		$this->_wizard = $wizard;
 	}
 
 	/**
@@ -1698,12 +1698,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item being added is not TWizardStep.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TWizardStep)
+		if ($item instanceof TWizardStep)
 		{
-			parent::insertAt($index,$item);
-			$this->_wizard->getMultiView()->getViews()->insertAt($index,$item);
+			parent::insertAt($index, $item);
+			$this->_wizard->getMultiView()->getViews()->insertAt($index, $item);
 			$this->_wizard->addedWizardStep($item);
 		}
 		else
@@ -1717,7 +1717,7 @@ 
 	 */
 	public function removeAt($index)
 	{
-		$step=parent::removeAt($index);
+		$step = parent::removeAt($index);
 		$this->_wizard->getMultiView()->getViews()->remove($step);
 		$this->_wizard->removedWizardStep($step);
 		return $step;
@@ -1739,10 +1739,10 @@ 
  */
 class TWizardNavigationContainer extends TControl implements INamingContainer
 {
-	private $_previousButton=null;
-	private $_nextButton=null;
-	private $_cancelButton=null;
-	private $_completeButton=null;
+	private $_previousButton = null;
+	private $_nextButton = null;
+	private $_cancelButton = null;
+	private $_completeButton = null;
 
 	/**
 	 * @return mixed the previous button
@@ -1757,7 +1757,7 @@ 
 	 */
 	public function setPreviousButton($value)
 	{
-		$this->_previousButton=$value;
+		$this->_previousButton = $value;
 	}
 
 	/**
@@ -1773,7 +1773,7 @@ 
 	 */
 	public function setNextButton($value)
 	{
-		$this->_nextButton=$value;
+		$this->_nextButton = $value;
 	}
 
 	/**
@@ -1789,7 +1789,7 @@ 
 	 */
 	public function setCancelButton($value)
 	{
-		$this->_cancelButton=$value;
+		$this->_cancelButton = $value;
 	}
 
 	/**
@@ -1805,7 +1805,7 @@ 
 	 */
 	public function setCompleteButton($value)
 	{
-		$this->_completeButton=$value;
+		$this->_completeButton = $value;
 	}
 }
 
@@ -1830,7 +1830,7 @@ 
  */
 class TWizardNavigationEventParameter extends TEventParameter
 {
-	private $_cancel=false;
+	private $_cancel = false;
 	private $_currentStep;
 	private $_nextStep;
 
@@ -1840,8 +1840,8 @@ 
 	 */
 	public function __construct($currentStep)
 	{
-		$this->_currentStep=$currentStep;
-		$this->_nextStep=$currentStep;
+		$this->_currentStep = $currentStep;
+		$this->_nextStep = $currentStep;
 	}
 
 	/**
@@ -1865,7 +1865,7 @@ 
 	 */
 	public function setNextStepIndex($index)
 	{
-		$this->_nextStep=TPropertyValue::ensureInteger($index);
+		$this->_nextStep = TPropertyValue::ensureInteger($index);
 	}
 
 	/**
@@ -1881,7 +1881,7 @@ 
 	 */
 	public function setCancelNavigation($value)
 	{
-		$this->_cancel=TPropertyValue::ensureBoolean($value);
+		$this->_cancel = TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -1901,7 +1901,7 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$dataList=new TDataList;
+		$dataList = new TDataList;
 		$dataList->setID(TWizard::ID_SIDEBAR_LIST);
 		$dataList->getSelectedItemStyle()->getFont()->setBold(true);
 		$dataList->setItemTemplate(new TWizardSideBarListItemTemplate);
@@ -1925,7 +1925,7 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$button=new TLinkButton;
+		$button = new TLinkButton;
 		$button->setID(TWizard::ID_SIDEBAR_BUTTON);
 		$parent->getControls()->add($button);
 	}
@@ -1948,7 +1948,7 @@ 
 	 */
 	public function __construct($wizard)
 	{
-		$this->_wizard=$wizard;
+		$this->_wizard = $wizard;
 	}
 
 	/**
@@ -1977,22 +1977,22 @@ 
 	 * @param string command name for the button's OnCommand event
 	 * @throws TInvalidDataValueException if the button type is not recognized
 	 */
-	protected function createNavigationButton($buttonStyle,$causesValidation,$commandName)
+	protected function createNavigationButton($buttonStyle, $causesValidation, $commandName)
 	{
-		switch($buttonStyle->getButtonType())
+		switch ($buttonStyle->getButtonType())
 		{
 			case TWizardNavigationButtonType::Button:
-				$button=new TButton;
+				$button = new TButton;
 				break;
 			case TWizardNavigationButtonType::Link:
-				$button=new TLinkButton;
+				$button = new TLinkButton;
 				break;
 			case TWizardNavigationButtonType::Image:
-				$button=new TImageButton;
+				$button = new TImageButton;
 				$button->setImageUrl($buttonStyle->getImageUrl());
 				break;
 			default:
-				throw new TInvalidDataValueException('wizard_buttontype_unknown',$buttonStyle->getButtonType());
+				throw new TInvalidDataValueException('wizard_buttontype_unknown', $buttonStyle->getButtonType());
 		}
 		$button->setText($buttonStyle->getButtonText());
 		$button->setCausesValidation($causesValidation);
@@ -2017,10 +2017,10 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$nextButton=$this->createNavigationButton($this->getWizard()->getStartNextButtonStyle(),true,TWizard::CMD_NEXT);
-		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(),false,TWizard::CMD_CANCEL);
+		$nextButton = $this->createNavigationButton($this->getWizard()->getStartNextButtonStyle(), true, TWizard::CMD_NEXT);
+		$cancelButton = $this->createNavigationButton($this->getWizard()->getCancelButtonStyle(), false, TWizard::CMD_CANCEL);
 
-		$controls=$parent->getControls();
+		$controls = $parent->getControls();
 		$controls->add($nextButton);
 		$controls->add("\n");
 		$controls->add($cancelButton);
@@ -2046,11 +2046,11 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$previousButton=$this->createNavigationButton($this->getWizard()->getFinishPreviousButtonStyle(),false,TWizard::CMD_PREVIOUS);
-		$completeButton=$this->createNavigationButton($this->getWizard()->getFinishCompleteButtonStyle(),true,TWizard::CMD_COMPLETE);
-		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(),false,TWizard::CMD_CANCEL);
+		$previousButton = $this->createNavigationButton($this->getWizard()->getFinishPreviousButtonStyle(), false, TWizard::CMD_PREVIOUS);
+		$completeButton = $this->createNavigationButton($this->getWizard()->getFinishCompleteButtonStyle(), true, TWizard::CMD_COMPLETE);
+		$cancelButton = $this->createNavigationButton($this->getWizard()->getCancelButtonStyle(), false, TWizard::CMD_CANCEL);
 
-		$controls=$parent->getControls();
+		$controls = $parent->getControls();
 		$controls->add($previousButton);
 		$controls->add("\n");
 		$controls->add($completeButton);
@@ -2079,11 +2079,11 @@ 
 	 */
 	public function instantiateIn($parent)
 	{
-		$previousButton=$this->createNavigationButton($this->getWizard()->getStepPreviousButtonStyle(),false,TWizard::CMD_PREVIOUS);
-		$nextButton=$this->createNavigationButton($this->getWizard()->getStepNextButtonStyle(),true,TWizard::CMD_NEXT);
-		$cancelButton=$this->createNavigationButton($this->getWizard()->getCancelButtonStyle(),false,TWizard::CMD_CANCEL);
+		$previousButton = $this->createNavigationButton($this->getWizard()->getStepPreviousButtonStyle(), false, TWizard::CMD_PREVIOUS);
+		$nextButton = $this->createNavigationButton($this->getWizard()->getStepNextButtonStyle(), true, TWizard::CMD_NEXT);
+		$cancelButton = $this->createNavigationButton($this->getWizard()->getCancelButtonStyle(), false, TWizard::CMD_CANCEL);
 
-		$controls=$parent->getControls();
+		$controls = $parent->getControls();
 		$controls->add($previousButton);
 		$controls->add("\n");
 		$controls->add($nextButton);
@@ -2113,9 +2113,9 @@ 
  */
 class TWizardNavigationButtonType extends TEnumerable
 {
-	const Button='Button';
-	const Image='Image';
-	const Link='Link';
+	const Button = 'Button';
+	const Image = 'Image';
+	const Link = 'Link';
 }
 
 
@@ -2136,10 +2136,10 @@ 
  */
 class TWizardStepType extends TEnumerable
 {
-	const Auto='Auto';
-	const Complete='Complete';
-	const Start='Start';
-	const Step='Step';
-	const Finish='Finish';
+	const Auto = 'Auto';
+	const Complete = 'Complete';
+	const Start = 'Start';
+	const Step = 'Step';
+	const Finish = 'Finish';
 }
 

Braces +199 added lines, -150 removed lines

@@ -192,8 +192,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TWizardStep)
-			$this->getWizardSteps()->add($object);
+		if($object instanceof TWizardStep) {
+					$this->getWizardSteps()->add($object);
+		}
 	}
 
 	/**
@@ -210,8 +211,9 @@ 
 	 */
 	public function setActiveStep($step)
 	{
-		if(($index=$this->getWizardSteps()->indexOf($step))<0)
-			throw new TInvalidOperationException('wizard_step_invalid');
+		if(($index=$this->getWizardSteps()->indexOf($step))<0) {
+					throw new TInvalidOperationException('wizard_step_invalid');
+		}
 		$this->setActiveStepIndex($index);
 	}
 
@@ -247,8 +249,9 @@ 
 	 */
 	public function getWizardSteps()
 	{
-		if($this->_wizardSteps===null)
-			$this->_wizardSteps=new TWizardStepCollection($this);
+		if($this->_wizardSteps===null) {
+					$this->_wizardSteps=new TWizardStepCollection($this);
+		}
 		return $this->_wizardSteps;
 	}
 
@@ -668,8 +671,9 @@ 
 	public function onCancelButtonClick($param)
 	{
 		$this->raiseEvent('OnCancelButtonClick',$this,$param);
-		if(($url=$this->getCancelDestinationUrl())!=='')
-			$this->getResponse()->redirect($url);
+		if(($url=$this->getCancelDestinationUrl())!=='') {
+					$this->getResponse()->redirect($url);
+		}
 	}
 
 	/**
@@ -681,8 +685,9 @@ 
 	public function onCompleteButtonClick($param)
 	{
 		$this->raiseEvent('OnCompleteButtonClick',$this,$param);
-		if(($url=$this->getFinishDestinationUrl())!=='')
-			$this->getResponse()->redirect($url);
+		if(($url=$this->getFinishDestinationUrl())!=='') {
+					$this->getResponse()->redirect($url);
+		}
 	}
 
 	/**
@@ -742,8 +747,9 @@ 
 	 */
 	public function addedWizardStep($step)
 	{
-		if(($wizard=$step->getWizard())!==null)
-			$wizard->getWizardSteps()->remove($step);
+		if(($wizard=$step->getWizard())!==null) {
+					$wizard->getWizardSteps()->remove($step);
+		}
 		$step->setWizard($this);
 		$this->wizardStepsChanged();
 	}
@@ -770,8 +776,9 @@ 
 		parent::onInit($param);
 		$this->ensureChildControls();
 		$this->setEnsureId(true);
-		if($this->getActiveStepIndex()<0 && $this->getWizardSteps()->getCount()>0)
-			$this->setActiveStepIndex(0);
+		if($this->getActiveStepIndex()<0 && $this->getWizardSteps()->getCount()>0) {
+					$this->setActiveStepIndex(0);
+		}
 	}
 
 	/**
@@ -782,8 +789,9 @@ 
 	{
 		$index=$this->getActiveStepIndex();
 		$history=$this->getHistory();
-		if(!$history->getCount() || $history->peek()!==$index)
-			$history->push($index);
+		if(!$history->getCount() || $history->peek()!==$index) {
+					$history->push($index);
+		}
 	}
 
 	/**
@@ -791,8 +799,9 @@ 
 	 */
 	protected function requiresControlsRecreation()
 	{
-		if($this->getChildControlsCreated())
-			$this->setChildControlsCreated(false);
+		if($this->getChildControlsCreated()) {
+					$this->setChildControlsCreated(false);
+		}
 	}
 
 	/**
@@ -816,8 +825,7 @@ 
 				$this->_navigation->renderControl($writer);
 				$writer->write("\n</td></tr></table>\n");
 				$this->renderEndTag($writer);
-			}
-			else
+			} else
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -846,8 +854,9 @@ 
 	 */
 	protected function applyHeaderProperties()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))!==null)
-			$this->_header->getStyle()->mergeWith($style);
+		if(($style=$this->getViewState('HeaderStyle',null))!==null) {
+					$this->_header->getStyle()->mergeWith($style);
+		}
 		if($this->getHeaderTemplate()===null)
 		{
 			$this->_header->getControls()->clear();
@@ -870,13 +879,15 @@ 
 			{
 				foreach($this->_sideBarDataList->getItems() as $item)
 				{
-					if(($button=$item->findControl('SideBarButton'))!==null)
-						$button->getStyle()->mergeWith($style);
+					if(($button=$item->findControl('SideBarButton'))!==null) {
+											$button->getStyle()->mergeWith($style);
+					}
 				}
 			}
 		}
-		if(($style=$this->getViewState('SideBarStyle',null))!==null)
-			$this->_sideBar->getStyle()->mergeWith($style);
+		if(($style=$this->getViewState('SideBarStyle',null))!==null) {
+					$this->_sideBar->getStyle()->mergeWith($style);
+		}
 	}
 
 	/**
@@ -884,8 +895,9 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style=$this->getViewState('StepStyle',null))!==null)
-			$this->_stepContent->getStyle()->mergeWith($style);
+		if(($style=$this->getViewState('StepStyle',null))!==null) {
+					$this->_stepContent->getStyle()->mergeWith($style);
+		}
 	}
 
 	/**
@@ -897,9 +909,9 @@ 
 		$activeStep=$this->getActiveStep();
 		$activeStepIndex=$this->getActiveStepIndex();
 
-		if(!$this->_navigation)
-			return;
-		else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		if(!$this->_navigation) {
+					return;
+		} else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
 		{
 			$this->_navigation->setVisible(false);
 			return;
@@ -915,9 +927,9 @@ 
 				{
 					$container->setVisible(true);
 					$showStandard=false;
+				} else {
+									$container->setVisible(false);
 				}
-				else
-					$container->setVisible(false);
 			}
 		}
 		$activeStepType=$this->getStepType($activeStep);
@@ -930,14 +942,16 @@ 
 		$this->_stepNavigation->setVisible($showStandard && $activeStepType===self::ST_STEP);
 		$this->_finishNavigation->setVisible($showStandard && $activeStepType===self::ST_FINISH);
 
-		if(($navigationStyle=$this->getViewState('NavigationStyle',null))!==null)
-			$this->_navigation->getStyle()->mergeWith($navigationStyle);
+		if(($navigationStyle=$this->getViewState('NavigationStyle',null))!==null) {
+					$this->_navigation->getStyle()->mergeWith($navigationStyle);
+		}
 
 		$displayCancelButton=$this->getShowCancelButton();
 		$cancelButtonStyle=$this->getCancelButtonStyle();
 		$buttonStyle=$this->getViewState('NavigationButtonStyle',null);
-		if($buttonStyle!==null)
-			$cancelButtonStyle->mergeWith($buttonStyle);
+		if($buttonStyle!==null) {
+					$cancelButtonStyle->mergeWith($buttonStyle);
+		}
 
 		// apply styles to start navigation buttons
 		if(($cancelButton=$this->_startNavigation->getCancelButton())!==null)
@@ -949,11 +963,13 @@ 
 		{
 			$button->setVisible(true);
 			$style=$this->getStartNextButtonStyle();
-			if($buttonStyle!==null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle!==null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
-			if($activeStepType===TWizardStepType::Start)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if($activeStepType===TWizardStepType::Start) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 
 		// apply styles to finish navigation buttons
@@ -966,19 +982,22 @@ 
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
 			$style=$this->getFinishPreviousButtonStyle();
-			if($buttonStyle!==null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle!==null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
 		}
 		if(($button=$this->_finishNavigation->getCompleteButton())!==null)
 		{
 			$button->setVisible(true);
 			$style=$this->getFinishCompleteButtonStyle();
-			if($buttonStyle!==null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle!==null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
-			if($activeStepType===TWizardStepType::Finish)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if($activeStepType===TWizardStepType::Finish) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 
 		// apply styles to step navigation buttons
@@ -991,19 +1010,22 @@ 
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
 			$style=$this->getStepPreviousButtonStyle();
-			if($buttonStyle!==null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle!==null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
 		}
 		if(($button=$this->_stepNavigation->getNextButton())!==null)
 		{
 			$button->setVisible(true);
 			$style=$this->getStepNextButtonStyle();
-			if($buttonStyle!==null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle!==null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
-			if($activeStepType===TWizardStepType::Step)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if($activeStepType===TWizardStepType::Step) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 	}
 
@@ -1033,20 +1055,21 @@ 
 			if(($index=$steps->indexOf($wizardStep))>=0)
 			{
 				$stepCount=$steps->getCount();
-				if($stepCount===1 || ($index<$stepCount-1 && $steps->itemAt($index+1)->getStepType()===TWizardStepType::Complete))
-					return TWizardStepType::Finish;
-				else if($index===0)
-					return TWizardStepType::Start;
-				else if($index===$stepCount-1)
-					return TWizardStepType::Finish;
-				else
-					return TWizardStepType::Step;
+				if($stepCount===1 || ($index<$stepCount-1 && $steps->itemAt($index+1)->getStepType()===TWizardStepType::Complete)) {
+									return TWizardStepType::Finish;
+				} else if($index===0) {
+									return TWizardStepType::Start;
+				} else if($index===$stepCount-1) {
+									return TWizardStepType::Finish;
+				} else {
+									return TWizardStepType::Step;
+				}
+			} else {
+							return $type;
 			}
-			else
-				return $type;
+		} else {
+					return $type;
 		}
-		else
-			return $type;
 	}
 
 	/**
@@ -1084,10 +1107,11 @@ 
 	protected function createHeader()
 	{
 		$this->_header=new TPanel;
-		if(($template=$this->getHeaderTemplate())!==null)
-			$template->instantiateIn($this->_header);
-		else
-			$this->_header->getControls()->add($this->getHeaderText());
+		if(($template=$this->getHeaderTemplate())!==null) {
+					$template->instantiateIn($this->_header);
+		} else {
+					$this->_header->getControls()->add($this->getHeaderText());
+		}
 		$this->getControls()->add($this->_header);
 	}
 
@@ -1098,8 +1122,9 @@ 
 	{
 		if($this->getShowSideBar())
 		{
-			if(($template=$this->getSideBarTemplate())===null)
-				$template=new TWizardSideBarTemplate;
+			if(($template=$this->getSideBarTemplate())===null) {
+							$template=new TWizardSideBarTemplate;
+			}
 			$this->_sideBar=new TPanel;
 			$template->instantiateIn($this->_sideBar);
 			$this->getControls()->add($this->_sideBar);
@@ -1112,8 +1137,7 @@ 
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
 			}
-		}
-		else
+		} else
 		{
 			$this->_sideBar=new TPanel;
 			$this->getControls()->add($this->_sideBar);
@@ -1140,19 +1164,21 @@ 
 			// if the button clicked causes validation which fails,
 			// by default we will cancel navigation to the new step
 			$button=$param->getCommandSource();
-			if(($button instanceof IButtonControl) && $button->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
-				$navParam->setCancelNavigation(true);
+			if(($button instanceof IButtonControl) && $button->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid()) {
+							$navParam->setCancelNavigation(true);
+			}
 
 			$this->_activeStepIndexSet=false;
 			$this->onSideBarButtonClick($navParam);
 			$this->_cancelNavigation=$navParam->getCancelNavigation();
 			if(!$this->_cancelNavigation)
 			{
-				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
-					$this->setActiveStepIndex($newStepIndex);
+				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex)) {
+									$this->setActiveStepIndex($newStepIndex);
+				}
+			} else {
+							$this->setActiveStepIndex($stepIndex);
 			}
-			else
-				$this->setActiveStepIndex($stepIndex);
 		}
 	}
 
@@ -1172,12 +1198,14 @@ 
 			if(($button=$item->findControl(self::ID_SIDEBAR_BUTTON))!==null)
 			{
 				$step=$item->getData();
-				if(($this->getStepType($step)===TWizardStepType::Complete))
-					$button->setEnabled(false);
-				if(($title=$step->getTitle())!=='')
-					$button->setText($title);
-				else
-					$button->setText($step->getID(false));
+				if(($this->getStepType($step)===TWizardStepType::Complete)) {
+									$button->setEnabled(false);
+				}
+				if(($title=$step->getTitle())!=='') {
+									$button->setText($title);
+				} else {
+									$button->setText($step->getID(false));
+				}
 				$index=$this->getWizardSteps()->indexOf($step);
 				$button->setCommandName(self::CMD_MOVETO);
 				$button->setCommandParameter("$index");
@@ -1192,15 +1220,17 @@ 
 	{
 		foreach($this->getWizardSteps() as $step)
 		{
-			if($step instanceof TTemplatedWizardStep)
-				$step->ensureChildControls();
+			if($step instanceof TTemplatedWizardStep) {
+							$step->ensureChildControls();
+			}
 		}
 		$multiView=$this->getMultiView();
 		$this->_stepContent=new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
-		if($multiView->getViews()->getCount())
-			$multiView->setActiveViewIndex(0);
+		if($multiView->getViews()->getCount()) {
+					$multiView->setActiveViewIndex(0);
+		}
 	}
 
 	/**
@@ -1216,8 +1246,9 @@ 
 			if($step instanceof TTemplatedWizardStep)
 			{
 				$step->instantiateNavigationTemplate();
-				if(($panel=$step->getNavigationContainer())!==null)
-					$controls->add($panel);
+				if(($panel=$step->getNavigationContainer())!==null) {
+									$controls->add($panel);
+				}
 			}
 		}
 		$this->_startNavigation=$this->createStartNavigation();
@@ -1233,8 +1264,9 @@ 
 	 */
 	protected function createStartNavigation()
 	{
-		if(($template=$this->getStartNavigationTemplate())===null)
-			$template=new TWizardStartNavigationTemplate($this);
+		if(($template=$this->getStartNavigationTemplate())===null) {
+					$template=new TWizardStartNavigationTemplate($this);
+		}
 		$navigation=new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
@@ -1245,8 +1277,9 @@ 
 	 */
 	protected function createStepNavigation()
 	{
-		if(($template=$this->getStepNavigationTemplate())===null)
-			$template=new TWizardStepNavigationTemplate($this);
+		if(($template=$this->getStepNavigationTemplate())===null) {
+					$template=new TWizardStepNavigationTemplate($this);
+		}
 		$navigation=new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
@@ -1257,8 +1290,9 @@ 
 	 */
 	protected function createFinishNavigation()
 	{
-		if(($template=$this->getFinishNavigationTemplate())===null)
-			$template=new TWizardFinishNavigationTemplate($this);
+		if(($template=$this->getFinishNavigationTemplate())===null) {
+					$template=new TWizardFinishNavigationTemplate($this);
+		}
 		$navigation=new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
@@ -1293,10 +1327,10 @@ 
 			if($popStack)
 			{
 				$previousStepIndex=$history->pop();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
-					$previousStepIndex=$history->pop();
-			}
-			else
+				if($activeStepIndex===$previousStepIndex && $history->getCount()>0) {
+									$previousStepIndex=$history->pop();
+				}
+			} else
 			{
 				$previousStepIndex=$history->peek();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
@@ -1307,9 +1341,9 @@ 
 				}
 			}
 			return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex;
+		} else {
+					return -1;
 		}
-		else
-			return -1;
 	}
 
 	/**
@@ -1317,10 +1351,11 @@ 
 	 */
 	protected function allowNavigationToPreviousStep()
 	{
-		if(($index=$this->getPreviousStepIndex(false))!==-1)
-			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
-		else
-			return false;
+		if(($index=$this->getPreviousStepIndex(false))!==-1) {
+					return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -1329,10 +1364,11 @@ 
 	 */
 	protected function allowNavigationToStep($index)
 	{
-		if($this->getHistory()->contains($index))
-			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
-		else
-			return true;
+		if($this->getHistory()->contains($index)) {
+					return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
+		} else {
+					return true;
+		}
 	}
 
 	/**
@@ -1357,8 +1393,9 @@ 
 			$type=$this->getStepType($this->getActiveStep());
 			$index=$this->getActiveStepIndex();
 			$navParam=new TWizardNavigationEventParameter($index);
-			if(($sender instanceof IButtonControl) && $sender->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
-				$navParam->setCancelNavigation(true);
+			if(($sender instanceof IButtonControl) && $sender->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid()) {
+							$navParam->setCancelNavigation(true);
+			}
 
 			$handled=false;
 			$movePrev=false;
@@ -1366,51 +1403,58 @@ 
 
 			if(strcasecmp($command,self::CMD_NEXT)===0)
 			{
-				if($type!==self::ST_START && $type!==self::ST_STEP)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_NEXT);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+				if($type!==self::ST_START && $type!==self::ST_STEP) {
+									throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_NEXT);
+				}
+				if($index<$this->getWizardSteps()->getCount()-1) {
+									$navParam->setNextStepIndex($index+1);
+				}
 				$this->onNextButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
+			} else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
 			{
-				if($type!==self::ST_FINISH && $type!==self::ST_STEP)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
+				if($type!==self::ST_FINISH && $type!==self::ST_STEP) {
+									throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
+				}
 				$movePrev=true;
-				if(($prevIndex=$this->getPreviousStepIndex(false))>=0)
-					$navParam->setNextStepIndex($prevIndex);
+				if(($prevIndex=$this->getPreviousStepIndex(false))>=0) {
+									$navParam->setNextStepIndex($prevIndex);
+				}
 				$this->onPreviousButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_COMPLETE)===0)
+			} else if(strcasecmp($command,self::CMD_COMPLETE)===0)
 			{
-				if($type!==self::ST_FINISH)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+				if($type!==self::ST_FINISH) {
+									throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
+				}
+				if($index<$this->getWizardSteps()->getCount()-1) {
+									$navParam->setNextStepIndex($index+1);
+				}
 				$this->onCompleteButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_MOVETO)===0)
+			} else if(strcasecmp($command,self::CMD_MOVETO)===0)
 			{
-				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
+				if($this->_cancelNavigation) {
+					// may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
+				}
 				$requestedStep=$param->getCommandParameter();
 				if (!is_numeric($requestedStep))
 				{
 					$requestedIndex=-1;
-					foreach ($this->getWizardSteps() as $index=>$step)
-						if ($step->getId()===$requestedStep)
+					foreach ($this->getWizardSteps() as $index=>$step) {
+											if ($step->getId()===$requestedStep)
 						{
 							$requestedIndex=$index;
+					}
 							break;
 						}
-					if ($requestedIndex<0)
-						throw new TConfigurationException('wizard_step_invalid');
+					if ($requestedIndex<0) {
+											throw new TConfigurationException('wizard_step_invalid');
+					}
+				} else {
+									$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
 				}
-				else
-					$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
 				$handled=true;
 			}
@@ -1422,13 +1466,15 @@ 
 					$nextStepIndex=$navParam->getNextStepIndex();
 					if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
 					{
-						if($movePrev)
-							$this->getPreviousStepIndex(true);  // pop out the previous move from history
+						if($movePrev) {
+													$this->getPreviousStepIndex(true);
+						}
+						// pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
+				} else {
+									$this->setActiveStepIndex($index);
 				}
-				else
-					$this->setActiveStepIndex($index);
 				return true;
 			}
 		}
@@ -1486,8 +1532,9 @@ 
 	public function setTitle($value)
 	{
 		$this->setViewState('Title',$value,'');
-		if($this->_wizard)
-			$this->_wizard->wizardStepsChanged();
+		if($this->_wizard) {
+					$this->_wizard->wizardStepsChanged();
+		}
 	}
 
 	/**
@@ -1523,8 +1570,9 @@ 
 		if($type!==$this->getStepType())
 		{
 			$this->setViewState('StepType',$type,TWizardStepType::Auto);
-			if($this->_wizard)
-				$this->_wizard->wizardStepsChanged();
+			if($this->_wizard) {
+							$this->_wizard->wizardStepsChanged();
+			}
 		}
 	}
 }
@@ -1595,8 +1643,9 @@ 
 	public function createChildControls()
 	{
 		$this->getControls()->clear();
-		if($this->_contentTemplate)
-			$this->_contentTemplate->instantiateIn($this);
+		if($this->_contentTemplate) {
+					$this->_contentTemplate->instantiateIn($this);
+		}
 	}
 
 	/**
@@ -1705,9 +1754,9 @@ 
 			parent::insertAt($index,$item);
 			$this->_wizard->getMultiView()->getViews()->insertAt($index,$item);
 			$this->_wizard->addedWizardStep($item);
+		} else {
+					throw new TInvalidDataTypeException('wizardstepcollection_wizardstep_required');
 		}
-		else
-			throw new TInvalidDataTypeException('wizardstepcollection_wizardstep_required');
 	}
 
 	/**