pradosoft / prado

framework/Web/UI/WebControls/TPager.php

Doc Comments +6 added lines

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

Spacing +88 added lines, -88 removed lines

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

Braces +11 added lines, -22 removed lines

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

framework/Web/UI/WebControls/TRangeValidator.php

Doc Comments +6 added lines

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

Indentation +7 added lines, -7 removed lines

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

Spacing +29 added lines, -29 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -259,8 +259,7 @@
 			if($maxValue!=='')
 				$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
 			return $valid;
-		}
-		else
+		} else
 		{
 			$value=strtotime($value);
 			if($minValue!=='')

framework/Web/UI/WebControls/TRatingList.php

Doc Comments +1 added lines

@@ -132,6 +132,7 @@
 
 	/**
 	 * @param float rating value
+	 * @param double $rating
 	 * @return int rating as integer
 	 */
 	protected function getRatingIndex($rating)

Indentation +2 added lines, -2 removed lines

@@ -215,7 +215,7 @@ 
  	}
 
  	/**
-	 * @return string rating style css class name.
+ 	 * @return string rating style css class name.
  	 */
 	protected function getRatingStyleCssClass()
  	{
@@ -258,7 +258,7 @@ 
  	}
 
  	/**
-	 * @return string find the client ID of the caption control.
+ 	 * @return string find the client ID of the caption control.
  	 */
 	protected function getCaptionControlID()
  	{

Spacing +33 added lines, -33 removed lines

@@ -28,12 +28,12 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'ratings';
+	const SCRIPT_PATH='ratings';
 
 	/**
 	 * @var array list of published rating images.
 	 */
-	private $_ratingImages = array();
+	private $_ratingImages=array();
 
 	/**
 	 * Sets the default repeat direction to horizontal.
@@ -49,7 +49,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 */
 	public function getRating()
 	{
-		$rating = $this->getViewState('Rating', null);
-		if ($rating === null)
-			return $this->getSelectedIndex()+1;
+		$rating=$this->getViewState('Rating', null);
+		if($rating===null)
+			return $this->getSelectedIndex() + 1;
 		else
 			return $rating;
 	}
@@ -117,15 +117,15 @@ 
 	 */
 	public function setRating($value)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->setViewState('Rating', $value, null);
-		$index = $this->getRatingIndex($value);
+		$index=$this->getRatingIndex($value);
 		parent::setSelectedIndex($index);
 	}
 
 	public function setSelectedIndex($value)
 	{
-		$this->setRating($value+1);
+		$this->setRating($value + 1);
 		parent::setSelectedIndex($value);
 	}
 
@@ -135,10 +135,10 @@ 
 	 */
 	protected function getRatingIndex($rating)
 	{
-		$interval = $this->getHalfRatingInterval();
-		$base = intval($rating)-1;
-		$remainder = $rating-$base-1;
-		return $remainder > $interval[1] ? $base+1 : $base;
+		$interval=$this->getHalfRatingInterval();
+		$base=intval($rating) - 1;
+		$remainder=$rating - $base - 1;
+		return $remainder > $interval[1] ? $base + 1 : $base;
 	}
 
 	/**
@@ -146,8 +146,8 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$value = $this->getRating();
-		$value = TPropertyValue::ensureInteger($value);
+		$value=$this->getRating();
+		$value=TPropertyValue::ensureInteger($value);
 		$this->setRating($value);
 		parent::onSelectedIndexChanged($param);
 	}
@@ -178,7 +178,7 @@ 
 				return $control;
 		}
 		throw new TInvalidDataValueException(
-			'ratinglist_invalid_caption_id',$id,$this->getID());
+			'ratinglist_invalid_caption_id', $id, $this->getID());
 	}
 
 	/**
@@ -245,14 +245,14 @@ 
 	 */
 	protected function getPostBackOptions()
  	{
-		$options = parent::getPostBackOptions();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['ReadOnly'] = $this->getReadOnly();
-		$options['Style'] = $this->getRatingStyleCssClass();
-		$options['CaptionID'] = $this->getCaptionControlID();
-		$options['SelectedIndex'] = $this->getSelectedIndex();
-		$options['Rating'] = $this->getRating();
-		$options['HalfRating'] = $this->getHalfRatingInterval();
+		$options=parent::getPostBackOptions();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['ReadOnly']=$this->getReadOnly();
+		$options['Style']=$this->getRatingStyleCssClass();
+		$options['CaptionID']=$this->getCaptionControlID();
+		$options['SelectedIndex']=$this->getSelectedIndex();
+		$options['Rating']=$this->getRating();
+		$options['HalfRating']=$this->getHalfRatingInterval();
 		return $options;
  	}
 
@@ -281,7 +281,7 @@ 
  	{
 		parent::onPreRender($param);
 		$this->publishStyle($this->getRatingStyle());
-		$this->_ratingImages = $this->publishImages($this->getRatingStyle());
+		$this->_ratingImages=$this->publishImages($this->getRatingStyle());
  		$this->registerClientScript();
 	}
 
@@ -291,8 +291,8 @@ 
 	 */
 	protected function publishStyle($style)
  	{
-		$cs = $this->getPage()->getClientScript();
-		$url = $this->getAssetUrl($style.'.css');
+		$cs=$this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($style.'.css');
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -305,10 +305,10 @@ 
 	 */
 	protected function publishImages($style, $fileExt='.gif')
  	{
-		$types = array('blank', 'selected', 'half', 'combined');
-		$files = array();
+		$types=array('blank', 'selected', 'half', 'combined');
+		$files=array();
 		foreach($types as $type)
-			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+			$files[$type]=$this->getAssetUrl("{$style}_{$type}{$fileExt}");
 		return $files;
  	}
 
@@ -327,7 +327,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
  	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
  	}
 
@@ -339,7 +339,7 @@ 
 	 */
 	public function render($writer)
  	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getPage()->getClientScript()->registerPostBackControl(
 			$this->getClientClassName(), $this->getPostBackOptions());
 		parent::render($writer);

Braces +1 added lines, -2 removed lines

@@ -267,8 +267,7 @@
 			{
 				if($control->getVisible(true))
 					return $control->getClientID();
-			}
-			else
+			} else
 				return $id;
  		}
 		return '';

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

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 \Prado\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());

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 \Prado\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);

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

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)

Braces +1 added lines, -2 removed lines

@@ -430,8 +430,7 @@
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}