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

Braces +2 added lines, -4 removed lines

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

Spacing +48 added lines, -48 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function setDirection($value)
 	{
-		$this->setViewState('Direction', TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TSliderDirection'),TSliderDirection::Horizontal);
+		$this->setViewState('Direction', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TSliderDirection'), TSliderDirection::Horizontal);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function getCssUrl()
 	{
-		return $this->getViewState('CssUrl','');
+		return $this->getViewState('CssUrl', '');
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function setCssUrl($value)
 	{
-		$this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CssUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 */
 	public function getMaxValue()
 	{
-		return $this->getViewState('MaxValue',100.0);
+		return $this->getViewState('MaxValue', 100.0);
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 */
 	public function setMaxValue($value)
 	{
-		$this->setViewState('MaxValue', TPropertyValue::ensureFloat($value),100.0);
+		$this->setViewState('MaxValue', TPropertyValue::ensureFloat($value), 100.0);
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	public function getMinValue()
 	{
-		return $this->getViewState('MinValue',0.0);
+		return $this->getViewState('MinValue', 0.0);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function setMinValue($value)
 	{
-		$this->setViewState('MinValue', TPropertyValue::ensureFloat($value),0.0);
+		$this->setViewState('MinValue', TPropertyValue::ensureFloat($value), 0.0);
 	}
 
 	/**
@@ -150,7 +150,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);
 	}
@@ -158,7 +158,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);
 	}
@@ -167,7 +167,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value',0.0);
+		return $this->getViewState('Value', 0.0);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value', TPropertyValue::ensureFloat($value),0.0);
+		$this->setViewState('Value', TPropertyValue::ensureFloat($value), 0.0);
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 */
 	public function onValueChanged($param)
 	{
-		$this->raiseEvent('OnValueChanged',$this,$param);
+		$this->raiseEvent('OnValueChanged', $this, $param);
 	}
 
 	/**
@@ -293,9 +293,9 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		$value=(float)$values[$this->getClientID().'_1'];
+		$value=(float) $values[$this->getClientID().'_1'];
 		if($this->getValue()!==$value)
 		{
 			$this->setValue($value);
@@ -319,7 +319,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -334,7 +334,7 @@ 
 	/**
 	 * @return string the HTML tag name for slider. Defaults to div.
 	 */
-	public function getTagName ()
+	public function getTagName()
 	{
 		return "div";
 	}
@@ -346,10 +346,10 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
-		if ($this->getCssClass()==='')
+		$writer->addAttribute('id', $this->getClientID());
+		if($this->getCssClass()==='')
 		{
-			$class=($this->getDirection()==TSliderDirection::Horizontal)?'HorizontalSlider':'VerticalSlider';
+			$class=($this->getDirection()==TSliderDirection::Horizontal) ? 'HorizontalSlider' : 'VerticalSlider';
 			$writer->addAttribute('class', 'Slider '.$class);
 		}
 
@@ -365,7 +365,7 @@ 
 		$writer->addAttribute('id', $this->getClientID().'_track');
 		$writer->renderBeginTag('div');
 		// Render the 'Progress Indicator'
-		if ($this->getProgressIndicator())
+		if($this->getProgressIndicator())
 		{
 			$writer->addAttribute('class', 'Progress');
 			$writer->addAttribute('id', $this->getClientID().'_progress');
@@ -402,7 +402,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();
@@ -424,7 +424,7 @@ 
 			$url=$manager->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'TSlider');
 			$url.='/TSlider.css';
 		}
-		$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
+		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
 
 	/**
@@ -433,12 +433,12 @@ 
 	protected function registerSliderClientScript()
 	{
 		$page=$this->getPage();
-		$cs = $page->getClientScript();
+		$cs=$page->getClientScript();
 		$cs->registerPradoScript("slider");
 		$id=$this->getClientID();
-		$cs->registerHiddenField($id.'_1',$this->getValue());
+		$cs->registerHiddenField($id.'_1', $this->getValue());
 		$page->registerRequiresPostData($this);
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getSliderOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getSliderOptions());
 	}
 
 	/**
@@ -448,30 +448,30 @@ 
 	protected function getSliderOptions()
 	{
 		// PostBack Options :
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['AutoPostBack']=$this->getAutoPostBack();
 
 		// Slider Control options
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
-		$options['axis'] = strtolower($this->getDirection());
-		$options['maximum'] = $maxValue;
-		$options['minimum'] = $minValue;
-		$options['range'] = array($minValue, $maxValue);
-		$options['sliderValue'] = $this->getValue();
-		$options['disabled'] = !$this->getEnabled();
+		$options['axis']=strtolower($this->getDirection());
+		$options['maximum']=$maxValue;
+		$options['minimum']=$minValue;
+		$options['range']=array($minValue, $maxValue);
+		$options['sliderValue']=$this->getValue();
+		$options['disabled']=!$this->getEnabled();
 		$values=$this->getValues();
-		if (!empty($values))
+		if(!empty($values))
 		{
 			// Values are provided. Check if min/max are present in them
-			if (!in_array($minValue, $values)) $values[]=$minValue;
-			if (!in_array($maxValue, $values)) $values[]=$maxValue;
+			if(!in_array($minValue, $values)) $values[]=$minValue;
+			if(!in_array($maxValue, $values)) $values[]=$maxValue;
 			// Remove all values outsize the range [min..max]
-			foreach ($values as $idx=>$value)
+			foreach($values as $idx=>$value)
 			{
-				if ($value < $minValue) unset ($values[$idx]);
-				if ($value > $maxValue) unset ($values[$idx]);
+				if($value < $minValue) unset ($values[$idx]);
+				if($value > $maxValue) unset ($values[$idx]);
 			}
 		}
 		else
@@ -479,19 +479,19 @@ 
 			// Values are not provided, generate automatically using stepsize
 			$step=$this->getStepSize();
 			// We want at most self::MAX_STEPS values, so, change the step if necessary
-			if (($maxValue-$minValue)/$step > self::MAX_STEPS)
+			if(($maxValue - $minValue) / $step > self::MAX_STEPS)
 			{
-				$step=($maxValue-$minValue)/self::MAX_STEPS;
+				$step=($maxValue - $minValue) / self::MAX_STEPS;
 			}
 			$values=array();
-			for ($i=$minValue;$i<=$maxValue;$i+=$step)
+			for($i=$minValue; $i <= $maxValue; $i+=$step)
 				$values[]=$i;
 			// Add max if it's not in the array because of step
-			if (!in_array($maxValue, $values)) $values[]=$maxValue;
+			if(!in_array($maxValue, $values)) $values[]=$maxValue;
 		}
-		$options['values'] = $values;
+		$options['values']=$values;
 		if($this->_clientScript!==null)
-			$options = array_merge($options,$this->_clientScript->getOptions()->toArray());
+			$options=array_merge($options, $this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TTable.php

Doc Comments +2 added lines

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

Braces +4 added lines, -8 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -109,10 +109,10 @@ 
 				if(($border=$this->getBorderWidth())==='')
 					$border=1;
 				else
-					$border=(int)$border;
+					$border=(int) $border;
 			}
 		}
-		$writer->addAttribute('border',"$border");
+		$writer->addAttribute('border', "$border");
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',$value,'');
+		$this->setViewState('Caption', $value, '');
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getCaptionAlign()
 	{
-		return $this->getViewState('CaptionAlign',TTableCaptionAlign::NotSet);
+		return $this->getViewState('CaptionAlign', TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->setViewState('CaptionAlign',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TTableCaptionAlign'),TTableCaptionAlign::NotSet);
+		$this->setViewState('CaptionAlign', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TTableCaptionAlign'), TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 		if(($caption=$this->getCaption())!=='')
 		{
 			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -310,7 +310,7 @@ 
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
-							if($index>0)
+							if($index > 0)
 								$writer->renderEndTag();
 							if($section===TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');

framework/Web/UI/WebControls/TTemplateColumn.php

Doc Comments +1 added lines, -1 removed lines

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

Braces +4 added lines, -8 removed lines

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

Spacing +15 added lines, -15 removed lines

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

framework/Web/UI/WebControls/TTextBox.php

Doc Comments +3 added lines, -1 removed lines

@@ -237,7 +237,7 @@ 
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{
@@ -342,6 +342,7 @@ 
 	 * An automatic postback to the server will occur whenever the user
 	 * modifies the text in the TTextBox control and then tabs out of the component.
 	 * @param boolean the value indicating if postback automatically
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -425,6 +426,7 @@ 
 
 	/**
 	 * @param boolean whether the textbox is read only
+	 * @param boolean $value
 	 */
 	public function setReadOnly($value)
 	{

Indentation +4 added lines, -4 removed lines

@@ -251,14 +251,14 @@ 
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -329,8 +329,8 @@ 
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user modifies the text in the TTextBox control and
-     * then tabs out of the component. Defaults to false.
+	 * will occur whenever the user modifies the text in the TTextBox control and
+	 * then tabs out of the component. Defaults to false.
 	 */
 	public function getAutoPostBack()
 	{

Spacing +80 added lines, -80 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		return ($this->getTextMode()==='MultiLine')?'textarea':'input';
+		return ($this->getTextMode()==='MultiLine') ? 'textarea' : 'input';
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -103,106 +103,106 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 		if(($uid=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uid);
+			$writer->addAttribute('name', $uid);
 		if(($textMode=$this->getTextMode())===TTextBoxMode::MultiLine)
 		{
-			if(($rows=$this->getRows())<=0)
+			if(($rows=$this->getRows()) <= 0)
 				$rows=self::DEFAULT_ROWS;
-			if(($cols=$this->getColumns())<=0)
+			if(($cols=$this->getColumns()) <= 0)
 				$cols=self::DEFAULT_COLUMNS;
-			$writer->addAttribute('rows',"$rows");
-			$writer->addAttribute('cols',"$cols");
+			$writer->addAttribute('rows', "$rows");
+			$writer->addAttribute('cols', "$cols");
 			if(!$this->getWrap())
-				$writer->addAttribute('wrap','off');
+				$writer->addAttribute('wrap', 'off');
 		}
 		else
 		{
 			switch($textMode)
 			{
 				case TTextBoxMode::Password:
-					$writer->addAttribute('type','password');
+					$writer->addAttribute('type', 'password');
 					break;
 				case TTextBoxMode::Color:
-					$writer->addAttribute('type','color');
+					$writer->addAttribute('type', 'color');
 					break;
 				case TTextBoxMode::Date:
-					$writer->addAttribute('type','date');
+					$writer->addAttribute('type', 'date');
 					break;
 				case TTextBoxMode::Datetime:
-					$writer->addAttribute('type','datetime');
+					$writer->addAttribute('type', 'datetime');
 					break;
 				case TTextBoxMode::DatetimeLocal:
-					$writer->addAttribute('type','datetime-local');
+					$writer->addAttribute('type', 'datetime-local');
 					break;
 				case TTextBoxMode::Email:
-					$writer->addAttribute('type','email');
+					$writer->addAttribute('type', 'email');
 					break;
 				case TTextBoxMode::Month:
-					$writer->addAttribute('type','month');
+					$writer->addAttribute('type', 'month');
 					break;
 				case TTextBoxMode::Number:
-					$writer->addAttribute('type','number');
+					$writer->addAttribute('type', 'number');
 					break;
 				case TTextBoxMode::Range:
-					$writer->addAttribute('type','range');
+					$writer->addAttribute('type', 'range');
 					break;
 				case TTextBoxMode::Search:
-					$writer->addAttribute('type','search');
+					$writer->addAttribute('type', 'search');
 					break;
 				case TTextBoxMode::Tel:
-					$writer->addAttribute('type','tel');
+					$writer->addAttribute('type', 'tel');
 					break;
 				case TTextBoxMode::Time:
-					$writer->addAttribute('type','time');
+					$writer->addAttribute('type', 'time');
 					break;
 				case TTextBoxMode::Url:
-					$writer->addAttribute('type','url');
+					$writer->addAttribute('type', 'url');
 					break;
 				case TTextBoxMode::Week:
-					$writer->addAttribute('type','week');
+					$writer->addAttribute('type', 'week');
 					break;
 				case TTextBoxMode::SingleLine:
 				default:
-					$writer->addAttribute('type','text');
+					$writer->addAttribute('type', 'text');
 					break;
 			}
 
-			if(($text=$this->getText())!=='' && ($textMode !== TTextBoxMode::Password || $this->getPersistPassword()))
-				$writer->addAttribute('value',$text);					
+			if(($text=$this->getText())!=='' && ($textMode!==TTextBoxMode::Password || $this->getPersistPassword()))
+				$writer->addAttribute('value', $text);					
 
 			if(($act=$this->getAutoCompleteType())!=='None')
 			{
 				if($act==='Disabled')
-					$writer->addAttribute('autocomplete','off');
+					$writer->addAttribute('autocomplete', 'off');
 				else if($act==='Search')
-					$writer->addAttribute('vcard_name','search');
+					$writer->addAttribute('vcard_name', 'search');
 				else if($act==='HomeCountryRegion')
-					$writer->addAttribute('vcard_name','HomeCountry');
+					$writer->addAttribute('vcard_name', 'HomeCountry');
 				else if($act==='BusinessCountryRegion')
-					$writer->addAttribute('vcard_name','BusinessCountry');
+					$writer->addAttribute('vcard_name', 'BusinessCountry');
 				else
 				{
-					if(strpos($act,'Business')===0)
-						$act='Business'.'.'.substr($act,8);
-					else if(strpos($act,'Home')===0)
-						$act='Home'.'.'.substr($act,4);
-					$writer->addAttribute('vcard_name','vCard.'.$act);
+					if(strpos($act, 'Business')===0)
+						$act='Business'.'.'.substr($act, 8);
+					else if(strpos($act, 'Home')===0)
+						$act='Home'.'.'.substr($act, 4);
+					$writer->addAttribute('vcard_name', 'vCard.'.$act);
 				}
 			}
 
-			if(($cols=$this->getColumns())>0)
-				$writer->addAttribute('size',"$cols");
-			if(($maxLength=$this->getMaxLength())>0)
-				$writer->addAttribute('maxlength',"$maxLength");
+			if(($cols=$this->getColumns()) > 0)
+				$writer->addAttribute('size', "$cols");
+			if(($maxLength=$this->getMaxLength()) > 0)
+				$writer->addAttribute('maxlength', "$maxLength");
 		}
 		if($this->getReadOnly())
-			$writer->addAttribute('readonly','readonly');
+			$writer->addAttribute('readonly', 'readonly');
 		$isEnabled=$this->getEnabled(true);
 		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		if($isEnabled
 			&& $this->getEnableClientScript()
-			&& ( $this->getAutoPostBack() || $textMode===TTextBoxMode::SingleLine)
+			&& ($this->getAutoPostBack() || $textMode===TTextBoxMode::SingleLine)
 			&& $page->getClientSupportsJavaScript())
 		{
 			$this->renderClientControlScript($writer);
@@ -215,9 +215,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -236,12 +236,12 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['TextMode'] = $this->getTextMode();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['TextMode']=$this->getTextMode();
 		return $options;
 	}
 
@@ -252,7 +252,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$value=$values[$key];
 		if($this->getAutoTrim())
@@ -313,7 +313,7 @@ 
 	 */
 	public function onTextChanged($param)
 	{
-		$this->raiseEvent('OnTextChanged',$this,$param);
+		$this->raiseEvent('OnTextChanged', $this, $param);
 	}
 
 	/**
@@ -357,7 +357,7 @@ 
 	 */
 	public function getAutoCompleteType()
 	{
-		return $this->getViewState('AutoCompleteType',TTextBoxAutoCompleteType::None);
+		return $this->getViewState('AutoCompleteType', TTextBoxAutoCompleteType::None);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setAutoCompleteType($value)
 	{
-		$this->setViewState('AutoCompleteType',TPropertyValue::ensureEnum($value,'TTextBoxAutoCompleteType'),TTextBoxAutoCompleteType::None);
+		$this->setViewState('AutoCompleteType', TPropertyValue::ensureEnum($value, 'TTextBoxAutoCompleteType'), TTextBoxAutoCompleteType::None);
 	}
 
 	/**
@@ -376,7 +376,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -387,7 +387,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -395,7 +395,7 @@ 
 	 */
 	public function getAutoTrim()
 	{
-		return $this->getViewState('AutoTrim',false);
+		return $this->getViewState('AutoTrim', false);
 	}
 
 	/**
@@ -404,7 +404,7 @@ 
 	 */
 	public function setAutoTrim($value)
 	{
-		$this->setViewState('AutoTrim',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoTrim', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -420,7 +420,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -428,7 +428,7 @@ 
 	 */
 	public function getColumns()
 	{
-		return $this->getViewState('Columns',0);
+		return $this->getViewState('Columns', 0);
 	}
 
 	/**
@@ -437,7 +437,7 @@ 
 	 */
 	public function setColumns($value)
 	{
-		$this->setViewState('Columns',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Columns', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -445,7 +445,7 @@ 
 	 */
 	public function getMaxLength()
 	{
-		return $this->getViewState('MaxLength',0);
+		return $this->getViewState('MaxLength', 0);
 	}
 
 	/**
@@ -454,7 +454,7 @@ 
 	 */
 	public function setMaxLength($value)
 	{
-		$this->setViewState('MaxLength',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('MaxLength', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -462,7 +462,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -470,7 +470,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -478,7 +478,7 @@ 
 	 */
 	public function getRows()
 	{
-		return $this->getViewState('Rows',self::DEFAULT_ROWS);
+		return $this->getViewState('Rows', self::DEFAULT_ROWS);
 	}
 
 	/**
@@ -487,7 +487,7 @@ 
 	 */
 	public function setRows($value)
 	{
-		$this->setViewState('Rows',TPropertyValue::ensureInteger($value),self::DEFAULT_ROWS);
+		$this->setViewState('Rows', TPropertyValue::ensureInteger($value), self::DEFAULT_ROWS);
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 	 */
 	public function getPersistPassword()
 	{
-		return $this->getViewState('PersistPassword',false);
+		return $this->getViewState('PersistPassword', false);
 	}
 
 	/**
@@ -503,7 +503,7 @@ 
 	 */
 	public function setPersistPassword($value)
 	{
-		$this->setViewState('PersistPassword',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('PersistPassword', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -511,7 +511,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -520,8 +520,8 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
-		$this->_safeText = null;
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
+		$this->_safeText=null;
 	}
 
 	/**
@@ -575,7 +575,7 @@ 
 	 */
 	public function getTextMode()
 	{
-		return $this->getViewState('TextMode',TTextBoxMode::SingleLine);
+		return $this->getViewState('TextMode', TTextBoxMode::SingleLine);
 	}
 
 	/**
@@ -585,7 +585,7 @@ 
 	 */
 	public function setTextMode($value)
 	{
-		$this->setViewState('TextMode',TPropertyValue::ensureEnum($value,'TTextBoxMode'),TTextBoxMode::SingleLine);
+		$this->setViewState('TextMode', TPropertyValue::ensureEnum($value, 'TTextBoxMode'), TTextBoxMode::SingleLine);
 	}
 
 	/**
@@ -593,7 +593,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -601,7 +601,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -609,7 +609,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->getViewState('Wrap',true);
+		return $this->getViewState('Wrap', true);
 	}
 
 	/**
@@ -618,7 +618,7 @@ 
 	 */
 	public function setWrap($value)
 	{
-		$this->setViewState('Wrap',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Wrap', TPropertyValue::ensureBoolean($value), true);
 	}
 }
 

Braces +2 added lines, -4 removed lines

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

framework/Web/UI/WebControls/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)

Indentation +11 added lines, -11 removed lines

@@ -19,19 +19,19 @@
 // BC trick : only define constants if Text/Highlighter.php
 // is not yet included
 if (!defined('HL_NUMBERS_LI')) {
-    /**#@+
+	/**#@+
      * Constant for use with $options['numbers']
      */
-    /**
-     * use numbered list, deprecated, use HL_NUMBERS_OL instaed
-     * @deprecated
-     */
-    define ('HL_NUMBERS_LI'    ,    1);
-    /**
-     * Use 2-column table with line numbers in left column and code in  right column.
-     */
-    define ('HL_NUMBERS_TABLE'    , 2);
-    /**#@-*/
+	/**
+	 * use numbered list, deprecated, use HL_NUMBERS_OL instaed
+	 * @deprecated
+	 */
+	define ('HL_NUMBERS_LI'    ,    1);
+	/**
+	 * Use 2-column table with line numbers in left column and code in  right column.
+	 */
+	define ('HL_NUMBERS_TABLE'    , 2);
+	/**#@-*/
 }
 
 

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 
 // BC trick : only define constants if Text/Highlighter.php
 // is not yet included
-if (!defined('HL_NUMBERS_LI')) {
+if(!defined('HL_NUMBERS_LI')) {
     /**#@+
      * Constant for use with $options['numbers']
      */
@@ -26,11 +26,11 @@ 
      * use numbered list, deprecated, use HL_NUMBERS_OL instaed
      * @deprecated
      */
-    define ('HL_NUMBERS_LI'    ,    1);
+    define('HL_NUMBERS_LI', 1);
     /**
      * Use 2-column table with line numbers in left column and code in  right column.
      */
-    define ('HL_NUMBERS_TABLE'    , 2);
+    define('HL_NUMBERS_TABLE', 2);
     /**#@-*/
 }
 
@@ -132,7 +132,7 @@ 
 	 */
 	public function setLineNumberStyle($value)
 	{
-		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value,'TTextHighlighterLineNumberStyle'));
+		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value, 'TTextHighlighterLineNumberStyle'));
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	protected function registerStyleSheet()
 	{
 		$cs=$this->getPage()->getClientScript();
-		$cssFile=Prado::getPathOfNamespace('Prado\\Vendor\\TextHighlighter\\highlight','.css');
+		$cssFile=Prado::getPathOfNamespace('Prado\\Vendor\\TextHighlighter\\highlight', '.css');
 		$cssKey='prado:TTextHighlighter:'.$cssFile;
 		if(!$cs->isStyleSheetFileRegistered($cssKey))
 			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
@@ -194,9 +194,9 @@ 
 			return ('<pre>'.htmlentities(trim($text)).'</pre>');
 
 		$options["use_language"]=true;
-		$options["tabsize"] = $this->getTabSize();
-		if ($this->getShowLineNumbers())
-			$options["numbers"] = self::$_lineNumberStyle[$this->getLineNumberStyle()];
+		$options["tabsize"]=$this->getTabSize();
+		if($this->getShowLineNumbers())
+			$options["numbers"]=self::$_lineNumberStyle[$this->getLineNumberStyle()];
 		$highlighter->setRenderer(new Text_Highlighter_Renderer_Html($options));
 		return $highlighter->highlight(trim($text));
 	}
@@ -206,7 +206,7 @@ 
 	 */
 	protected function getHeaderTemplate()
 	{
-		$id = $this->getClientID();
+		$id=$this->getClientID();
 		return TJavaScript::renderScriptBlock("new Prado.WebUI.TTextHighlighter('{$id}');");
 	}
 

Braces +1 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

Spacing +4 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->_imageUrl===null?'':$this->_imageUrl;
+		return $this->_imageUrl===null ? '' : $this->_imageUrl;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getButtonText()
 	{
-		return $this->_buttonText===null?'':$this->_buttonText;
+		return $this->_buttonText===null ? '' : $this->_buttonText;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->_buttonType===null? TWizardNavigationButtonType::Button :$this->_buttonType;
+		return $this->_buttonType===null ? TWizardNavigationButtonType::Button : $this->_buttonType;
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->_buttonType=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TWizardNavigationButtonType');
+		$this->_buttonType=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TWizardNavigationButtonType');
 	}
 
 	/**

framework/Wsat/TWsatARGenerator.php

Doc Comments +4 added lines

@@ -207,6 +207,10 @@
                 return $code;
         }
 
+        /**
+         * @param string $classname
+         * @param string $toString
+         */
         protected function generateClass($properties, $tablename, $classname, $toString)
         {
                 $props = implode("\n", $properties);

Indentation +193 added lines, -193 removed lines

@@ -14,206 +14,206 @@ 
 class TWsatARGenerator extends TWsatBaseGenerator
 {
 
-        /**
-         * Class name prefix
-         */
-        private $_clasPrefix;
-
-        /**
-         * Class name sufix
-         */
-        private $_classSufix;
-
-        /**
-         * all table relations array
-         */
-        private $_relations;
-
-        /**
-         * unquote chars
-         * @var array
-         */
-        private $uqChars = array('[', ']', '"', '`', "'");
-
-        function __construct()
-        {
-                parent::__construct();
-        }
-
-        public function setClasPrefix($_clas_prefix)
-        {
-                $this->_clasPrefix = $_clas_prefix;
-        }
-
-        public function setClassSufix($_clas_sufix)
-        {
-                $this->_classSufix = $_clas_sufix;
-        }
+		/**
+		 * Class name prefix
+		 */
+		private $_clasPrefix;
+
+		/**
+		 * Class name sufix
+		 */
+		private $_classSufix;
+
+		/**
+		 * all table relations array
+		 */
+		private $_relations;
+
+		/**
+		 * unquote chars
+		 * @var array
+		 */
+		private $uqChars = array('[', ']', '"', '`', "'");
+
+		function __construct()
+		{
+				parent::__construct();
+		}
+
+		public function setClasPrefix($_clas_prefix)
+		{
+				$this->_clasPrefix = $_clas_prefix;
+		}
+
+		public function setClassSufix($_clas_sufix)
+		{
+				$this->_classSufix = $_clas_sufix;
+		}
 
 //-----------------------------------------------------------------------------
-        // <editor-fold defaultstate="collapsed" desc="Main APIs">
-        public function generate($tableName)
-        {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                $this->_commonGenerate($tableName, $tableInfo);
-        }
-
-        public function generateAll()
-        {
-                foreach ($this->getAllTableNames() as $tableName)
-                {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                        if (!empty($this->_relations))
-                        {
-                                // Cancel generation of M-M relationships middle table
-                                if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
-                                        continue;
-                        }
-                        $this->_commonGenerate($tableName, $tableInfo);
-                }
-        }
-
-        public function buildRelations()
-        {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
-                {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
-
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
-                        {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
-
-                                $this->_relations[$table_name_mm][] = array(
-                                        "prop_name" => strtolower($table_name_mm2),
-                                        "rel_type" => "self::MANY_TO_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($table_name_mm2),
-                                        "prop_ref" => $table_name
-                                );
-
-                                $this->_relations[$table_name_mm2][] = array(
-                                        "prop_name" => strtolower($table_name_mm),
-                                        "rel_type" => "self::MANY_TO_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($table_name_mm),
-                                        "prop_ref" => $table_name
-                                );
-                                continue;
-                        }
-                        foreach ($fks as $fk_data)//1-M relationships
-                        {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
-
-                                $this->_relations[$owner_table][] = array(
-                                        "prop_name" => strtolower($slave_table),
-                                        "rel_type" => "self::HAS_MANY",
-                                        "ref_class_name" => $this->_getProperClassName($slave_table),
-                                        "prop_ref" => $fk_prop
-                                );
-
-                                $this->_relations[$slave_table][] = array(
-                                        "prop_name" => strtolower($owner_table),
-                                        "rel_type" => "self::BELONGS_TO",
-                                        "ref_class_name" => $this->_getProperClassName($owner_table),
-                                        "prop_ref" => $fk_prop
-                                );
-                        }
-                }
-        }
+		// <editor-fold defaultstate="collapsed" desc="Main APIs">
+		public function generate($tableName)
+		{
+				$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+				$this->_commonGenerate($tableName, $tableInfo);
+		}
+
+		public function generateAll()
+		{
+				foreach ($this->getAllTableNames() as $tableName)
+				{
+						$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+						if (!empty($this->_relations))
+						{
+								// Cancel generation of M-M relationships middle table
+								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+										continue;
+						}
+						$this->_commonGenerate($tableName, $tableInfo);
+				}
+		}
+
+		public function buildRelations()
+		{
+				$this->_relations = array();
+				foreach ($this->getAllTableNames() as $table_name)
+				{
+						$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
+						$pks = $tableInfo->getPrimaryKeys();
+						$fks = $tableInfo->getForeignKeys();
+
+						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						{
+								$table_name_mm = $fks[0]["table"];
+								$table_name_mm2 = $fks[1]["table"];
+
+								$this->_relations[$table_name_mm][] = array(
+										"prop_name" => strtolower($table_name_mm2),
+										"rel_type" => "self::MANY_TO_MANY",
+										"ref_class_name" => $this->_getProperClassName($table_name_mm2),
+										"prop_ref" => $table_name
+								);
+
+								$this->_relations[$table_name_mm2][] = array(
+										"prop_name" => strtolower($table_name_mm),
+										"rel_type" => "self::MANY_TO_MANY",
+										"ref_class_name" => $this->_getProperClassName($table_name_mm),
+										"prop_ref" => $table_name
+								);
+								continue;
+						}
+						foreach ($fks as $fk_data)//1-M relationships
+						{
+								$owner_table = $fk_data["table"];
+								$slave_table = $table_name;
+								$fk_prop = key($fk_data["keys"]);
+
+								$this->_relations[$owner_table][] = array(
+										"prop_name" => strtolower($slave_table),
+										"rel_type" => "self::HAS_MANY",
+										"ref_class_name" => $this->_getProperClassName($slave_table),
+										"prop_ref" => $fk_prop
+								);
+
+								$this->_relations[$slave_table][] = array(
+										"prop_name" => strtolower($owner_table),
+										"rel_type" => "self::BELONGS_TO",
+										"ref_class_name" => $this->_getProperClassName($owner_table),
+										"prop_ref" => $fk_prop
+								);
+						}
+				}
+		}
 
 // </editor-fold>
 //-----------------------------------------------------------------------------
-        // <editor-fold defaultstate="collapsed" desc="Common Methods">
-
-        private function _commonGenerate($tableName, $tableInfo)
-        {
-                if (count($tableInfo->getColumns()) === 0)
-                        throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
-                else
-                {
-                        $properties = array();
-                        foreach ($tableInfo->getColumns() as $field => $metadata)
-                                $properties[] = $this->generateProperty($field, $metadata);
-                        $toString = $this->_buildSmartToString($tableInfo);
-                }
-
-                $clasName = $this->_getProperClassName($tableName);
-                $class = $this->generateClass($properties, $tableName, $clasName, $toString);
-                $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
-                file_put_contents($output, $class);
-        }
-
-        private function _getProperClassName($tableName)
-        {
-                $table_name_words = str_replace("_", " ", strtolower($tableName));
-                $final_conversion = str_replace(" ", "", ucwords($table_name_words));
-                return $this->_clasPrefix . $final_conversion . $this->_classSufix;
-        }
+		// <editor-fold defaultstate="collapsed" desc="Common Methods">
+
+		private function _commonGenerate($tableName, $tableInfo)
+		{
+				if (count($tableInfo->getColumns()) === 0)
+						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+				else
+				{
+						$properties = array();
+						foreach ($tableInfo->getColumns() as $field => $metadata)
+								$properties[] = $this->generateProperty($field, $metadata);
+						$toString = $this->_buildSmartToString($tableInfo);
+				}
+
+				$clasName = $this->_getProperClassName($tableName);
+				$class = $this->generateClass($properties, $tableName, $clasName, $toString);
+				$output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+				file_put_contents($output, $class);
+		}
+
+		private function _getProperClassName($tableName)
+		{
+				$table_name_words = str_replace("_", " ", strtolower($tableName));
+				$final_conversion = str_replace(" ", "", ucwords($table_name_words));
+				return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+		}
 
 //-----------------------------------------------------------------------------
 
-        protected function generateProperty($field, $metadata)
-        {
-                $prop = '';
-                $name = '$' . $field;
-
-                /* TODO use in version 2.0 */
-                // $type = $column->getPHPType();
-
-                $prop .= "\tpublic $name;";
-                return $prop;
-        }
-
-        private function _renderRelations($tablename)
-        {
-                if (!isset($this->_relations[$tablename]))
-                        return "";
-
-                $code = "\tpublic static \$RELATIONS = array (";
-                foreach ($this->_relations[$tablename] as $rel_data)
-                        $code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
-
-                $code = substr($code, 0, -1);
-                $code .= "\n\t);";
-                return $code;
-        }
-
-        private function _buildSmartToString($tableInfo)
-        {
-                $code = "\tpublic function __toString() {";
-                $property = "throw new THttpException(500, 'Not implemented yet.');";
-                try
-                {
-                        foreach ($tableInfo->getColumns() as $column)
-                        {
-                                if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
-                                {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                        break;
-                                }
-                        }
-                } catch (Exception $ex)
-                {
-                        Prado::trace($ex->getMessage());
-                }
-                $code .= "\n\t\treturn \$this->$property;";
-                $code .= "\n\t}";
-                return $code;
-        }
-
-        protected function generateClass($properties, $tablename, $classname, $toString)
-        {
-                $props = implode("\n", $properties);
-                $relations = $this->_renderRelations($tablename);
-                $date = date('Y-m-d h:i:s');
-                $env_user = getenv("username");
-                return <<<EOD
+		protected function generateProperty($field, $metadata)
+		{
+				$prop = '';
+				$name = '$' . $field;
+
+				/* TODO use in version 2.0 */
+				// $type = $column->getPHPType();
+
+				$prop .= "\tpublic $name;";
+				return $prop;
+		}
+
+		private function _renderRelations($tablename)
+		{
+				if (!isset($this->_relations[$tablename]))
+						return "";
+
+				$code = "\tpublic static \$RELATIONS = array (";
+				foreach ($this->_relations[$tablename] as $rel_data)
+						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+
+				$code = substr($code, 0, -1);
+				$code .= "\n\t);";
+				return $code;
+		}
+
+		private function _buildSmartToString($tableInfo)
+		{
+				$code = "\tpublic function __toString() {";
+				$property = "throw new THttpException(500, 'Not implemented yet.');";
+				try
+				{
+						foreach ($tableInfo->getColumns() as $column)
+						{
+								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+										$property = str_replace($this->uqChars, "", $column->ColumnName);
+								elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+								{
+										$property = str_replace($this->uqChars, "", $column->ColumnName);
+										break;
+								}
+						}
+				} catch (Exception $ex)
+				{
+						Prado::trace($ex->getMessage());
+				}
+				$code .= "\n\t\treturn \$this->$property;";
+				$code .= "\n\t}";
+				return $code;
+		}
+
+		protected function generateClass($properties, $tablename, $classname, $toString)
+		{
+				$props = implode("\n", $properties);
+				$relations = $this->_renderRelations($tablename);
+				$date = date('Y-m-d h:i:s');
+				$env_user = getenv("username");
+				return <<<EOD
 <?php
 /**
  * Auto generated by PRADO - WSAT on $date.
@@ -234,7 +234,7 @@ 
 $toString
 }
 EOD;
-        }
+		}
 
 // </editor-fold>
 }
\ No newline at end of file

Spacing +59 added lines, -59 removed lines

@@ -33,7 +33,7 @@ 
          * unquote chars
          * @var array
          */
-        private $uqChars = array('[', ']', '"', '`', "'");
+        private $uqChars=array('[', ']', '"', '`', "'");
 
         function __construct()
         {
@@ -42,31 +42,31 @@ 
 
         public function setClasPrefix($_clas_prefix)
         {
-                $this->_clasPrefix = $_clas_prefix;
+                $this->_clasPrefix=$_clas_prefix;
         }
 
         public function setClassSufix($_clas_sufix)
         {
-                $this->_classSufix = $_clas_sufix;
+                $this->_classSufix=$_clas_sufix;
         }
 
 //-----------------------------------------------------------------------------
         // <editor-fold defaultstate="collapsed" desc="Main APIs">
         public function generate($tableName)
         {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+                $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
                 $this->_commonGenerate($tableName, $tableInfo);
         }
 
         public function generateAll()
         {
-                foreach ($this->getAllTableNames() as $tableName)
+                foreach($this->getAllTableNames() as $tableName)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                        if (!empty($this->_relations))
+                        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+                        if(!empty($this->_relations))
                         {
                                 // Cancel generation of M-M relationships middle table
-                                if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                                if(count($tableInfo->getPrimaryKeys())===2 && count($tableInfo->getColumns())===2)//M-M relationships
                                         continue;
                         }
                         $this->_commonGenerate($tableName, $tableInfo);
@@ -75,26 +75,26 @@ 
 
         public function buildRelations()
         {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
+                $this->_relations=array();
+                foreach($this->getAllTableNames() as $table_name)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
+                        $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+                        $pks=$tableInfo->getPrimaryKeys();
+                        $fks=$tableInfo->getForeignKeys();
 
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                        if(count($pks)===2 && count($tableInfo->getColumns())===2)//M-M relationships
                         {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
+                                $table_name_mm=$fks[0]["table"];
+                                $table_name_mm2=$fks[1]["table"];
 
-                                $this->_relations[$table_name_mm][] = array(
+                                $this->_relations[$table_name_mm][]=array(
                                         "prop_name" => strtolower($table_name_mm2),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm2),
                                         "prop_ref" => $table_name
                                 );
 
-                                $this->_relations[$table_name_mm2][] = array(
+                                $this->_relations[$table_name_mm2][]=array(
                                         "prop_name" => strtolower($table_name_mm),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm),
@@ -102,20 +102,20 @@ 
                                 );
                                 continue;
                         }
-                        foreach ($fks as $fk_data)//1-M relationships
+                        foreach($fks as $fk_data)//1-M relationships
                         {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
+                                $owner_table=$fk_data["table"];
+                                $slave_table=$table_name;
+                                $fk_prop=key($fk_data["keys"]);
 
-                                $this->_relations[$owner_table][] = array(
+                                $this->_relations[$owner_table][]=array(
                                         "prop_name" => strtolower($slave_table),
                                         "rel_type" => "self::HAS_MANY",
                                         "ref_class_name" => $this->_getProperClassName($slave_table),
                                         "prop_ref" => $fk_prop
                                 );
 
-                                $this->_relations[$slave_table][] = array(
+                                $this->_relations[$slave_table][]=array(
                                         "prop_name" => strtolower($owner_table),
                                         "rel_type" => "self::BELONGS_TO",
                                         "ref_class_name" => $this->_getProperClassName($owner_table),
@@ -131,88 +131,88 @@ 
 
         private function _commonGenerate($tableName, $tableInfo)
         {
-                if (count($tableInfo->getColumns()) === 0)
-                        throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+                if(count($tableInfo->getColumns())===0)
+                        throw new Exception("Unable to find table or view $tableName in ".$this->_dbMetaData->getDbConnection()->getConnectionString().".");
                 else
                 {
-                        $properties = array();
-                        foreach ($tableInfo->getColumns() as $field => $metadata)
-                                $properties[] = $this->generateProperty($field, $metadata);
-                        $toString = $this->_buildSmartToString($tableInfo);
+                        $properties=array();
+                        foreach($tableInfo->getColumns() as $field => $metadata)
+                                $properties[]=$this->generateProperty($field, $metadata);
+                        $toString=$this->_buildSmartToString($tableInfo);
                 }
 
-                $clasName = $this->_getProperClassName($tableName);
-                $class = $this->generateClass($properties, $tableName, $clasName, $toString);
-                $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+                $clasName=$this->_getProperClassName($tableName);
+                $class=$this->generateClass($properties, $tableName, $clasName, $toString);
+                $output=$this->_opFile.DIRECTORY_SEPARATOR.$clasName.".php";
                 file_put_contents($output, $class);
         }
 
         private function _getProperClassName($tableName)
         {
-                $table_name_words = str_replace("_", " ", strtolower($tableName));
-                $final_conversion = str_replace(" ", "", ucwords($table_name_words));
-                return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+                $table_name_words=str_replace("_", " ", strtolower($tableName));
+                $final_conversion=str_replace(" ", "", ucwords($table_name_words));
+                return $this->_clasPrefix.$final_conversion.$this->_classSufix;
         }
 
 //-----------------------------------------------------------------------------
 
         protected function generateProperty($field, $metadata)
         {
-                $prop = '';
-                $name = '$' . $field;
+                $prop='';
+                $name='$'.$field;
 
                 /* TODO use in version 2.0 */
                 // $type = $column->getPHPType();
 
-                $prop .= "\tpublic $name;";
+                $prop.="\tpublic $name;";
                 return $prop;
         }
 
         private function _renderRelations($tablename)
         {
-                if (!isset($this->_relations[$tablename]))
+                if(!isset($this->_relations[$tablename]))
                         return "";
 
-                $code = "\tpublic static \$RELATIONS = array (";
-                foreach ($this->_relations[$tablename] as $rel_data)
-                        $code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+                $code="\tpublic static \$RELATIONS = array (";
+                foreach($this->_relations[$tablename] as $rel_data)
+                        $code.="\n\t\t'".$rel_data["prop_name"]."' => array(".$rel_data["rel_type"].", '".$rel_data["ref_class_name"]."', '".$rel_data["prop_ref"]."'),";
 
-                $code = substr($code, 0, -1);
-                $code .= "\n\t);";
+                $code=substr($code, 0, -1);
+                $code.="\n\t);";
                 return $code;
         }
 
         private function _buildSmartToString($tableInfo)
         {
-                $code = "\tpublic function __toString() {";
-                $property = "throw new THttpException(500, 'Not implemented yet.');";
+                $code="\tpublic function __toString() {";
+                $property="throw new THttpException(500, 'Not implemented yet.');";
                 try
                 {
-                        foreach ($tableInfo->getColumns() as $column)
+                        foreach($tableInfo->getColumns() as $column)
                         {
-                                if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+                                if(isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
+                                elseif($column->PdoType==PDO::PARAM_STR && $column->DBType!="date")
                                 {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
                                         break;
                                 }
                         }
-                } catch (Exception $ex)
+                } catch(Exception $ex)
                 {
                         Prado::trace($ex->getMessage());
                 }
-                $code .= "\n\t\treturn \$this->$property;";
-                $code .= "\n\t}";
+                $code.="\n\t\treturn \$this->$property;";
+                $code.="\n\t}";
                 return $code;
         }
 
         protected function generateClass($properties, $tablename, $classname, $toString)
         {
-                $props = implode("\n", $properties);
-                $relations = $this->_renderRelations($tablename);
-                $date = date('Y-m-d h:i:s');
-                $env_user = getenv("username");
+                $props=implode("\n", $properties);
+                $relations=$this->_renderRelations($tablename);
+                $date=date('Y-m-d h:i:s');
+                $env_user=getenv("username");
                 return <<<EOD
 <?php
 /**

framework/Wsat/TWsatScaffoldingGenerator.php

Doc Comments +8 added lines

@@ -44,6 +44,10 @@ 
 
     //---------------------------------------------------------------------
     // <editor-fold defaultstate="collapsed" desc="Page Generation">
+
+    /**
+     * @param integer $viewType
+     */
     public function generate($tableName, $viewType)
     {
         switch ($viewType)
@@ -141,6 +145,10 @@ 
 // </editor-fold>
     //---------------------------------------------------------------------
     // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
+
+    /**
+     * @param string $classname
+     */
     private function generateClass($classname)
     {
         $date = date('Y-m-d h:i:s');

Indentation +124 added lines, -124 removed lines

@@ -14,138 +14,138 @@ 
 class TWsatScaffoldingGenerator extends TWsatBaseGenerator
 {
 
-    /**
-     * Const View Types for generation
-     */
-    const LIST_TYPE = 0;
-    const ADD_TYPE = 1;
-    const SHOW_TYPE = 2;
-
-    /**
-     * Bootstrap option
-     */
-    private $_bootstrap;
-
-    function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Generates CRUD Operations for a single DB table
-     * @param type $tableName
-     */
-    public function generateCRUD($tableName)
-    {
-        $this->generate($tableName, self::ADD_TYPE);
-        $this->generate($tableName, self::LIST_TYPE);
-        $this->generate($tableName, self::SHOW_TYPE);
-    }
-
-    //---------------------------------------------------------------------
-    // <editor-fold defaultstate="collapsed" desc="Page Generation">
-    public function generate($tableName, $viewType)
-    {
-        switch ($viewType)
-        {
-            default:
-            case self::LIST_TYPE:
-                $unitName = "list" . ucfirst($tableName);
-                break;
-
-            case self::ADD_TYPE:
-                $unitName = "add" . ucfirst($tableName);
-                break;
-
-            case self::SHOW_TYPE:
-                $unitName = "show" . ucfirst($tableName);
-                break;
-        }
-
-        $class = $this->generateClass($unitName);
-        $outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
-        file_put_contents($outputClass, $class);
-
-        $outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
-        $page = $this->generatePage($tableName, $viewType);
-        file_put_contents($outputPage, $page);
-    }
-
-    private function generatePage($tableName, $type, $tContentId = "Content")
-    {
-        $pageContent = $this->getPageContent($tableName, $type);
-        return <<<EOD
+	/**
+	 * Const View Types for generation
+	 */
+	const LIST_TYPE = 0;
+	const ADD_TYPE = 1;
+	const SHOW_TYPE = 2;
+
+	/**
+	 * Bootstrap option
+	 */
+	private $_bootstrap;
+
+	function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Generates CRUD Operations for a single DB table
+	 * @param type $tableName
+	 */
+	public function generateCRUD($tableName)
+	{
+		$this->generate($tableName, self::ADD_TYPE);
+		$this->generate($tableName, self::LIST_TYPE);
+		$this->generate($tableName, self::SHOW_TYPE);
+	}
+
+	//---------------------------------------------------------------------
+	// <editor-fold defaultstate="collapsed" desc="Page Generation">
+	public function generate($tableName, $viewType)
+	{
+		switch ($viewType)
+		{
+			default:
+			case self::LIST_TYPE:
+				$unitName = "list" . ucfirst($tableName);
+				break;
+
+			case self::ADD_TYPE:
+				$unitName = "add" . ucfirst($tableName);
+				break;
+
+			case self::SHOW_TYPE:
+				$unitName = "show" . ucfirst($tableName);
+				break;
+		}
+
+		$class = $this->generateClass($unitName);
+		$outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+		file_put_contents($outputClass, $class);
+
+		$outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
+		$page = $this->generatePage($tableName, $viewType);
+		file_put_contents($outputPage, $page);
+	}
+
+	private function generatePage($tableName, $type, $tContentId = "Content")
+	{
+		$pageContent = $this->getPageContent($tableName, $type);
+		return <<<EOD
 <com:TContent ID="$tContentId">   
                      
        $pageContent
                
 </com:TContent>
 EOD;
-    }
-
-    private function getPageContent($tableName, $type)
-    {
-        $code = "";
-        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-        switch ($type)
-        {
-            case self::LIST_TYPE:
-                break;
-            case self::ADD_TYPE:
-                foreach ($tableInfo->getColumns() as $colField => $colMetadata)
-                {
-                    if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
-                    {
-                        $code .= $this->generateControl($colMetadata);
-                        $code .= $this->generateValidators($colMetadata);
-                        $code .= "\n";
-                    }
-                }
-                foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
-                {
-                    $colField = $this->eq($colMetadata["table"]);
-                    $code .= "\t<com:TTextBox ID=$colField />\n";
-                    $code .= "\n";
-                    //  TWsatBaseGenerator::pr($tableInfo);
-                }
-                $code .= "\t<com:TButton Text=\"Accept\" />\n";
-
-            case self::SHOW_TYPE:
-                break;
-        }
-        return $code;
-    }
-
-    private function generateControl($colMetadata)
-    {
-        $controlType = "TTextBox";
-        switch ($colMetadata->DbType)
-        {
+	}
+
+	private function getPageContent($tableName, $type)
+	{
+		$code = "";
+		$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+		switch ($type)
+		{
+			case self::LIST_TYPE:
+				break;
+			case self::ADD_TYPE:
+				foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+				{
+					if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+					{
+						$code .= $this->generateControl($colMetadata);
+						$code .= $this->generateValidators($colMetadata);
+						$code .= "\n";
+					}
+				}
+				foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+				{
+					$colField = $this->eq($colMetadata["table"]);
+					$code .= "\t<com:TTextBox ID=$colField />\n";
+					$code .= "\n";
+					//  TWsatBaseGenerator::pr($tableInfo);
+				}
+				$code .= "\t<com:TButton Text=\"Accept\" />\n";
+
+			case self::SHOW_TYPE:
+				break;
+		}
+		return $code;
+	}
+
+	private function generateControl($colMetadata)
+	{
+		$controlType = "TTextBox";
+		switch ($colMetadata->DbType)
+		{
             
-        }
-        $controlId = $colMetadata->ColumnId;
-        return "\t<com:$controlType ID=\"$controlId\" />\n";
-    }
-
-    private function generateValidators($colMetadata)
-    {
-        $controlId = $colMetadata->ColumnId;
-        $code = "";
-        if (!$colMetadata->AllowNull)
-        {
-            $code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
-        }
-        return $code;
-    }
+		}
+		$controlId = $colMetadata->ColumnId;
+		return "\t<com:$controlType ID=\"$controlId\" />\n";
+	}
+
+	private function generateValidators($colMetadata)
+	{
+		$controlId = $colMetadata->ColumnId;
+		$code = "";
+		if (!$colMetadata->AllowNull)
+		{
+			$code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
+		}
+		return $code;
+	}
 
 // </editor-fold>
-    //---------------------------------------------------------------------
-    // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
-    private function generateClass($classname)
-    {
-        $date = date('Y-m-d h:i:s');
-        $env_user = getenv("username");
-        return <<<EOD
+	//---------------------------------------------------------------------
+	// <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
+	private function generateClass($classname)
+	{
+		$date = date('Y-m-d h:i:s');
+		$env_user = getenv("username");
+		return <<<EOD
 <?php
 /**
  * Auto generated by PRADO - WSAT on $date.
@@ -156,7 +156,7 @@ 
 
 }
 EOD;
-    }
+	}
 
 // </editor-fold>
 }

Spacing +35 added lines, -35 removed lines

@@ -17,9 +17,9 @@ 
     /**
      * Const View Types for generation
      */
-    const LIST_TYPE = 0;
-    const ADD_TYPE = 1;
-    const SHOW_TYPE = 2;
+    const LIST_TYPE=0;
+    const ADD_TYPE=1;
+    const SHOW_TYPE=2;
 
     /**
      * Bootstrap option
@@ -46,34 +46,34 @@ 
     // <editor-fold defaultstate="collapsed" desc="Page Generation">
     public function generate($tableName, $viewType)
     {
-        switch ($viewType)
+        switch($viewType)
         {
             default:
             case self::LIST_TYPE:
-                $unitName = "list" . ucfirst($tableName);
+                $unitName="list".ucfirst($tableName);
                 break;
 
             case self::ADD_TYPE:
-                $unitName = "add" . ucfirst($tableName);
+                $unitName="add".ucfirst($tableName);
                 break;
 
             case self::SHOW_TYPE:
-                $unitName = "show" . ucfirst($tableName);
+                $unitName="show".ucfirst($tableName);
                 break;
         }
 
-        $class = $this->generateClass($unitName);
-        $outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+        $class=$this->generateClass($unitName);
+        $outputClass=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".php";
         file_put_contents($outputClass, $class);
 
-        $outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
-        $page = $this->generatePage($tableName, $viewType);
+        $outputPage=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".page";
+        $page=$this->generatePage($tableName, $viewType);
         file_put_contents($outputPage, $page);
     }
 
-    private function generatePage($tableName, $type, $tContentId = "Content")
+    private function generatePage($tableName, $type, $tContentId="Content")
     {
-        $pageContent = $this->getPageContent($tableName, $type);
+        $pageContent=$this->getPageContent($tableName, $type);
         return <<<EOD
 <com:TContent ID="$tContentId">   
                      
@@ -85,30 +85,30 @@ 
 
     private function getPageContent($tableName, $type)
     {
-        $code = "";
-        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-        switch ($type)
+        $code="";
+        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+        switch($type)
         {
             case self::LIST_TYPE:
                 break;
             case self::ADD_TYPE:
-                foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+                foreach($tableInfo->getColumns() as $colField => $colMetadata)
                 {
-                    if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+                    if(!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
                     {
-                        $code .= $this->generateControl($colMetadata);
-                        $code .= $this->generateValidators($colMetadata);
-                        $code .= "\n";
+                        $code.=$this->generateControl($colMetadata);
+                        $code.=$this->generateValidators($colMetadata);
+                        $code.="\n";
                     }
                 }
-                foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+                foreach($tableInfo->getForeignKeys() as $colField => $colMetadata)
                 {
-                    $colField = $this->eq($colMetadata["table"]);
-                    $code .= "\t<com:TTextBox ID=$colField />\n";
-                    $code .= "\n";
+                    $colField=$this->eq($colMetadata["table"]);
+                    $code.="\t<com:TTextBox ID=$colField />\n";
+                    $code.="\n";
                     //  TWsatBaseGenerator::pr($tableInfo);
                 }
-                $code .= "\t<com:TButton Text=\"Accept\" />\n";
+                $code.="\t<com:TButton Text=\"Accept\" />\n";
 
             case self::SHOW_TYPE:
                 break;
@@ -118,22 +118,22 @@ 
 
     private function generateControl($colMetadata)
     {
-        $controlType = "TTextBox";
-        switch ($colMetadata->DbType)
+        $controlType="TTextBox";
+        switch($colMetadata->DbType)
         {
             
         }
-        $controlId = $colMetadata->ColumnId;
+        $controlId=$colMetadata->ColumnId;
         return "\t<com:$controlType ID=\"$controlId\" />\n";
     }
 
     private function generateValidators($colMetadata)
     {
-        $controlId = $colMetadata->ColumnId;
-        $code = "";
-        if (!$colMetadata->AllowNull)
+        $controlId=$colMetadata->ColumnId;
+        $code="";
+        if(!$colMetadata->AllowNull)
         {
-            $code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
+            $code.="\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
         }
         return $code;
     }
@@ -143,8 +143,8 @@ 
     // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
     private function generateClass($classname)
     {
-        $date = date('Y-m-d h:i:s');
-        $env_user = getenv("username");
+        $date=date('Y-m-d h:i:s');
+        $env_user=getenv("username");
         return <<<EOD
 <?php
 /**

framework/Security/TAuthManager.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 
 		// check for authentication expiration
 		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))

Braces +1 added lines, -2 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -94,14 +94,14 @@ 
 		if(is_string($this->_userManager))
 		{
 			if(($users=$application->getModule($this->_userManager))===null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
 			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 			$this->_userManager=$users;
 		}
-		$application->attachEventHandler('OnAuthentication',array($this,'doAuthentication'));
-		$application->attachEventHandler('OnEndRequest',array($this,'leave'));
-		$application->attachEventHandler('OnAuthorization',array($this,'doAuthorization'));
+		$application->attachEventHandler('OnAuthentication', array($this, 'doAuthentication'));
+		$application->attachEventHandler('OnEndRequest', array($this, 'leave'));
+		$application->attachEventHandler('OnAuthorization', array($this, 'doAuthorization'));
 		$this->_initialized=true;
 	}
 
@@ -122,7 +122,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
 		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 		$this->_userManager=$provider;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param mixed sender of the Authentication event
 	 * @param mixed event parameter
 	 */
-	public function doAuthentication($sender,$param)
+	public function doAuthentication($sender, $param)
 	{
 		$this->onAuthenticate($param);
 
@@ -168,7 +168,7 @@ 
 	 * @param mixed sender of the Authorization event
 	 * @param mixed event parameter
 	 */
-	public function doAuthorization($sender,$param)
+	public function doAuthorization($sender, $param)
 	{
 		if(!$this->_skipAuthorization)
 		{
@@ -183,7 +183,7 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter
 	 */
-	public function leave($sender,$param)
+	public function leave($sender, $param)
 	{
 		$application=$this->getApplication();
 		if($application->getResponse()->getStatusCode()===401)
@@ -229,7 +229,7 @@ 
 	 */
 	public function setReturnUrl($value)
 	{
-		$this->getSession()->add($this->getReturnUrlVarName(),$value);
+		$this->getSession()->add($this->getReturnUrlVarName(), $value);
 	}
 
 	/**
@@ -288,8 +288,8 @@ 
 		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		$isAuthExpired=$this->_authExpire > 0 && !$user->getIsGuest() &&
+        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
@@ -302,7 +302,7 @@ 
 					$user=$user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
-					$isAuthExpired = false;
+					$isAuthExpired=false;
 				}
 			}
 		}
@@ -317,7 +317,7 @@ 
 
 		// event handler gets a chance to do further auth work
 		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate',$this,$application);
+			$this->raiseEvent('OnAuthenticate', $this, $application);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	{
 		$this->logout();
 		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire',$this,$param);
+			$this->raiseEvent('OnAuthExpire', $this, $param);
 	}
 
 	/**
@@ -343,8 +343,8 @@ 
 	{
 		$application=$this->getApplication();
 		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize',$this,$application);
-		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(),$application->getRequest()->getRequestType(),$application->getRequest()->getUserHostAddress()))
+			$this->raiseEvent('OnAuthorize', $this, $application);
+		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
 			$application->completeRequest();
@@ -383,7 +383,7 @@ 
 			if(($session=$this->getSession())===null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
-				$session->add($this->getUserKey(),$user->saveToString());
+				$session->add($this->getUserKey(), $user->saveToString());
 		}
 	}
 
@@ -411,19 +411,19 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username,$password,$expire=0)
+	public function login($username, $password, $expire=0)
 	{
-		if($this->_userManager->validateUser($username,$password))
+		if($this->_userManager->validateUser($username, $password))
 		{
 			if(($user=$this->_userManager->getUser($username))===null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
-			if($expire>0)
+			if($expire > 0)
 			{
-				$cookie=new THttpCookie($this->getUserKey(),'');
-				$cookie->setExpire(time()+$expire);
+				$cookie=new THttpCookie($this->getUserKey(), '');
+				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
 			}
@@ -446,7 +446,7 @@ 
 		$session->destroy();
 		if($this->getAllowAutoLogin())
 		{
-			$cookie=new THttpCookie($this->getUserKey(),'');
+			$cookie=new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

Doc Comments +2 added lines

@@ -228,6 +228,7 @@ 
 	/**
 	 * Sets the URL that the browser should be redirected to when login succeeds.
 	 * @param string the URL to be redirected to.
+	 * @param string $value
 	 */
 	public function setReturnUrl($value)
 	{
@@ -376,6 +377,7 @@ 
 	/**
 	 * Updates the user data stored in session.
 	 * @param IUser user object
+	 * @param TUser $user
 	 * @throws new TConfigurationException if session module is not loaded.
 	 */
 	public function updateSessionUser($user)