pradosoft / prado

framework/Web/UI/WebControls/TRadioButtonList.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 	/**
 	 * Creates a control used for repetition (used as a template).
-	 * @return TControl the control to be repeated
+	 * @return TRadioButtonItem the control to be repeated
 	 */
 	protected function createRepeatedControl()
 	{

Spacing +4 added lines, -4 removed lines

@@ -54,14 +54,14 @@
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = isset($values[$key])?$values[$key]:'';
-		$oldSelection = $this->getSelectedIndex();
+		$value=isset($values[$key]) ? $values[$key] : '';
+		$oldSelection=$this->getSelectedIndex();
 		$this->ensureDataBound();
 		foreach($this->getItems() as $index => $item)
 		{
-			if($item->getEnabled() && $item->getValue() === $value)
+			if($item->getEnabled() && $item->getValue()===$value)
 			{
-				if($index === $oldSelection)
+				if($index===$oldSelection)
 					return false;
 				else
 				{

framework/Web/UI/WebControls/TRepeaterItemEventParameter.php

Doc Comments +1 added lines

@@ -34,6 +34,7 @@
 	/**
 	 * Constructor.
 	 * @param TControl repeater item related with the corresponding event
+	 * @param \Prado\TComponent $item
 	 */
 	public function __construct($item)
 	{

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 */
 	public function __construct($item)
 	{
-		$this->_item = $item;
+		$this->_item=$item;
 	}
 
 	/**

framework/Web/UI/WebControls/TRequiredFieldValidator.php

Doc Comments +9 added lines

@@ -96,6 +96,9 @@ 
 			return $this->validateStandardControl($control);
 	}
 
+	/**
+	 * @param TListControl $control
+	 */
 	private function validateListControl($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -108,6 +111,9 @@ 
 		return $count > 0;
 	}
 
+	/**
+	 * @param TRadioButton $control
+	 */
 	private function validateRadioButtonGroup($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -124,6 +130,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param \Prado\Web\UI\TControl $control
+	 */
 	private function validateStandardControl($control)
 	{
 		$initial = trim($this->getInitialValue());

Spacing +16 added lines, -16 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	protected function getControlPromptValue()
 	{
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
 			return $control->getPromptValue();
 		return '';
@@ -88,7 +88,7 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
 			return $this->validateListControl($control);
 		elseif($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
@@ -99,11 +99,11 @@ 
 
 	private function validateListControl($control)
 	{
-		$initial = trim($this->getInitialValue());
-		$count = 0;
+		$initial=trim($this->getInitialValue());
+		$count=0;
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected() && $item->getValue() != $initial)
+			if($item->getSelected() && $item->getValue()!=$initial)
 				$count++;
 		}
 		return $count > 0;
@@ -111,13 +111,13 @@ 
 
 	private function validateRadioButtonGroup($control)
 	{
-		$initial = trim($this->getInitialValue());
+		$initial=trim($this->getInitialValue());
 		foreach($control->getRadioButtonsInGroup() as $radio)
 		{
 			if($radio->getChecked())
 			{
-				if(strlen($value = $radio->getValue()) > 0)
-					return $value !== $initial;
+				if(strlen($value=$radio->getValue()) > 0)
+					return $value!==$initial;
 				else
 					return true;
 			}
@@ -127,9 +127,9 @@ 
 
 	private function validateStandardControl($control)
 	{
-		$initial = trim($this->getInitialValue());
-		$value = $this->getValidationValue($control);
-		return (is_bool($value) && $value) || trim($value) !== $initial;
+		$initial=trim($this->getInitialValue());
+		$value=$this->getValidationValue($control);
+		return (is_bool($value) && $value) || trim($value)!==$initial;
 	}
 
 	/**
@@ -138,13 +138,13 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$options['InitialValue'] = $this->getInitialValue();
-		$control = $this->getValidationTarget();
+		$options=parent::getClientScriptOptions();
+		$options['InitialValue']=$this->getInitialValue();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
-			$options['TotalItems'] = $control->getItemCount();
+			$options['TotalItems']=$control->getItemCount();
 		if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
-			$options['GroupName'] = $control->getGroupName();
+			$options['GroupName']=$control->getGroupName();
 		return $options;
 	}
 }

framework/Web/UI/WebControls/TValidatorClientSide.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@
 	 */
 	public function getObserveChanges()
 	{
-		$changes = $this->getOption('ObserveChanges');
-		return ($changes === null) ? true : $changes;
+		$changes=$this->getOption('ObserveChanges');
+		return ($changes===null) ? true : $changes;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TWizard.php

Doc Comments +8 added lines

@@ -663,6 +663,7 @@ 
 	 * This event is raised when a cancel navigation button is clicked in the
 	 * current active step.
 	 * @param TEventParameter event parameter
+	 * @param \Prado\Web\UI\TCommandEventParameter $param
 	 */
 	public function onCancelButtonClick($param)
 	{
@@ -676,6 +677,7 @@ 
 	 * This event is raised when a finish navigation button is clicked in the
 	 * current active step.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onCompleteButtonClick($param)
 	{
@@ -689,6 +691,7 @@ 
 	 * This event is raised when a next navigation button is clicked in the
 	 * current active step.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onNextButtonClick($param)
 	{
@@ -700,6 +703,7 @@ 
 	 * This event is raised when a previous navigation button is clicked in the
 	 * current active step.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onPreviousButtonClick($param)
 	{
@@ -710,6 +714,7 @@ 
 	 * Raises <b>OnSideBarButtonClick</b> event.
 	 * This event is raised when a link button in the side bar is clicked.
 	 * @param TWizardNavigationEventParameter event parameter
+	 * @param TWizardNavigationEventParameter $param
 	 */
 	public function onSideBarButtonClick($param)
 	{
@@ -738,6 +743,7 @@ 
 	 * This method should only be used by control developers.
 	 * It is invoked when a step is added into the step collection of the wizard.
 	 * @param TWizardStep wizard step to be added into multiview.
+	 * @param TWizardStep $step
 	 */
 	public function addedWizardStep($step)
 	{
@@ -1281,6 +1287,7 @@ 
 	 * Determines the index of the previous step based on history.
 	 * @param boolean whether the first item in the history stack should be popped
 	 * up after calling this method.
+	 * @param boolean $popStack
 	 */
 	protected function getPreviousStepIndex($popStack)
 	{
@@ -1324,6 +1331,7 @@ 
 
 	/**
 	 * @param integer index of the step
+	 * @param integer $index
 	 * @return boolean whether navigation to the specified step is allowed
 	 */
 	protected function allowNavigationToStep($index)

Spacing +205 added lines, -205 removed lines

@@ -84,19 +84,19 @@ 
 	/**
 	 * Navigation commands.
 	 */
-	const CMD_PREVIOUS = 'PreviousStep';
-	const CMD_NEXT = 'NextStep';
-	const CMD_CANCEL = 'Cancel';
-	const CMD_COMPLETE = 'Complete';
-	const CMD_MOVETO = 'MoveTo';
+	const CMD_PREVIOUS='PreviousStep';
+	const CMD_NEXT='NextStep';
+	const CMD_CANCEL='Cancel';
+	const CMD_COMPLETE='Complete';
+	const CMD_MOVETO='MoveTo';
 	/**
 	 * Side bar button ID
 	 */
-	const ID_SIDEBAR_BUTTON = 'SideBarButton';
+	const ID_SIDEBAR_BUTTON='SideBarButton';
 	/**
 	 * Side bar data list
 	 */
-	const ID_SIDEBAR_LIST = 'SideBarList';
+	const ID_SIDEBAR_LIST='SideBarList';
 
 	/**
 	 * @var TMultiView multiview that contains the wizard steps
@@ -157,7 +157,7 @@ 
 	/**
 	 * @var boolean whether ActiveStepIndex was already set
 	 */
-	private $_activeStepIndexSet = false;
+	private $_activeStepIndexSet=false;
 	/**
 	 * @var TDataList side bar data list.
 	 */
@@ -165,7 +165,7 @@ 
 	/**
 	 * @var boolean whether navigation should be cancelled (a status set in OnSideBarButtonClick)
 	 */
-	private $_cancelNavigation = false;
+	private $_cancelNavigation=false;
 
 	/**
 	 * @return string tag name for the wizard
@@ -201,7 +201,7 @@ 
 	 */
 	public function setActiveStep($step)
 	{
-		if(($index = $this->getWizardSteps()->indexOf($step)) < 0)
+		if(($index=$this->getWizardSteps()->indexOf($step)) < 0)
 			throw new TInvalidOperationException('wizard_step_invalid');
 		$this->setActiveStepIndex($index);
 	}
@@ -219,13 +219,13 @@ 
 	 */
 	public function setActiveStepIndex($value)
 	{
-		$value = TPropertyValue::ensureInteger($value);
-		$multiView = $this->getMultiView();
-		if($multiView->getActiveViewIndex() !== $value)
+		$value=TPropertyValue::ensureInteger($value);
+		$multiView=$this->getMultiView();
+		if($multiView->getActiveViewIndex()!==$value)
 		{
 			$multiView->setActiveViewIndex($value);
-			$this->_activeStepIndexSet = true;
-			if($this->_sideBarDataList !== null && $this->getSideBarTemplate() !== null)
+			$this->_activeStepIndexSet=true;
+			if($this->_sideBarDataList!==null && $this->getSideBarTemplate()!==null)
 			{
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -238,8 +238,8 @@ 
 	 */
 	public function getWizardSteps()
 	{
-		if($this->_wizardSteps === null)
-			$this->_wizardSteps = new TWizardStepCollection($this);
+		if($this->_wizardSteps===null)
+			$this->_wizardSteps=new TWizardStepCollection($this);
 		return $this->_wizardSteps;
 	}
 
@@ -288,7 +288,7 @@ 
 	 */
 	public function setStartNavigationTemplate($value)
 	{
-		$this->_startNavigationTemplate = $value;
+		$this->_startNavigationTemplate=$value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -305,7 +305,7 @@ 
 	 */
 	public function setStepNavigationTemplate($value)
 	{
-		$this->_stepNavigationTemplate = $value;
+		$this->_stepNavigationTemplate=$value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -322,7 +322,7 @@ 
 	 */
 	public function setFinishNavigationTemplate($value)
 	{
-		$this->_finishNavigationTemplate = $value;
+		$this->_finishNavigationTemplate=$value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -339,7 +339,7 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		$this->_headerTemplate = $value;
+		$this->_headerTemplate=$value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -356,7 +356,7 @@ 
 	 */
 	public function setSideBarTemplate($value)
 	{
-		$this->_sideBarTemplate = $value;
+		$this->_sideBarTemplate=$value;
 		$this->requiresControlsRecreation();
 	}
 
@@ -416,9 +416,9 @@ 
 	 */
 	public function getSideBarButtonStyle()
 	{
-		if(($style = $this->getViewState('SideBarButtonStyle', null)) === null)
+		if(($style=$this->getViewState('SideBarButtonStyle', null))===null)
 		{
-			$style = new TStyle;
+			$style=new TStyle;
 			$this->setViewState('SideBarButtonStyle', $style, null);
 		}
 		return $style;
@@ -429,9 +429,9 @@ 
 	 */
 	public function getNavigationButtonStyle()
 	{
-		if(($style = $this->getViewState('NavigationButtonStyle', null)) === null)
+		if(($style=$this->getViewState('NavigationButtonStyle', null))===null)
 		{
-			$style = new TStyle;
+			$style=new TStyle;
 			$this->setViewState('NavigationButtonStyle', $style, null);
 		}
 		return $style;
@@ -442,9 +442,9 @@ 
 	 */
 	public function getStartNextButtonStyle()
 	{
-		if(($style = $this->getViewState('StartNextButtonStyle', null)) === null)
+		if(($style=$this->getViewState('StartNextButtonStyle', null))===null)
 		{
-			$style = new TWizardNavigationButtonStyle;
+			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
 			$this->setViewState('StartNextButtonStyle', $style, null);
 		}
@@ -456,9 +456,9 @@ 
 	 */
 	public function getStepNextButtonStyle()
 	{
-		if(($style = $this->getViewState('StepNextButtonStyle', null)) === null)
+		if(($style=$this->getViewState('StepNextButtonStyle', null))===null)
 		{
-			$style = new TWizardNavigationButtonStyle;
+			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
 			$this->setViewState('StepNextButtonStyle', $style, null);
 		}
@@ -470,9 +470,9 @@ 
 	 */
 	public function getStepPreviousButtonStyle()
 	{
-		if(($style = $this->getViewState('StepPreviousButtonStyle', null)) === null)
+		if(($style=$this->getViewState('StepPreviousButtonStyle', null))===null)
 		{
-			$style = new TWizardNavigationButtonStyle;
+			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
 			$this->setViewState('StepPreviousButtonStyle', $style, null);
 		}
@@ -484,9 +484,9 @@ 
 	 */
 	public function getFinishCompleteButtonStyle()
 	{
-		if(($style = $this->getViewState('FinishCompleteButtonStyle', null)) === null)
+		if(($style=$this->getViewState('FinishCompleteButtonStyle', null))===null)
 		{
-			$style = new TWizardNavigationButtonStyle;
+			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Complete');
 			$this->setViewState('FinishCompleteButtonStyle', $style, null);
 		}
@@ -498,9 +498,9 @@ 
 	 */
 	public function getFinishPreviousButtonStyle()
 	{
-		if(($style = $this->getViewState('FinishPreviousButtonStyle', null)) === null)
+		if(($style=$this->getViewState('FinishPreviousButtonStyle', null))===null)
 		{
-			$style = new TWizardNavigationButtonStyle;
+			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
 			$this->setViewState('FinishPreviousButtonStyle', $style, null);
 		}
@@ -512,9 +512,9 @@ 
 	 */
 	public function getCancelButtonStyle()
 	{
-		if(($style = $this->getViewState('CancelButtonStyle', null)) === null)
+		if(($style=$this->getViewState('CancelButtonStyle', null))===null)
 		{
-			$style = new TWizardNavigationButtonStyle;
+			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Cancel');
 			$this->setViewState('CancelButtonStyle', $style, null);
 		}
@@ -526,9 +526,9 @@ 
 	 */
 	public function getSideBarStyle()
 	{
-		if(($style = $this->getViewState('SideBarStyle', null)) === null)
+		if(($style=$this->getViewState('SideBarStyle', null))===null)
 		{
-			$style = new TPanelStyle;
+			$style=new TPanelStyle;
 			$this->setViewState('SideBarStyle', $style, null);
 		}
 		return $style;
@@ -539,9 +539,9 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
-			$style = new TPanelStyle;
+			$style=new TPanelStyle;
 			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
@@ -552,9 +552,9 @@ 
 	 */
 	public function getStepStyle()
 	{
-		if(($style = $this->getViewState('StepStyle', null)) === null)
+		if(($style=$this->getViewState('StepStyle', null))===null)
 		{
-			$style = new TPanelStyle;
+			$style=new TPanelStyle;
 			$this->setViewState('StepStyle', $style, null);
 		}
 		return $style;
@@ -565,9 +565,9 @@ 
 	 */
 	public function getNavigationStyle()
 	{
-		if(($style = $this->getViewState('NavigationStyle', null)) === null)
+		if(($style=$this->getViewState('NavigationStyle', null))===null)
 		{
-			$style = new TPanelStyle;
+			$style=new TPanelStyle;
 			$this->setViewState('NavigationStyle', $style, null);
 		}
 		return $style;
@@ -659,7 +659,7 @@ 
 	public function onCancelButtonClick($param)
 	{
 		$this->raiseEvent('OnCancelButtonClick', $this, $param);
-		if(($url = $this->getCancelDestinationUrl()) !== '')
+		if(($url=$this->getCancelDestinationUrl())!=='')
 			$this->getResponse()->redirect($url);
 	}
 
@@ -672,7 +672,7 @@ 
 	public function onCompleteButtonClick($param)
 	{
 		$this->raiseEvent('OnCompleteButtonClick', $this, $param);
-		if(($url = $this->getFinishDestinationUrl()) !== '')
+		if(($url=$this->getFinishDestinationUrl())!=='')
 			$this->getResponse()->redirect($url);
 	}
 
@@ -715,11 +715,11 @@ 
 	 */
 	public function getMultiView()
 	{
-		if($this->_multiView === null)
+		if($this->_multiView===null)
 		{
-			$this->_multiView = new TMultiView;
+			$this->_multiView=new TMultiView;
 			$this->_multiView->setID('WizardMultiView');
-			$this->_multiView->attachEventHandler('OnActiveViewChanged', [$this,'onActiveStepChanged']);
+			$this->_multiView->attachEventHandler('OnActiveViewChanged', [$this, 'onActiveStepChanged']);
 			$this->_multiView->ignoreBubbleEvents();
 		}
 		return $this->_multiView;
@@ -733,7 +733,7 @@ 
 	 */
 	public function addedWizardStep($step)
 	{
-		if(($wizard = $step->getWizard()) !== null)
+		if(($wizard=$step->getWizard())!==null)
 			$wizard->getWizardSteps()->remove($step);
 		$step->setWizard($this);
 		$this->wizardStepsChanged();
@@ -771,9 +771,9 @@ 
 	 */
 	public function saveState()
 	{
-		$index = $this->getActiveStepIndex();
-		$history = $this->getHistory();
-		if(!$history->getCount() || $history->peek() !== $index)
+		$index=$this->getActiveStepIndex();
+		$history=$this->getHistory();
+		if(!$history->getCount() || $history->peek()!==$index)
 			$history->push($index);
 	}
 
@@ -837,9 +837,9 @@ 
 	 */
 	protected function applyHeaderProperties()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) !== null)
+		if(($style=$this->getViewState('HeaderStyle', null))!==null)
 			$this->_header->getStyle()->mergeWith($style);
-		if($this->getHeaderTemplate() === null)
+		if($this->getHeaderTemplate()===null)
 		{
 			$this->_header->getControls()->clear();
 			$this->_header->getControls()->add($this->getHeaderText());
@@ -852,21 +852,21 @@ 
 	protected function applySideBarProperties()
 	{
 		$this->_sideBar->setVisible($this->getShowSideBar());
-		if($this->_sideBarDataList !== null && $this->getShowSideBar())
+		if($this->_sideBarDataList!==null && $this->getShowSideBar())
 		{
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 			$this->_sideBarDataList->dataBind();
-			if(($style = $this->getViewState('SideBarButtonStyle', null)) !== null)
+			if(($style=$this->getViewState('SideBarButtonStyle', null))!==null)
 			{
 				foreach($this->_sideBarDataList->getItems() as $item)
 				{
-					if(($button = $item->findControl('SideBarButton')) !== null)
+					if(($button=$item->findControl('SideBarButton'))!==null)
 						$button->getStyle()->mergeWith($style);
 				}
 			}
 		}
-		if(($style = $this->getViewState('SideBarStyle', null)) !== null)
+		if(($style=$this->getViewState('SideBarStyle', null))!==null)
 			$this->_sideBar->getStyle()->mergeWith($style);
 	}
 
@@ -875,7 +875,7 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style = $this->getViewState('StepStyle', null)) !== null)
+		if(($style=$this->getViewState('StepStyle', null))!==null)
 			$this->_stepContent->getStyle()->mergeWith($style);
 	}
 
@@ -884,9 +884,9 @@ 
 	 */
 	protected function applyNavigationProperties()
 	{
-		$wizardSteps = $this->getWizardSteps();
-		$activeStep = $this->getActiveStep();
-		$activeStepIndex = $this->getActiveStepIndex();
+		$wizardSteps=$this->getWizardSteps();
+		$activeStep=$this->getActiveStep();
+		$activeStepIndex=$this->getActiveStepIndex();
 
 		if(!$this->_navigation)
 			return;
@@ -897,103 +897,103 @@ 
 		}
 
 		// set visibility of different types of navigation panel
-		$showStandard = true;
+		$showStandard=true;
 		foreach($wizardSteps as $step)
 		{
-			if(($step instanceof TTemplatedWizardStep) && ($container = $step->getNavigationContainer()) !== null)
+			if(($step instanceof TTemplatedWizardStep) && ($container=$step->getNavigationContainer())!==null)
 			{
-				if($activeStep === $step)
+				if($activeStep===$step)
 				{
 					$container->setVisible(true);
-					$showStandard = false;
+					$showStandard=false;
 				}
 				else
 					$container->setVisible(false);
 			}
 		}
-		$activeStepType = $this->getStepType($activeStep);
-		if($activeStepType === TWizardStepType::Complete)
+		$activeStepType=$this->getStepType($activeStep);
+		if($activeStepType===TWizardStepType::Complete)
 		{
 			$this->_sideBar->setVisible(false);
 			$this->_header->setVisible(false);
 		}
-		$this->_startNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Start);
-		$this->_stepNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Step);
-		$this->_finishNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Finish);
+		$this->_startNavigation->setVisible($showStandard && $activeStepType===TWizardStepType::Start);
+		$this->_stepNavigation->setVisible($showStandard && $activeStepType===TWizardStepType::Step);
+		$this->_finishNavigation->setVisible($showStandard && $activeStepType===TWizardStepType::Finish);
 
-		if(($navigationStyle = $this->getViewState('NavigationStyle', null)) !== null)
+		if(($navigationStyle=$this->getViewState('NavigationStyle', null))!==null)
 			$this->_navigation->getStyle()->mergeWith($navigationStyle);
 
-		$displayCancelButton = $this->getShowCancelButton();
-		$cancelButtonStyle = $this->getCancelButtonStyle();
-		$buttonStyle = $this->getViewState('NavigationButtonStyle', null);
-		if($buttonStyle !== null)
+		$displayCancelButton=$this->getShowCancelButton();
+		$cancelButtonStyle=$this->getCancelButtonStyle();
+		$buttonStyle=$this->getViewState('NavigationButtonStyle', null);
+		if($buttonStyle!==null)
 			$cancelButtonStyle->mergeWith($buttonStyle);
 
 		// apply styles to start navigation buttons
-		if(($cancelButton = $this->_startNavigation->getCancelButton()) !== null)
+		if(($cancelButton=$this->_startNavigation->getCancelButton())!==null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button = $this->_startNavigation->getNextButton()) !== null)
+		if(($button=$this->_startNavigation->getNextButton())!==null)
 		{
 			$button->setVisible(true);
-			$style = $this->getStartNextButtonStyle();
-			if($buttonStyle !== null)
+			$style=$this->getStartNextButtonStyle();
+			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Start)
+			if($activeStepType===TWizardStepType::Start)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to finish navigation buttons
-		if(($cancelButton = $this->_finishNavigation->getCancelButton()) !== null)
+		if(($cancelButton=$this->_finishNavigation->getCancelButton())!==null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button = $this->_finishNavigation->getPreviousButton()) !== null)
+		if(($button=$this->_finishNavigation->getPreviousButton())!==null)
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
-			$style = $this->getFinishPreviousButtonStyle();
-			if($buttonStyle !== null)
+			$style=$this->getFinishPreviousButtonStyle();
+			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
 		}
-		if(($button = $this->_finishNavigation->getCompleteButton()) !== null)
+		if(($button=$this->_finishNavigation->getCompleteButton())!==null)
 		{
 			$button->setVisible(true);
-			$style = $this->getFinishCompleteButtonStyle();
-			if($buttonStyle !== null)
+			$style=$this->getFinishCompleteButtonStyle();
+			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Finish)
+			if($activeStepType===TWizardStepType::Finish)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to step navigation buttons
-		if(($cancelButton = $this->_stepNavigation->getCancelButton()) !== null)
+		if(($cancelButton=$this->_stepNavigation->getCancelButton())!==null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button = $this->_stepNavigation->getPreviousButton()) !== null)
+		if(($button=$this->_stepNavigation->getPreviousButton())!==null)
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
-			$style = $this->getStepPreviousButtonStyle();
-			if($buttonStyle !== null)
+			$style=$this->getStepPreviousButtonStyle();
+			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
 		}
-		if(($button = $this->_stepNavigation->getNextButton()) !== null)
+		if(($button=$this->_stepNavigation->getNextButton())!==null)
 		{
 			$button->setVisible(true);
-			$style = $this->getStepNextButtonStyle();
-			if($buttonStyle !== null)
+			$style=$this->getStepNextButtonStyle();
+			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Step)
+			if($activeStepType===TWizardStepType::Step)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 	}
@@ -1003,9 +1003,9 @@ 
 	 */
 	protected function getHistory()
 	{
-		if(($history = $this->getControlState('History', null)) === null)
+		if(($history=$this->getControlState('History', null))===null)
 		{
-			$history = new TStack;
+			$history=new TStack;
 			$this->setControlState('History', $history);
 		}
 		return $history;
@@ -1018,17 +1018,17 @@ 
 	 */
 	protected function getStepType($wizardStep)
 	{
-		if(($type = $wizardStep->getStepType()) === TWizardStepType::Auto)
+		if(($type=$wizardStep->getStepType())===TWizardStepType::Auto)
 		{
-			$steps = $this->getWizardSteps();
-			if(($index = $steps->indexOf($wizardStep)) >= 0)
+			$steps=$this->getWizardSteps();
+			if(($index=$steps->indexOf($wizardStep)) >= 0)
 			{
-				$stepCount = $steps->getCount();
-				if($stepCount === 1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType() === TWizardStepType::Complete))
+				$stepCount=$steps->getCount();
+				if($stepCount===1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType()===TWizardStepType::Complete))
 					return TWizardStepType::Finish;
-				elseif($index === 0)
+				elseif($index===0)
 					return TWizardStepType::Start;
-				elseif($index === $stepCount - 1)
+				elseif($index===$stepCount - 1)
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
@@ -1046,14 +1046,14 @@ 
 	protected function reset()
 	{
 		$this->getControls()->clear();
-		$this->_header = null;
-		$this->_stepContent = null;
-		$this->_sideBar = null;
-		$this->_sideBarDataList = null;
-		$this->_navigation = null;
-		$this->_startNavigation = null;
-		$this->_stepNavigation = null;
-		$this->_finishNavigation = null;
+		$this->_header=null;
+		$this->_stepContent=null;
+		$this->_sideBar=null;
+		$this->_sideBarDataList=null;
+		$this->_navigation=null;
+		$this->_startNavigation=null;
+		$this->_stepNavigation=null;
+		$this->_finishNavigation=null;
 	}
 
 	/**
@@ -1074,8 +1074,8 @@ 
 	 */
 	protected function createHeader()
 	{
-		$this->_header = new TPanel;
-		if(($template = $this->getHeaderTemplate()) !== null)
+		$this->_header=new TPanel;
+		if(($template=$this->getHeaderTemplate())!==null)
 			$template->instantiateIn($this->_header);
 		else
 			$this->_header->getControls()->add($this->getHeaderText());
@@ -1089,16 +1089,16 @@ 
 	{
 		if($this->getShowSideBar())
 		{
-			if(($template = $this->getSideBarTemplate()) === null)
-				$template = new TWizardSideBarTemplate;
-			$this->_sideBar = new TPanel;
+			if(($template=$this->getSideBarTemplate())===null)
+				$template=new TWizardSideBarTemplate;
+			$this->_sideBar=new TPanel;
 			$template->instantiateIn($this->_sideBar);
 			$this->getControls()->add($this->_sideBar);
 
-			if(($this->_sideBarDataList = $this->_sideBar->findControl(self::ID_SIDEBAR_LIST)) !== null)
+			if(($this->_sideBarDataList=$this->_sideBar->findControl(self::ID_SIDEBAR_LIST))!==null)
 			{
-				$this->_sideBarDataList->attachEventHandler('OnItemCommand', [$this,'dataListItemCommand']);
-				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', [$this,'dataListItemDataBound']);
+				$this->_sideBarDataList->attachEventHandler('OnItemCommand', [$this, 'dataListItemCommand']);
+				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', [$this, 'dataListItemDataBound']);
 				$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -1106,7 +1106,7 @@ 
 		}
 		else
 		{
-			$this->_sideBar = new TPanel;
+			$this->_sideBar=new TPanel;
 			$this->getControls()->add($this->_sideBar);
 		}
 	}
@@ -1120,23 +1120,23 @@ 
 	 */
 	public function dataListItemCommand($sender, $param)
 	{
-		$item = $param->getItem();
-		if($param->getCommandName() === self::CMD_MOVETO)
+		$item=$param->getItem();
+		if($param->getCommandName()===self::CMD_MOVETO)
 		{
-			$stepIndex = $this->getActiveStepIndex();
-			$newStepIndex = TPropertyValue::ensureInteger($param->getCommandParameter());
-			$navParam = new TWizardNavigationEventParameter($stepIndex);
+			$stepIndex=$this->getActiveStepIndex();
+			$newStepIndex=TPropertyValue::ensureInteger($param->getCommandParameter());
+			$navParam=new TWizardNavigationEventParameter($stepIndex);
 			$navParam->setNextStepIndex($newStepIndex);
 
 			// if the button clicked causes validation which fails,
 			// by default we will cancel navigation to the new step
-			$button = $param->getCommandSource();
-			if(($button instanceof \Prado\Web\UI\IButtonControl) && $button->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
+			$button=$param->getCommandSource();
+			if(($button instanceof \Prado\Web\UI\IButtonControl) && $button->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
 				$navParam->setCancelNavigation(true);
 
-			$this->_activeStepIndexSet = false;
+			$this->_activeStepIndexSet=false;
 			$this->onSideBarButtonClick($navParam);
-			$this->_cancelNavigation = $navParam->getCancelNavigation();
+			$this->_cancelNavigation=$navParam->getCancelNavigation();
 			if(!$this->_cancelNavigation)
 			{
 				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
@@ -1156,20 +1156,20 @@ 
 	 */
 	public function dataListItemDataBound($sender, $param)
 	{
-		$item = $param->getItem();
-		$itemType = $item->getItemType();
-		if($itemType === 'Item' || $itemType === 'AlternatingItem' || $itemType === 'SelectedItem' || $itemType === 'EditItem')
+		$item=$param->getItem();
+		$itemType=$item->getItemType();
+		if($itemType==='Item' || $itemType==='AlternatingItem' || $itemType==='SelectedItem' || $itemType==='EditItem')
 		{
-			if(($button = $item->findControl(self::ID_SIDEBAR_BUTTON)) !== null)
+			if(($button=$item->findControl(self::ID_SIDEBAR_BUTTON))!==null)
 			{
-				$step = $item->getData();
-				if(($this->getStepType($step) === TWizardStepType::Complete))
+				$step=$item->getData();
+				if(($this->getStepType($step)===TWizardStepType::Complete))
 					$button->setEnabled(false);
-				if(($title = $step->getTitle()) !== '')
+				if(($title=$step->getTitle())!=='')
 					$button->setText($title);
 				else
 					$button->setText($step->getID(false));
-				$index = $this->getWizardSteps()->indexOf($step);
+				$index=$this->getWizardSteps()->indexOf($step);
 				$button->setCommandName(self::CMD_MOVETO);
 				$button->setCommandParameter("$index");
 			}
@@ -1186,8 +1186,8 @@ 
 			if($step instanceof TTemplatedWizardStep)
 				$step->ensureChildControls();
 		}
-		$multiView = $this->getMultiView();
-		$this->_stepContent = new TPanel;
+		$multiView=$this->getMultiView();
+		$this->_stepContent=new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
 		if($multiView->getViews()->getCount())
@@ -1199,23 +1199,23 @@ 
 	 */
 	protected function createNavigation()
 	{
-		$this->_navigation = new TPanel;
+		$this->_navigation=new TPanel;
 		$this->getControls()->add($this->_navigation);
-		$controls = $this->_navigation->getControls();
+		$controls=$this->_navigation->getControls();
 		foreach($this->getWizardSteps() as $step)
 		{
 			if($step instanceof TTemplatedWizardStep)
 			{
 				$step->instantiateNavigationTemplate();
-				if(($panel = $step->getNavigationContainer()) !== null)
+				if(($panel=$step->getNavigationContainer())!==null)
 					$controls->add($panel);
 			}
 		}
-		$this->_startNavigation = $this->createStartNavigation();
+		$this->_startNavigation=$this->createStartNavigation();
 		$controls->add($this->_startNavigation);
-		$this->_stepNavigation = $this->createStepNavigation();
+		$this->_stepNavigation=$this->createStepNavigation();
 		$controls->add($this->_stepNavigation);
-		$this->_finishNavigation = $this->createFinishNavigation();
+		$this->_finishNavigation=$this->createFinishNavigation();
 		$controls->add($this->_finishNavigation);
 	}
 
@@ -1224,9 +1224,9 @@ 
 	 */
 	protected function createStartNavigation()
 	{
-		if(($template = $this->getStartNavigationTemplate()) === null)
-			$template = new TWizardStartNavigationTemplate($this);
-		$navigation = new TWizardNavigationContainer;
+		if(($template=$this->getStartNavigationTemplate())===null)
+			$template=new TWizardStartNavigationTemplate($this);
+		$navigation=new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
 	}
@@ -1236,9 +1236,9 @@ 
 	 */
 	protected function createStepNavigation()
 	{
-		if(($template = $this->getStepNavigationTemplate()) === null)
-			$template = new TWizardStepNavigationTemplate($this);
-		$navigation = new TWizardNavigationContainer;
+		if(($template=$this->getStepNavigationTemplate())===null)
+			$template=new TWizardStepNavigationTemplate($this);
+		$navigation=new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
 	}
@@ -1248,9 +1248,9 @@ 
 	 */
 	protected function createFinishNavigation()
 	{
-		if(($template = $this->getFinishNavigationTemplate()) === null)
-			$template = new TWizardFinishNavigationTemplate($this);
-		$navigation = new TWizardNavigationContainer;
+		if(($template=$this->getFinishNavigationTemplate())===null)
+			$template=new TWizardFinishNavigationTemplate($this);
+		$navigation=new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
 	}
@@ -1261,7 +1261,7 @@ 
 	 */
 	public function wizardStepsChanged()
 	{
-		if($this->_sideBarDataList !== null)
+		if($this->_sideBarDataList!==null)
 		{
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
@@ -1276,28 +1276,28 @@ 
 	 */
 	protected function getPreviousStepIndex($popStack)
 	{
-		$history = $this->getHistory();
+		$history=$this->getHistory();
 		if($history->getCount() >= 0)
 		{
-			$activeStepIndex = $this->getActiveStepIndex();
-			$previousStepIndex = -1;
+			$activeStepIndex=$this->getActiveStepIndex();
+			$previousStepIndex=-1;
 			if($popStack)
 			{
-				$previousStepIndex = $history->pop();
-				if($activeStepIndex === $previousStepIndex && $history->getCount() > 0)
-					$previousStepIndex = $history->pop();
+				$previousStepIndex=$history->pop();
+				if($activeStepIndex===$previousStepIndex && $history->getCount() > 0)
+					$previousStepIndex=$history->pop();
 			}
 			else
 			{
-				$previousStepIndex = $history->peek();
-				if($activeStepIndex === $previousStepIndex && $history->getCount() > 1)
+				$previousStepIndex=$history->peek();
+				if($activeStepIndex===$previousStepIndex && $history->getCount() > 1)
 				{
-					$saveIndex = $history->pop();
-					$previousStepIndex = $history->peek();
+					$saveIndex=$history->pop();
+					$previousStepIndex=$history->peek();
 					$history->push($saveIndex);
 				}
 			}
-			return $activeStepIndex === $previousStepIndex ? -1 : $previousStepIndex;
+			return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex;
 		}
 		else
 			return -1;
@@ -1308,7 +1308,7 @@ 
 	 */
 	protected function allowNavigationToPreviousStep()
 	{
-		if(($index = $this->getPreviousStepIndex(false)) !== -1)
+		if(($index=$this->getPreviousStepIndex(false))!==-1)
 			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
 		else
 			return false;
@@ -1338,83 +1338,83 @@ 
 	{
 		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
-			$command = $param->getCommandName();
-			if(strcasecmp($command, self::CMD_CANCEL) === 0)
+			$command=$param->getCommandName();
+			if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelButtonClick($param);
 				return true;
 			}
 
-			$type = $this->getStepType($this->getActiveStep());
-			$index = $this->getActiveStepIndex();
-			$navParam = new TWizardNavigationEventParameter($index);
-			if(($sender instanceof \Prado\Web\UI\IButtonControl) && $sender->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
+			$type=$this->getStepType($this->getActiveStep());
+			$index=$this->getActiveStepIndex();
+			$navParam=new TWizardNavigationEventParameter($index);
+			if(($sender instanceof \Prado\Web\UI\IButtonControl) && $sender->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
 				$navParam->setCancelNavigation(true);
 
-			$handled = false;
-			$movePrev = false;
-			$this->_activeStepIndexSet = false;
+			$handled=false;
+			$movePrev=false;
+			$this->_activeStepIndexSet=false;
 
-			if(strcasecmp($command, self::CMD_NEXT) === 0)
+			if(strcasecmp($command, self::CMD_NEXT)===0)
 			{
-				if($type !== TWizardStepType::Start && $type !== TWizardStepType::Step)
+				if($type!==TWizardStepType::Start && $type!==TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
 				if($index < $this->getWizardSteps()->getCount() - 1)
 					$navParam->setNextStepIndex($index + 1);
 				$this->onNextButtonClick($navParam);
-				$handled = true;
+				$handled=true;
 			}
-			elseif(strcasecmp($command, self::CMD_PREVIOUS) === 0)
+			elseif(strcasecmp($command, self::CMD_PREVIOUS)===0)
 			{
-				if($type !== TWizardStepType::Finish && $type !== TWizardStepType::Step)
+				if($type!==TWizardStepType::Finish && $type!==TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
-				$movePrev = true;
-				if(($prevIndex = $this->getPreviousStepIndex(false)) >= 0)
+				$movePrev=true;
+				if(($prevIndex=$this->getPreviousStepIndex(false)) >= 0)
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
-				$handled = true;
+				$handled=true;
 			}
-			elseif(strcasecmp($command, self::CMD_COMPLETE) === 0)
+			elseif(strcasecmp($command, self::CMD_COMPLETE)===0)
 			{
-				if($type !== TWizardStepType::Finish)
+				if($type!==TWizardStepType::Finish)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
 				if($index < $this->getWizardSteps()->getCount() - 1)
 					$navParam->setNextStepIndex($index + 1);
 				$this->onCompleteButtonClick($navParam);
-				$handled = true;
+				$handled=true;
 			}
-			elseif(strcasecmp($command, self::CMD_MOVETO) === 0)
+			elseif(strcasecmp($command, self::CMD_MOVETO)===0)
 			{
 				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
-				$requestedStep = $param->getCommandParameter();
-				if (!is_numeric($requestedStep))
+				$requestedStep=$param->getCommandParameter();
+				if(!is_numeric($requestedStep))
 				{
-					$requestedIndex = -1;
-					foreach ($this->getWizardSteps() as $index => $step)
-						if ($step->getId() === $requestedStep)
+					$requestedIndex=-1;
+					foreach($this->getWizardSteps() as $index => $step)
+						if($step->getId()===$requestedStep)
 						{
-							$requestedIndex = $index;
+							$requestedIndex=$index;
 							break;
 						}
-					if ($requestedIndex < 0)
+					if($requestedIndex < 0)
 						throw new TConfigurationException('wizard_step_invalid');
 				}
 				else
-					$requestedIndex = TPropertyValue::ensureInteger($requestedStep);
+					$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
-				$handled = true;
+				$handled=true;
 			}
 
 			if($handled)
 			{
 				if(!$navParam->getCancelNavigation())
 				{
-					$nextStepIndex = $navParam->getNextStepIndex();
+					$nextStepIndex=$navParam->getNextStepIndex();
 					if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
 					{
 						if($movePrev)
-							$this->getPreviousStepIndex(true);  // pop out the previous move from history
+							$this->getPreviousStepIndex(true); // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
 				}

Braces +13 added lines, -26 removed lines

@@ -807,8 +807,7 @@ 
 				$this->_navigation->renderControl($writer);
 				$writer->write("\n</td></tr></table>\n");
 				$this->renderEndTag($writer);
-			}
-			else
+			} else
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -906,8 +905,7 @@ 
 				{
 					$container->setVisible(true);
 					$showStandard = false;
-				}
-				else
+				} else
 					$container->setVisible(false);
 			}
 		}
@@ -1032,11 +1030,9 @@ 
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
-			}
-			else
+			} else
 				return $type;
-		}
-		else
+		} else
 			return $type;
 	}
 
@@ -1103,8 +1099,7 @@ 
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
 			}
-		}
-		else
+		} else
 		{
 			$this->_sideBar = new TPanel;
 			$this->getControls()->add($this->_sideBar);
@@ -1141,8 +1136,7 @@ 
 			{
 				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
 					$this->setActiveStepIndex($newStepIndex);
-			}
-			else
+			} else
 				$this->setActiveStepIndex($stepIndex);
 		}
 	}
@@ -1286,8 +1280,7 @@ 
 				$previousStepIndex = $history->pop();
 				if($activeStepIndex === $previousStepIndex && $history->getCount() > 0)
 					$previousStepIndex = $history->pop();
-			}
-			else
+			} else
 			{
 				$previousStepIndex = $history->peek();
 				if($activeStepIndex === $previousStepIndex && $history->getCount() > 1)
@@ -1298,8 +1291,7 @@ 
 				}
 			}
 			return $activeStepIndex === $previousStepIndex ? -1 : $previousStepIndex;
-		}
-		else
+		} else
 			return -1;
 	}
 
@@ -1363,8 +1355,7 @@ 
 					$navParam->setNextStepIndex($index + 1);
 				$this->onNextButtonClick($navParam);
 				$handled = true;
-			}
-			elseif(strcasecmp($command, self::CMD_PREVIOUS) === 0)
+			} elseif(strcasecmp($command, self::CMD_PREVIOUS) === 0)
 			{
 				if($type !== TWizardStepType::Finish && $type !== TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
@@ -1373,8 +1364,7 @@ 
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
 				$handled = true;
-			}
-			elseif(strcasecmp($command, self::CMD_COMPLETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_COMPLETE) === 0)
 			{
 				if($type !== TWizardStepType::Finish)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
@@ -1382,8 +1372,7 @@ 
 					$navParam->setNextStepIndex($index + 1);
 				$this->onCompleteButtonClick($navParam);
 				$handled = true;
-			}
-			elseif(strcasecmp($command, self::CMD_MOVETO) === 0)
+			} elseif(strcasecmp($command, self::CMD_MOVETO) === 0)
 			{
 				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
@@ -1399,8 +1388,7 @@ 
 						}
 					if ($requestedIndex < 0)
 						throw new TConfigurationException('wizard_step_invalid');
-				}
-				else
+				} else
 					$requestedIndex = TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
 				$handled = true;
@@ -1417,8 +1405,7 @@ 
 							$this->getPreviousStepIndex(true);  // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
-				}
-				else
+				} else
 					$this->setActiveStepIndex($index);
 				return true;
 			}

framework/Web/UI/WebControls/TWizardNavigationEventParameter.php

Doc Comments +2 added lines

@@ -39,6 +39,7 @@ 
 	/**
 	 * Constructor.
 	 * @param integer current step index
+	 * @param integer $currentStep
 	 */
 	public function __construct($currentStep)
 	{
@@ -80,6 +81,7 @@ 
 
 	/**
 	 * @param boolean whether navigation to the next step should be canceled.
+	 * @param boolean $value
 	 */
 	public function setCancelNavigation($value)
 	{

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
  */
 class TWizardNavigationEventParameter extends \Prado\TEventParameter
 {
-	private $_cancel = false;
+	private $_cancel=false;
 	private $_currentStep;
 	private $_nextStep;
 
@@ -43,8 +43,8 @@ 
 	 */
 	public function __construct($currentStep)
 	{
-		$this->_currentStep = $currentStep;
-		$this->_nextStep = $currentStep;
+		$this->_currentStep=$currentStep;
+		$this->_nextStep=$currentStep;
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 	 */
 	public function setNextStepIndex($index)
 	{
-		$this->_nextStep = TPropertyValue::ensureInteger($index);
+		$this->_nextStep=TPropertyValue::ensureInteger($index);
 	}
 
 	/**
@@ -84,6 +84,6 @@ 
 	 */
 	public function setCancelNavigation($value)
 	{
-		$this->_cancel = TPropertyValue::ensureBoolean($value);
+		$this->_cancel=TPropertyValue::ensureBoolean($value);
 	}
 }
\ No newline at end of file

framework/Xml/TXmlDocument.php

Doc Comments +3 added lines

@@ -94,6 +94,7 @@ 
 
 	/**
 	 * @param string version of this XML document
+	 * @param string $version
 	 */
 	public function setVersion($version)
 	{
@@ -110,6 +111,7 @@ 
 
 	/**
 	 * @param string encoding of this XML document
+	 * @param string $encoding
 	 */
 	public function setEncoding($encoding)
 	{
@@ -233,6 +235,7 @@ 
 	/**
 	 * Recursively converts DOM XML nodes into TXmlElement
 	 * @param DOMXmlNode the node to be converted
+	 * @param \DOMElement $node
 	 * @return TXmlElement the converted TXmlElement
 	 */
 	protected function buildElement($node)

Braces +1 added lines, -2 removed lines

@@ -195,8 +195,7 @@
 		{
 			fwrite($fw, $this->saveToString());
 			fclose($fw);
-		}
-		else
+		} else
 			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 

Spacing +23 added lines, -23 removed lines

@@ -78,7 +78,7 @@ 
 	 * @param string version of this XML document
 	 * @param string encoding of this XML document
 	 */
-	public function __construct($version = '1.0', $encoding = '')
+	public function __construct($version='1.0', $encoding='')
 	{
 		parent::__construct('');
 		$this->setVersion($version);
@@ -98,7 +98,7 @@ 
 	 */
 	public function setVersion($version)
 	{
-		$this->_version = $version;
+		$this->_version=$version;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function setEncoding($encoding)
 	{
-		$this->_encoding = $encoding;
+		$this->_encoding=$encoding;
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function loadFromFile($file)
 	{
-		if(($str = @file_get_contents($file)) !== false)
+		if(($str=@file_get_contents($file))!==false)
 			return $this->loadFromString($str);
 		else
 			throw new TIOException('xmldocument_file_read_failed', $file);
@@ -140,41 +140,41 @@ 
 	public function loadFromString($string)
 	{
 		// TODO: since PHP 5.1, we can get parsing errors and throw them as exception
-		$doc = new \DOMDocument();
-		if($doc->loadXML($string) === false)
+		$doc=new \DOMDocument();
+		if($doc->loadXML($string)===false)
 			return false;
 
 		$this->setEncoding($doc->encoding);
 		$this->setVersion($doc->xmlVersion);
 
-		$element = $doc->documentElement;
+		$element=$doc->documentElement;
 		$this->setTagName($element->tagName);
 		$this->setValue($element->nodeValue);
-		$elements = $this->getElements();
-		$attributes = $this->getAttributes();
+		$elements=$this->getElements();
+		$attributes=$this->getAttributes();
 		$elements->clear();
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if($bSimpleXml===null)
+			$bSimpleXml=(boolean) function_exists('simplexml_load_string');
 
 		if($bSimpleXml)
 		{
-			$simpleDoc = simplexml_load_string($string);
-			$docNamespaces = $simpleDoc->getDocNamespaces(false);
-			$simpleDoc = null;
+			$simpleDoc=simplexml_load_string($string);
+			$docNamespaces=$simpleDoc->getDocNamespaces(false);
+			$simpleDoc=null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
-				if($prefix === '')
+				if($prefix==='')
 					$attributes->add('xmlns', $uri);
 				else
-					$attributes->add('xmlns:' . $prefix, $uri);
+					$attributes->add('xmlns:'.$prefix, $uri);
 			}
 		}
 
 		foreach($element->attributes as $name => $attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+			$attributes->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 		foreach($element->childNodes as $child)
 		{
 			if($child instanceof \DOMElement)
@@ -191,7 +191,7 @@ 
 	 */
 	public function saveToFile($file)
 	{
-		if(($fw = fopen($file, 'w')) !== false)
+		if(($fw=fopen($file, 'w'))!==false)
 		{
 			fwrite($fw, $this->saveToString());
 			fclose($fw);
@@ -206,9 +206,9 @@ 
 	 */
 	public function saveToString()
 	{
-		$version = empty($this->_version)?' version="1.0"':' version="' . $this->_version . '"';
-		$encoding = empty($this->_encoding)?'':' encoding="' . $this->_encoding . '"';
-		return "<?xml{$version}{$encoding}?>\n" . $this->toString(0);
+		$version=empty($this->_version) ? ' version="1.0"' : ' version="'.$this->_version.'"';
+		$encoding=empty($this->_encoding) ? '' : ' encoding="'.$this->_encoding.'"';
+		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
 	}
 
 	/**
@@ -238,10 +238,10 @@ 
 	 */
 	protected function buildElement($node)
 	{
-		$element = new TXmlElement($node->tagName);
+		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
 		foreach($node->attributes as $name => $attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+			$element->getAttributes()->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 
 		foreach($node->childNodes as $child)
 		{

framework/Xml/TXmlElement.php

Doc Comments +2 added lines

@@ -71,6 +71,7 @@ 
 
 	/**
 	 * @param TXmlElement parent element of this element
+	 * @param TXmlElement|null $parent
 	 */
 	public function setParent($parent)
 	{
@@ -180,6 +181,7 @@ 
 	}
 
 	/**
+	 * @param string $tagName
 	 * @return TList list of all child elements that have the specified tag-name
 	 */
 	public function getElementsByTagName($tagName)

Spacing +26 added lines, -26 removed lines

@@ -39,11 +39,11 @@ 
 	/**
 	 * @var string tag-name of this element
 	 */
-	private $_tagName = 'unknown';
+	private $_tagName='unknown';
 	/**
 	 * @var string text enclosed between opening and closing tags of this element
 	 */
-	private $_value = '';
+	private $_value='';
 	/**
 	 * @var TXmlElementList list of child elements of this element
 	 */
@@ -75,7 +75,7 @@ 
 	 */
 	public function setParent($parent)
 	{
-		$this->_parent = $parent;
+		$this->_parent=$parent;
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setTagName($tagName)
 	{
-		$this->_tagName = $tagName;
+		$this->_tagName=$tagName;
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = TPropertyValue::ensureString($value);
+		$this->_value=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function getHasElement()
 	{
-		return $this->_elements !== null && $this->_elements->getCount() > 0;
+		return $this->_elements!==null && $this->_elements->getCount() > 0;
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function getHasAttribute()
 	{
-		return $this->_attributes !== null && $this->_attributes->getCount() > 0;
+		return $this->_attributes!==null && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->_attributes !== null)
+		if($this->_attributes!==null)
 			return $this->_attributes->itemAt($name);
 		else
 			return null;
@@ -152,7 +152,7 @@ 
 	public function getElements()
 	{
 		if(!$this->_elements)
-			$this->_elements = new TXmlElementList($this);
+			$this->_elements=new TXmlElementList($this);
 		return $this->_elements;
 	}
 
@@ -162,7 +162,7 @@ 
 	public function getAttributes()
 	{
 		if(!$this->_attributes)
-			$this->_attributes = new TMap;
+			$this->_attributes=new TMap;
 		return $this->_attributes;
 	}
 
@@ -174,7 +174,7 @@ 
 		if($this->_elements)
 		{
 			foreach($this->_elements as $element)
-				if($element->_tagName === $tagName)
+				if($element->_tagName===$tagName)
 					return $element;
 		}
 		return null;
@@ -185,11 +185,11 @@ 
 	 */
 	public function getElementsByTagName($tagName)
 	{
-		$list = new TList;
+		$list=new TList;
 		if($this->_elements)
 		{
 			foreach($this->_elements as $element)
-				if($element->_tagName === $tagName)
+				if($element->_tagName===$tagName)
 					$list->add($element);
 		}
 		return $list;
@@ -198,33 +198,33 @@ 
 	/**
 	 * @return string string representation of this element
 	 */
-	public function toString($indent = 0)
+	public function toString($indent=0)
 	{
-		$attr = '';
-		if($this->_attributes !== null)
+		$attr='';
+		if($this->_attributes!==null)
 		{
 			foreach($this->_attributes as $name => $value)
 			{
-				$value = $this->xmlEncode($value);
-				$attr .= " $name=\"$value\"";
+				$value=$this->xmlEncode($value);
+				$attr.=" $name=\"$value\"";
 			}
 		}
-		$prefix = str_repeat(' ', $indent * 4);
+		$prefix=str_repeat(' ', $indent * 4);
 		if($this->getHasElement())
 		{
-			$str = $prefix . "<{$this->_tagName}$attr>\n";
+			$str=$prefix."<{$this->_tagName}$attr>\n";
 			foreach($this->getElements() as $element)
-				$str .= $element->toString($indent + 1) . "\n";
-			$str .= $prefix . "</{$this->_tagName}>";
+				$str.=$element->toString($indent + 1)."\n";
+			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
 		}
-		elseif(($value = $this->getValue()) !== '')
+		elseif(($value=$this->getValue())!=='')
 		{
-			$value = $this->xmlEncode($value);
-			return $prefix . "<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+			$value=$this->xmlEncode($value);
+			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
 		}
 		else
-			return $prefix . "<{$this->_tagName}$attr />";
+			return $prefix."<{$this->_tagName}$attr />";
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -217,13 +217,11 @@
 				$str .= $element->toString($indent + 1) . "\n";
 			$str .= $prefix . "</{$this->_tagName}>";
 			return $str;
-		}
-		elseif(($value = $this->getValue()) !== '')
+		} elseif(($value = $this->getValue()) !== '')
 		{
 			$value = $this->xmlEncode($value);
 			return $prefix . "<{$this->_tagName}$attr>$value</{$this->_tagName}>";
-		}
-		else
+		} else
 			return $prefix . "<{$this->_tagName}$attr />";
 	}
 

framework/Data/ActiveRecord/TActiveRecordInvalidFinderResult.php

Spacing +2 added lines, -2 removed lines

@@ -29,6 +29,6 @@
  */
 class TActiveRecordInvalidFinderResult extends \Prado\TEnumerable
 {
-	const Null = 'Null';
-	const Exception = 'Exception';
+	const Null='Null';
+	const Exception='Exception';
 }
\ No newline at end of file