pradosoft / prado

framework/Web/UI/WebControls/TDataTypeValidator.php

Spacing +5 added lines, -5 removed lines

@@ -87,10 +87,10 @@ 
 	 */
 	protected function evaluateDataTypeCheck($value)
 	{
-		if($value == '')
+		if ($value == '')
 			return true;
 
-		switch($this->getDataType())
+		switch ($this->getDataType())
 		{
 			case TValidationDataType::Integer:
 				return preg_match('/^[-+]?[0-9]+$/', trim($value));
@@ -98,7 +98,7 @@ 
 				return preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 			case TValidationDataType::Date:
 				$dateFormat = $this->getDateFormat();
-				if(strlen($dateFormat))
+				if (strlen($dateFormat))
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return $formatter->isValidDate($value);
@@ -117,7 +117,7 @@ 
 	{
 		$options = parent::getClientScriptOptions();
 		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
+		if (($dateFormat = $this->getDateFormat()) !== '')
 			$options['DateFormat'] = $dateFormat;
 		return $options;
 	}
@@ -131,7 +131,7 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
+		if (($value = $this->getValidationValue($this->getValidationTarget())) === '')
 			return true;
 
 		return $this->evaluateDataTypeCheck($value);

Braces +11 added lines, -8 removed lines

@@ -87,8 +87,9 @@ 
 	 */
 	protected function evaluateDataTypeCheck($value)
 	{
-		if($value == '')
-			return true;
+		if($value == '') {
+					return true;
+		}
 
 		switch($this->getDataType())
 		{
@@ -102,9 +103,9 @@ 
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return $formatter->isValidDate($value);
+				} else {
+									return strtotime($value) > 0;
 				}
-				else
-					return strtotime($value) > 0;
 		}
 		return true;
 	}
@@ -117,8 +118,9 @@ 
 	{
 		$options = parent::getClientScriptOptions();
 		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
-			$options['DateFormat'] = $dateFormat;
+		if(($dateFormat = $this->getDateFormat()) !== '') {
+					$options['DateFormat'] = $dateFormat;
+		}
 		return $options;
 	}
 
@@ -131,8 +133,9 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
-			return true;
+		if(($value = $this->getValidationValue($this->getValidationTarget())) === '') {
+					return true;
+		}
 
 		return $this->evaluateDataTypeCheck($value);
 	}

framework/Web/UI/WebControls/TWizardStep.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 	public function setTitle($value)
 	{
 		$this->setViewState('Title', $value, '');
-		if($this->_wizard)
+		if ($this->_wizard)
 			$this->_wizard->wizardStepsChanged();
 	}
 
@@ -96,10 +96,10 @@ 
 	public function setStepType($type)
 	{
 		$type = TPropertyValue::ensureEnum($type, 'Prado\\Web\\UI\\WebControls\\TWizardStepType');
-		if($type !== $this->getStepType())
+		if ($type !== $this->getStepType())
 		{
 			$this->setViewState('StepType', $type, TWizardStepType::Auto);
-			if($this->_wizard)
+			if ($this->_wizard)
 				$this->_wizard->wizardStepsChanged();
 		}
 	}

Braces +6 added lines, -4 removed lines

@@ -62,8 +62,9 @@ 
 	public function setTitle($value)
 	{
 		$this->setViewState('Title', $value, '');
-		if($this->_wizard)
-			$this->_wizard->wizardStepsChanged();
+		if($this->_wizard) {
+					$this->_wizard->wizardStepsChanged();
+		}
 	}
 
 	/**
@@ -99,8 +100,9 @@ 
 		if($type !== $this->getStepType())
 		{
 			$this->setViewState('StepType', $type, TWizardStepType::Auto);
-			if($this->_wizard)
-				$this->_wizard->wizardStepsChanged();
+			if($this->_wizard) {
+							$this->_wizard->wizardStepsChanged();
+			}
 		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TDataGridColumnCollection.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TDataGridColumn)
+		if ($item instanceof TDataGridColumn)
 		{
 			$item->setOwner($this->_o);
 			parent::insertAt($index, $item);

Braces +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
 		{
 			$item->setOwner($this->_o);
 			parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
 		}
-		else
-			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TDataGridPager.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;

Braces +2 added lines, -2 removed lines

@@ -51,9 +51,9 @@
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

framework/Web/UI/WebControls/TPager.php

Spacing +39 added lines, -39 removed lines

@@ -74,7 +74,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if($this->getEnableViewState(true))
+		if ($this->getEnableViewState(true))
 		{
 			$this->getControls()->clear();
 			$this->buildPager();
@@ -324,7 +324,7 @@ 
 	 */
 	public function setPageButtonCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 1)
+		if (($value = TPropertyValue::ensureInteger($value)) < 1)
 			throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
 		$this->setViewState('PageButtonCount', $value, 10);
 	}
@@ -343,7 +343,7 @@ 
 	 */
 	protected function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('pager_currentpageindex_invalid');
 		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
@@ -362,7 +362,7 @@ 
 	 */
 	protected function setPageCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('pager_pagecount_invalid');
 		$this->setViewState('PageCount', $value, 0);
 	}
@@ -394,10 +394,10 @@ 
 		parent::onPreRender($param);
 
 		$controlID = $this->getControlToPaginate();
-		if(($targetControl = $this->getNamingContainer()->findControl($controlID)) === null || !($targetControl instanceof TDataBoundControl))
+		if (($targetControl = $this->getNamingContainer()->findControl($controlID)) === null || !($targetControl instanceof TDataBoundControl))
 			throw new TConfigurationException('pager_controltopaginate_invalid', $controlID);
 
-		if($targetControl->getAllowPaging())
+		if ($targetControl->getAllowPaging())
 		{
 			$this->_pageCount = $targetControl->getPageCount();
 			$this->getControls()->clear();
@@ -417,7 +417,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_pageCount > 1)
+		if ($this->_pageCount > 1)
 			parent::render($writer);
 	}
 
@@ -428,7 +428,7 @@ 
 	 */
 	protected function buildPager()
 	{
-		switch($this->getMode())
+		switch ($this->getMode())
 		{
 			case TPagerMode::NextPrev:
 				$this->buildNextPrevPager();
@@ -456,9 +456,9 @@ 
 	 */
 	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType === TPagerButtonType::LinkButton)
+		if ($buttonType === TPagerButtonType::LinkButton)
 		{
-			if($enabled)
+			if ($enabled)
 				$button = new TLinkButton;
 			else
 			{
@@ -470,14 +470,14 @@ 
 		}
 		else
 		{
-			if($buttonType === TPagerButtonType::ImageButton)
+			if ($buttonType === TPagerButtonType::ImageButton)
 			{
 				$button = new TImageButton;
 				$button->setImageUrl($this->getPageImageUrl($text, $commandName));
 			}
 			else
 				$button = new TButton;
-			if(!$enabled)
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 		$button->setText($text);
@@ -495,7 +495,7 @@ 
 	 */
 	protected function getPageImageUrl($text, $commandName)
 	{
-		switch($commandName)
+		switch ($commandName)
 		{
 			case self::CMD_PAGE:
 				$url = $this->getNumericPageImageUrl();
@@ -520,9 +520,9 @@ 
 	{
 		$buttonType = $this->getButtonType();
 		$controls = $this->getControls();
-		if($this->getIsFirstPage())
+		if ($this->getIsFirstPage())
 		{
-			if(($text = $this->getFirstPageText()) !== '')
+			if (($text = $this->getFirstPageText()) !== '')
 			{
 				$label = $this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($label);
@@ -533,7 +533,7 @@ 
 		}
 		else
 		{
-			if(($text = $this->getFirstPageText()) !== '')
+			if (($text = $this->getFirstPageText()) !== '')
 			{
 				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($button);
@@ -543,11 +543,11 @@ 
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($this->getIsLastPage())
+		if ($this->getIsLastPage())
 		{
 			$label = $this->createPagerButton($buttonType, false, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($label);
-			if(($text = $this->getLastPageText()) !== '')
+			if (($text = $this->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$label = $this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_LAST, '');
@@ -558,7 +558,7 @@ 
 		{
 			$button = $this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($button);
-			if(($text = $this->getLastPageText()) !== '')
+			if (($text = $this->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_LAST, '');
@@ -577,24 +577,24 @@ 
 		$pageCount = $this->getPageCount();
 		$pageIndex = $this->getCurrentPageIndex() + 1;
 		$maxButtonCount = $this->getPageButtonCount();
-		$buttonCount = $maxButtonCount > $pageCount?$pageCount:$maxButtonCount;
+		$buttonCount = $maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
 		$startPageIndex = 1;
 		$endPageIndex = $buttonCount;
-		if($pageIndex > $endPageIndex)
+		if ($pageIndex > $endPageIndex)
 		{
-			$startPageIndex = ((int)(($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
-			if(($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount)
+			$startPageIndex = ((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if (($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount)
 				$endPageIndex = $pageCount;
-			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
+			if ($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1)
+				if (($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1)
 					$startPageIndex = 1;
 			}
 		}
 
-		if($startPageIndex > 1)
+		if ($startPageIndex > 1)
 		{
-			if(($text = $this->getFirstPageText()) !== '')
+			if (($text = $this->getFirstPageText()) !== '')
 			{
 				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_FIRST, '');
 				$controls->add($button);
@@ -606,9 +606,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($buttonType, false, "$i", self::CMD_PAGE, '');
 				$controls->add($label);
@@ -618,17 +618,17 @@ 
 				$button = $this->createPagerButton($buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i < $endPageIndex)
+			if ($i < $endPageIndex)
 				$controls->add("\n");
 		}
 
-		if($pageCount > $endPageIndex)
+		if ($pageCount > $endPageIndex)
 		{
 			$controls->add("\n");
 			$nextPageIndex = $endPageIndex + 1;
 			$button = $this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
-			if(($text = $this->getLastPageText()) !== '')
+			if (($text = $this->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$button = $this->createPagerButton($buttonType, true, $text, self::CMD_PAGE_LAST, '');
@@ -648,7 +648,7 @@ 
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged', [$this,'listIndexChanged']);
+		$list->attachEventHandler('OnSelectedIndexChanged', [$this, 'listIndexChanged']);
 	}
 
 	/**
@@ -682,33 +682,33 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$command = $param->getCommandName();
-			if(strcasecmp($command, self::CMD_PAGE) === 0)
+			if (strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$pageIndex = TPropertyValue::ensureInteger($param->getCommandParameter()) - 1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE_NEXT) === 0)
+			elseif (strcasecmp($command, self::CMD_PAGE_NEXT) === 0)
 			{
 				$pageIndex = $this->getCurrentPageIndex() + 1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE_PREV) === 0)
+			elseif (strcasecmp($command, self::CMD_PAGE_PREV) === 0)
 			{
 				$pageIndex = $this->getCurrentPageIndex() - 1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE_FIRST) === 0)
+			elseif (strcasecmp($command, self::CMD_PAGE_FIRST) === 0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, 0));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE_LAST) === 0)
+			elseif (strcasecmp($command, self::CMD_PAGE_LAST) === 0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $this->getPageCount() - 1));
 				return true;

Braces +44 added lines, -43 removed lines

@@ -324,8 +324,9 @@ 
 	 */
 	public function setPageButtonCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 1)
-			throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) < 1) {
+					throw new TInvalidDataValueException('pager_pagebuttoncount_invalid');
+		}
 		$this->setViewState('PageButtonCount', $value, 10);
 	}
 
@@ -343,8 +344,9 @@ 
 	 */
 	protected function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			throw new TInvalidDataValueException('pager_currentpageindex_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					throw new TInvalidDataValueException('pager_currentpageindex_invalid');
+		}
 		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
@@ -362,8 +364,9 @@ 
 	 */
 	protected function setPageCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			throw new TInvalidDataValueException('pager_pagecount_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					throw new TInvalidDataValueException('pager_pagecount_invalid');
+		}
 		$this->setViewState('PageCount', $value, 0);
 	}
 
@@ -394,8 +397,9 @@ 
 		parent::onPreRender($param);
 
 		$controlID = $this->getControlToPaginate();
-		if(($targetControl = $this->getNamingContainer()->findControl($controlID)) === null || !($targetControl instanceof TDataBoundControl))
-			throw new TConfigurationException('pager_controltopaginate_invalid', $controlID);
+		if(($targetControl = $this->getNamingContainer()->findControl($controlID)) === null || !($targetControl instanceof TDataBoundControl)) {
+					throw new TConfigurationException('pager_controltopaginate_invalid', $controlID);
+		}
 
 		if($targetControl->getAllowPaging())
 		{
@@ -404,9 +408,9 @@ 
 			$this->setPageCount($targetControl->getPageCount());
 			$this->setCurrentPageIndex($targetControl->getCurrentPageIndex());
 			$this->buildPager();
+		} else {
+					$this->_pageCount = 0;
 		}
-		else
-			$this->_pageCount = 0;
 	}
 
 	/**
@@ -417,8 +421,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_pageCount > 1)
-			parent::render($writer);
+		if($this->_pageCount > 1) {
+					parent::render($writer);
+		}
 	}
 
 	/**
@@ -458,27 +463,27 @@ 
 	{
 		if($buttonType === TPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button = new TLinkButton;
-			else
+			if($enabled) {
+							$button = new TLinkButton;
+			} else
 			{
 				$button = new TLabel;
 				$button->setText($text);
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			if($buttonType === TPagerButtonType::ImageButton)
 			{
 				$button = new TImageButton;
 				$button->setImageUrl($this->getPageImageUrl($text, $commandName));
+			} else {
+							$button = new TButton;
+			}
+			if(!$enabled) {
+							$button->setEnabled(false);
 			}
-			else
-				$button = new TButton;
-			if(!$enabled)
-				$button->setEnabled(false);
 		}
 		$button->setText($text);
 		$button->setCommandName($commandName);
@@ -530,8 +535,7 @@ 
 			}
 			$label = $this->createPagerButton($buttonType, false, $this->getPrevPageText(), self::CMD_PAGE_PREV, '');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text = $this->getFirstPageText()) !== '')
 			{
@@ -553,8 +557,7 @@ 
 				$label = $this->createPagerButton($buttonType, false, $text, self::CMD_PAGE_LAST, '');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button = $this->createPagerButton($buttonType, true, $this->getNextPageText(), self::CMD_PAGE_NEXT, '');
 			$controls->add($button);
@@ -583,12 +586,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;
+				}
 			}
 		}
 
@@ -612,14 +617,14 @@ 
 			{
 				$label = $this->createPagerButton($buttonType, false, "$i", self::CMD_PAGE, '');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button = $this->createPagerButton($buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i < $endPageIndex)
-				$controls->add("\n");
+			if($i < $endPageIndex) {
+							$controls->add("\n");
+			}
 		}
 
 		if($pageCount > $endPageIndex)
@@ -690,32 +695,28 @@ 
 				$pageIndex = TPropertyValue::ensureInteger($param->getCommandParameter()) - 1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE_NEXT) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE_NEXT) === 0)
 			{
 				$pageIndex = $this->getCurrentPageIndex() + 1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE_PREV) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE_PREV) === 0)
 			{
 				$pageIndex = $this->getCurrentPageIndex() - 1;
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $pageIndex));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE_FIRST) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE_FIRST) === 0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, 0));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE_LAST) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE_LAST) === 0)
 			{
 				$this->onPageIndexChanged(new TPagerPageChangedEventParameter($sender, $this->getPageCount() - 1));
 				return true;
 			}
 			return false;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TRangeValidator.php

Spacing +18 added lines, -18 removed lines

@@ -171,10 +171,10 @@ 
 	protected function evaluateIsValid()
 	{
 		$value = $this->getValidationValue($this->getValidationTarget());
-		if($value === '')
+		if ($value === '')
 			return true;
 
-		switch($this->getDataType())
+		switch ($this->getDataType())
 		{
 			case TRangeValidationDataType::Integer:
 				return $this->isValidInteger($value);
@@ -201,9 +201,9 @@ 
 
 		$valid = preg_match('/^[-+]?[0-9]+$/', trim($value));
 		$value = intval($value);
-		if($minValue !== '')
+		if ($minValue !== '')
 			$valid = $valid && $this->isGreaterThan($value, intval($minValue));
-		if($maxValue !== '')
+		if ($maxValue !== '')
 			$valid = $valid && $this->isLessThan($value, intval($maxValue));
 		return $valid;
 	}
@@ -230,9 +230,9 @@ 
 
 		$valid = preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 		$value = floatval($value);
-		if($minValue !== '')
+		if ($minValue !== '')
 			$valid = $valid && $this->isGreaterThan($value, floatval($minValue));
-		if($maxValue !== '')
+		if ($maxValue !== '')
 			$valid = $valid && $this->isLessThan($value, floatval($maxValue));
 		return $valid;
 	}
@@ -251,22 +251,22 @@ 
 		$valid = true;
 
 		$dateFormat = $this->getDateFormat();
-		if($dateFormat !== '')
+		if ($dateFormat !== '')
 		{
 			$formatter = new TSimpleDateFormatter($dateFormat);
 			$value = $formatter->parse($value);
-			if($minValue !== '')
+			if ($minValue !== '')
 				$valid = $valid && $this->isGreaterThan($value, $formatter->parse($minValue));
-			if($maxValue !== '')
+			if ($maxValue !== '')
 				$valid = $valid && $this->isLessThan($value, $formatter->parse($maxValue));
 			return $valid;
 		}
 		else
 		{
 			$value = strtotime($value);
-			if($minValue !== '')
+			if ($minValue !== '')
 				$valid = $valid && $this->isGreaterThan($value, strtotime($minValue));
-			if($maxValue !== '')
+			if ($maxValue !== '')
 				$valid = $valid && $this->isLessThan($value, strtotime($maxValue));
 			return $valid;
 		}
@@ -284,9 +284,9 @@ 
 		$maxValue = $this->getMaxValue();
 
 		$valid = true;
-		if($minValue !== '')
+		if ($minValue !== '')
 			$valid = $valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
-		if($maxValue !== '')
+		if ($maxValue !== '')
 			$valid = $valid && $this->isLessThan(strcmp($value, $maxValue), 0);
 		return $valid;
 	}
@@ -302,18 +302,18 @@ 
 
 		$valid = true;
 		$charset = $this->getCharset();
-		if($charset === '')
+		if ($charset === '')
 		{
 			$app = $this->getApplication()->getGlobalization();
 			$charset = $app ? $app->getCharset() : null;
-			if(!$charset)
+			if (!$charset)
 				$charset = 'UTF-8';
 		}
 
 		$length = iconv_strlen($value, $charset);
-		if($minValue !== '')
+		if ($minValue !== '')
 			$valid = $valid && $this->isGreaterThan($length, intval($minValue));
-		if($maxValue !== '')
+		if ($maxValue !== '')
 			$valid = $valid && $this->isLessThan($length, intval($maxValue));
 		return $valid;
 	}
@@ -329,7 +329,7 @@ 
 		$options['MaxValue'] = $this->getMaxValue();
 		$options['DataType'] = $this->getDataType();
 		$options['StrictComparison'] = $this->getStrictComparison();
-		if(($dateFormat = $this->getDateFormat()) !== '')
+		if (($dateFormat = $this->getDateFormat()) !== '')
 			$options['DateFormat'] = $dateFormat;
 		return $options;
 	}

Braces +46 added lines, -32 removed lines

@@ -171,8 +171,9 @@ 
 	protected function evaluateIsValid()
 	{
 		$value = $this->getValidationValue($this->getValidationTarget());
-		if($value === '')
-			return true;
+		if($value === '') {
+					return true;
+		}
 
 		switch($this->getDataType())
 		{
@@ -201,10 +202,12 @@ 
 
 		$valid = preg_match('/^[-+]?[0-9]+$/', trim($value));
 		$value = intval($value);
-		if($minValue !== '')
-			$valid = $valid && $this->isGreaterThan($value, intval($minValue));
-		if($maxValue !== '')
-			$valid = $valid && $this->isLessThan($value, intval($maxValue));
+		if($minValue !== '') {
+					$valid = $valid && $this->isGreaterThan($value, intval($minValue));
+		}
+		if($maxValue !== '') {
+					$valid = $valid && $this->isLessThan($value, intval($maxValue));
+		}
 		return $valid;
 	}
 
@@ -230,10 +233,12 @@ 
 
 		$valid = preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 		$value = floatval($value);
-		if($minValue !== '')
-			$valid = $valid && $this->isGreaterThan($value, floatval($minValue));
-		if($maxValue !== '')
-			$valid = $valid && $this->isLessThan($value, floatval($maxValue));
+		if($minValue !== '') {
+					$valid = $valid && $this->isGreaterThan($value, floatval($minValue));
+		}
+		if($maxValue !== '') {
+					$valid = $valid && $this->isLessThan($value, floatval($maxValue));
+		}
 		return $valid;
 	}
 
@@ -255,19 +260,22 @@ 
 		{
 			$formatter = new TSimpleDateFormatter($dateFormat);
 			$value = $formatter->parse($value);
-			if($minValue !== '')
-				$valid = $valid && $this->isGreaterThan($value, $formatter->parse($minValue));
-			if($maxValue !== '')
-				$valid = $valid && $this->isLessThan($value, $formatter->parse($maxValue));
+			if($minValue !== '') {
+							$valid = $valid && $this->isGreaterThan($value, $formatter->parse($minValue));
+			}
+			if($maxValue !== '') {
+							$valid = $valid && $this->isLessThan($value, $formatter->parse($maxValue));
+			}
 			return $valid;
-		}
-		else
+		} else
 		{
 			$value = strtotime($value);
-			if($minValue !== '')
-				$valid = $valid && $this->isGreaterThan($value, strtotime($minValue));
-			if($maxValue !== '')
-				$valid = $valid && $this->isLessThan($value, strtotime($maxValue));
+			if($minValue !== '') {
+							$valid = $valid && $this->isGreaterThan($value, strtotime($minValue));
+			}
+			if($maxValue !== '') {
+							$valid = $valid && $this->isLessThan($value, strtotime($maxValue));
+			}
 			return $valid;
 		}
 	}
@@ -284,10 +292,12 @@ 
 		$maxValue = $this->getMaxValue();
 
 		$valid = true;
-		if($minValue !== '')
-			$valid = $valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
-		if($maxValue !== '')
-			$valid = $valid && $this->isLessThan(strcmp($value, $maxValue), 0);
+		if($minValue !== '') {
+					$valid = $valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
+		}
+		if($maxValue !== '') {
+					$valid = $valid && $this->isLessThan(strcmp($value, $maxValue), 0);
+		}
 		return $valid;
 	}
 
@@ -306,15 +316,18 @@ 
 		{
 			$app = $this->getApplication()->getGlobalization();
 			$charset = $app ? $app->getCharset() : null;
-			if(!$charset)
-				$charset = 'UTF-8';
+			if(!$charset) {
+							$charset = 'UTF-8';
+			}
 		}
 
 		$length = iconv_strlen($value, $charset);
-		if($minValue !== '')
-			$valid = $valid && $this->isGreaterThan($length, intval($minValue));
-		if($maxValue !== '')
-			$valid = $valid && $this->isLessThan($length, intval($maxValue));
+		if($minValue !== '') {
+					$valid = $valid && $this->isGreaterThan($length, intval($minValue));
+		}
+		if($maxValue !== '') {
+					$valid = $valid && $this->isLessThan($length, intval($maxValue));
+		}
 		return $valid;
 	}
 
@@ -329,8 +342,9 @@ 
 		$options['MaxValue'] = $this->getMaxValue();
 		$options['DataType'] = $this->getDataType();
 		$options['StrictComparison'] = $this->getStrictComparison();
-		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/TWizardStepCollection.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TWizardStep)
+		if ($item instanceof TWizardStep)
 		{
 			parent::insertAt($index, $item);
 			$this->_wizard->getMultiView()->getViews()->insertAt($index, $item);

Braces +2 added lines, -2 removed lines

@@ -54,9 +54,9 @@
 			parent::insertAt($index, $item);
 			$this->_wizard->getMultiView()->getViews()->insertAt($index, $item);
 			$this->_wizard->addedWizardStep($item);
+		} else {
+					throw new TInvalidDataTypeException('wizardstepcollection_wizardstep_required');
 		}
-		else
-			throw new TInvalidDataTypeException('wizardstepcollection_wizardstep_required');
 	}
 
 	/**

framework/Web/UI/WebControls/TDataListItem.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;

Braces +2 added lines, -2 removed lines

@@ -137,8 +137,8 @@
 		{
 			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TEditCommandColumn.php

Spacing +6 added lines, -6 removed lines

@@ -206,13 +206,13 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
 		{
 			$button = $this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
 			$cell->registerObject('EditButton', $button);
 		}
-		elseif($itemType === TListItemType::EditItem)
+		elseif ($itemType === TListItemType::EditItem)
 		{
 			$controls = $cell->getControls();
 			$button = $this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
@@ -238,16 +238,16 @@ 
 	 */
 	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
-		if($this->getButtonType() === TButtonColumnType::LinkButton)
+		if ($this->getButtonType() === TButtonColumnType::LinkButton)
 			$button = new TLinkButton;
-		elseif($this->getButtonType() === TButtonColumnType::PushButton)
+		elseif ($this->getButtonType() === TButtonColumnType::PushButton)
 			$button = new TButton;
 		else	// image buttons
 		{
 			$button = new TImageButton;
-			if(strcasecmp($commandName, 'Update') === 0)
+			if (strcasecmp($commandName, 'Update') === 0)
 				$url = $this->getUpdateImageUrl();
-			elseif(strcasecmp($commandName, 'Cancel') === 0)
+			elseif (strcasecmp($commandName, 'Cancel') === 0)
 				$url = $this->getCancelImageUrl();
 			else
 				$url = $this->getEditImageUrl();

Braces +15 added lines, -15 removed lines

@@ -211,8 +211,7 @@ 
 			$button = $this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
 			$cell->registerObject('EditButton', $button);
-		}
-		elseif($itemType === TListItemType::EditItem)
+		} elseif($itemType === TListItemType::EditItem)
 		{
 			$controls = $cell->getControls();
 			$button = $this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
@@ -222,9 +221,9 @@ 
 			$button = $this->createButton('Cancel', $this->getCancelText(), false, '');
 			$controls->add($button);
 			$cell->registerObject('CancelButton', $button);
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -238,19 +237,20 @@ 
 	 */
 	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
-		if($this->getButtonType() === TButtonColumnType::LinkButton)
-			$button = new TLinkButton;
-		elseif($this->getButtonType() === TButtonColumnType::PushButton)
-			$button = new TButton;
-		else	// image buttons
+		if($this->getButtonType() === TButtonColumnType::LinkButton) {
+					$button = new TLinkButton;
+		} elseif($this->getButtonType() === TButtonColumnType::PushButton) {
+					$button = new TButton;
+		} else	// image buttons
 		{
 			$button = new TImageButton;
-			if(strcasecmp($commandName, 'Update') === 0)
-				$url = $this->getUpdateImageUrl();
-			elseif(strcasecmp($commandName, 'Cancel') === 0)
-				$url = $this->getCancelImageUrl();
-			else
-				$url = $this->getEditImageUrl();
+			if(strcasecmp($commandName, 'Update') === 0) {
+							$url = $this->getUpdateImageUrl();
+			} elseif(strcasecmp($commandName, 'Cancel') === 0) {
+							$url = $this->getCancelImageUrl();
+			} else {
+							$url = $this->getEditImageUrl();
+			}
 			$button->setImageUrl($url);
 		}
 		$button->setText($text);