pradosoft / prado

framework/Web/UI/WebControls/TTableCell.php

Indentation +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 
 	/**
 	 * Sets the horizontal alignment of the contents within the table item.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)
@@ -110,7 +110,7 @@ 
 
 	/**
 	 * Sets the vertical alignment of the contents within the table item.
-     * Valid values include 'NotSet','Top','Bottom','Middle'
+	 * Valid values include 'NotSet','Top','Bottom','Middle'
 	 * @param string the horizontal alignment
 	 */
 	public function setVerticalAlign($value)

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -197,10 +197,10 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($colspan=$this->getColumnSpan())>0)
-			$writer->addAttribute('colspan',"$colspan");
-		if(($rowspan=$this->getRowSpan())>0)
-			$writer->addAttribute('rowspan',"$rowspan");
+		if(($colspan=$this->getColumnSpan()) > 0)
+			$writer->addAttribute('colspan', "$colspan");
+		if(($rowspan=$this->getRowSpan()) > 0)
+			$writer->addAttribute('rowspan', "$rowspan");
 	}
 
 	/**

framework/Web/UI/WebControls/TPanel.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 	/**
 	 * Sets the horizontal alignment of the contents within the panel.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if(($butt=$this->getDefaultButton())!=='')
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getGroupingText()
 	{
-		return $this->getViewState('GroupingText','');
+		return $this->getViewState('GroupingText', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setGroupingText($value)
 	{
-		$this->setViewState('GroupingText',$value,'');
+		$this->setViewState('GroupingText', $value, '');
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 		if(($butt=$this->getDefaultButton())!=='')
 		{
 			if(($button=$this->findControl($butt))===null)
-				throw new TInvalidDataValueException('panel_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
 			else
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}

framework/Web/UI/ActiveControls/TActiveLabel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -71,7 +71,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		if(parent::getForControl() === $value)
+		if(parent::getForControl()===$value)
 			return;
 
 		parent::setForControl($value);
@@ -87,7 +87,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 }

framework/Web/UI/ActiveControls/TActiveDataList.php

Indentation +27 added lines, -27 removed lines

@@ -31,8 +31,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -40,7 +40,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -52,11 +52,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -65,7 +65,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -76,13 +76,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -92,14 +92,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -109,8 +109,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     parent::setDataSource($value);
     if($this->getActiveControl()->canUpdateClientSide()) {
       $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+      $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }

framework/Util/TDateTimeStamp.php

Indentation +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 /**
  * TDateTimeStamp class file.
-
  * @author Fabio Bas ctrlaltca[AT]gmail[DOT]com
  * @link https://github.com/pradosoft/prado
  * @copyright Copyright &copy; 2005-2015 The PRADO Group
@@ -186,7 +185,7 @@ 
 
 	/**
 	 * @return integer|float a timestamp given a local time
-     */
+	 */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();

Spacing +34 added lines, -34 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal=array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf=array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -36,7 +36,7 @@ 
 	 */
 	public function getDayofWeek($year, $month, $day)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setDate($year, $month, $day);
 		return (int) $dt->format('w');
 	}
@@ -49,8 +49,8 @@ 
 	 */
 	public function isLeapYear($year)
 	{
-		$year = $this->digitCheck($year);
-		$dt = new DateTime();
+		$year=$this->digitCheck($year);
+		$dt=new DateTime();
 		$dt->setDate($year, 1, 1);
 		return (bool) $dt->format('L');
 	}
@@ -62,22 +62,22 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
-			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+		if($y < 100) {
+			$yr=(integer) date("Y");
+			$century=(integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
-				$c1 = $century + 1;
-				$c0 = $century;
+			if($yr % 100 > 50) {
+				$c1=$century + 1;
+				$c0=$century;
 			} else {
-				$c1 = $century;
-				$c0 = $century - 1;
+				$c1=$century;
+				$c0=$century - 1;
 			}
-			$c1 *= 100;
+			$c1*=100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if(($y + $c1) < $yr + 30) $y=$y + $c1;
+			else $y=$y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -92,7 +92,7 @@ 
 	 */
 	public function getGMTDiff($ts=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($ts)
 			$dt->setTimeStamp($ts);
 		else
@@ -106,9 +106,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if($txt===false) return getdate();
 
-		$dt = new DateTime($txt);
+		$dt=new DateTime($txt);
 
 		return array(
 			'seconds' => (int) $dt->format('s'),
@@ -128,11 +128,11 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d=false, $fast=false)
 	{
-		if ($d === false) return getdate();
+		if($d===false) return getdate();
 
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setTimestamp($d);
 
 		return array(
@@ -153,20 +153,20 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+		if($this->isLeapYear($y))
+			$marr=& self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr=& self::$_month_normal;
 
-		if ($m > 12 || $m < 1) return false;
+		if($m > 12 || $m < 1) return false;
 
-		if ($d > 31 || $d < 1) return false;
+		if($d > 31 || $d < 1) return false;
 
-		if ($marr[$m] < $d) return false;
+		if($marr[$m] < $d) return false;
 
-		if ($y < 1000 && $y > 3000) return false;
+		if($y < 1000 && $y > 3000) return false;
 
 		return true;
 	}
@@ -174,9 +174,9 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
@@ -187,9 +187,9 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon=false, $day=false, $year=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setDate($year!==false ? $year : date('Y'),

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +4 added lines, -3 removed lines

@@ -199,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -217,7 +217,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -261,6 +261,7 @@ 
 	 * update. This will automatically set HasPrority to true.
 	 * @param boolean true enables the callback response to update the
 	 * viewstate.
+	 * @param boolean $value
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
@@ -269,7 +270,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +3 added lines, -3 removed lines

@@ -264,7 +264,7 @@ 
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
-		$enabled = TPropertyValue::ensureBoolean($value);
+		$enabled=TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
 	}
 
@@ -274,7 +274,7 @@ 
 	 */
 	public function getEnablePageStateUpdate()
 	{
-		$option = $this->getOption('EnablePageStateUpdate');
+		$option=$this->getOption('EnablePageStateUpdate');
 		return ($option===null) ? true : $option;
 	}
 
@@ -292,7 +292,7 @@ 
 	public function setPostBackTarget($value)
 	{
 		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+			$value=$value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}
 

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Indentation +4 added lines, -4 removed lines

@@ -68,9 +68,9 @@ 
 	}
 
 	/**
-	* Creates a new callback control, sets the adapter to
-	* TActiveControlAdapter.
-	*/
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter.
+	 */
 	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
@@ -111,7 +111,7 @@ 
 	 * @param string $value container tag
 	 */
 	public function setSurroundingTag($value) {
-    $this->_surroundingTag=TPropertyValue::ensureString($value);
+	$this->_surroundingTag=TPropertyValue::ensureString($value);
 	}
 
 	/**

Braces +34 added lines, -68 removed lines

@@ -145,8 +145,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button=new TActiveButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -180,8 +179,7 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}
@@ -248,8 +246,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -262,19 +259,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -283,8 +277,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -376,8 +369,7 @@ 
 				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 }
@@ -416,8 +408,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -428,27 +419,23 @@ 
 						$button->setAlternateText($text);
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
 					if($text!=='')
 						$image->setAlternateText($text);
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -491,8 +478,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -505,8 +491,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -514,11 +499,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -527,8 +510,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -574,8 +556,7 @@ 
 			$cell->registerObject('CheckBox',$checkBox);
 			if($this->getDataField()!=='')
 				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 
@@ -597,8 +578,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -611,8 +591,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -620,11 +599,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -633,8 +610,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -676,8 +652,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -690,8 +665,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -699,11 +673,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -712,8 +684,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -759,8 +730,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -773,19 +743,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -794,8 +761,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');

Spacing +25 added lines, -25 removed lines

@@ -94,7 +94,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -136,7 +136,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter) {
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
 		if($buttonType===TDataGridPagerButtonType::LinkButton) {
 			if($enabled)
 				$button=new TActiveLinkButton;
@@ -179,10 +179,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -208,7 +208,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderDataGrid($writer) {
-	  $writer->addAttribute('id',$this->getSurroundingTagID());
+	  $writer->addAttribute('id', $this->getSurroundingTagID());
 	  $writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();
@@ -234,7 +234,7 @@ 
  * @since 3.1.9
  */
 class TActiveBoundColumn extends TBoundColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -313,7 +313,7 @@ 
  * @since 3.1.9
  */
 class TActiveEditCommandColumn extends TEditCommandColumn {
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup) {
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup) {
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
 			$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
@@ -322,9 +322,9 @@ 
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
 				$button->setToolTip($text);
-				if(strcasecmp($commandName,'Update')===0)
+				if(strcasecmp($commandName, 'Update')===0)
 					$url=$this->getUpdateImageUrl();
-				else if(strcasecmp($commandName,'Cancel')===0)
+				else if(strcasecmp($commandName, 'Cancel')===0)
 						$url=$this->getCancelImageUrl();
 					else
 						$url=$this->getEditImageUrl();
@@ -355,7 +355,7 @@ 
  * @since 3.1.9
  */
 class TActiveButtonColumn extends TButtonColumn {
-	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) {
 			$buttonType=$this->getButtonType();
 			if($buttonType===TButtonColumnType::LinkButton)
@@ -373,12 +373,12 @@ 
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
 			if($this->getDataTextField()!=='' || ($buttonType===TButtonColumnType::ImageButton && $this->getDataImageUrlField()!==''))
-				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$button->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			$cell->getControls()->add($button);
-			$cell->registerObject('Button',$button);
+			$cell->registerObject('Button', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 }
 
@@ -402,7 +402,7 @@ 
  * @since 3.1.9
  */
 class TActiveTemplateColumn extends TTemplateColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -473,7 +473,7 @@ 
 class TActiveHyperLinkColumn extends THyperLinkColumn
 {
 
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -562,7 +562,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)
 		{
@@ -571,15 +571,15 @@ 
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
-			$cell->registerObject('CheckBox',$checkBox);
+			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField()!=='')
-				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$checkBox->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -658,7 +658,7 @@ 
  */
 class TActiveDropDownListColumn extends TDropDownListColumn
 {
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -745,7 +745,7 @@ 
  * @since 3.1.9
  */
 class TActiveLiteralColumn extends TLiteralColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -821,8 +821,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_callbackoptions === null)
-			$this->_callbackoptions = new TCallbackOptions;
+		if($this->_callbackoptions===null)
+			$this->_callbackoptions=new TCallbackOptions;
 		return $this->_callbackoptions->getClientSide();
 	}
 }

framework/Caching/TCache.php

Doc Comments +10 added lines, -1 removed lines

@@ -106,7 +106,7 @@ 
 
 	/**
 	 * @param string a key identifying a value to be cached
-	 * @return sring a key generated from the provided key which ensures the uniqueness across applications
+	 * @return string a key generated from the provided key which ensures the uniqueness across applications
 	 */
 	protected function generateUniqueKey($key)
 	{
@@ -198,6 +198,7 @@ 
 	 * in {@link get()} already. So only the implementation of data retrieval
 	 * is needed.
 	 * @param string a unique key identifying the cached value
+	 * @param string $key
 	 * @return string the value stored in cache, false if the value is not in the cache or expired.
 	 */
 	abstract protected function getValue($key);
@@ -212,6 +213,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function setValue($key,$value,$expire);
@@ -226,6 +229,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function addValue($key,$value,$expire);
@@ -234,6 +239,7 @@ 
 	 * Deletes a value with the specified key from cache
 	 * This method should be implemented by child classes to delete the data from actual cache storage.
 	 * @param string the key of the value to be deleted
+	 * @param string $key
 	 * @return boolean if no error happens during deletion
 	 */
 	abstract protected function deleteValue($key);
@@ -490,6 +496,7 @@ 
 	 * By default, it always returns true, meaning the file should be checked.
 	 * You may override this method to check only certain files.
 	 * @param string the name of the file that may be checked for dependency.
+	 * @param string $fileName
 	 * @return boolean whether this file should be checked.
 	 */
 	protected function validateFile($fileName)
@@ -503,6 +510,7 @@ 
 	 * By default, it always returns true, meaning the subdirectory should be checked.
 	 * You may override this method to check only certain subdirectories.
 	 * @param string the name of the subdirectory that may be checked for dependency.
+	 * @param string $directory
 	 * @return boolean whether this subdirectory should be checked.
 	 */
 	protected function validateDirectory($directory)
@@ -516,6 +524,7 @@ 
 	 * {@link setRecursiveCheck RecursiveCheck} is set true.
 	 * @param string the directory name
 	 * @param int level of the recursion
+	 * @param string $directory
 	 * @return array list of file modification time indexed by the file path
 	 */
 	protected function generateTimestamps($directory,$level=0)

Spacing +19 added lines, -19 removed lines

@@ -64,7 +64,7 @@ 
 			if($this->getApplication()->getCache()===null)
 				$this->getApplication()->setCache($this);
 			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
 		}
 	}
 
@@ -142,14 +142,14 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id,$value,$expire=0,$dependency=null)
+	public function set($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			$this->delete($id);
 		else
 		{
-			$data=array($value,$dependency);
-			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
+			$data=array($value, $dependency);
+			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
 
@@ -162,12 +162,12 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			return false;
-		$data=array($value,$dependency);
-		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
+		$data=array($value, $dependency);
+		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	abstract protected function setValue($key,$value,$expire);
+	abstract protected function setValue($key, $value, $expire);
 
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
@@ -228,7 +228,7 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	abstract protected function addValue($key,$value,$expire);
+	abstract protected function addValue($key, $value, $expire);
 
 	/**
 	 * Deletes a value with the specified key from cache
@@ -246,7 +246,7 @@ 
 	 */
 	public function offsetExists($id)
 	{
-		return $this->get($id) !== false;
+		return $this->get($id)!==false;
 	}
 
 	/**
@@ -430,7 +430,7 @@ 
 	public function setDirectory($directory)
 	{
 		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
 		$this->_directory=$path;
 		$this->_timestamps=$this->generateTimestamps($path);
 	}
@@ -518,10 +518,10 @@ 
 	 * @param int level of the recursion
 	 * @return array list of file modification time indexed by the file path
 	 */
-	protected function generateTimestamps($directory,$level=0)
+	protected function generateTimestamps($directory, $level=0)
 	{
 		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
+			throw new TIOException('directorycachedependency_directory_invalid', $directory);
 		$timestamps=array();
 		while(($file=readdir($dir))!==false)
 		{
@@ -530,8 +530,8 @@ 
 				continue;
 			else if(is_dir($path))
 			{
-				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
+					$timestamps=array_merge($this->generateTimestamps($path, $level + 1));
 			}
 			else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);
@@ -699,10 +699,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a dependency instance
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof ICacheDependency)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
 	}

Braces +1 added lines, -2 removed lines

@@ -532,8 +532,7 @@
 			{
 				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
-			}
-			else if($this->validateFile($path))
+			} else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);

framework/Collections/TAttributeCollection.php

Doc Comments +2 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param boolean whether the keys are case-sensitive.
+	 * @param boolean $value
 	 */
 	public function setCaseSensitive($value)
 	{
@@ -126,6 +127,7 @@ 
 	 * Removes an item from the map by its key.
 	 * This overrides the parent implementation by converting the key to lower case first if CaseSensitive is false.
 	 * @param mixed the key of the item to be removed
+	 * @param string $key
 	 * @return mixed the removed value, null if no such key exists.
 	 */
 	public function remove($key)

Spacing +10 added lines, -10 removed lines

@@ -53,8 +53,8 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
-			$exprops[] = "\0TAttributeCollection\0_caseSensitive";
+		if($this->_caseSensitive===false)
+			$exprops[]="\0TAttributeCollection\0_caseSensitive";
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -117,9 +117,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**