pradosoft / prado

framework/Web/UI/WebControls/TAccordionViewCollection.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAccordionView)
+		if ($item instanceof TAccordionView)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
@@ -47,9 +47,9 @@ 
 	 */
 	public function findIndexByID($id)
 	{
-		foreach($this as $index => $view)
+		foreach ($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
+			if ($view->getID(false) === $id)
 				return $index;
 		}
 		return -1;

Braces +8 added lines, -6 removed lines

@@ -34,10 +34,11 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAccordionView)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		if($item instanceof TAccordionView) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		}
 	}
 
 	/**
@@ -49,8 +50,9 @@ 
 	{
 		foreach($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
-				return $index;
+			if($view->getID(false) === $id) {
+							return $index;
+			}
 		}
 		return -1;
 	}

framework/Web/UI/WebControls/TDataListItemRenderer.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style = $this->getViewState('Style', null))
+		if ($style = $this->getViewState('Style', null))
 			return $style;
 		else
 		{
@@ -79,7 +79,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;
@@ -108,7 +108,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($style = $this->getViewState('Style', null))
+		if ($style = $this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 	}
 
@@ -124,7 +124,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getTagName() !== '')
+		if ($this->getTagName() !== '')
 		{
 			$this->renderBeginTag($writer);
 			$this->renderContents($writer);

Braces +10 added lines, -9 removed lines

@@ -52,9 +52,9 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style = $this->getViewState('Style', null))
-			return $style;
-		else
+		if($style = $this->getViewState('Style', null)) {
+					return $style;
+		} else
 		{
 			$style = $this->createStyle();
 			$this->setViewState('Style', $style, null);
@@ -83,9 +83,9 @@ 
 		{
 			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -108,8 +108,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($style = $this->getViewState('Style', null))
-			$style->addAttributesToRender($writer);
+		if($style = $this->getViewState('Style', null)) {
+					$style->addAttributesToRender($writer);
+		}
 	}
 
 	/**
@@ -129,9 +130,9 @@ 
 			$this->renderBeginTag($writer);
 			$this->renderContents($writer);
 			$this->renderEndTag($writer);
+		} else {
+					$this->renderContents($writer);
 		}
-		else
-			$this->renderContents($writer);
 	}
 
 	/**

framework/Web/UI/WebControls/TCustomValidator.php

Spacing +5 added lines, -5 removed lines

@@ -86,7 +86,7 @@ 
 	public function evaluateIsValid()
 	{
 		$value = '';
-		if($this->getValidationTarget() !== null)
+		if ($this->getValidationTarget() !== null)
 			$value = $this->getValidationValue($this->getValidationTarget());
 		return $this->onServerValidate($value);
 	}
@@ -112,9 +112,9 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
+		if (($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
 			return $control;
-		elseif(($id = $this->getControlToValidate()) !== '')
+		elseif (($id = $this->getControlToValidate()) !== '')
 			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 		else
 			return null;
@@ -127,7 +127,7 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($clientJs = $this->getClientValidationFunction()) !== '')
+		if (($clientJs = $this->getClientValidationFunction()) !== '')
 			$options['ClientValidationFunction'] = $clientJs;
 		return $options;
 	}
@@ -138,7 +138,7 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		if($this->getClientValidationFunction() !== '')
+		if ($this->getClientValidationFunction() !== '')
 			parent::registerClientScriptValidator();
 	}
 }
\ No newline at end of file

Braces +16 added lines, -12 removed lines

@@ -86,8 +86,9 @@ 
 	public function evaluateIsValid()
 	{
 		$value = '';
-		if($this->getValidationTarget() !== null)
-			$value = $this->getValidationValue($this->getValidationTarget());
+		if($this->getValidationTarget() !== null) {
+					$value = $this->getValidationValue($this->getValidationTarget());
+		}
 		return $this->onServerValidate($value);
 	}
 
@@ -112,12 +113,13 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
-			return $control;
-		elseif(($id = $this->getControlToValidate()) !== '')
-			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
-		else
-			return null;
+		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null) {
+					return $control;
+		} elseif(($id = $this->getControlToValidate()) !== '') {
+					throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -127,8 +129,9 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($clientJs = $this->getClientValidationFunction()) !== '')
-			$options['ClientValidationFunction'] = $clientJs;
+		if(($clientJs = $this->getClientValidationFunction()) !== '') {
+					$options['ClientValidationFunction'] = $clientJs;
+		}
 		return $options;
 	}
 
@@ -138,7 +141,8 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		if($this->getClientValidationFunction() !== '')
-			parent::registerClientScriptValidator();
+		if($this->getClientValidationFunction() !== '') {
+					parent::registerClientScriptValidator();
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php

Spacing +14 added lines, -14 removed lines

@@ -54,13 +54,13 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TWizardNavigationButtonStyle)
+		if ($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($this->_imageUrl === null && $style->_imageUrl !== null)
+			if ($this->_imageUrl === null && $style->_imageUrl !== null)
 				$this->_imageUrl = $style->_imageUrl;
-			if($this->_buttonText === null && $style->_buttonText !== null)
+			if ($this->_buttonText === null && $style->_buttonText !== null)
 				$this->_buttonText = $style->_buttonText;
-			if($this->_buttonType === null && $style->_buttonType !== null)
+			if ($this->_buttonType === null && $style->_buttonType !== null)
 				$this->_buttonType = $style->_buttonType;
 		}
 	}
@@ -74,13 +74,13 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TWizardNavigationButtonStyle)
+		if ($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($style->_imageUrl !== null)
+			if ($style->_imageUrl !== null)
 				$this->_imageUrl = $style->_imageUrl;
-			if($style->_buttonText !== null)
+			if ($style->_buttonText !== null)
 				$this->_buttonText = $style->_buttonText;
-			if($style->_buttonType !== null)
+			if ($style->_buttonType !== null)
 				$this->_buttonType = $style->_buttonType;
 		}
 	}
@@ -90,7 +90,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->_imageUrl === null?'':$this->_imageUrl;
+		return $this->_imageUrl === null ? '' : $this->_imageUrl;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function getButtonText()
 	{
-		return $this->_buttonText === null?'':$this->_buttonText;
+		return $this->_buttonText === null ? '' : $this->_buttonText;
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->_buttonType === null? TWizardNavigationButtonType::Button :$this->_buttonType;
+		return $this->_buttonType === null ? TWizardNavigationButtonType::Button : $this->_buttonType;
 	}
 
 	/**
@@ -139,12 +139,12 @@ 
 	 */
 	public function apply($button)
 	{
-		if($button instanceof TImageButton)
+		if ($button instanceof TImageButton)
 		{
-			if($button->getImageUrl() === '')
+			if ($button->getImageUrl() === '')
 				$button->setImageUrl($this->getImageUrl());
 		}
-		if($button->getText() === '')
+		if ($button->getText() === '')
 			$button->setText($this->getButtonText());
 		$button->getStyle()->mergeWith($this);
 	}

Braces +24 added lines, -16 removed lines

@@ -56,12 +56,15 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($this->_imageUrl === null && $style->_imageUrl !== null)
-				$this->_imageUrl = $style->_imageUrl;
-			if($this->_buttonText === null && $style->_buttonText !== null)
-				$this->_buttonText = $style->_buttonText;
-			if($this->_buttonType === null && $style->_buttonType !== null)
-				$this->_buttonType = $style->_buttonType;
+			if($this->_imageUrl === null && $style->_imageUrl !== null) {
+							$this->_imageUrl = $style->_imageUrl;
+			}
+			if($this->_buttonText === null && $style->_buttonText !== null) {
+							$this->_buttonText = $style->_buttonText;
+			}
+			if($this->_buttonType === null && $style->_buttonType !== null) {
+							$this->_buttonType = $style->_buttonType;
+			}
 		}
 	}
 
@@ -76,12 +79,15 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($style->_imageUrl !== null)
-				$this->_imageUrl = $style->_imageUrl;
-			if($style->_buttonText !== null)
-				$this->_buttonText = $style->_buttonText;
-			if($style->_buttonType !== null)
-				$this->_buttonType = $style->_buttonType;
+			if($style->_imageUrl !== null) {
+							$this->_imageUrl = $style->_imageUrl;
+			}
+			if($style->_buttonText !== null) {
+							$this->_buttonText = $style->_buttonText;
+			}
+			if($style->_buttonType !== null) {
+							$this->_buttonType = $style->_buttonType;
+			}
 		}
 	}
 
@@ -141,11 +147,13 @@ 
 	{
 		if($button instanceof TImageButton)
 		{
-			if($button->getImageUrl() === '')
-				$button->setImageUrl($this->getImageUrl());
+			if($button->getImageUrl() === '') {
+							$button->setImageUrl($this->getImageUrl());
+			}
+		}
+		if($button->getText() === '') {
+					$button->setText($this->getButtonText());
 		}
-		if($button->getText() === '')
-			$button->setText($this->getButtonText());
 		$button->getStyle()->mergeWith($this);
 	}
 }

framework/Web/UI/WebControls/TLiteral.php

Spacing +2 added lines, -2 removed lines

@@ -101,9 +101,9 @@
 	 */
 	public function render($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 		{
-			if($this->getEncode())
+			if ($this->getEncode())
 				$writer->write(THttpUtility::htmlEncode($text));
 			else
 				$writer->write($text);

Braces +7 added lines, -6 removed lines

@@ -103,13 +103,14 @@
 	{
 		if(($text = $this->getText()) !== '')
 		{
-			if($this->getEncode())
-				$writer->write(THttpUtility::htmlEncode($text));
-			else
-				$writer->write($text);
+			if($this->getEncode()) {
+							$writer->write(THttpUtility::htmlEncode($text));
+			} else {
+							$writer->write($text);
+			}
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
 

framework/Web/UI/WebControls/TDropDownListColumn.php

Spacing +13 added lines, -13 removed lines

@@ -77,7 +77,7 @@ 
 	{
 		parent::loadState($state);
 		$this->_stateLoaded = true;
-		if(!$this->_dataBound)
+		if (!$this->_dataBound)
 			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
 	}
 
@@ -100,7 +100,7 @@ 
 	public function addParsedObject($object)
 	{
 		// Do not add items from template if items are loaded from viewstate
-		if(!$this->_stateLoaded && ($object instanceof TListItem))
+		if (!$this->_stateLoaded && ($object instanceof TListItem))
 		{
 			$object->setSelected(false);
 			$index = $this->_listControl->getItems()->add($object);
@@ -254,7 +254,7 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if(!$this->_dataBound && $this->_listControl->getDataSource() !== null)
+		if (!$this->_dataBound && $this->_listControl->getDataSource() !== null)
 		{
 			$this->_listControl->setDataTextField($this->getListTextField());
 			$this->_listControl->setDataValueField($this->getListValueField());
@@ -262,10 +262,10 @@ 
 			$this->_listControl->dataBind();
 			$this->_dataBound = true;
 		}
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::EditItem:
-				if(!$this->getReadOnly())
+				if (!$this->getReadOnly())
 				{
 					$listControl = clone $this->_listControl;
 					$cell->getControls()->add($listControl);
@@ -274,13 +274,13 @@ 
 				}
 				else
 					$control = $cell;
-				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
-				if($this->getDataTextField() !== '' || $this->getDataValueField() !== '')
-					$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				if ($this->getDataTextField() !== '' || $this->getDataValueField() !== '')
+					$cell->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 				break;
 			default:
 				parent::initializeCell($cell, $columnIndex, $itemType);
@@ -297,23 +297,23 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($valueField = $this->getDataValueField()) !== '')
+		if (($valueField = $this->getDataValueField()) !== '')
 			$value = $this->getDataFieldValue($data, $valueField);
 		else
 			$value = '';
-		if(($textField = $this->getDataTextField()) !== '')
+		if (($textField = $this->getDataTextField()) !== '')
 		{
 			$text = $this->getDataFieldValue($data, $textField);
-			if($valueField === '')
+			if ($valueField === '')
 				$value = $text;
 			$formatString = $this->getDataTextFormatString();
 			$text = $this->formatDataValue($formatString, $text);
 		}
 		else
 			$text = $value;
-		if($sender instanceof TTableCell)
+		if ($sender instanceof TTableCell)
 			$sender->setText($text);
-		elseif($sender instanceof TDropDownList)
+		elseif ($sender instanceof TDropDownList)
 			$sender->setSelectedValue($value);
 	}
 }

Braces +23 added lines, -18 removed lines

@@ -77,8 +77,9 @@ 
 	{
 		parent::loadState($state);
 		$this->_stateLoaded = true;
-		if(!$this->_dataBound)
-			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
+		if(!$this->_dataBound) {
+					$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
+		}
 	}
 
 	/**
@@ -271,16 +272,17 @@ 
 					$cell->getControls()->add($listControl);
 					$cell->registerObject('DropDownList', $listControl);
 					$control = $listControl;
+				} else {
+									$control = $cell;
 				}
-				else
-					$control = $cell;
 				$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
-				if($this->getDataTextField() !== '' || $this->getDataValueField() !== '')
-					$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				if($this->getDataTextField() !== '' || $this->getDataValueField() !== '') {
+									$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				}
 				break;
 			default:
 				parent::initializeCell($cell, $columnIndex, $itemType);
@@ -297,24 +299,27 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($valueField = $this->getDataValueField()) !== '')
-			$value = $this->getDataFieldValue($data, $valueField);
-		else
-			$value = '';
+		if(($valueField = $this->getDataValueField()) !== '') {
+					$value = $this->getDataFieldValue($data, $valueField);
+		} else {
+					$value = '';
+		}
 		if(($textField = $this->getDataTextField()) !== '')
 		{
 			$text = $this->getDataFieldValue($data, $textField);
-			if($valueField === '')
-				$value = $text;
+			if($valueField === '') {
+							$value = $text;
+			}
 			$formatString = $this->getDataTextFormatString();
 			$text = $this->formatDataValue($formatString, $text);
+		} else {
+					$text = $value;
+		}
+		if($sender instanceof TTableCell) {
+					$sender->setText($text);
+		} elseif($sender instanceof TDropDownList) {
+					$sender->setSelectedValue($value);
 		}
-		else
-			$text = $value;
-		if($sender instanceof TTableCell)
-			$sender->setText($text);
-		elseif($sender instanceof TDropDownList)
-			$sender->setSelectedValue($value);
 	}
 }
 

framework/Web/UI/WebControls/TRepeaterItem.php

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TDataBoundControl.php

Spacing +34 added lines, -34 removed lines

@@ -98,7 +98,7 @@ 
 	public function setDataSourceID($value)
 	{
 		$dsid = $this->getViewState('DataSourceID', '');
-		if($dsid !== '' && $value === '')
+		if ($dsid !== '' && $value === '')
 			$this->_requiresBindToNull = true;
 		$this->setViewState('DataSourceID', $value, '');
 		$this->onDataSourceChanged();
@@ -122,7 +122,7 @@ 
 	{
 		$this->_currentViewValid = false;
 		$this->_currentDataSourceValid = false;
-		if($this->getInitialized())
+		if ($this->getInitialized())
 			$this->setRequiresDataBinding(true);
 	}
 
@@ -221,7 +221,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = 0;
 		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
@@ -240,7 +240,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 1)
+		if (($value = TPropertyValue::ensureInteger($value)) < 1)
 			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid', get_class($this));
 		$this->setViewState('PageSize', TPropertyValue::ensureInteger($value), 10);
 	}
@@ -269,7 +269,7 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid', get_class($this));
 		$this->setViewState('VirtualItemCount', $value, 0);
 	}
@@ -283,7 +283,7 @@ 
 	protected function setRequiresDataBinding($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if($value && $this->_prerendered)
+		if ($value && $this->_prerendered)
 		{
 			$this->_requiresDataBinding = true;
 			$this->ensureDataBound();
@@ -300,7 +300,7 @@ 
 	 */
 	protected function ensureDataBound()
 	{
-		if($this->_requiresDataBinding && ($this->getUsingDataSourceID() || $this->_requiresBindToNull))
+		if ($this->_requiresDataBinding && ($this->getUsingDataSourceID() || $this->_requiresBindToNull))
 		{
 			$this->dataBind();
 			$this->_requiresBindToNull = false;
@@ -333,19 +333,19 @@ 
 		$this->dataBindProperties();
 		$this->onDataBinding(null);
 
-		if(($view = $this->getDataSourceView()) !== null)
+		if (($view = $this->getDataSourceView()) !== null)
 			$data = $view->select($this->getSelectParameters());
 		else
 			$data = null;
 
-		if($data instanceof \Traversable)
+		if ($data instanceof \Traversable)
 		{
-			if($this->getAllowPaging())
+			if ($this->getAllowPaging())
 			{
 				$ds = $this->createPagedDataSource();
 				$ds->setDataSource($data);
 				$this->setViewState('PageCount', $ds->getPageCount());
-				if($ds->getCurrentPageIndex() >= $ds->getPageCount())
+				if ($ds->getCurrentPageIndex() >= $ds->getPageCount())
 				{
 					$ds->setCurrentPageIndex($ds->getPageCount() - 1);
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
@@ -364,22 +364,22 @@ 
 
 	public function dataSourceViewChanged($sender, $param)
 	{
-		if(!$this->_ignoreDataSourceViewChanged)
+		if (!$this->_ignoreDataSourceViewChanged)
 			$this->setRequiresDataBinding(true);
 	}
 
 	protected function getDataSourceView()
 	{
-		if(!$this->_currentViewValid)
+		if (!$this->_currentViewValid)
 		{
-			if($this->_currentView && $this->_currentViewIsFromDataSourceID)
-				$this->_currentView->detachEventHandler('DataSourceViewChanged', [$this,'dataSourceViewChanged']);
-			if(($dataSource = $this->determineDataSource()) !== null)
+			if ($this->_currentView && $this->_currentViewIsFromDataSourceID)
+				$this->_currentView->detachEventHandler('DataSourceViewChanged', [$this, 'dataSourceViewChanged']);
+			if (($dataSource = $this->determineDataSource()) !== null)
 			{
-				if(($view = $dataSource->getView($this->getDataMember())) === null)
+				if (($view = $dataSource->getView($this->getDataMember())) === null)
 					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid', $this->getDataMember());
-				if($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID())
-					$view->attachEventHandler('OnDataSourceViewChanged', [$this,'dataSourceViewChanged']);
+				if ($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID())
+					$view->attachEventHandler('OnDataSourceViewChanged', [$this, 'dataSourceViewChanged']);
 				$this->_currentView = $view;
 			}
 			else
@@ -391,18 +391,18 @@ 
 
 	protected function determineDataSource()
 	{
-		if(!$this->_currentDataSourceValid)
+		if (!$this->_currentDataSourceValid)
 		{
-			if(($dsid = $this->getDataSourceID()) !== '')
+			if (($dsid = $this->getDataSourceID()) !== '')
 			{
-				if(($dataSource = $this->getNamingContainer()->findControl($dsid)) === null)
+				if (($dataSource = $this->getNamingContainer()->findControl($dsid)) === null)
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent', $dsid);
-				elseif(!($dataSource instanceof IDataSource))
+				elseif (!($dataSource instanceof IDataSource))
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
 				else
 					$this->_currentDataSource = $dataSource;
 			}
-			elseif(($dataSource = $this->getDataSource()) !== null)
+			elseif (($dataSource = $this->getDataSource()) !== null)
 				$this->_currentDataSource = new TReadOnlyDataSource($dataSource, $this->getDataMember());
 			else
 				$this->_currentDataSource = null;
@@ -434,7 +434,7 @@ 
 	{
 		parent::onInit($param);
 		$page = $this->getPage();
-		$page->attachEventHandler('OnPreLoad', [$this,'pagePreLoad']);
+		$page->attachEventHandler('OnPreLoad', [$this, 'pagePreLoad']);
 	}
 
 	/**
@@ -447,7 +447,7 @@ 
 	{
 		$this->_initialized = true;
 		$isPostBack = $this->getPage()->getIsPostBack();
-		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
+		if (!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
 			$this->setRequiresDataBinding(true);
 	}
 
@@ -472,25 +472,25 @@ 
 	 */
 	protected function validateDataSource($value)
 	{
-		if(is_string($value))
+		if (is_string($value))
 		{
 			$list = new TList;
-			foreach(TPropertyValue::ensureArray($value) as $key => $value)
+			foreach (TPropertyValue::ensureArray($value) as $key => $value)
 			{
-				if(is_array($value))
+				if (is_array($value))
 					$list->add($value);
 				else
-					$list->add([$value,is_string($key)?$key:$value]);
+					$list->add([$value, is_string($key) ? $key : $value]);
 			}
 			return $list;
 		}
-		elseif(is_array($value))
+		elseif (is_array($value))
 			return new TMap($value);
-		elseif($value instanceof TDbDataReader) {
+		elseif ($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
 		}
-		elseif(($value instanceof \Traversable) || $value === null)
+		elseif (($value instanceof \Traversable) || $value === null)
 			return $value;
 		else
 			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));
@@ -508,7 +508,7 @@ 
 
 	public function getSelectParameters()
 	{
-		if(!$this->_parameters)
+		if (!$this->_parameters)
 			$this->_parameters = new TDataSourceSelectParameters;
 		return $this->_parameters;
 	}

Braces +66 added lines, -54 removed lines

@@ -98,8 +98,9 @@ 
 	public function setDataSourceID($value)
 	{
 		$dsid = $this->getViewState('DataSourceID', '');
-		if($dsid !== '' && $value === '')
-			$this->_requiresBindToNull = true;
+		if($dsid !== '' && $value === '') {
+					$this->_requiresBindToNull = true;
+		}
 		$this->setViewState('DataSourceID', $value, '');
 		$this->onDataSourceChanged();
 	}
@@ -122,8 +123,9 @@ 
 	{
 		$this->_currentViewValid = false;
 		$this->_currentDataSourceValid = false;
-		if($this->getInitialized())
-			$this->setRequiresDataBinding(true);
+		if($this->getInitialized()) {
+					$this->setRequiresDataBinding(true);
+		}
 	}
 
 	/**
@@ -221,8 +223,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = 0;
+		}
 		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
@@ -240,8 +243,9 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 1)
-			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid', get_class($this));
+		if(($value = TPropertyValue::ensureInteger($value)) < 1) {
+					throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid', get_class($this));
+		}
 		$this->setViewState('PageSize', TPropertyValue::ensureInteger($value), 10);
 	}
 
@@ -269,8 +273,9 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid', get_class($this));
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid', get_class($this));
+		}
 		$this->setViewState('VirtualItemCount', $value, 0);
 	}
 
@@ -287,9 +292,9 @@ 
 		{
 			$this->_requiresDataBinding = true;
 			$this->ensureDataBound();
+		} else {
+					$this->_requiresDataBinding = $value;
 		}
-		else
-			$this->_requiresDataBinding = $value;
 	}
 
 	/**
@@ -333,10 +338,11 @@ 
 		$this->dataBindProperties();
 		$this->onDataBinding(null);
 
-		if(($view = $this->getDataSourceView()) !== null)
-			$data = $view->select($this->getSelectParameters());
-		else
-			$data = null;
+		if(($view = $this->getDataSourceView()) !== null) {
+					$data = $view->select($this->getSelectParameters());
+		} else {
+					$data = null;
+		}
 
 		if($data instanceof \Traversable)
 		{
@@ -351,8 +357,7 @@ 
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
-			}
-			else
+			} else
 			{
 				$this->clearViewState('PageCount');
 				$this->performDataBinding($data);
@@ -364,26 +369,30 @@ 
 
 	public function dataSourceViewChanged($sender, $param)
 	{
-		if(!$this->_ignoreDataSourceViewChanged)
-			$this->setRequiresDataBinding(true);
+		if(!$this->_ignoreDataSourceViewChanged) {
+					$this->setRequiresDataBinding(true);
+		}
 	}
 
 	protected function getDataSourceView()
 	{
 		if(!$this->_currentViewValid)
 		{
-			if($this->_currentView && $this->_currentViewIsFromDataSourceID)
-				$this->_currentView->detachEventHandler('DataSourceViewChanged', [$this,'dataSourceViewChanged']);
+			if($this->_currentView && $this->_currentViewIsFromDataSourceID) {
+							$this->_currentView->detachEventHandler('DataSourceViewChanged', [$this,'dataSourceViewChanged']);
+			}
 			if(($dataSource = $this->determineDataSource()) !== null)
 			{
-				if(($view = $dataSource->getView($this->getDataMember())) === null)
-					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid', $this->getDataMember());
-				if($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID())
-					$view->attachEventHandler('OnDataSourceViewChanged', [$this,'dataSourceViewChanged']);
+				if(($view = $dataSource->getView($this->getDataMember())) === null) {
+									throw new TInvalidDataValueException('databoundcontrol_datamember_invalid', $this->getDataMember());
+				}
+				if($this->_currentViewIsFromDataSourceID = $this->getUsingDataSourceID()) {
+									$view->attachEventHandler('OnDataSourceViewChanged', [$this,'dataSourceViewChanged']);
+				}
 				$this->_currentView = $view;
+			} else {
+							$this->_currentView = null;
 			}
-			else
-				$this->_currentView = null;
 			$this->_currentViewValid = true;
 		}
 		return $this->_currentView;
@@ -395,17 +404,18 @@ 
 		{
 			if(($dsid = $this->getDataSourceID()) !== '')
 			{
-				if(($dataSource = $this->getNamingContainer()->findControl($dsid)) === null)
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent', $dsid);
-				elseif(!($dataSource instanceof IDataSource))
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
-				else
-					$this->_currentDataSource = $dataSource;
+				if(($dataSource = $this->getNamingContainer()->findControl($dsid)) === null) {
+									throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent', $dsid);
+				} elseif(!($dataSource instanceof IDataSource)) {
+									throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
+				} else {
+									$this->_currentDataSource = $dataSource;
+				}
+			} elseif(($dataSource = $this->getDataSource()) !== null) {
+							$this->_currentDataSource = new TReadOnlyDataSource($dataSource, $this->getDataMember());
+			} else {
+							$this->_currentDataSource = null;
 			}
-			elseif(($dataSource = $this->getDataSource()) !== null)
-				$this->_currentDataSource = new TReadOnlyDataSource($dataSource, $this->getDataMember());
-			else
-				$this->_currentDataSource = null;
 			$this->_currentDataSourceValid = true;
 		}
 		return $this->_currentDataSource;
@@ -447,8 +457,9 @@ 
 	{
 		$this->_initialized = true;
 		$isPostBack = $this->getPage()->getIsPostBack();
-		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound())))
-			$this->setRequiresDataBinding(true);
+		if(!$isPostBack || ($isPostBack && (!$this->getEnableViewState(true) || !$this->getIsDataBound()))) {
+					$this->setRequiresDataBinding(true);
+		}
 	}
 
 	/**
@@ -477,23 +488,23 @@ 
 			$list = new TList;
 			foreach(TPropertyValue::ensureArray($value) as $key => $value)
 			{
-				if(is_array($value))
-					$list->add($value);
-				else
-					$list->add([$value,is_string($key)?$key:$value]);
+				if(is_array($value)) {
+									$list->add($value);
+				} else {
+									$list->add([$value,is_string($key)?$key:$value]);
+				}
 			}
 			return $list;
-		}
-		elseif(is_array($value))
-			return new TMap($value);
-		elseif($value instanceof TDbDataReader) {
+		} elseif(is_array($value)) {
+					return new TMap($value);
+		} elseif($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
+		} elseif(($value instanceof \Traversable) || $value === null) {
+					return $value;
+		} else {
+					throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));
 		}
-		elseif(($value instanceof \Traversable) || $value === null)
-			return $value;
-		else
-			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));
 	}
 
 	public function getDataMember()
@@ -508,8 +519,9 @@ 
 
 	public function getSelectParameters()
 	{
-		if(!$this->_parameters)
-			$this->_parameters = new TDataSourceSelectParameters;
+		if(!$this->_parameters) {
+					$this->_parameters = new TDataSourceSelectParameters;
+		}
 		return $this->_parameters;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TAccordionView.php

Spacing +7 added lines, -7 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
+		if (!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
 			$this->getStyle()->setStyleField('display', 'none');
 
 		$this->getStyle()->mergeWith($this->getParent()->getViewStyle());
@@ -129,9 +129,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);
 	}
 
@@ -141,11 +141,11 @@ 
 	 */
 	public function renderHeader($writer)
 	{
-		if($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
+		if ($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
 		{
-			$writer->addAttribute('id', $this->getClientID() . '_0');
+			$writer->addAttribute('id', $this->getClientID().'_0');
 
-			$style = $this->getActive()?$this->getParent()->getActiveHeaderStyle():$this->getParent()->getHeaderStyle();
+			$style = $this->getActive() ? $this->getParent()->getActiveHeaderStyle() : $this->getParent()->getHeaderStyle();
 
 			$style->addAttributesToRender($writer);
 
@@ -165,7 +165,7 @@ 
 	protected function renderHeaderContent($writer)
 	{
 		$url = $this->getNavigateUrl();
-		if(($caption = $this->getCaption()) === '')
+		if (($caption = $this->getCaption()) === '')
 			$caption = ' ';
 
 		if ($url != '')

Braces +17 added lines, -12 removed lines

@@ -45,8 +45,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
-			$this->getStyle()->setStyleField('display', 'none');
+		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript()) {
+					$this->getStyle()->setStyleField('display', 'none');
+		}
 
 		$this->getStyle()->mergeWith($this->getParent()->getViewStyle());
 
@@ -129,10 +130,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
-			$writer->write($text);
-		elseif($this->getHasControls())
-			parent::renderContents($writer);
+		if(($text = $this->getText()) !== '') {
+					$writer->write($text);
+		} elseif($this->getHasControls()) {
+					parent::renderContents($writer);
+		}
 	}
 
 	/**
@@ -165,13 +167,16 @@ 
 	protected function renderHeaderContent($writer)
 	{
 		$url = $this->getNavigateUrl();
-		if(($caption = $this->getCaption()) === '')
-			$caption = ' ';
+		if(($caption = $this->getCaption()) === '') {
+					$caption = ' ';
+		}
 
-		if ($url != '')
-			$writer->write("<a href=\"{$url}\">");
+		if ($url != '') {
+					$writer->write("<a href=\"{$url}\">");
+		}
 		$writer->write("{$caption}");
-		if ($url != '')
-			$writer->write("</a>");
+		if ($url != '') {
+					$writer->write("</a>");
+		}
 	}
 }