pradosoft / prado

framework/Web/UI/WebControls/TTableStyle.php

Spacing +29 added lines, -29 removed lines

@@ -96,19 +96,19 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableStyle)
+		if ($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl !== null)
+			if ($style->_backImageUrl !== null)
 				$this->_backImageUrl = $style->_backImageUrl;
-			if($style->_horizontalAlign !== null)
+			if ($style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_cellPadding !== null)
+			if ($style->_cellPadding !== null)
 				$this->_cellPadding = $style->_cellPadding;
-			if($style->_cellSpacing !== null)
+			if ($style->_cellSpacing !== null)
 				$this->_cellSpacing = $style->_cellSpacing;
-			if($style->_gridLines !== null)
+			if ($style->_gridLines !== null)
 				$this->_gridLines = $style->_gridLines;
-			if($style->_borderCollapse !== null)
+			if ($style->_borderCollapse !== null)
 				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
@@ -122,19 +122,19 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableStyle)
+		if ($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl === null && $style->_backImageUrl !== null)
+			if ($this->_backImageUrl === null && $style->_backImageUrl !== null)
 				$this->_backImageUrl = $style->_backImageUrl;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_cellPadding === null && $style->_cellPadding !== null)
+			if ($this->_cellPadding === null && $style->_cellPadding !== null)
 				$this->_cellPadding = $style->_cellPadding;
-			if($this->_cellSpacing === null && $style->_cellSpacing !== null)
+			if ($this->_cellSpacing === null && $style->_cellSpacing !== null)
 				$this->_cellSpacing = $style->_cellSpacing;
-			if($this->_gridLines === null && $style->_gridLines !== null)
+			if ($this->_gridLines === null && $style->_gridLines !== null)
 				$this->_gridLines = $style->_gridLines;
-			if($this->_borderCollapse === null && $style->_borderCollapse !== null)
+			if ($this->_borderCollapse === null && $style->_borderCollapse !== null)
 				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
@@ -147,22 +147,22 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url = trim($this->getBackImageUrl())) !== '')
-			$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		if (($url = trim($this->getBackImageUrl())) !== '')
+			$writer->addStyleAttribute('background-image', 'url('.$url.')');
 
-		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
 			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
 
-		if(($cellPadding = $this->getCellPadding()) >= 0)
+		if (($cellPadding = $this->getCellPadding()) >= 0)
 			$writer->addAttribute('cellpadding', "$cellPadding");
 
-		if(($cellSpacing = $this->getCellSpacing()) >= 0)
+		if (($cellSpacing = $this->getCellSpacing()) >= 0)
 			$writer->addAttribute('cellspacing', "$cellSpacing");
 
-		if($this->getBorderCollapse())
+		if ($this->getBorderCollapse())
 			$writer->addStyleAttribute('border-collapse', 'collapse');
 
-		switch($this->getGridLines())
+		switch ($this->getGridLines())
 		{
 			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
 			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
@@ -177,7 +177,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl === null?'':$this->_backImageUrl;
+		return $this->_backImageUrl === null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign === null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign === null ?THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -211,7 +211,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		return $this->_cellPadding === null?-1:$this->_cellPadding;
+		return $this->_cellPadding === null ?-1 : $this->_cellPadding;
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
+		if (($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 
@@ -229,7 +229,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing === null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing === null ?-1 : $this->_cellSpacing;
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
+		if (($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 
@@ -247,7 +247,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		return $this->_gridLines === null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines === null ?TTableGridLines::None : $this->_gridLines;
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse === null?false:$this->_borderCollapse;
+		return $this->_borderCollapse === null ?false:$this->_borderCollapse;
 	}
 
 	/**

Braces +75 added lines, -50 removed lines

@@ -58,18 +58,24 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_backImageUrl === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellSpacing";
-		if ($this->_gridLines === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_gridLines";
-		if ($this->_borderCollapse === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_borderCollapse";
+		if ($this->_backImageUrl === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_backImageUrl";
+		}
+		if ($this->_horizontalAlign === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_horizontalAlign";
+		}
+		if ($this->_cellPadding === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellPadding";
+		}
+		if ($this->_cellSpacing === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellSpacing";
+		}
+		if ($this->_gridLines === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_gridLines";
+		}
+		if ($this->_borderCollapse === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_borderCollapse";
+		}
 	}
 
 	/**
@@ -98,18 +104,24 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl !== null)
-				$this->_backImageUrl = $style->_backImageUrl;
-			if($style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_cellPadding !== null)
-				$this->_cellPadding = $style->_cellPadding;
-			if($style->_cellSpacing !== null)
-				$this->_cellSpacing = $style->_cellSpacing;
-			if($style->_gridLines !== null)
-				$this->_gridLines = $style->_gridLines;
-			if($style->_borderCollapse !== null)
-				$this->_borderCollapse = $style->_borderCollapse;
+			if($style->_backImageUrl !== null) {
+							$this->_backImageUrl = $style->_backImageUrl;
+			}
+			if($style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($style->_cellPadding !== null) {
+							$this->_cellPadding = $style->_cellPadding;
+			}
+			if($style->_cellSpacing !== null) {
+							$this->_cellSpacing = $style->_cellSpacing;
+			}
+			if($style->_gridLines !== null) {
+							$this->_gridLines = $style->_gridLines;
+			}
+			if($style->_borderCollapse !== null) {
+							$this->_borderCollapse = $style->_borderCollapse;
+			}
 		}
 	}
 
@@ -124,18 +136,24 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl === null && $style->_backImageUrl !== null)
-				$this->_backImageUrl = $style->_backImageUrl;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_cellPadding === null && $style->_cellPadding !== null)
-				$this->_cellPadding = $style->_cellPadding;
-			if($this->_cellSpacing === null && $style->_cellSpacing !== null)
-				$this->_cellSpacing = $style->_cellSpacing;
-			if($this->_gridLines === null && $style->_gridLines !== null)
-				$this->_gridLines = $style->_gridLines;
-			if($this->_borderCollapse === null && $style->_borderCollapse !== null)
-				$this->_borderCollapse = $style->_borderCollapse;
+			if($this->_backImageUrl === null && $style->_backImageUrl !== null) {
+							$this->_backImageUrl = $style->_backImageUrl;
+			}
+			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($this->_cellPadding === null && $style->_cellPadding !== null) {
+							$this->_cellPadding = $style->_cellPadding;
+			}
+			if($this->_cellSpacing === null && $style->_cellSpacing !== null) {
+							$this->_cellSpacing = $style->_cellSpacing;
+			}
+			if($this->_gridLines === null && $style->_gridLines !== null) {
+							$this->_gridLines = $style->_gridLines;
+			}
+			if($this->_borderCollapse === null && $style->_borderCollapse !== null) {
+							$this->_borderCollapse = $style->_borderCollapse;
+			}
 		}
 	}
 
@@ -147,20 +165,25 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url = trim($this->getBackImageUrl())) !== '')
-			$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		if(($url = trim($this->getBackImageUrl())) !== '') {
+					$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		}
 
-		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
+		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet) {
+					$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
+		}
 
-		if(($cellPadding = $this->getCellPadding()) >= 0)
-			$writer->addAttribute('cellpadding', "$cellPadding");
+		if(($cellPadding = $this->getCellPadding()) >= 0) {
+					$writer->addAttribute('cellpadding', "$cellPadding");
+		}
 
-		if(($cellSpacing = $this->getCellSpacing()) >= 0)
-			$writer->addAttribute('cellspacing', "$cellSpacing");
+		if(($cellSpacing = $this->getCellSpacing()) >= 0) {
+					$writer->addAttribute('cellspacing', "$cellSpacing");
+		}
 
-		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse', 'collapse');
+		if($this->getBorderCollapse()) {
+					$writer->addStyleAttribute('border-collapse', 'collapse');
+		}
 
 		switch($this->getGridLines())
 		{
@@ -220,8 +243,9 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
-			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		if(($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1) {
+					throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		}
 	}
 
 	/**
@@ -238,8 +262,9 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
-			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		if(($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1) {
+					throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TAccordion.php

Spacing +30 added lines, -30 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TAccordionView)
+		if ($object instanceof TAccordionView)
 			$this->getControls()->add($object);
 	}
 
@@ -144,32 +144,32 @@ 
 	{
 		$activeView = null;
 		$views = $this->getViews();
-		if(($id = $this->getActiveViewID()) !== '')
+		if (($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index = $views->findIndexByID($id)) >= 0)
+			if (($index = $views->findIndexByID($id)) >= 0)
 				$activeView = $views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
 		}
-		elseif(($index = $this->getActiveViewIndex()) >= 0)
+		elseif (($index = $this->getActiveViewIndex()) >= 0)
 		{
-			if($index < $views->getCount())
+			if ($index < $views->getCount())
 				$activeView = $views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
 		}
 		else
 		{
-			foreach($views as $index => $view)
+			foreach ($views as $index => $view)
 			{
-				if($view->getActive())
+				if ($view->getActive())
 				{
 					$activeView = $view;
 					break;
 				}
 			}
 		}
-		if($activeView !== null)
+		if ($activeView !== null)
 			$this->activateView($activeView);
 		return $activeView;
 	}
@@ -180,7 +180,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view) >= 0)
+		if ($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('accordion_view_inexistent');
@@ -208,7 +208,7 @@ 
 	public function getCssClass()
 	{
 		$cssClass = parent::getCssClass();
-			return $cssClass === ''?'accordion':$cssClass;
+			return $cssClass === '' ? 'accordion' : $cssClass;
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style = $this->getViewState('ViewStyle', null)) === null)
+		if (($style = $this->getViewState('ViewStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('accordion-view');
@@ -278,7 +278,7 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('accordion-header');
@@ -308,7 +308,7 @@ 
 	 */
 	public function getActiveHeaderStyle()
 	{
-		if(($style = $this->getViewState('ActiveHeaderStyle', null)) === null)
+		if (($style = $this->getViewState('ActiveHeaderStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('accordion-header-active');
@@ -342,9 +342,9 @@ 
 	{
 		$this->setActiveViewIndex(-1);
 		$this->setActiveViewID('');
-		foreach($this->getViews() as $index => $v)
+		foreach ($this->getViews() as $index => $v)
 		{
-			if($view === $v)
+			if ($view === $v)
 			{
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
@@ -364,11 +364,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(($index = $values[$this->getClientID() . '_1']) !== null)
+		if (($index = $values[$this->getClientID().'_1']) !== null)
 		{
-			$index = (int)$index;
+			$index = (int) $index;
 			$currentIndex = $this->getActiveViewIndex();
-			if($currentIndex !== $index)
+			if ($currentIndex !== $index)
 			{
 				$this->setActiveViewID(''); // clear up view ID
 				$this->setActiveViewIndex($index);
@@ -419,7 +419,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 	}
 
@@ -432,15 +432,15 @@ 
 	{
 		$url = $this->getCssUrl();
 
-		if($url === '') {
+		if ($url === '') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'accordion.css');
+		if ($url === 'default') {
+			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'accordion.css');
 		}
 
-		if($url !== '') {
+		if ($url !== '') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -460,11 +460,11 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
+		if (!$this->getViews()->itemAt($index)->Visible)
 			$index = 0;
-		$cs->registerHiddenField($id . '_1', $index);
+		$cs->registerHiddenField($id.'_1', $index);
 		$page->registerRequiresPostData($this);
-		$page->registerRequiresPostData($id . "_1");
+		$page->registerRequiresPostData($id."_1");
 	}
 
 	/**
@@ -490,8 +490,8 @@ 
 		if (($viewheight = $this->getViewHeight()) > 0)
 			$options['maxHeight'] = $viewheight;
 		$views = [];
-		foreach($this->getViews() as $view)
-			$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
+		foreach ($this->getViews() as $view)
+			$views[$view->getClientID()] = $view->getVisible() ? '1' : '0';
 		$options['Views'] = $views;
 
 		return $options;
@@ -527,10 +527,10 @@ 
 	public function renderContents($writer)
 	{
 		$views = $this->getViews();
-		if($views->getCount() > 0)
+		if ($views->getCount() > 0)
 		{
 			$writer->writeLine();
-			foreach($views as $view)
+			foreach ($views as $view)
 			{
 				$view->renderHeader($writer);
 				$view->renderControl($writer);

Braces +34 added lines, -28 removed lines

@@ -89,8 +89,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TAccordionView)
-			$this->getControls()->add($object);
+		if($object instanceof TAccordionView) {
+					$this->getControls()->add($object);
+		}
 	}
 
 	/**
@@ -146,19 +147,19 @@ 
 		$views = $this->getViews();
 		if(($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index = $views->findIndexByID($id)) >= 0)
-				$activeView = $views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
-		}
-		elseif(($index = $this->getActiveViewIndex()) >= 0)
+			if(($index = $views->findIndexByID($id)) >= 0) {
+							$activeView = $views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
+			}
+		} elseif(($index = $this->getActiveViewIndex()) >= 0)
 		{
-			if($index < $views->getCount())
-				$activeView = $views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
-		}
-		else
+			if($index < $views->getCount()) {
+							$activeView = $views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
+			}
+		} else
 		{
 			foreach($views as $index => $view)
 			{
@@ -169,8 +170,9 @@ 
 				}
 			}
 		}
-		if($activeView !== null)
-			$this->activateView($activeView);
+		if($activeView !== null) {
+					$this->activateView($activeView);
+		}
 		return $activeView;
 	}
 
@@ -180,10 +182,11 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view) >= 0)
-			$this->activateView($view);
-		else
-			throw new TInvalidOperationException('accordion_view_inexistent');
+		if($this->getViews()->indexOf($view) >= 0) {
+					$this->activateView($view);
+		} else {
+					throw new TInvalidOperationException('accordion_view_inexistent');
+		}
 	}
 
 	/**
@@ -349,9 +352,9 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
+			} else {
+							$v->setActive(false);
 			}
-			else
-				$v->setActive(false);
 		}
 	}
 
@@ -460,8 +463,9 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
-			$index = 0;
+		if(!$this->getViews()->itemAt($index)->Visible) {
+					$index = 0;
+		}
 		$cs->registerHiddenField($id . '_1', $index);
 		$page->registerRequiresPostData($this);
 		$page->registerRequiresPostData($id . "_1");
@@ -487,11 +491,13 @@ 
 		$options['HeaderCssClass'] = $this->getHeaderCssClass();
 		$options['Duration'] = $this->getAnimationDuration();
 
-		if (($viewheight = $this->getViewHeight()) > 0)
-			$options['maxHeight'] = $viewheight;
+		if (($viewheight = $this->getViewHeight()) > 0) {
+					$options['maxHeight'] = $viewheight;
+		}
 		$views = [];
-		foreach($this->getViews() as $view)
-			$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
+		foreach($this->getViews() as $view) {
+					$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
+		}
 		$options['Views'] = $views;
 
 		return $options;

framework/Web/UI/WebControls/TLiteralColumn.php

Spacing +7 added lines, -7 removed lines

@@ -106,14 +106,14 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::EditItem || $itemType === TListItemType::SelectedItem)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::EditItem || $itemType === TListItemType::SelectedItem)
 		{
-			if($this->getDataField() !== '')
+			if ($this->getDataField() !== '')
 			{
-				$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$cell->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			} else {
 				$text = $this->getText();
-				if($this->getEncode())
+				if ($this->getEncode())
 					$text = THttpUtility::htmlEncode($text);
 				$cell->setText($text);
 			}
@@ -132,13 +132,13 @@ 
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
 		$formatString = $this->getDataFormatString();
-		if(($field = $this->getDataField()) !== '')
+		if (($field = $this->getDataField()) !== '')
 			$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
 		else
 			$value = $this->formatDataValue($formatString, $data);
-		if($sender instanceof TTableCell)
+		if ($sender instanceof TTableCell)
 		{
-			if($this->getEncode())
+			if ($this->getEncode())
 				$value = THttpUtility::htmlEncode($value);
 			$sender->setText($value);
 		}

Braces +13 added lines, -10 removed lines

@@ -113,13 +113,14 @@ 
 				$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 			} else {
 				$text = $this->getText();
-				if($this->getEncode())
-					$text = THttpUtility::htmlEncode($text);
+				if($this->getEncode()) {
+									$text = THttpUtility::htmlEncode($text);
+				}
 				$cell->setText($text);
 			}
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -132,14 +133,16 @@ 
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
 		$formatString = $this->getDataFormatString();
-		if(($field = $this->getDataField()) !== '')
-			$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
-		else
-			$value = $this->formatDataValue($formatString, $data);
+		if(($field = $this->getDataField()) !== '') {
+					$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
+		} else {
+					$value = $this->formatDataValue($formatString, $data);
+		}
 		if($sender instanceof TTableCell)
 		{
-			if($this->getEncode())
-				$value = THttpUtility::htmlEncode($value);
+			if($this->getEncode()) {
+							$value = THttpUtility::htmlEncode($value);
+			}
 			$sender->setText($value);
 		}
 	}

framework/Web/UI/WebControls/TRadioButton.php

Spacing +23 added lines, -23 removed lines

@@ -112,10 +112,10 @@ 
 	public function loadPostData($key, $values)
 	{
 		$uniqueGroupName = $this->getUniqueGroupName();
-		$value = isset($values[$uniqueGroupName])?$values[$uniqueGroupName]:null;
-		if($value !== null && $value === $this->getValueAttribute())
+		$value = isset($values[$uniqueGroupName]) ? $values[$uniqueGroupName] : null;
+		if ($value !== null && $value === $this->getValueAttribute())
 		{
-			if(!$this->getChecked())
+			if (!$this->getChecked())
 			{
 				$this->setChecked(true);
 				return true;
@@ -123,7 +123,7 @@ 
 			else
 				return false;
 		}
-		elseif($this->getChecked())
+		elseif ($this->getChecked())
 			$this->setChecked(false);
 		return false;
 	}
@@ -153,22 +153,22 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName = $this->getViewState('UniqueGroupName', '')) !== '')
+		if (($groupName = $this->getViewState('UniqueGroupName', '')) !== '')
 			return $groupName;
-		elseif(($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
+		elseif (($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
 		{
 			$groupName = $this->getGroupName();
 			$this->_previousUniqueID = $uniqueID;
-			if($uniqueID !== '')
+			if ($uniqueID !== '')
 			{
-				if(($pos = strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR)) !== false)
+				if (($pos = strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR)) !== false)
 				{
-					if($groupName !== '')
-						$groupName = substr($uniqueID, 0, $pos + 1) . $groupName;
-					elseif($this->getNamingContainer() instanceof TRadioButtonList)
+					if ($groupName !== '')
+						$groupName = substr($uniqueID, 0, $pos + 1).$groupName;
+					elseif ($this->getNamingContainer() instanceof TRadioButtonList)
 						$groupName = substr($uniqueID, 0, $pos);
 				}
-				if($groupName === '')
+				if ($groupName === '')
 					$groupName = $uniqueID;
 			}
 			$this->_uniqueGroupName = $groupName;
@@ -207,9 +207,9 @@ 
 	{
 		$group = $this->getUniqueGroupName();
 		$buttons = [];
-		foreach(self::$_activeButtons as $control)
+		foreach (self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
+			if ($control->getUniqueGroupName() === $group)
 				$buttons[] = $control;
 		}
 		return $buttons;
@@ -220,7 +220,7 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value = parent::getValueAttribute()) === '')
+		if (($value = parent::getValueAttribute()) === '')
 			return $this->getUniqueID();
 		else
 			return $value;
@@ -250,20 +250,20 @@ 
 	 */
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		if($clientID !== '')
+		if ($clientID !== '')
 			$writer->addAttribute('id', $clientID);
 		$writer->addAttribute('type', 'radio');
 		$writer->addAttribute('name', $this->getUniqueGroupName());
 		$writer->addAttribute('value', $this->getValueAttribute());
-		if(!empty($onclick))
+		if (!empty($onclick))
 			$writer->addAttribute('onclick', $onclick);
-		if($this->getChecked())
+		if ($this->getChecked())
 			$writer->addAttribute('checked', 'checked');
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 
 		$page = $this->getPage();
-		if($this->getEnabled(true)
+		if ($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $page->getClientSupportsJavaScript())
@@ -271,11 +271,11 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey = $this->getAccessKey()) !== '')
+		if (($accesskey = $this->getAccessKey()) !== '')
 			$writer->addAttribute('accesskey', $accesskey);
-		if(($tabindex = $this->getTabIndex()) > 0)
+		if (($tabindex = $this->getTabIndex()) > 0)
 			$writer->addAttribute('tabindex', "$tabindex");
-		if($attributes = $this->getViewState('InputAttributes', null))
+		if ($attributes = $this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();

Braces +44 added lines, -33 removed lines

@@ -119,12 +119,12 @@ 
 			{
 				$this->setChecked(true);
 				return true;
+			} else {
+							return false;
 			}
-			else
-				return false;
+		} elseif($this->getChecked()) {
+					$this->setChecked(false);
 		}
-		elseif($this->getChecked())
-			$this->setChecked(false);
 		return false;
 	}
 
@@ -153,9 +153,9 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName = $this->getViewState('UniqueGroupName', '')) !== '')
-			return $groupName;
-		elseif(($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
+		if(($groupName = $this->getViewState('UniqueGroupName', '')) !== '') {
+					return $groupName;
+		} elseif(($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
 		{
 			$groupName = $this->getGroupName();
 			$this->_previousUniqueID = $uniqueID;
@@ -163,13 +163,15 @@ 
 			{
 				if(($pos = strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR)) !== false)
 				{
-					if($groupName !== '')
-						$groupName = substr($uniqueID, 0, $pos + 1) . $groupName;
-					elseif($this->getNamingContainer() instanceof TRadioButtonList)
-						$groupName = substr($uniqueID, 0, $pos);
+					if($groupName !== '') {
+											$groupName = substr($uniqueID, 0, $pos + 1) . $groupName;
+					} elseif($this->getNamingContainer() instanceof TRadioButtonList) {
+											$groupName = substr($uniqueID, 0, $pos);
+					}
+				}
+				if($groupName === '') {
+									$groupName = $uniqueID;
 				}
-				if($groupName === '')
-					$groupName = $uniqueID;
 			}
 			$this->_uniqueGroupName = $groupName;
 		}
@@ -209,8 +211,9 @@ 
 		$buttons = [];
 		foreach(self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
-				$buttons[] = $control;
+			if($control->getUniqueGroupName() === $group) {
+							$buttons[] = $control;
+			}
 		}
 		return $buttons;
 	}
@@ -220,10 +223,11 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value = parent::getValueAttribute()) === '')
-			return $this->getUniqueID();
-		else
-			return $value;
+		if(($value = parent::getValueAttribute()) === '') {
+					return $this->getUniqueID();
+		} else {
+					return $value;
+		}
 	}
 
 	/**
@@ -250,17 +254,21 @@ 
 	 */
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		if($clientID !== '')
-			$writer->addAttribute('id', $clientID);
+		if($clientID !== '') {
+					$writer->addAttribute('id', $clientID);
+		}
 		$writer->addAttribute('type', 'radio');
 		$writer->addAttribute('name', $this->getUniqueGroupName());
 		$writer->addAttribute('value', $this->getValueAttribute());
-		if(!empty($onclick))
-			$writer->addAttribute('onclick', $onclick);
-		if($this->getChecked())
-			$writer->addAttribute('checked', 'checked');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!empty($onclick)) {
+					$writer->addAttribute('onclick', $onclick);
+		}
+		if($this->getChecked()) {
+					$writer->addAttribute('checked', 'checked');
+		}
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 
 		$page = $this->getPage();
 		if($this->getEnabled(true)
@@ -271,12 +279,15 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey = $this->getAccessKey()) !== '')
-			$writer->addAttribute('accesskey', $accesskey);
-		if(($tabindex = $this->getTabIndex()) > 0)
-			$writer->addAttribute('tabindex', "$tabindex");
-		if($attributes = $this->getViewState('InputAttributes', null))
-			$writer->addAttributes($attributes);
+		if(($accesskey = $this->getAccessKey()) !== '') {
+					$writer->addAttribute('accesskey', $accesskey);
+		}
+		if(($tabindex = $this->getTabIndex()) > 0) {
+					$writer->addAttribute('tabindex', "$tabindex");
+		}
+		if($attributes = $this->getViewState('InputAttributes', null)) {
+					$writer->addAttributes($attributes);
+		}
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
 	}

framework/Web/UI/WebControls/THyperLink.php

Spacing +11 added lines, -11 removed lines

@@ -50,12 +50,12 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$isEnabled = $this->getEnabled(true);
-		if($this->getEnabled() && !$isEnabled)
+		if ($this->getEnabled() && !$isEnabled)
 			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
-		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled)
+		if (($url = $this->getNavigateUrl()) !== '' && $isEnabled)
 			$writer->addAttribute('href', $url);
-		if(($target = $this->getTarget()) !== '')
+		if (($target = $this->getTarget()) !== '')
 			$writer->addAttribute('target', $target);
 	}
 
@@ -65,11 +65,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($imageUrl = $this->getImageUrl()) === '')
+		if (($imageUrl = $this->getImageUrl()) === '')
 		{
-			if(($text = $this->getText()) !== '')
+			if (($text = $this->getText()) !== '')
 				$writer->write(THttpUtility::htmlEncode($text));
-			elseif($this->getHasControls())
+			elseif ($this->getHasControls())
 				parent::renderContents($writer);
 			else
 				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
@@ -90,15 +90,15 @@ 
 	{
 		$image = new TImage;
 		$image->setImageUrl($imageUrl);
-		if(($width = $this->getImageWidth()) !== '')
+		if (($width = $this->getImageWidth()) !== '')
 			$image->setWidth($width);
-		if(($height = $this->getImageHeight()) !== '')
+		if (($height = $this->getImageHeight()) !== '')
 			$image->setHeight($height);
-		if(($toolTip = $this->getToolTip()) !== '')
+		if (($toolTip = $this->getToolTip()) !== '')
 			$image->setToolTip($toolTip);
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 			$image->setAlternateText($text);
-		if(($align = $this->getImageAlign()) !== '')
+		if (($align = $this->getImageAlign()) !== '')
 			$image->setImageAlign($align);
 		$image->setBorderWidth('0');
 		return $image;

Braces +32 added lines, -24 removed lines

@@ -50,13 +50,16 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$isEnabled = $this->getEnabled(true);
-		if($this->getEnabled() && !$isEnabled)
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getEnabled() && !$isEnabled) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		parent::addAttributesToRender($writer);
-		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled)
-			$writer->addAttribute('href', $url);
-		if(($target = $this->getTarget()) !== '')
-			$writer->addAttribute('target', $target);
+		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled) {
+					$writer->addAttribute('href', $url);
+		}
+		if(($target = $this->getTarget()) !== '') {
+					$writer->addAttribute('target', $target);
+		}
 	}
 
 	/**
@@ -67,14 +70,14 @@ 
 	{
 		if(($imageUrl = $this->getImageUrl()) === '')
 		{
-			if(($text = $this->getText()) !== '')
-				$writer->write(THttpUtility::htmlEncode($text));
-			elseif($this->getHasControls())
-				parent::renderContents($writer);
-			else
-				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
-		}
-		else
+			if(($text = $this->getText()) !== '') {
+							$writer->write(THttpUtility::htmlEncode($text));
+			} elseif($this->getHasControls()) {
+							parent::renderContents($writer);
+			} else {
+							$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
+			}
+		} else
 		{
 			$this->createImage($imageUrl)->renderControl($writer);
 		}
@@ -90,16 +93,21 @@ 
 	{
 		$image = new TImage;
 		$image->setImageUrl($imageUrl);
-		if(($width = $this->getImageWidth()) !== '')
-			$image->setWidth($width);
-		if(($height = $this->getImageHeight()) !== '')
-			$image->setHeight($height);
-		if(($toolTip = $this->getToolTip()) !== '')
-			$image->setToolTip($toolTip);
-		if(($text = $this->getText()) !== '')
-			$image->setAlternateText($text);
-		if(($align = $this->getImageAlign()) !== '')
-			$image->setImageAlign($align);
+		if(($width = $this->getImageWidth()) !== '') {
+					$image->setWidth($width);
+		}
+		if(($height = $this->getImageHeight()) !== '') {
+					$image->setHeight($height);
+		}
+		if(($toolTip = $this->getToolTip()) !== '') {
+					$image->setToolTip($toolTip);
+		}
+		if(($text = $this->getText()) !== '') {
+					$image->setAlternateText($text);
+		}
+		if(($align = $this->getImageAlign()) !== '') {
+					$image->setImageAlign($align);
+		}
 		$image->setBorderWidth('0');
 		return $image;
 	}

framework/Web/UI/WebControls/TTextHighlighter.php

Spacing +6 added lines, -6 removed lines

@@ -165,9 +165,9 @@ 
 	protected function registerStyleSheet()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$cssFile = Prado::getPathOfNamespace('Vendor.bower-asset.highlightjs.styles.' . $this->getSyntaxStyle(), '.css');
-		$cssKey = 'prado:TTextHighlighter:' . $cssFile;
-		if(!$cs->isStyleSheetFileRegistered($cssKey))
+		$cssFile = Prado::getPathOfNamespace('Vendor.bower-asset.highlightjs.styles.'.$this->getSyntaxStyle(), '.css');
+		$cssKey = 'prado:TTextHighlighter:'.$cssFile;
+		if (!$cs->isStyleSheetFileRegistered($cssKey))
 			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
 	}
 
@@ -196,7 +196,7 @@ 
 		$writer->addAttribute('id', $this->getClientID());
 		parent::renderBeginTag($writer);
 
-		$writer->addAttribute('id', $this->getClientID() . '_code');
+		$writer->addAttribute('id', $this->getClientID().'_code');
 		$writer->addAttribute('class', $this->getLanguage());
 		$writer->renderBeginTag('code');
 	}
@@ -209,7 +209,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getEncodeHtml())
+		if ($this->getEncodeHtml())
 		{
 			$escapedWriter = new TTextHighlighterWriter($writer);
 			parent::renderChildren($escapedWriter);
@@ -235,7 +235,7 @@ 
 
 		$options = TJavaScript::encode($this->getTextHighlightOptions());
 		$code = "new Prado.WebUI.TTextHighlighter($options);";
-		$cs->registerEndScript("prado:" . $this->getClientID(), $code);
+		$cs->registerEndScript("prado:".$this->getClientID(), $code);
 
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -167,8 +167,9 @@
 		$cs = $this->getPage()->getClientScript();
 		$cssFile = Prado::getPathOfNamespace('Vendor.bower-asset.highlightjs.styles.' . $this->getSyntaxStyle(), '.css');
 		$cssKey = 'prado:TTextHighlighter:' . $cssFile;
-		if(!$cs->isStyleSheetFileRegistered($cssKey))
-			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
+		if(!$cs->isStyleSheetFileRegistered($cssKey)) {
+					$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TDataGrid.php

Spacing +169 added lines, -169 removed lines

@@ -224,10 +224,10 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TDataGridColumn)
+		if ($object instanceof TDataGridColumn)
 			$this->getColumns()->add($object);
 		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+			parent::addParsedObject($object); // this is needed by EmptyTemplate
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function getColumns()
 	{
-		if(!$this->_columns)
+		if (!$this->_columns)
 			$this->_columns = new TDataGridColumnCollection($this);
 		return $this->_columns;
 	}
@@ -245,7 +245,7 @@ 
 	 */
 	public function getAutoColumns()
 	{
-		if(!$this->_autoColumns)
+		if (!$this->_autoColumns)
 			$this->_autoColumns = new TDataGridColumnCollection($this);
 		return $this->_autoColumns;
 	}
@@ -255,7 +255,7 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
+		if (!$this->_items)
 			$this->_items = new TDataGridItemCollection;
 		return $this->_items;
 	}
@@ -265,7 +265,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -299,7 +299,7 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style = $this->getViewState('ItemStyle', null)) === null)
+		if (($style = $this->getViewState('ItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('ItemStyle', $style, null);
@@ -312,7 +312,7 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style = $this->getViewState('AlternatingItemStyle', null)) === null)
+		if (($style = $this->getViewState('AlternatingItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('AlternatingItemStyle', $style, null);
@@ -325,7 +325,7 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style = $this->getViewState('SelectedItemStyle', null)) === null)
+		if (($style = $this->getViewState('SelectedItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('SelectedItemStyle', $style, null);
@@ -338,7 +338,7 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style = $this->getViewState('EditItemStyle', null)) === null)
+		if (($style = $this->getViewState('EditItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('EditItemStyle', $style, null);
@@ -351,7 +351,7 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('HeaderStyle', $style, null);
@@ -364,7 +364,7 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style = $this->getViewState('FooterStyle', null)) === null)
+		if (($style = $this->getViewState('FooterStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('FooterStyle', $style, null);
@@ -377,7 +377,7 @@ 
 	 */
 	public function getPagerStyle()
 	{
-		if(($style = $this->getViewState('PagerStyle', null)) === null)
+		if (($style = $this->getViewState('PagerStyle', null)) === null)
 		{
 			$style = new TDataGridPagerStyle;
 			$this->setViewState('PagerStyle', $style, null);
@@ -391,7 +391,7 @@ 
 	 */
 	public function getTableHeadStyle()
 	{
-		if(($style = $this->getViewState('TableHeadStyle', null)) === null)
+		if (($style = $this->getViewState('TableHeadStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$this->setViewState('TableHeadStyle', $style, null);
@@ -405,7 +405,7 @@ 
 	 */
 	public function getTableBodyStyle()
 	{
-		if(($style = $this->getViewState('TableBodyStyle', null)) === null)
+		if (($style = $this->getViewState('TableBodyStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$this->setViewState('TableBodyStyle', $style, null);
@@ -419,7 +419,7 @@ 
 	 */
 	public function getTableFootStyle()
 	{
-		if(($style = $this->getViewState('TableFootStyle', null)) === null)
+		if (($style = $this->getViewState('TableFootStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$this->setViewState('TableFootStyle', $style, null);
@@ -498,7 +498,7 @@ 
 	{
 		$index = $this->getSelectedItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -522,23 +522,23 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
-		if(($current = $this->getSelectedItemIndex()) !== $value)
+		if (($current = $this->getSelectedItemIndex()) !== $value)
 		{
 			$this->setViewState('SelectedItemIndex', $value, -1);
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
-			if($current >= 0 && $current < $itemCount)
+			if ($current >= 0 && $current < $itemCount)
 			{
 				$item = $items->itemAt($current);
-				if($item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				if ($item->getItemType() !== TListItemType::EditItem)
+					$item->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value >= 0 && $value < $itemCount)
+			if ($value >= 0 && $value < $itemCount)
 			{
 				$item = $items->itemAt($value);
-				if($item->getItemType() !== TListItemType::EditItem)
+				if ($item->getItemType() !== TListItemType::EditItem)
 					$item->setItemType(TListItemType::SelectedItem);
 			}
 		}
@@ -551,7 +551,7 @@ 
 	{
 		$index = $this->getEditItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -574,16 +574,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
-		if(($current = $this->getEditItemIndex()) !== $value)
+		if (($current = $this->getEditItemIndex()) !== $value)
 		{
 			$this->setViewState('EditItemIndex', $value, -1);
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
-			if($current >= 0 && $current < $itemCount)
-				$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
-			if($value >= 0 && $value < $itemCount)
+			if ($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
+			if ($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -666,7 +666,7 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_emptyTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
@@ -687,51 +687,51 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TDataGridCommandEventParameter)
+		if ($param instanceof TDataGridCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			$command = $param->getCommandName();
-			if(strcasecmp($command, self::CMD_SELECT) === 0)
+			if (strcasecmp($command, self::CMD_SELECT) === 0)
 			{
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			elseif (strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			elseif (strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			elseif (strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			elseif (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			elseif (strcasecmp($command, self::CMD_SORT) === 0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			elseif (strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$p = $param->getCommandParameter();
-				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
+				if (strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
 					$pageIndex = $this->getCurrentPageIndex() + 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0)
+				elseif (strcasecmp($p, self::CMD_PAGE_PREV) === 0)
 					$pageIndex = $this->getCurrentPageIndex() - 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
+				elseif (strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
 					$pageIndex = 0;
-				elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0)
+				elseif (strcasecmp($p, self::CMD_PAGE_LAST) === 0)
 					$pageIndex = $this->getPageCount() - 1;
 				else
 					$pageIndex = TPropertyValue::ensureInteger($p) - 1;
@@ -857,25 +857,25 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if(!$this->getEnableViewState(true))
+		if (!$this->getEnableViewState(true))
 			return;
-		if($this->_items)
+		if ($this->_items)
 			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
-		if($this->_autoColumns)
+		if ($this->_autoColumns)
 		{
 			$state = [];
-			foreach($this->_autoColumns as $column)
+			foreach ($this->_autoColumns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('AutoColumns', $state, []);
 		}
 		else
 			$this->clearViewState('AutoColumns');
-		if($this->_columns)
+		if ($this->_columns)
 		{
 			$state = [];
-			foreach($this->_columns as $column)
+			foreach ($this->_columns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('Columns', $state, []);
 		}
@@ -890,15 +890,15 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getEnableViewState(true))
+		if (!$this->getEnableViewState(true))
 			return;
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 		{
 			$state = $this->getViewState('AutoColumns', []);
-			if(!empty($state))
+			if (!empty($state))
 			{
 				$this->_autoColumns = new TDataGridColumnCollection($this);
-				foreach($state as $st)
+				foreach ($state as $st)
 				{
 					$column = new $this->AutoGenerateColumnName;
 					$column->loadState($st);
@@ -908,10 +908,10 @@ 
 			else
 				$this->_autoColumns = null;
 			$state = $this->getViewState('Columns', []);
-			if($this->_columns && $this->_columns->getCount() === count($state))
+			if ($this->_columns && $this->_columns->getCount() === count($state))
 			{
 				$i = 0;
-				foreach($this->_columns as $column)
+				foreach ($this->_columns as $column)
 				{
 					$column->loadState($state[$i]);
 					$i++;
@@ -953,39 +953,39 @@ 
 
 		$items = $this->getItems();
 
-		if($columns->getCount())
+		if ($columns->getCount())
 		{
-			foreach($columns as $column)
+			foreach ($columns as $column)
 				$column->initialize();
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
-			for($index = 0;$index < $itemCount;++$index)
+			for ($index = 0; $index < $itemCount; ++$index)
 			{
-				if($index === 0)
+				if ($index === 0)
 				{
-					if($allowPaging)
+					if ($allowPaging)
 						$this->_topPager = $this->createPager();
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
-				if($index === $editIndex)
+				if ($index === $editIndex)
 					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
+				elseif ($index === $selectedIndex)
 					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
+				elseif ($index % 2)
 					$itemType = TListItemType::AlternatingItem;
 				else
 					$itemType = TListItemType::Item;
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
-			if($index > 0)
+			if ($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, false, null, $columns);
-				if($allowPaging)
+				if ($allowPaging)
 					$this->_bottomPager = $this->createPager();
 			}
 		}
-		if(!$dsIndex && $this->_emptyTemplate !== null)
+		if (!$dsIndex && $this->_emptyTemplate !== null)
 		{
 			$this->_useEmptyTemplate = true;
 			$this->_emptyTemplate->instantiateIn($this);
@@ -1006,7 +1006,7 @@ 
 		$keyField = $this->getDataKeyField();
 
 		// get all columns
-		if($this->getAutoGenerateColumns())
+		if ($this->getAutoGenerateColumns())
 		{
 			$columns = new TList($this->getColumns());
 			$autoColumns = $this->createAutoColumns($data);
@@ -1020,32 +1020,32 @@ 
 
 		$index = 0;
 		$allowPaging = $this->getAllowPaging() && ($data instanceof TPagedDataSource);
-		$dsIndex = $allowPaging?$data->getFirstIndexInPage():0;
+		$dsIndex = $allowPaging ? $data->getFirstIndexInPage() : 0;
 		$this->setViewState('DataSourceIndex', $dsIndex, 0);
-		if($columns->getCount())
+		if ($columns->getCount())
 		{
-			foreach($columns as $column)
+			foreach ($columns as $column)
 				$column->initialize();
 
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
-			foreach($data as $key => $row)
+			foreach ($data as $key => $row)
 			{
-				if($keyField !== '')
+				if ($keyField !== '')
 					$keys->add($this->getDataFieldValue($row, $keyField));
 				else
 					$keys->add($key);
-				if($index === 0)
+				if ($index === 0)
 				{
-					if($allowPaging)
+					if ($allowPaging)
 						$this->_topPager = $this->createPager();
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
-				if($index === $editIndex)
+				if ($index === $editIndex)
 					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
+				elseif ($index === $selectedIndex)
 					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
+				elseif ($index % 2)
 					$itemType = TListItemType::AlternatingItem;
 				else
 					$itemType = TListItemType::Item;
@@ -1053,15 +1053,15 @@ 
 				$index++;
 				$dsIndex++;
 			}
-			if($index > 0)
+			if ($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
-				if($allowPaging)
+				if ($allowPaging)
 					$this->_bottomPager = $this->createPager();
 			}
 		}
 		$this->setViewState('ItemCount', $index, 0);
-		if(!$dsIndex && $this->_emptyTemplate !== null)
+		if (!$dsIndex && $this->_emptyTemplate !== null)
 		{
 			$this->_useEmptyTemplate = true;
 			$this->_emptyTemplate->instantiateIn($this);
@@ -1075,37 +1075,37 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns = $this->_allColumns) === null)
+		if (($columns = $this->_allColumns) === null)
 			return;
 		$items = $this->getItems();
-		foreach($columns as $id => $column)
+		foreach ($columns as $id => $column)
 		{
-			if(!$column->getEnableCellGrouping())
+			if (!$column->getEnableCellGrouping())
 				continue;
 			$prevCell = null;
 			$prevCellText = null;
-			foreach($items as $item)
+			foreach ($items as $item)
 			{
 				$itemType = $item->getItemType();
 				$cell = $item->getCells()->itemAt($id);
-				if(!$cell->getVisible())
+				if (!$cell->getVisible())
 					continue;
-				if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
+				if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
 				{
-					if(($cellText = $this->getCellText($cell)) === '')
+					if (($cellText = $this->getCellText($cell)) === '')
 					{
 						$prevCell = null;
 						$prevCellText = null;
 						continue;
 					}
-					if($prevCell === null || $prevCellText !== $cellText)
+					if ($prevCell === null || $prevCellText !== $cellText)
 					{
 						$prevCell = $cell;
 						$prevCellText = $cellText;
 					}
 					else
 					{
-						if(($rowSpan = $prevCell->getRowSpan()) === 0)
+						if (($rowSpan = $prevCell->getRowSpan()) === 0)
 							$rowSpan = 1;
 						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
@@ -1117,12 +1117,12 @@ 
 
 	private function getCellText($cell)
 	{
-		if(($data = $cell->getText()) === '' && $cell->getHasControls())
+		if (($data = $cell->getText()) === '' && $cell->getHasControls())
 		{
 			$controls = $cell->getControls();
-			foreach($controls as $control)
+			foreach ($controls as $control)
 			{
-				if($control instanceof \Prado\IDataRenderer)
+				if ($control instanceof \Prado\IDataRenderer)
 					return $control->getData();
 			}
 		}
@@ -1145,7 +1145,7 @@ 
 		$item = $this->createItem($itemIndex, $dataSourceIndex, $itemType);
 		$this->initializeItem($item, $columns);
 		$param = new TDataGridItemEventParameter($item);
-		if($dataBind)
+		if ($dataBind)
 		{
 			$item->setData($dataItem);
 			$this->onItemCreated($param);
@@ -1171,13 +1171,13 @@ 
 		$cells = $item->getCells();
 		$itemType = $item->getItemType();
 		$index = 0;
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
-			if($itemType === TListItemType::Header)
+			if ($itemType === TListItemType::Header)
 				$cell = new TTableHeaderCell;
 			else
 				$cell = new TTableCell;
-			if(($id = $column->getID()) !== '')
+			if (($id = $column->getID()) !== '')
 				$item->registerObject($id, $cell);
 			$cells->add($cell);
 			$column->initializeCell($cell, $index, $itemType);
@@ -1200,7 +1200,7 @@ 
 	 */
 	protected function buildPager($pager)
 	{
-		switch($this->getPagerStyle()->getMode())
+		switch ($this->getPagerStyle()->getMode())
 		{
 			case TDataGridPagerMode::NextPrev:
 				$this->buildNextPrevPager($pager);
@@ -1226,9 +1226,9 @@ 
 	 */
 	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType === TDataGridPagerButtonType::LinkButton)
+		if ($buttonType === TDataGridPagerButtonType::LinkButton)
 		{
-			if($enabled)
+			if ($enabled)
 				$button = new TLinkButton;
 			else
 			{
@@ -1240,7 +1240,7 @@ 
 		else
 		{
 			$button = new TButton;
-			if(!$enabled)
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 		$button->setText($text);
@@ -1260,9 +1260,9 @@ 
 		$buttonType = $style->getButtonType();
 		$controls = $pager->getControls();
 		$currentPageIndex = $this->getCurrentPageIndex();
-		if($currentPageIndex === 0)
+		if ($currentPageIndex === 0)
 		{
-			if(($text = $style->getFirstPageText()) !== '')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
@@ -1274,7 +1274,7 @@ 
 		}
 		else
 		{
-			if(($text = $style->getFirstPageText()) !== '')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
@@ -1285,11 +1285,11 @@ 
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($currentPageIndex === $this->getPageCount() - 1)
+		if ($currentPageIndex === $this->getPageCount() - 1)
 		{
 			$label = $this->createPagerButton($pager, $buttonType, false, $style->getNextPageText(), '', '');
 			$controls->add($label);
-			if(($text = $style->getLastPageText()) !== '')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
@@ -1300,7 +1300,7 @@ 
 		{
 			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
-			if(($text = $style->getLastPageText()) !== '')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
@@ -1321,24 +1321,24 @@ 
 		$pageCount = $this->getPageCount();
 		$pageIndex = $this->getCurrentPageIndex() + 1;
 		$maxButtonCount = $style->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 = $style->getFirstPageText()) !== '')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
@@ -1350,9 +1350,9 @@ 
 			$controls->add("\n");
 		}
 
-		for($i = $startPageIndex;$i <= $endPageIndex;++$i)
+		for ($i = $startPageIndex; $i <= $endPageIndex; ++$i)
 		{
-			if($i === $pageIndex)
+			if ($i === $pageIndex)
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
@@ -1362,17 +1362,17 @@ 
 				$button = $this->createPagerButton($pager, $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($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
-			if(($text = $style->getLastPageText()) !== '')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
@@ -1388,16 +1388,16 @@ 
 	 */
 	protected function createAutoColumns($dataSource)
 	{
-		if(!$dataSource)
+		if (!$dataSource)
 			return null;
 		$autoColumns = $this->getAutoColumns();
 		$autoColumns->clear();
-		foreach($dataSource as $row)
+		foreach ($dataSource as $row)
 		{
-			foreach($row as $key => $value)
+			foreach ($row as $key => $value)
 			{
 				$column = new $this->AutoGenerateColumnName;
-				if(is_string($key))
+				if (is_string($key))
 				{
 					$column->setHeaderText($key);
 					$column->setDataField($key);
@@ -1433,9 +1433,9 @@ 
 		$itemStyle = $this->getViewState('ItemStyle', null);
 
 		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
-		if($itemStyle !== null)
+		if ($itemStyle !== null)
 		{
-			if($alternatingItemStyle === null)
+			if ($alternatingItemStyle === null)
 				$alternatingItemStyle = $itemStyle;
 			else
 				$alternatingItemStyle->mergeWith($itemStyle);
@@ -1444,9 +1444,9 @@ 
 		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
 
 		$editItemStyle = $this->getViewState('EditItemStyle', null);
-		if($selectedItemStyle !== null)
+		if ($selectedItemStyle !== null)
 		{
-			if($editItemStyle === null)
+			if ($editItemStyle === null)
 				$editItemStyle = $selectedItemStyle;
 			else
 				$editItemStyle->mergeWith($selectedItemStyle);
@@ -1457,77 +1457,77 @@ 
 		$pagerStyle = $this->getViewState('PagerStyle', null);
 		$separatorStyle = $this->getViewState('SeparatorStyle', null);
 
-		foreach($this->getControls() as $index => $item)
+		foreach ($this->getControls() as $index => $item)
 		{
-			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
+			if (!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
 				continue;
 			$itemType = $item->getItemType();
-			switch($itemType)
+			switch ($itemType)
 			{
 				case TListItemType::Header:
-					if($headerStyle)
+					if ($headerStyle)
 						$item->getStyle()->mergeWith($headerStyle);
-					if(!$this->getShowHeader())
+					if (!$this->getShowHeader())
 						$item->setVisible(false);
 					break;
 				case TListItemType::Footer:
-					if($footerStyle)
+					if ($footerStyle)
 						$item->getStyle()->mergeWith($footerStyle);
-					if(!$this->getShowFooter())
+					if (!$this->getShowFooter())
 						$item->setVisible(false);
 					break;
 				case TListItemType::Separator:
-					if($separatorStyle)
+					if ($separatorStyle)
 						$item->getStyle()->mergeWith($separatorStyle);
 					break;
 				case TListItemType::Item:
-					if($itemStyle)
+					if ($itemStyle)
 						$item->getStyle()->mergeWith($itemStyle);
 					break;
 				case TListItemType::AlternatingItem:
-					if($alternatingItemStyle)
+					if ($alternatingItemStyle)
 						$item->getStyle()->mergeWith($alternatingItemStyle);
 					break;
 				case TListItemType::SelectedItem:
-					if($selectedItemStyle)
+					if ($selectedItemStyle)
 						$item->getStyle()->mergeWith($selectedItemStyle);
-					if($index % 2 == 1)
+					if ($index % 2 == 1)
 					{
-						if($itemStyle)
+						if ($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
 					}
 					else
 					{
-						if($alternatingItemStyle)
+						if ($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
 					}
 					break;
 				case TListItemType::EditItem:
-					if($editItemStyle)
+					if ($editItemStyle)
 						$item->getStyle()->mergeWith($editItemStyle);
-					if($index % 2 == 1)
+					if ($index % 2 == 1)
 					{
-						if($itemStyle)
+						if ($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
 					}
 					else
 					{
-						if($alternatingItemStyle)
+						if ($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
 					}
 					break;
 				case TListItemType::Pager:
-					if($pagerStyle)
+					if ($pagerStyle)
 					{
 						$item->getStyle()->mergeWith($pagerStyle);
-						if($index === 0)
+						if ($index === 0)
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
+							if ($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 						else
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
+							if ($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 					}
@@ -1535,25 +1535,25 @@ 
 				default:
 					break;
 			}
-			if($this->_columns && $itemType !== TListItemType::Pager)
+			if ($this->_columns && $itemType !== TListItemType::Pager)
 			{
 				$n = $this->_columns->getCount();
 				$cells = $item->getCells();
-				for($i = 0;$i < $n;++$i)
+				for ($i = 0; $i < $n; ++$i)
 				{
 					$cell = $cells->itemAt($i);
 					$column = $this->_columns->itemAt($i);
-					if(!$column->getVisible())
+					if (!$column->getVisible())
 						$cell->setVisible(false);
 					else
 					{
-						if($itemType === TListItemType::Header)
+						if ($itemType === TListItemType::Header)
 							$style = $column->getHeaderStyle(false);
-						elseif($itemType === TListItemType::Footer)
+						elseif ($itemType === TListItemType::Footer)
 							$style = $column->getFooterStyle(false);
 						else
 							$style = $column->getItemStyle(false);
-						if($style !== null)
+						if ($style !== null)
 							$cell->getStyle()->mergeWith($style);
 					}
 				}
@@ -1568,9 +1568,9 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($caption = $this->getCaption()) !== '')
+		if (($caption = $this->getCaption()) !== '')
 		{
-			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
+			if (($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
 				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
@@ -1584,30 +1584,30 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$this->groupCells();
-			if($this->_useEmptyTemplate)
+			if ($this->_useEmptyTemplate)
 			{
 				$control = new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
-				if($this->getHasStyle())
+				if ($this->getHasStyle())
 					$control->getStyle()->copyFrom($this->getStyle());
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
 			}
-			elseif($this->getViewState('ItemCount', 0) > 0)
+			elseif ($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
-				if($this->_topPager)
+				if ($this->_topPager)
 				{
 					$this->_topPager->renderControl($writer);
 					$writer->writeLine();
 				}
 				$this->renderTable($writer);
-				if($this->_bottomPager)
+				if ($this->_bottomPager)
 				{
 					$writer->writeLine();
 					$this->_bottomPager->renderControl($writer);
@@ -1623,27 +1623,27 @@ 
 	protected function renderTable($writer)
 	{
 		$this->renderBeginTag($writer);
-		if($this->_header && $this->_header->getVisible())
+		if ($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style = $this->getViewState('TableHeadStyle', null))
+			if ($style = $this->getViewState('TableHeadStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('thead');
 			$this->_header->render($writer);
 			$writer->renderEndTag();
 		}
 		$writer->writeLine();
-		if($style = $this->getViewState('TableBodyStyle', null))
+		if ($style = $this->getViewState('TableBodyStyle', null))
 			$style->addAttributesToRender($writer);
 		$writer->renderBeginTag('tbody');
-		foreach($this->getItems() as $item)
+		foreach ($this->getItems() as $item)
 			$item->renderControl($writer);
 		$writer->renderEndTag();
 
-		if($this->_footer && $this->_footer->getVisible())
+		if ($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style = $this->getViewState('TableFootStyle', null))
+			if ($style = $this->getViewState('TableFootStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);

Braces +272 added lines, -222 removed lines

@@ -224,10 +224,12 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TDataGridColumn)
-			$this->getColumns()->add($object);
-		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+		if($object instanceof TDataGridColumn) {
+					$this->getColumns()->add($object);
+		} else {
+					parent::addParsedObject($object);
+		}
+		// this is needed by EmptyTemplate
 	}
 
 	/**
@@ -235,8 +237,9 @@ 
 	 */
 	public function getColumns()
 	{
-		if(!$this->_columns)
-			$this->_columns = new TDataGridColumnCollection($this);
+		if(!$this->_columns) {
+					$this->_columns = new TDataGridColumnCollection($this);
+		}
 		return $this->_columns;
 	}
 
@@ -245,8 +248,9 @@ 
 	 */
 	public function getAutoColumns()
 	{
-		if(!$this->_autoColumns)
-			$this->_autoColumns = new TDataGridColumnCollection($this);
+		if(!$this->_autoColumns) {
+					$this->_autoColumns = new TDataGridColumnCollection($this);
+		}
 		return $this->_autoColumns;
 	}
 
@@ -255,8 +259,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items = new TDataGridItemCollection;
+		if(!$this->_items) {
+					$this->_items = new TDataGridItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -498,10 +503,11 @@ 
 	{
 		$index = $this->getSelectedItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -522,8 +528,9 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		if(($current = $this->getSelectedItemIndex()) !== $value)
 		{
 			$this->setViewState('SelectedItemIndex', $value, -1);
@@ -532,14 +539,16 @@ 
 			if($current >= 0 && $current < $itemCount)
 			{
 				$item = $items->itemAt($current);
-				if($item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				if($item->getItemType() !== TListItemType::EditItem) {
+									$item->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				}
 			}
 			if($value >= 0 && $value < $itemCount)
 			{
 				$item = $items->itemAt($value);
-				if($item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType(TListItemType::SelectedItem);
+				if($item->getItemType() !== TListItemType::EditItem) {
+									$item->setItemType(TListItemType::SelectedItem);
+				}
 			}
 		}
 	}
@@ -551,10 +560,11 @@ 
 	{
 		$index = $this->getEditItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -574,17 +584,20 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		if(($current = $this->getEditItemIndex()) !== $value)
 		{
 			$this->setViewState('EditItemIndex', $value, -1);
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
-			if($current >= 0 && $current < $itemCount)
-				$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
-			if($value >= 0 && $value < $itemCount)
-				$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			if($current >= 0 && $current < $itemCount) {
+							$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+			}
+			if($value >= 0 && $value < $itemCount) {
+							$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			}
 		}
 	}
 
@@ -666,10 +679,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_emptyTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_emptyTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
+		}
 	}
 
 	/**
@@ -696,45 +710,40 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			} elseif(strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			} elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			} elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			} elseif(strcasecmp($command, self::CMD_SORT) === 0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$p = $param->getCommandParameter();
-				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
-					$pageIndex = $this->getCurrentPageIndex() + 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0)
-					$pageIndex = $this->getCurrentPageIndex() - 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
-					$pageIndex = 0;
-				elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0)
-					$pageIndex = $this->getPageCount() - 1;
-				else
-					$pageIndex = TPropertyValue::ensureInteger($p) - 1;
+				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0) {
+									$pageIndex = $this->getCurrentPageIndex() + 1;
+				} elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0) {
+									$pageIndex = $this->getCurrentPageIndex() - 1;
+				} elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0) {
+									$pageIndex = 0;
+				} elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0) {
+									$pageIndex = $this->getPageCount() - 1;
+				} else {
+									$pageIndex = TPropertyValue::ensureInteger($p) - 1;
+				}
 				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
@@ -857,30 +866,34 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if(!$this->getEnableViewState(true))
-			return;
-		if($this->_items)
-			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
-		else
-			$this->clearViewState('ItemCount');
+		if(!$this->getEnableViewState(true)) {
+					return;
+		}
+		if($this->_items) {
+					$this->setViewState('ItemCount', $this->_items->getCount(), 0);
+		} else {
+					$this->clearViewState('ItemCount');
+		}
 		if($this->_autoColumns)
 		{
 			$state = [];
-			foreach($this->_autoColumns as $column)
-				$state[] = $column->saveState();
+			foreach($this->_autoColumns as $column) {
+							$state[] = $column->saveState();
+			}
 			$this->setViewState('AutoColumns', $state, []);
+		} else {
+					$this->clearViewState('AutoColumns');
 		}
-		else
-			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
 			$state = [];
-			foreach($this->_columns as $column)
-				$state[] = $column->saveState();
+			foreach($this->_columns as $column) {
+							$state[] = $column->saveState();
+			}
 			$this->setViewState('Columns', $state, []);
+		} else {
+					$this->clearViewState('Columns');
 		}
-		else
-			$this->clearViewState('Columns');
 	}
 
 	/**
@@ -890,8 +903,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getEnableViewState(true))
-			return;
+		if(!$this->getEnableViewState(true)) {
+					return;
+		}
 		if(!$this->getIsDataBound())
 		{
 			$state = $this->getViewState('AutoColumns', []);
@@ -904,9 +918,9 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
+			} else {
+							$this->_autoColumns = null;
 			}
-			else
-				$this->_autoColumns = null;
 			$state = $this->getViewState('Columns', []);
 			if($this->_columns && $this->_columns->getCount() === count($state))
 			{
@@ -955,34 +969,38 @@ 
 
 		if($columns->getCount())
 		{
-			foreach($columns as $column)
-				$column->initialize();
+			foreach($columns as $column) {
+							$column->initialize();
+			}
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
 			for($index = 0;$index < $itemCount;++$index)
 			{
 				if($index === 0)
 				{
-					if($allowPaging)
-						$this->_topPager = $this->createPager();
+					if($allowPaging) {
+											$this->_topPager = $this->createPager();
+					}
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
-				if($index === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
-					$itemType = TListItemType::AlternatingItem;
-				else
-					$itemType = TListItemType::Item;
+				if($index === $editIndex) {
+									$itemType = TListItemType::EditItem;
+				} elseif($index === $selectedIndex) {
+									$itemType = TListItemType::SelectedItem;
+				} elseif($index % 2) {
+									$itemType = TListItemType::AlternatingItem;
+				} else {
+									$itemType = TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
 			if($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, false, null, $columns);
-				if($allowPaging)
-					$this->_bottomPager = $this->createPager();
+				if($allowPaging) {
+									$this->_bottomPager = $this->createPager();
+				}
 			}
 		}
 		if(!$dsIndex && $this->_emptyTemplate !== null)
@@ -1011,9 +1029,9 @@ 
 			$columns = new TList($this->getColumns());
 			$autoColumns = $this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
+		} else {
+					$columns = $this->getColumns();
 		}
-		else
-			$columns = $this->getColumns();
 		$this->_allColumns = $columns;
 
 		$items = $this->getItems();
@@ -1024,31 +1042,35 @@ 
 		$this->setViewState('DataSourceIndex', $dsIndex, 0);
 		if($columns->getCount())
 		{
-			foreach($columns as $column)
-				$column->initialize();
+			foreach($columns as $column) {
+							$column->initialize();
+			}
 
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
 			foreach($data as $key => $row)
 			{
-				if($keyField !== '')
-					$keys->add($this->getDataFieldValue($row, $keyField));
-				else
-					$keys->add($key);
+				if($keyField !== '') {
+									$keys->add($this->getDataFieldValue($row, $keyField));
+				} else {
+									$keys->add($key);
+				}
 				if($index === 0)
 				{
-					if($allowPaging)
-						$this->_topPager = $this->createPager();
+					if($allowPaging) {
+											$this->_topPager = $this->createPager();
+					}
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
-				if($index === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
-					$itemType = TListItemType::AlternatingItem;
-				else
-					$itemType = TListItemType::Item;
+				if($index === $editIndex) {
+									$itemType = TListItemType::EditItem;
+				} elseif($index === $selectedIndex) {
+									$itemType = TListItemType::SelectedItem;
+				} elseif($index % 2) {
+									$itemType = TListItemType::AlternatingItem;
+				} else {
+									$itemType = TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, true, $row, $columns));
 				$index++;
 				$dsIndex++;
@@ -1056,8 +1078,9 @@ 
 			if($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
-				if($allowPaging)
-					$this->_bottomPager = $this->createPager();
+				if($allowPaging) {
+									$this->_bottomPager = $this->createPager();
+				}
 			}
 		}
 		$this->setViewState('ItemCount', $index, 0);
@@ -1075,21 +1098,24 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns = $this->_allColumns) === null)
-			return;
+		if(($columns = $this->_allColumns) === null) {
+					return;
+		}
 		$items = $this->getItems();
 		foreach($columns as $id => $column)
 		{
-			if(!$column->getEnableCellGrouping())
-				continue;
+			if(!$column->getEnableCellGrouping()) {
+							continue;
+			}
 			$prevCell = null;
 			$prevCellText = null;
 			foreach($items as $item)
 			{
 				$itemType = $item->getItemType();
 				$cell = $item->getCells()->itemAt($id);
-				if(!$cell->getVisible())
-					continue;
+				if(!$cell->getVisible()) {
+									continue;
+				}
 				if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
 				{
 					if(($cellText = $this->getCellText($cell)) === '')
@@ -1102,11 +1128,11 @@ 
 					{
 						$prevCell = $cell;
 						$prevCellText = $cellText;
-					}
-					else
+					} else
 					{
-						if(($rowSpan = $prevCell->getRowSpan()) === 0)
-							$rowSpan = 1;
+						if(($rowSpan = $prevCell->getRowSpan()) === 0) {
+													$rowSpan = 1;
+						}
 						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
 					}
@@ -1122,8 +1148,9 @@ 
 			$controls = $cell->getControls();
 			foreach($controls as $control)
 			{
-				if($control instanceof \Prado\IDataRenderer)
-					return $control->getData();
+				if($control instanceof \Prado\IDataRenderer) {
+									return $control->getData();
+				}
 			}
 		}
 		return $data;
@@ -1152,8 +1179,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1173,12 +1199,14 @@ 
 		$index = 0;
 		foreach($columns as $column)
 		{
-			if($itemType === TListItemType::Header)
-				$cell = new TTableHeaderCell;
-			else
-				$cell = new TTableCell;
-			if(($id = $column->getID()) !== '')
-				$item->registerObject($id, $cell);
+			if($itemType === TListItemType::Header) {
+							$cell = new TTableHeaderCell;
+			} else {
+							$cell = new TTableCell;
+			}
+			if(($id = $column->getID()) !== '') {
+							$item->registerObject($id, $cell);
+			}
 			$cells->add($cell);
 			$column->initializeCell($cell, $index, $itemType);
 			$index++;
@@ -1228,20 +1256,20 @@ 
 	{
 		if($buttonType === TDataGridPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button = new TLinkButton;
-			else
+			if($enabled) {
+							$button = new TLinkButton;
+			} else
 			{
 				$button = new TLabel;
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button = new TButton;
-			if(!$enabled)
-				$button->setEnabled(false);
+			if(!$enabled) {
+							$button->setEnabled(false);
+			}
 		}
 		$button->setText($text);
 		$button->setCommandName($commandName);
@@ -1271,8 +1299,7 @@ 
 
 			$label = $this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text = $style->getFirstPageText()) !== '')
 			{
@@ -1295,8 +1322,7 @@ 
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
@@ -1327,12 +1353,14 @@ 
 		if($pageIndex > $endPageIndex)
 		{
 			$startPageIndex = ((int)(($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
-			if(($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount)
-				$endPageIndex = $pageCount;
+			if(($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount) {
+							$endPageIndex = $pageCount;
+			}
 			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1)
-					$startPageIndex = 1;
+				if(($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1) {
+									$startPageIndex = 1;
+				}
 			}
 		}
 
@@ -1356,14 +1384,14 @@ 
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i < $endPageIndex)
-				$controls->add("\n");
+			if($i < $endPageIndex) {
+							$controls->add("\n");
+			}
 		}
 
 		if($pageCount > $endPageIndex)
@@ -1388,8 +1416,9 @@ 
 	 */
 	protected function createAutoColumns($dataSource)
 	{
-		if(!$dataSource)
-			return null;
+		if(!$dataSource) {
+					return null;
+		}
 		$autoColumns = $this->getAutoColumns();
 		$autoColumns->clear();
 		foreach($dataSource as $row)
@@ -1403,8 +1432,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1435,10 +1463,11 @@ 
 		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle !== null)
 		{
-			if($alternatingItemStyle === null)
-				$alternatingItemStyle = $itemStyle;
-			else
-				$alternatingItemStyle->mergeWith($itemStyle);
+			if($alternatingItemStyle === null) {
+							$alternatingItemStyle = $itemStyle;
+			} else {
+							$alternatingItemStyle->mergeWith($itemStyle);
+			}
 		}
 
 		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
@@ -1446,10 +1475,11 @@ 
 		$editItemStyle = $this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle !== null)
 		{
-			if($editItemStyle === null)
-				$editItemStyle = $selectedItemStyle;
-			else
-				$editItemStyle->mergeWith($selectedItemStyle);
+			if($editItemStyle === null) {
+							$editItemStyle = $selectedItemStyle;
+			} else {
+							$editItemStyle->mergeWith($selectedItemStyle);
+			}
 		}
 
 		$headerStyle = $this->getViewState('HeaderStyle', null);
@@ -1459,61 +1489,73 @@ 
 
 		foreach($this->getControls() as $index => $item)
 		{
-			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
-				continue;
+			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager)) {
+							continue;
+			}
 			$itemType = $item->getItemType();
 			switch($itemType)
 			{
 				case TListItemType::Header:
-					if($headerStyle)
-						$item->getStyle()->mergeWith($headerStyle);
-					if(!$this->getShowHeader())
-						$item->setVisible(false);
+					if($headerStyle) {
+											$item->getStyle()->mergeWith($headerStyle);
+					}
+					if(!$this->getShowHeader()) {
+											$item->setVisible(false);
+					}
 					break;
 				case TListItemType::Footer:
-					if($footerStyle)
-						$item->getStyle()->mergeWith($footerStyle);
-					if(!$this->getShowFooter())
-						$item->setVisible(false);
+					if($footerStyle) {
+											$item->getStyle()->mergeWith($footerStyle);
+					}
+					if(!$this->getShowFooter()) {
+											$item->setVisible(false);
+					}
 					break;
 				case TListItemType::Separator:
-					if($separatorStyle)
-						$item->getStyle()->mergeWith($separatorStyle);
+					if($separatorStyle) {
+											$item->getStyle()->mergeWith($separatorStyle);
+					}
 					break;
 				case TListItemType::Item:
-					if($itemStyle)
-						$item->getStyle()->mergeWith($itemStyle);
+					if($itemStyle) {
+											$item->getStyle()->mergeWith($itemStyle);
+					}
 					break;
 				case TListItemType::AlternatingItem:
-					if($alternatingItemStyle)
-						$item->getStyle()->mergeWith($alternatingItemStyle);
+					if($alternatingItemStyle) {
+											$item->getStyle()->mergeWith($alternatingItemStyle);
+					}
 					break;
 				case TListItemType::SelectedItem:
-					if($selectedItemStyle)
-						$item->getStyle()->mergeWith($selectedItemStyle);
+					if($selectedItemStyle) {
+											$item->getStyle()->mergeWith($selectedItemStyle);
+					}
 					if($index % 2 == 1)
 					{
-						if($itemStyle)
-							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+						if($itemStyle) {
+													$item->getStyle()->mergeWith($itemStyle);
+						}
+					} else
 					{
-						if($alternatingItemStyle)
-							$item->getStyle()->mergeWith($alternatingItemStyle);
+						if($alternatingItemStyle) {
+													$item->getStyle()->mergeWith($alternatingItemStyle);
+						}
 					}
 					break;
 				case TListItemType::EditItem:
-					if($editItemStyle)
-						$item->getStyle()->mergeWith($editItemStyle);
+					if($editItemStyle) {
+											$item->getStyle()->mergeWith($editItemStyle);
+					}
 					if($index % 2 == 1)
 					{
-						if($itemStyle)
-							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+						if($itemStyle) {
+													$item->getStyle()->mergeWith($itemStyle);
+						}
+					} else
 					{
-						if($alternatingItemStyle)
-							$item->getStyle()->mergeWith($alternatingItemStyle);
+						if($alternatingItemStyle) {
+													$item->getStyle()->mergeWith($alternatingItemStyle);
+						}
 					}
 					break;
 				case TListItemType::Pager:
@@ -1522,13 +1564,14 @@ 
 						$item->getStyle()->mergeWith($pagerStyle);
 						if($index === 0)
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
-								$item->setVisible(false);
-						}
-						else
+							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible()) {
+															$item->setVisible(false);
+							}
+						} else
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
-								$item->setVisible(false);
+							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible()) {
+															$item->setVisible(false);
+							}
 						}
 					}
 					break;
@@ -1543,18 +1586,20 @@ 
 				{
 					$cell = $cells->itemAt($i);
 					$column = $this->_columns->itemAt($i);
-					if(!$column->getVisible())
-						$cell->setVisible(false);
-					else
+					if(!$column->getVisible()) {
+											$cell->setVisible(false);
+					} else
 					{
-						if($itemType === TListItemType::Header)
-							$style = $column->getHeaderStyle(false);
-						elseif($itemType === TListItemType::Footer)
-							$style = $column->getFooterStyle(false);
-						else
-							$style = $column->getItemStyle(false);
-						if($style !== null)
-							$cell->getStyle()->mergeWith($style);
+						if($itemType === TListItemType::Header) {
+													$style = $column->getHeaderStyle(false);
+						} elseif($itemType === TListItemType::Footer) {
+													$style = $column->getFooterStyle(false);
+						} else {
+													$style = $column->getItemStyle(false);
+						}
+						if($style !== null) {
+													$cell->getStyle()->mergeWith($style);
+						}
 					}
 				}
 			}
@@ -1570,8 +1615,9 @@ 
 		parent::renderBeginTag($writer);
 		if(($caption = $this->getCaption()) !== '')
 		{
-			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align', strtolower($align));
+			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet) {
+							$writer->addAttribute('align', strtolower($align));
+			}
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -1592,13 +1638,13 @@ 
 				$control = new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
-				if($this->getHasStyle())
-					$control->getStyle()->copyFrom($this->getStyle());
+				if($this->getHasStyle()) {
+									$control->getStyle()->copyFrom($this->getStyle());
+				}
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			elseif($this->getViewState('ItemCount', 0) > 0)
+			} elseif($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)
@@ -1626,25 +1672,29 @@ 
 		if($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style = $this->getViewState('TableHeadStyle', null))
-				$style->addAttributesToRender($writer);
+			if($style = $this->getViewState('TableHeadStyle', null)) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('thead');
 			$this->_header->render($writer);
 			$writer->renderEndTag();
 		}
 		$writer->writeLine();
-		if($style = $this->getViewState('TableBodyStyle', null))
-			$style->addAttributesToRender($writer);
+		if($style = $this->getViewState('TableBodyStyle', null)) {
+					$style->addAttributesToRender($writer);
+		}
 		$writer->renderBeginTag('tbody');
-		foreach($this->getItems() as $item)
-			$item->renderControl($writer);
+		foreach($this->getItems() as $item) {
+					$item->renderControl($writer);
+		}
 		$writer->renderEndTag();
 
 		if($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style = $this->getViewState('TableFootStyle', null))
-				$style->addAttributesToRender($writer);
+			if($style = $this->getViewState('TableFootStyle', null)) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);
 			$writer->renderEndTag();

framework/Web/UI/WebControls/TCompareValidator.php

Spacing +12 added lines, -12 removed lines

@@ -151,21 +151,21 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
+		if (($value = $this->getValidationValue($this->getValidationTarget())) === '')
 			return true;
 
-		if(($controlToCompare = $this->getControlToCompare()) !== '')
+		if (($controlToCompare = $this->getControlToCompare()) !== '')
 		{
-			if(($control2 = $this->findControl($controlToCompare)) === null)
+			if (($control2 = $this->findControl($controlToCompare)) === null)
 				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2 = $this->getValidationValue($control2)) === '')
+			if (($value2 = $this->getValidationValue($control2)) === '')
 				return false;
 		}
 		else
 			$value2 = $this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
-		switch($this->getOperator())
+		switch ($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
 				return $values[0] == $values[1];
@@ -192,7 +192,7 @@ 
 	 */
 	protected function getComparisonValues($value1, $value2)
 	{
-		switch($this->getDataType())
+		switch ($this->getDataType())
 		{
 			case TValidationDataType::Integer:
 				return [intval($value1), intval($value2)];
@@ -200,7 +200,7 @@ 
 				return [floatval($value1), floatval($value2)];
 			case TValidationDataType::Date:
 				$dateFormat = $this->getDateFormat();
-				if($dateFormat !== '')
+				if ($dateFormat !== '')
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
@@ -218,17 +218,17 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($name = $this->getControlToCompare()) !== '')
+		if (($name = $this->getControlToCompare()) !== '')
 		{
-			if(($control = $this->findControl($name)) !== null)
+			if (($control = $this->findControl($name)) !== null)
 				$options['ControlToCompare'] = $control->getClientID();
 		}
-		if(($value = $this->getValueToCompare()) !== '')
+		if (($value = $this->getValueToCompare()) !== '')
 			$options['ValueToCompare'] = $value;
-		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
+		if (($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
 			$options['Operator'] = $operator;
 		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
+		if (($dateFormat = $this->getDateFormat()) !== '')
 			$options['DateFormat'] = $dateFormat;
 		return $options;
 	}

Braces +25 added lines, -18 removed lines

@@ -151,18 +151,21 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
-			return true;
+		if(($value = $this->getValidationValue($this->getValidationTarget())) === '') {
+					return true;
+		}
 
 		if(($controlToCompare = $this->getControlToCompare()) !== '')
 		{
-			if(($control2 = $this->findControl($controlToCompare)) === null)
-				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2 = $this->getValidationValue($control2)) === '')
-				return false;
+			if(($control2 = $this->findControl($controlToCompare)) === null) {
+							throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
+			}
+			if(($value2 = $this->getValidationValue($control2)) === '') {
+							return false;
+			}
+		} else {
+					$value2 = $this->getValueToCompare();
 		}
-		else
-			$value2 = $this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
@@ -204,9 +207,9 @@ 
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
+				} else {
+									return [strtotime($value1), strtotime($value2)];
 				}
-				else
-					return [strtotime($value1), strtotime($value2)];
 		}
 		return [$value1, $value2];
 	}
@@ -220,16 +223,20 @@ 
 		$options = parent::getClientScriptOptions();
 		if(($name = $this->getControlToCompare()) !== '')
 		{
-			if(($control = $this->findControl($name)) !== null)
-				$options['ControlToCompare'] = $control->getClientID();
+			if(($control = $this->findControl($name)) !== null) {
+							$options['ControlToCompare'] = $control->getClientID();
+			}
+		}
+		if(($value = $this->getValueToCompare()) !== '') {
+					$options['ValueToCompare'] = $value;
+		}
+		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal) {
+					$options['Operator'] = $operator;
 		}
-		if(($value = $this->getValueToCompare()) !== '')
-			$options['ValueToCompare'] = $value;
-		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
-			$options['Operator'] = $operator;
 		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
-			$options['DateFormat'] = $dateFormat;
+		if(($dateFormat = $this->getDateFormat()) !== '') {
+					$options['DateFormat'] = $dateFormat;
+		}
 		return $options;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TTableCell.php

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getHorizontalAlign();
 		else
 			return 'NotSet';
@@ -80,7 +80,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getVerticalAlign();
 		else
 			return 'NotSet';
@@ -135,7 +135,7 @@ 
 	 */
 	public function getWrap()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getWrap();
 		else
 			return true;
@@ -201,9 +201,9 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($colspan = $this->getColumnSpan()) > 0)
+		if (($colspan = $this->getColumnSpan()) > 0)
 			$writer->addAttribute('colspan', "$colspan");
-		if(($rowspan = $this->getRowSpan()) > 0)
+		if (($rowspan = $this->getRowSpan()) > 0)
 			$writer->addAttribute('rowspan', "$rowspan");
 	}
 
@@ -213,9 +213,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 			$writer->write($text);
-		elseif($this->getHasControls())
+		elseif ($this->getHasControls())
 			parent::renderContents($writer);
 		else
 			$writer->write(' ');

Braces +28 added lines, -22 removed lines

@@ -59,10 +59,11 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getHorizontalAlign();
-		else
-			return 'NotSet';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getHorizontalAlign();
+		} else {
+					return 'NotSet';
+		}
 	}
 
 	/**
@@ -80,10 +81,11 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getVerticalAlign();
-		else
-			return 'NotSet';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getVerticalAlign();
+		} else {
+					return 'NotSet';
+		}
 	}
 
 	/**
@@ -135,10 +137,11 @@ 
 	 */
 	public function getWrap()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getWrap();
-		else
-			return true;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getWrap();
+		} else {
+					return true;
+		}
 	}
 
 	/**
@@ -201,10 +204,12 @@ 
 	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");
+		}
 	}
 
 	/**
@@ -213,12 +218,13 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
-			$writer->write($text);
-		elseif($this->getHasControls())
-			parent::renderContents($writer);
-		else
-			$writer->write(' ');
+		if(($text = $this->getText()) !== '') {
+					$writer->write($text);
+		} elseif($this->getHasControls()) {
+					parent::renderContents($writer);
+		} else {
+					$writer->write(' ');
+		}
 	}
 }