pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -222,7 +222,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -250,7 +250,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

framework/Web/UI/ActiveControls/TCallbackErrorHandler.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use Prado\Exceptions\TErrorHandler;
 use Prado\Exceptions\TPhpErrorException;
 use Prado\Prado;
-use Prado\TApplication;
 use Prado\Web\Javascripts\TJavaScript;
 
 /**

Spacing +8 added lines, -8 removed lines

@@ -41,22 +41,22 @@ 
 	{
 		if($this->getApplication()->getMode()===TApplicationMode::Debug)
 		{
-			$response = $this->getApplication()->getResponse();
-			$trace = $this->getExceptionStackTrace($exception);
+			$response=$this->getApplication()->getResponse();
+			$trace=$this->getExceptionStackTrace($exception);
 			// avoid error on non-utf8 strings
 			try {
-				$trace = TJavaScript::jsonEncode($trace);
-			} catch (Exception $e) {
+				$trace=TJavaScript::jsonEncode($trace);
+			} catch(Exception $e) {
 				// strip everythin not 7bit ascii
-				$trace = preg_replace('/[^(\x20-\x7F)]*/','', serialize($trace));
+				$trace=preg_replace('/[^(\x20-\x7F)]*/', '', serialize($trace));
 			}
 
 			// avoid exception loop if headers have already been sent
 			try {
 				$response->setStatusCode(500, 'Internal Server Error');
-			} catch (Exception $e) { }
+			} catch(Exception $e) { }
 
-			$content = $response->createHtmlWriter();
+			$content=$response->createHtmlWriter();
 			$content->getWriter()->setBoundary(TActivePageAdapter::CALLBACK_ERROR_HEADER);
 			$content->write($trace);
 		}
@@ -91,7 +91,7 @@ 
 		$data['type']=get_class($exception);
 		$data['message']=$exception->getMessage();
 		$data['version']=$_SERVER['SERVER_SOFTWARE'].' '.Prado::getVersion();
-		$data['time']=@strftime('%Y-%m-%d %H:%M',time());
+		$data['time']=@strftime('%Y-%m-%d %H:%M', time());
 		return $data;
 	}
 }
\ No newline at end of file

framework/Web/Javascripts/packages.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 //package base folder in prado alias notation
-$folders = array(
+$folders=array(
 	'prado' => 'Prado\\Web\\Javascripts\\source\\prado',
 	'jquery' => 'Vendor\\bower-asset\\jquery\\dist',
 	'jquery-ui' => 'Vendor\\bower-asset\\jquery-ui',
@@ -13,7 +13,7 @@ 
 );
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	// base prado scripts
 	'prado' => array(
 		'prado/prado.js',
@@ -112,7 +112,7 @@ 
 );
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 	'jquery'			=> array('jquery'),
 	'prado'				=> array('jquery', 'prado'),
 	'bootstrap'			=> array('jquery', 'bootstrap'),

framework/Web/UI/WebControls/TWizard.php

Spacing +83 added lines, -83 removed lines

@@ -200,7 +200,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);
 	}
@@ -247,7 +247,7 @@ 
 	 */
 	public function getShowCancelButton()
 	{
-		return $this->getViewState('ShowCancelButton',false);
+		return $this->getViewState('ShowCancelButton', false);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function setShowCancelButton($value)
 	{
-		$this->setViewState('ShowCancelButton',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ShowCancelButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 */
 	public function getShowSideBar()
 	{
-		return $this->getViewState('ShowSideBar',true);
+		return $this->getViewState('ShowSideBar', true);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function setShowSideBar($value)
 	{
-		$this->setViewState('ShowSideBar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowSideBar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	 */
 	public function getHeaderText()
 	{
-		return $this->getViewState('HeaderText','');
+		return $this->getViewState('HeaderText', '');
 	}
 
 	/**
@@ -372,7 +372,7 @@ 
 	 */
 	public function setHeaderText($value)
 	{
-		$this->setViewState('HeaderText',TPropertyValue::ensureString($value),'');
+		$this->setViewState('HeaderText', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -381,7 +381,7 @@ 
 	 */
 	public function getCancelDestinationUrl()
 	{
-		return $this->getViewState('CancelDestinationUrl','');
+		return $this->getViewState('CancelDestinationUrl', '');
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 */
 	public function setCancelDestinationUrl($value)
 	{
-		$this->setViewState('CancelDestinationUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CancelDestinationUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -399,7 +399,7 @@ 
 	 */
 	public function getFinishDestinationUrl()
 	{
-		return $this->getViewState('FinishDestinationUrl','');
+		return $this->getViewState('FinishDestinationUrl', '');
 	}
 
 	/**
@@ -407,7 +407,7 @@ 
 	 */
 	public function setFinishDestinationUrl($value)
 	{
-		$this->setViewState('FinishDestinationUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('FinishDestinationUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -415,10 +415,10 @@ 
 	 */
 	public function getSideBarButtonStyle()
 	{
-		if(($style=$this->getViewState('SideBarButtonStyle',null))===null)
+		if(($style=$this->getViewState('SideBarButtonStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('SideBarButtonStyle',$style,null);
+			$this->setViewState('SideBarButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -428,10 +428,10 @@ 
 	 */
 	public function getNavigationButtonStyle()
 	{
-		if(($style=$this->getViewState('NavigationButtonStyle',null))===null)
+		if(($style=$this->getViewState('NavigationButtonStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('NavigationButtonStyle',$style,null);
+			$this->setViewState('NavigationButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -441,11 +441,11 @@ 
 	 */
 	public function getStartNextButtonStyle()
 	{
-		if(($style=$this->getViewState('StartNextButtonStyle',null))===null)
+		if(($style=$this->getViewState('StartNextButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
-			$this->setViewState('StartNextButtonStyle',$style,null);
+			$this->setViewState('StartNextButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -455,11 +455,11 @@ 
 	 */
 	public function getStepNextButtonStyle()
 	{
-		if(($style=$this->getViewState('StepNextButtonStyle',null))===null)
+		if(($style=$this->getViewState('StepNextButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
-			$this->setViewState('StepNextButtonStyle',$style,null);
+			$this->setViewState('StepNextButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -469,11 +469,11 @@ 
 	 */
 	public function getStepPreviousButtonStyle()
 	{
-		if(($style=$this->getViewState('StepPreviousButtonStyle',null))===null)
+		if(($style=$this->getViewState('StepPreviousButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
-			$this->setViewState('StepPreviousButtonStyle',$style,null);
+			$this->setViewState('StepPreviousButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -483,11 +483,11 @@ 
 	 */
 	public function getFinishCompleteButtonStyle()
 	{
-		if(($style=$this->getViewState('FinishCompleteButtonStyle',null))===null)
+		if(($style=$this->getViewState('FinishCompleteButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Complete');
-			$this->setViewState('FinishCompleteButtonStyle',$style,null);
+			$this->setViewState('FinishCompleteButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -497,11 +497,11 @@ 
 	 */
 	public function getFinishPreviousButtonStyle()
 	{
-		if(($style=$this->getViewState('FinishPreviousButtonStyle',null))===null)
+		if(($style=$this->getViewState('FinishPreviousButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
-			$this->setViewState('FinishPreviousButtonStyle',$style,null);
+			$this->setViewState('FinishPreviousButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -511,11 +511,11 @@ 
 	 */
 	public function getCancelButtonStyle()
 	{
-		if(($style=$this->getViewState('CancelButtonStyle',null))===null)
+		if(($style=$this->getViewState('CancelButtonStyle', null))===null)
 		{
 			$style=new TWizardNavigationButtonStyle;
 			$style->setButtonText('Cancel');
-			$this->setViewState('CancelButtonStyle',$style,null);
+			$this->setViewState('CancelButtonStyle', $style, null);
 		}
 		return $style;
 	}
@@ -525,10 +525,10 @@ 
 	 */
 	public function getSideBarStyle()
 	{
-		if(($style=$this->getViewState('SideBarStyle',null))===null)
+		if(($style=$this->getViewState('SideBarStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('SideBarStyle',$style,null);
+			$this->setViewState('SideBarStyle', $style, null);
 		}
 		return $style;
 	}
@@ -538,10 +538,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -551,10 +551,10 @@ 
 	 */
 	public function getStepStyle()
 	{
-		if(($style=$this->getViewState('StepStyle',null))===null)
+		if(($style=$this->getViewState('StepStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('StepStyle',$style,null);
+			$this->setViewState('StepStyle', $style, null);
 		}
 		return $style;
 	}
@@ -564,10 +564,10 @@ 
 	 */
 	public function getNavigationStyle()
 	{
-		if(($style=$this->getViewState('NavigationStyle',null))===null)
+		if(($style=$this->getViewState('NavigationStyle', null))===null)
 		{
 			$style=new TPanelStyle;
-			$this->setViewState('NavigationStyle',$style,null);
+			$this->setViewState('NavigationStyle', $style, null);
 		}
 		return $style;
 	}
@@ -577,7 +577,7 @@ 
 	 */
 	public function getUseDefaultLayout()
 	{
-		return $this->getViewState('UseDefaultLayout',true);
+		return $this->getViewState('UseDefaultLayout', true);
 	}
 
 	/**
@@ -587,7 +587,7 @@ 
 	 */
 	public function setUseDefaultLayout($value)
 	{
-		$this->setViewState('UseDefaultLayout',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('UseDefaultLayout', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -646,7 +646,7 @@ 
 	 */
 	public function onActiveStepChanged($param)
 	{
-		$this->raiseEvent('OnActiveStepChanged',$this,$param);
+		$this->raiseEvent('OnActiveStepChanged', $this, $param);
 	}
 
 	/**
@@ -657,7 +657,7 @@ 
 	 */
 	public function onCancelButtonClick($param)
 	{
-		$this->raiseEvent('OnCancelButtonClick',$this,$param);
+		$this->raiseEvent('OnCancelButtonClick', $this, $param);
 		if(($url=$this->getCancelDestinationUrl())!=='')
 			$this->getResponse()->redirect($url);
 	}
@@ -670,7 +670,7 @@ 
 	 */
 	public function onCompleteButtonClick($param)
 	{
-		$this->raiseEvent('OnCompleteButtonClick',$this,$param);
+		$this->raiseEvent('OnCompleteButtonClick', $this, $param);
 		if(($url=$this->getFinishDestinationUrl())!=='')
 			$this->getResponse()->redirect($url);
 	}
@@ -683,7 +683,7 @@ 
 	 */
 	public function onNextButtonClick($param)
 	{
-		$this->raiseEvent('OnNextButtonClick',$this,$param);
+		$this->raiseEvent('OnNextButtonClick', $this, $param);
 	}
 
 	/**
@@ -694,7 +694,7 @@ 
 	 */
 	public function onPreviousButtonClick($param)
 	{
-		$this->raiseEvent('OnPreviousButtonClick',$this,$param);
+		$this->raiseEvent('OnPreviousButtonClick', $this, $param);
 	}
 
 	/**
@@ -704,7 +704,7 @@ 
 	 */
 	public function onSideBarButtonClick($param)
 	{
-		$this->raiseEvent('OnSideBarButtonClick',$this,$param);
+		$this->raiseEvent('OnSideBarButtonClick', $this, $param);
 	}
 
 	/**
@@ -718,7 +718,7 @@ 
 		{
 			$this->_multiView=new TMultiView;
 			$this->_multiView->setID('WizardMultiView');
-			$this->_multiView->attachEventHandler('OnActiveViewChanged',array($this,'onActiveStepChanged'));
+			$this->_multiView->attachEventHandler('OnActiveViewChanged', array($this, 'onActiveStepChanged'));
 			$this->_multiView->ignoreBubbleEvents();
 		}
 		return $this->_multiView;
@@ -760,7 +760,7 @@ 
 		parent::onInit($param);
 		$this->ensureChildControls();
 		$this->setEnsureId(true);
-		if($this->getActiveStepIndex()<0 && $this->getWizardSteps()->getCount()>0)
+		if($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0)
 			$this->setActiveStepIndex(0);
 	}
 
@@ -836,7 +836,7 @@ 
 	 */
 	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)
 		{
@@ -856,7 +856,7 @@ 
 			$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)
 				{
@@ -865,7 +865,7 @@ 
 				}
 			}
 		}
-		if(($style=$this->getViewState('SideBarStyle',null))!==null)
+		if(($style=$this->getViewState('SideBarStyle', null))!==null)
 			$this->_sideBar->getStyle()->mergeWith($style);
 	}
 
@@ -874,7 +874,7 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style=$this->getViewState('StepStyle',null))!==null)
+		if(($style=$this->getViewState('StepStyle', null))!==null)
 			$this->_stepContent->getStyle()->mergeWith($style);
 	}
 
@@ -889,7 +889,7 @@ 
 
 		if(!$this->_navigation)
 			return;
-		else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		else if($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
 		{
 			$this->_navigation->setVisible(false);
 			return;
@@ -920,12 +920,12 @@ 
 		$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);
+		$buttonStyle=$this->getViewState('NavigationButtonStyle', null);
 		if($buttonStyle!==null)
 			$cancelButtonStyle->mergeWith($buttonStyle);
 
@@ -1002,10 +1002,10 @@ 
 	 */
 	protected function getHistory()
 	{
-		if(($history=$this->getControlState('History',null))===null)
+		if(($history=$this->getControlState('History', null))===null)
 		{
 			$history=new TStack;
-			$this->setControlState('History',$history);
+			$this->setControlState('History', $history);
 		}
 		return $history;
 	}
@@ -1020,14 +1020,14 @@ 
 		if(($type=$wizardStep->getStepType())===TWizardStepType::Auto)
 		{
 			$steps=$this->getWizardSteps();
-			if(($index=$steps->indexOf($wizardStep))>=0)
+			if(($index=$steps->indexOf($wizardStep)) >= 0)
 			{
 				$stepCount=$steps->getCount();
-				if($stepCount===1 || ($index<$stepCount-1 && $steps->itemAt($index+1)->getStepType()===TWizardStepType::Complete))
+				if($stepCount===1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType()===TWizardStepType::Complete))
 					return TWizardStepType::Finish;
 				else if($index===0)
 					return TWizardStepType::Start;
-				else if($index===$stepCount-1)
+				else if($index===$stepCount - 1)
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
@@ -1096,8 +1096,8 @@ 
 
 			if(($this->_sideBarDataList=$this->_sideBar->findControl(self::ID_SIDEBAR_LIST))!==null)
 			{
-				$this->_sideBarDataList->attachEventHandler('OnItemCommand',array($this,'dataListItemCommand'));
-				$this->_sideBarDataList->attachEventHandler('OnItemDataBound',array($this,'dataListItemDataBound'));
+				$this->_sideBarDataList->attachEventHandler('OnItemCommand', array($this, 'dataListItemCommand'));
+				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', array($this, 'dataListItemDataBound'));
 				$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -1117,7 +1117,7 @@ 
 	 * @param mixed sender of the event
 	 * @param TDataListCommandEventParameter
 	 */
-	public function dataListItemCommand($sender,$param)
+	public function dataListItemCommand($sender, $param)
 	{
 		$item=$param->getItem();
 		if($param->getCommandName()===self::CMD_MOVETO)
@@ -1153,7 +1153,7 @@ 
 	 * @param mixed sender of the event
 	 * @param TDataListItemEventParameter
 	 */
-	public function dataListItemDataBound($sender,$param)
+	public function dataListItemDataBound($sender, $param)
 	{
 		$item=$param->getItem();
 		$itemType=$item->getItemType();
@@ -1276,20 +1276,20 @@ 
 	protected function getPreviousStepIndex($popStack)
 	{
 		$history=$this->getHistory();
-		if($history->getCount()>=0)
+		if($history->getCount() >= 0)
 		{
 			$activeStepIndex=$this->getActiveStepIndex();
 			$previousStepIndex=-1;
 			if($popStack)
 			{
 				$previousStepIndex=$history->pop();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
+				if($activeStepIndex===$previousStepIndex && $history->getCount() > 0)
 					$previousStepIndex=$history->pop();
 			}
 			else
 			{
 				$previousStepIndex=$history->peek();
-				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
+				if($activeStepIndex===$previousStepIndex && $history->getCount() > 1)
 				{
 					$saveIndex=$history->pop();
 					$previousStepIndex=$history->peek();
@@ -1333,12 +1333,12 @@ 
 	 * @param TEventParameter event parameter
 	 * @throws TInvalidDataValueException if a navigation command is associated with an invalid parameter
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_CANCEL)===0)
+			if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelButtonClick($param);
 				return true;
@@ -1354,49 +1354,49 @@ 
 			$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)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_NEXT);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
+				if($index < $this->getWizardSteps()->getCount() - 1)
+					$navParam->setNextStepIndex($index + 1);
 				$this->onNextButtonClick($navParam);
 				$handled=true;
 			}
-			else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
+			else if(strcasecmp($command, self::CMD_PREVIOUS)===0)
 			{
 				if($type!==TWizardStepType::Finish && $type!==TWizardStepType::Step)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
 				$movePrev=true;
-				if(($prevIndex=$this->getPreviousStepIndex(false))>=0)
+				if(($prevIndex=$this->getPreviousStepIndex(false)) >= 0)
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
 				$handled=true;
 			}
-			else if(strcasecmp($command,self::CMD_COMPLETE)===0)
+			else if(strcasecmp($command, self::CMD_COMPLETE)===0)
 			{
 				if($type!==TWizardStepType::Finish)
-					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
-				if($index<$this->getWizardSteps()->getCount()-1)
-					$navParam->setNextStepIndex($index+1);
+					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
+				if($index < $this->getWizardSteps()->getCount() - 1)
+					$navParam->setNextStepIndex($index + 1);
 				$this->onCompleteButtonClick($navParam);
 				$handled=true;
 			}
-			else if(strcasecmp($command,self::CMD_MOVETO)===0)
+			else if(strcasecmp($command, self::CMD_MOVETO)===0)
 			{
 				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
 				$requestedStep=$param->getCommandParameter();
-				if (!is_numeric($requestedStep))
+				if(!is_numeric($requestedStep))
 				{
 					$requestedIndex=-1;
-					foreach ($this->getWizardSteps() as $index=>$step)
-						if ($step->getId()===$requestedStep)
+					foreach($this->getWizardSteps() as $index=>$step)
+						if($step->getId()===$requestedStep)
 						{
 							$requestedIndex=$index;
 							break;
 						}
-					if ($requestedIndex<0)
+					if($requestedIndex < 0)
 						throw new TConfigurationException('wizard_step_invalid');
 				}
 				else
@@ -1413,7 +1413,7 @@ 
 					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

@@ -806,8 +806,7 @@ 
 				$this->_navigation->renderControl($writer);
 				$writer->write("\n</td></tr></table>\n");
 				$this->renderEndTag($writer);
-			}
-			else
+			} else
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -905,8 +904,7 @@ 
 				{
 					$container->setVisible(true);
 					$showStandard=false;
-				}
-				else
+				} else
 					$container->setVisible(false);
 			}
 		}
@@ -1031,11 +1029,9 @@ 
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
-			}
-			else
+			} else
 				return $type;
-		}
-		else
+		} else
 			return $type;
 	}
 
@@ -1102,8 +1098,7 @@ 
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
 			}
-		}
-		else
+		} else
 		{
 			$this->_sideBar=new TPanel;
 			$this->getControls()->add($this->_sideBar);
@@ -1140,8 +1135,7 @@ 
 			{
 				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
 					$this->setActiveStepIndex($newStepIndex);
-			}
-			else
+			} else
 				$this->setActiveStepIndex($stepIndex);
 		}
 	}
@@ -1285,8 +1279,7 @@ 
 				$previousStepIndex=$history->pop();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>0)
 					$previousStepIndex=$history->pop();
-			}
-			else
+			} else
 			{
 				$previousStepIndex=$history->peek();
 				if($activeStepIndex===$previousStepIndex && $history->getCount()>1)
@@ -1297,8 +1290,7 @@ 
 				}
 			}
 			return $activeStepIndex===$previousStepIndex ? -1 : $previousStepIndex;
-		}
-		else
+		} else
 			return -1;
 	}
 
@@ -1362,8 +1354,7 @@ 
 					$navParam->setNextStepIndex($index+1);
 				$this->onNextButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
+			} else if(strcasecmp($command,self::CMD_PREVIOUS)===0)
 			{
 				if($type!==TWizardStepType::Finish && $type!==TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_PREVIOUS);
@@ -1372,8 +1363,7 @@ 
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_COMPLETE)===0)
+			} else if(strcasecmp($command,self::CMD_COMPLETE)===0)
 			{
 				if($type!==TWizardStepType::Finish)
 					throw new TInvalidDataValueException('wizard_command_invalid',self::CMD_COMPLETE);
@@ -1381,8 +1371,7 @@ 
 					$navParam->setNextStepIndex($index+1);
 				$this->onCompleteButtonClick($navParam);
 				$handled=true;
-			}
-			else if(strcasecmp($command,self::CMD_MOVETO)===0)
+			} else if(strcasecmp($command,self::CMD_MOVETO)===0)
 			{
 				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
@@ -1398,8 +1387,7 @@ 
 						}
 					if ($requestedIndex<0)
 						throw new TConfigurationException('wizard_step_invalid');
-				}
-				else
+				} else
 					$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
 				$handled=true;
@@ -1416,8 +1404,7 @@ 
 							$this->getPreviousStepIndex(true);  // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
-				}
-				else
+				} else
 					$this->setActiveStepIndex($index);
 				return true;
 			}

framework/Web/UI/JuiControls/TJuiSelectable.php

Spacing +14 added lines, -14 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function getWidgetID()
 	{
-	  return $this->getClientID() . '_0';
+	  return $this->getClientID().'_0';
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -112,7 +112,7 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 		// overload the "OnStop" event to add information about the current selected items
 		if(isset($options['stop']))
 		{
@@ -128,7 +128,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavaScript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -149,7 +149,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -158,7 +158,7 @@ 
 	 * Raises the OnSelected event
 	 * @param object $params event parameters
 	 */
-	public function onSelected ($params)
+	public function onSelected($params)
 	{
 		$this->raiseEvent('OnSelected', $this, $params);
 	}
@@ -167,7 +167,7 @@ 
 	 * Raises the OnSelecting event
 	 * @param object $params event parameters
 	 */
-	public function onSelecting ($params)
+	public function onSelecting($params)
 	{
 		$this->raiseEvent('OnSelecting', $this, $params);
 	}
@@ -176,7 +176,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -185,7 +185,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function onStop ($params)
+	public function onStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}
@@ -194,7 +194,7 @@ 
 	 * Raises the OnUnselected event
 	 * @param object $params event parameters
 	 */
-	public function onUnselected ($params)
+	public function onUnselected($params)
 	{
 		$this->raiseEvent('OnUnselected', $this, $params);
 	}
@@ -203,7 +203,7 @@ 
 	 * Raises the OnUnselecting event
 	 * @param object $params event parameters
 	 */
-	public function onUnselecting ($params)
+	public function onUnselecting($params)
 	{
 		$this->raiseEvent('OnUnselecting', $this, $params);
 	}
@@ -238,7 +238,7 @@ 
 	public function getSelectables()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -247,10 +247,10 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = new TRepeater;
+		$repeater=new TRepeater;
 		$repeater->setHeaderTemplate(new TJuiSelectableTemplate('<ul id="'.$this->getWidgetID().'">'));
 		$repeater->setFooterTemplate(new TJuiSelectableTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->Data %></li>',null));
+		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->Data %></li>', null));
 		$repeater->setEmptyTemplate(new TJuiSelectableTemplate('<ul></ul>'));
 		$this->getControls()->add($repeater);
 		return $repeater;

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Spacing +19 added lines, -19 removed lines

@@ -90,7 +90,7 @@ 
 	public function setRecordPk($value)
 	{
 		$this->clearRecordObject();
-		$val = TPropertyValue::ensureArray($value);
+		$val=TPropertyValue::ensureArray($value);
 		$this->setViewState('PK', count($val) > 0 ? $val : null);
 	}
 
@@ -115,11 +115,11 @@ 
 	 */
 	public function initializeEditForm()
 	{
-		$record = $this->getCurrentRecord();
-		$classPath = $this->getEditRenderer();
-		if($classPath === '')
+		$record=$this->getCurrentRecord();
+		$classPath=$this->getEditRenderer();
+		if($classPath==='')
 		{
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
 		}
@@ -141,11 +141,11 @@ 
 	 */
 	protected function createEditRenderer($record, $classPath)
 	{
-		$this->_editRenderer = Prado::createComponent($classPath);
+		$this->_editRenderer=Prado::createComponent($classPath);
 		if($this->_editRenderer instanceof IScaffoldEditRenderer)
 		{
-			$index = $this->getControls()->remove($this->getInputRepeater());
-			$this->getControls()->insertAt($index,$this->_editRenderer);
+			$index=$this->getControls()->remove($this->getInputRepeater());
+			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
 		}
 		else
@@ -160,16 +160,16 @@ 
 	 */
 	protected function createRepeaterEditItem($sender, $param)
 	{
-		$type = $param->getItem()->getItemType();
+		$type=$param->getItem()->getItemType();
 		if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 		{
-			$item = $param->getItem();
-			$column = $item->getData();
+			$item=$param->getItem();
+			$column=$item->getData();
 			if($column===null)
 				return;
 
-			$record = $this->getCurrentRecord();
-			$builder = $this->getScaffoldInputBuilder($record);
+			$record=$this->getCurrentRecord();
+			$builder=$this->getScaffoldInputBuilder($record);
 			$builder->createScaffoldInput($this, $item, $column, $record);
 		}
 	}
@@ -201,14 +201,14 @@ 
 	{
 		if($this->getPage()->getIsValid())
 		{
-			$record = $this->getCurrentRecord();
+			$record=$this->getCurrentRecord();
 			if($this->_editRenderer===null)
 			{
-				$table = $this->getTableInfo();
-				$builder = $this->getScaffoldInputBuilder($record);
+				$table=$this->getTableInfo();
+				$builder=$this->getScaffoldInputBuilder($record);
 				foreach($this->getInputRepeater()->getItems() as $item)
 				{
-					$column = $table->getColumn($item->getCustomData());
+					$column=$table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
 			}
@@ -272,10 +272,10 @@ 
 	protected function getScaffoldInputBuilder($record)
 	{
 		static $_builders=array();
-		$class = get_class($record);
+		$class=get_class($record);
 		if(!isset($_builders[$class]))
 		{
-			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
+			$_builders[$class]=TScaffoldInputBase::createInputBuilder($record);
 		}
 		return $_builders[$class];
 	}

framework/TApplication.php

Spacing +69 added lines, -69 removed lines

@@ -107,7 +107,7 @@ 
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
-	const CONFIG_TYPE_XML = 'xml';
+	const CONFIG_TYPE_XML='xml';
 	/**
 	 * Application configuration file name
 	 */
@@ -119,7 +119,7 @@ 
 	/**
 	 * Configuration file type, application.php and config.php
 	 */
-	const CONFIG_TYPE_PHP = 'php';
+	const CONFIG_TYPE_PHP='php';
 	/**
 	 * Runtime directory name
 	 */
@@ -272,7 +272,7 @@ 
 	/**
 	 * @var string Customizable page service ID
 	 */
-	private $_pageServiceID = self::PAGE_SERVICE_ID;
+	private $_pageServiceID=self::PAGE_SERVICE_ID;
 
 	/**
 	 * Constructor.
@@ -292,7 +292,7 @@ 
 	 * @param boolean whether to cache application configuration. Defaults to true.
 	 * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid.
 	 */
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	public function __construct($basePath='protected', $cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
 	{
 		// register application as a singleton
 		Prado::setApplication($this);
@@ -305,9 +305,9 @@ 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID=md5($this->_runtimePath);
 		$this->_parameters=new \Prado\Collections\TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		$this->_services=array($this->getPageServiceID()=>array('TPageService', array(), null));
 
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 
 	/**
@@ -324,7 +324,7 @@ 
 	{
 		// determine configuration path and file
 		if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
+			throw new TConfigurationException('application_basepath_invalid', $basePath);
 		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
 			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
 		else if(is_file($basePath))
@@ -345,7 +345,7 @@ 
 				if(!is_dir($runtimePath))
 				{
 					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
@@ -354,7 +354,7 @@ 
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -371,14 +371,14 @@ 
 			$n=count(self::$_steps);
 			$this->_step=0;
 			$this->_requestCompleted=false;
-			while($this->_step<$n)
+			while($this->_step < $n)
 			{
 				if($this->_mode===TApplicationMode::Off)
-					throw new THttpException(503,'application_unavailable');
+					throw new THttpException(503, 'application_unavailable');
 				if($this->_requestCompleted)
 					break;
 				$method=self::$_steps[$this->_step];
-				Prado::trace("Executing $method()",'Prado\TApplication');
+				Prado::trace("Executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
 			}
@@ -416,9 +416,9 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @return mixed the global value corresponding to $key
 	 */
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue=null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -431,7 +431,7 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
 	 */
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue=null, $forceSave=false)
 	{
 		$this->_stateChanged=true;
 		if($value===$defaultValue)
@@ -531,7 +531,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'\Prado\TApplicationMode');
+		$this->_mode=TPropertyValue::ensureEnum($value, '\Prado\TApplicationMode');
 	}
 
 	/**
@@ -579,7 +579,7 @@ 
 	 */
 	public function setConfigurationType($value)
 	{
-		$this->_configType = $value;
+		$this->_configType=$value;
 	}
 
 	/**
@@ -592,10 +592,10 @@ 
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_PHP;
 					break;
 				default:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_XML;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_XML;
 			}
 		}
 		return $this->_configFileExt;
@@ -607,15 +607,15 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if($fileName==null)
 		{
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$fileName = TApplication::CONFIG_FILE_PHP;
+					$fileName=TApplication::CONFIG_FILE_PHP;
 					break;
 				default:
-					$fileName = TApplication::CONFIG_FILE_XML;
+					$fileName=TApplication::CONFIG_FILE_XML;
 			}
 		}
 		return $fileName;
@@ -666,7 +666,7 @@ 
 	public function setModule($id, IModule $module=null)
 	{
 		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
 			$this->_modules[$id]=$module;
 	}
@@ -682,7 +682,7 @@ 
 		// force loading of a lazy module
 		if($this->_modules[$id]===null)
 		{
-			$module = $this->internalLoadModule($id, true);
+			$module=$this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
 		}
 
@@ -931,37 +931,37 @@ 
 		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
 		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
-			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})",'\Prado\TApplication');
+			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", '\Prado\TApplication');
 			$this->setModule($id, null);
 			return null;
 		}
 
-		Prado::trace("Loading module $id ({$moduleClass})",'\Prado\TApplication');
+		Prado::trace("Loading module $id ({$moduleClass})", '\Prado\TApplication');
 		$module=Prado::createComponent($moduleClass);
 		foreach($initProperties as $name=>$value)
 		{
 			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
+		$this->setModule($id, $module);
 		// keep the key to avoid reuse of the old module id
 		$this->_lazyModules[$id]=null;
 
-		return array($module,$configElement);
+		return array($module, $configElement);
 	}
 	/**
 	 * Applies an application configuration.
 	 * @param TApplicationConfiguration the configuration
 	 * @param boolean whether the configuration is specified within a service.
 	 */
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService=false)
 	{
 		if($config->getIsEmpty())
 			return;
 
 		// set path aliases and using namespaces
 		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
+			Prado::setPathOfAlias($alias, $path);
 		foreach($config->getUsings() as $using)
 			Prado::using($using);
 
@@ -969,11 +969,11 @@ 
 		if(!$withinService)
 		{
 			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+				$this->setSubProperty($name, $value);
 		}
 
 		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('Prado\Web\Services\TPageService',array(),null));
+			$this->_services=array($this->getPageServiceID()=>array('Prado\Web\Services\TPageService', array(), null));
 
 		// load parameters
 		foreach($config->getParameters() as $id=>$parameter)
@@ -982,11 +982,11 @@ 
 			{
 				$component=Prado::createComponent($parameter[0]);
 				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$this->_parameters->add($id,$component);
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
@@ -996,7 +996,7 @@ 
 			if(!is_string($id))
 				$id='_module'.count($this->_lazyModules);
 			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
+			if($module=$this->internalLoadModule($id))
 				$modules[]=$module;
 		}
 		foreach($modules as $module)
@@ -1013,12 +1013,12 @@ 
 				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt()))===null || !is_file($path))
+					throw new TConfigurationException('application_includefile_invalid', $filePath);
 				$cn=$this->getApplicationConfigurationClass();
 				$c=new $cn;
 				$c->loadFromFile($path);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
@@ -1034,21 +1034,21 @@ 
 	 */
 	protected function initApplication()
 	{
-		Prado::trace('Initializing application','Prado\TApplication');
+		Prado::trace('Initializing application', 'Prado\TApplication');
 
 		if($this->_configFile!==null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if($this->_cacheFile===null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
 				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
-			$this->applyConfiguration($config,false);
+			$this->applyConfiguration($config, false);
 		}
 
 		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
@@ -1067,32 +1067,32 @@ 
 	{
 		if(isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
+			list($serviceClass, $initProperties, $configElement)=$this->_services[$serviceID];
 			$service=Prado::createComponent($serviceClass);
 			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
 			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 
 			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+				$service->setSubProperty($name, $value);
 
 			if($configElement!==null)
 			{
 				$config=new TApplicationConfiguration;
 				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1103,9 +1103,9 @@ 
 	 */
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'Prado\TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'Prado\TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 
 	/**
@@ -1117,7 +1117,7 @@ 
 	 */
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 
 	/**
@@ -1126,7 +1126,7 @@ 
 	 */
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 
 	/**
@@ -1135,7 +1135,7 @@ 
 	 */
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 
 	/**
@@ -1144,7 +1144,7 @@ 
 	 */
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 
 	/**
@@ -1153,7 +1153,7 @@ 
 	 */
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 
 	/**
@@ -1163,7 +1163,7 @@ 
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 
 	/**
@@ -1172,7 +1172,7 @@ 
 	 */
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 
 	/**
@@ -1181,7 +1181,7 @@ 
 	 */
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 
 	/**
@@ -1199,7 +1199,7 @@ 
 	 */
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 
@@ -1209,7 +1209,7 @@ 
 	 */
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 
 	/**
@@ -1218,14 +1218,14 @@ 
 	 */
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
 
 	/**
 	 * Flushes output to client side.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushOutput($continueBuffering = true)
+	public function flushOutput($continueBuffering=true)
 	{
 		$this->getResponse()->flush($continueBuffering);
 	}
@@ -1237,7 +1237,7 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
-		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->saveGlobals(); // save global state
+		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }

framework/I18N/core/MessageSource.php

Indentation +6 added lines, -6 removed lines

@@ -110,13 +110,13 @@
 	/**
 	 * Factory method to instantiate a new MessageSource depending on the
 	 * source type. The allowed source types are 'XLIFF', 'PHP', 'gettext' and
-     * 'Database'. The source parameter depends on the source type. 
-     * For 'gettext', 'PHP' and 'XLIFF', 'source' should point to the directory 
-     * where the messages are stored. 
-     * For 'Database', 'source' must be a valid connection id.
+	 * 'Database'. The source parameter depends on the source type. 
+	 * For 'gettext', 'PHP' and 'XLIFF', 'source' should point to the directory 
+	 * where the messages are stored. 
+	 * For 'Database', 'source' must be a valid connection id.
 	 *
- 	 * Custom message source are possible by supplying the a filename parameter
- 	 * in the factory method.
+	 * Custom message source are possible by supplying the a filename parameter
+	 * in the factory method.
 	 * 
 	 * @param string the message source type.
 	 * @param string the location of the resource or the ConnectionID.

Spacing +20 added lines, -20 removed lines

@@ -82,7 +82,7 @@ 
 	 * Array of translation messages.
 	 * @var array 
 	 */
-	protected $messages = array();
+	protected $messages=array();
 
 	/**
 	 * The source of message translations.
@@ -96,7 +96,7 @@ 
 	 */
 	protected $cache;
 	
-	protected $untranslated = array();
+	protected $untranslated=array();
 
 	/**
 	 * Private constructor. MessageSource must be initialized using
@@ -126,23 +126,23 @@ 
 	 */
 	static function &factory($type, $source='.', $filename='')
 	{
-		$types = array('XLIFF','PHP','gettext','Database');
+		$types=array('XLIFF', 'PHP', 'gettext', 'Database');
 
 		if(empty($filename) && !in_array($type, $types))
 			throw new Exception('Invalid type "'.$type.'", valid types are '.
 				implode(', ', $types));
 		
-		$class = 'MessageSource_'.$type;
+		$class='MessageSource_'.$type;
 		
 		if(empty($filename))
-			$filename = dirname(__FILE__).'/'.$class.'.php';
+			$filename=dirname(__FILE__).'/'.$class.'.php';
 						
-		if(is_file($filename) == false)
+		if(is_file($filename)==false)
 			throw new Exception("File $filename not found");
 						
 		include_once $filename;
         
-		$obj =  new $class($source);
+		$obj=new $class($source);
 		
 		return $obj;
 	}
@@ -168,36 +168,36 @@ 
 	 */
 	function load($catalogue='messages')
 	{
-		$variants = $this->getCatalogueList($catalogue);
+		$variants=$this->getCatalogueList($catalogue);
 		
-		$this->messages = array();
+		$this->messages=array();
 		
 		foreach($variants as $variant)
 		{
-			$source = $this->getSource($variant);
+			$source=$this->getSource($variant);
 			
-			if($this->isValidSource($source) == false) continue;
+			if($this->isValidSource($source)==false) continue;
 
-			$loadData = true;
+			$loadData=true;
 			
 			if($this->cache)
 			{
-				$data = $this->cache->get($variant, 
+				$data=$this->cache->get($variant, 
 					$this->culture, $this->getLastModified($source));
 				
 				if(is_array($data))
 				{
-					$this->messages[$variant] = $data;
-					$loadData = false;
+					$this->messages[$variant]=$data;
+					$loadData=false;
 				}
 				unset($data);
 			}
 			if($loadData)
 			{
-				$data = &$this->loadData($source);
+				$data=&$this->loadData($source);
 				if(is_array($data))
 				{
-					$this->messages[$variant] = $data;
+					$this->messages[$variant]=$data;
 					if($this->cache)
 						$this->cache->save($data, $variant, $this->culture);
 				}	
@@ -233,7 +233,7 @@ 
 	 */
 	public function setCache(MessageCache $cache)
 	{
-		$this->cache = $cache;
+		$this->cache=$cache;
 	}
 	
 	/**
@@ -244,7 +244,7 @@ 
 	public function append($message)
 	{
 		if(!in_array($message, $this->untranslated))
-			$this->untranslated[] = $message;
+			$this->untranslated[]=$message;
 	}
 	
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}	
 	
 	/**

bin/prado-cli.php

Doc Comments +25 added lines

@@ -143,6 +143,10 @@ 
 	 */
 	abstract public function performAction($args);
 
+	/**
+	 * @param string $dir
+	 * @param integer $mask
+	 */
 	protected function createDirectory($dir, $mask)
 	{
 		if(!is_dir($dir))
@@ -154,6 +158,9 @@ 
 			chmod($dir, $mask);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected function createFile($filename, $content)
 	{
 		if(!is_file($filename))
@@ -302,6 +309,9 @@ 
 ';
 	}
 
+	/**
+	 * @param string $appName
+	 */
 	protected function renderConfigFile($appName)
 	{
 		return <<<EOD
@@ -515,6 +525,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getActiveRecordConfig($app_dir)
 	{
 		if(false === ($xml=$this->getXmlFile($app_dir)))
@@ -530,6 +543,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getOutputFile($app_dir, $namespace)
 	{
 		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
@@ -591,6 +607,9 @@ 
 		return $prop;
 	}
 
+	/**
+	 * @param string $class
+	 */
 	protected function generateClass($properties, $tablename, $class)
 	{
 		$props = implode("\n", $properties);
@@ -686,6 +705,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $l
+     */
     public function generate($l)
     {
 		$input = explode(" ", trim($l));
@@ -724,6 +746,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $app_dir
+     */
     protected function getActiveRecordConfig($app_dir) {
         if (false === ($xml = $this->getXmlFile($app_dir)))
             return false;

Spacing +154 added lines, -154 removed lines

@@ -13,11 +13,11 @@ 
 	die('Must be run from the command line');
 
 // Locate composer's autoloader
-if(file_exists($autoloader = realpath(__DIR__ . '/../vendor/autoload.php')))
+if(file_exists($autoloader=realpath(__DIR__.'/../vendor/autoload.php')))
 {
 	// if we are running inside a prado repo checkout, get out of bin/
 	include($autoloader);
-} elseif(file_exists($autoloader = realpath(__DIR__ . '/../../../autoload.php'))) {
+} elseif(file_exists($autoloader=realpath(__DIR__.'/../../../autoload.php'))) {
 	// if we are running from inside an application's vendor/ directory, get out of pradosoft/prado/bin/
 	include($autoloader);
 }
@@ -69,7 +69,7 @@ 
 	 */
 	public function addActionClass($class)
 	{
-		$this->_actions[$class] = new $class;
+		$this->_actions[$class]=new $class;
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance===null)
+			$instance=new self;
 		return $instance;
 	}
 
@@ -96,17 +96,17 @@ 
 	{
 		if(count($args) > 1)
 			array_shift($args);
-		$valid = false;
+		$valid=false;
 		foreach($this->_actions as $class => $action)
 		{
 			if($action->isValidAction($args))
 			{
-				$valid |= $action->performAction($args);
+				$valid|=$action->performAction($args);
 				break;
 			}
 			else
 			{
-				$valid = false;
+				$valid=false;
 			}
 		}
 		if(!$valid)
@@ -165,23 +165,23 @@ 
 
 	public function isValidAction($args)
 	{
-		return 0 == strcasecmp($args[0], $this->action) &&
-			count($args)-1 >= count($this->parameters);
+		return 0==strcasecmp($args[0], $this->action) &&
+			count($args) - 1 >= count($this->parameters);
 	}
 
 	public function renderHelp()
 	{
-		$params = array();
+		$params=array();
 		foreach($this->parameters as $v)
-			$params[] = '<'.$v.'>';
-		$parameters = join($params, ' ');
-		$options = array();
+			$params[]='<'.$v.'>';
+		$parameters=join($params, ' ');
+		$options=array();
 		foreach($this->optional as $v)
-			$options[] = '['.$v.']';
-		$optional = (strlen($parameters) ? ' ' : ''). join($options, ' ');
+			$options[]='['.$v.']';
+		$optional=(strlen($parameters) ? ' ' : '').join($options, ' ');
 		$description='';
-		foreach(explode("\n", wordwrap($this->description,65)) as $line)
-			$description .= '    '.$line."\n";
+		foreach(explode("\n", wordwrap($this->description, 65)) as $line)
+			$description.='    '.$line."\n";
 		return <<<EOD
   {$this->action} {$parameters}{$optional}
 {$description}
@@ -191,15 +191,15 @@ 
 
 	protected function initializePradoApplication($directory)
 	{
-		$_SERVER['SCRIPT_FILENAME'] = $directory.'/index.php';
-		$app_dir = realpath($directory.'/protected/');
-		if($app_dir !== false && is_dir($app_dir))
+		$_SERVER['SCRIPT_FILENAME']=$directory.'/index.php';
+		$app_dir=realpath($directory.'/protected/');
+		if($app_dir!==false && is_dir($app_dir))
 		{
 			if(Prado::getApplication()===null)
 			{
-				$app = new PradoShellApplication($app_dir);
+				$app=new PradoShellApplication($app_dir);
 				$app->run();
-				$dir = substr(str_replace(realpath('./'),'',$app_dir),1);
+				$dir=substr(str_replace(realpath('./'), '', $app_dir), 1);
 				PradoCommandLineInterpreter::printGreeting();
 				echo '** Loaded PRADO appplication in directory "'.$dir."\".\n";
 			}
@@ -209,9 +209,9 @@ 
 		else
 		{
 			PradoCommandLineInterpreter::printGreeting();
-			echo '+'.str_repeat('-',77)."+\n";
+			echo '+'.str_repeat('-', 77)."+\n";
 			echo '** Unable to load PRADO application in directory "'.$directory."\".\n";
-			echo '+'.str_repeat('-',77)."+\n";
+			echo '+'.str_repeat('-', 77)."+\n";
 		}
 		return false;
 	}
@@ -226,10 +226,10 @@ 
  */
 class PradoCommandLineCreateProject extends PradoCommandLineAction
 {
-	protected $action = '-c';
-	protected $parameters = array('directory');
-	protected $optional = array();
-	protected $description = 'Creates a Prado project skeleton for the given <directory>.';
+	protected $action='-c';
+	protected $parameters=array('directory');
+	protected $optional=array();
+	protected $description='Creates a Prado project skeleton for the given <directory>.';
 
 	public function performAction($args)
 	{
@@ -243,31 +243,31 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if(strlen(trim($dir))==0)
 			return;
 
-		$rootPath = realpath(dirname(trim($dir)));
+		$rootPath=realpath(dirname(trim($dir)));
 
 		if(basename($dir)!=='.')
-			$basePath = $rootPath.DIRECTORY_SEPARATOR.basename($dir);
+			$basePath=$rootPath.DIRECTORY_SEPARATOR.basename($dir);
 		else
-			$basePath = $rootPath;
-		$appName = basename($basePath);
-		$assetPath = $basePath.DIRECTORY_SEPARATOR.'assets';
-		$protectedPath  = $basePath.DIRECTORY_SEPARATOR.'protected';
-		$runtimePath = $basePath.DIRECTORY_SEPARATOR.'protected'.DIRECTORY_SEPARATOR.'runtime';
-		$pagesPath = $protectedPath.DIRECTORY_SEPARATOR.'pages';
-
-		$indexFile = $basePath.DIRECTORY_SEPARATOR.'index.php';
-		$htaccessFile = $protectedPath.DIRECTORY_SEPARATOR.'.htaccess';
-		$configFile = $protectedPath.DIRECTORY_SEPARATOR.'application.xml';
-		$defaultPageFile = $pagesPath.DIRECTORY_SEPARATOR.'Home.page';
+			$basePath=$rootPath;
+		$appName=basename($basePath);
+		$assetPath=$basePath.DIRECTORY_SEPARATOR.'assets';
+		$protectedPath=$basePath.DIRECTORY_SEPARATOR.'protected';
+		$runtimePath=$basePath.DIRECTORY_SEPARATOR.'protected'.DIRECTORY_SEPARATOR.'runtime';
+		$pagesPath=$protectedPath.DIRECTORY_SEPARATOR.'pages';
+
+		$indexFile=$basePath.DIRECTORY_SEPARATOR.'index.php';
+		$htaccessFile=$protectedPath.DIRECTORY_SEPARATOR.'.htaccess';
+		$configFile=$protectedPath.DIRECTORY_SEPARATOR.'application.xml';
+		$defaultPageFile=$pagesPath.DIRECTORY_SEPARATOR.'Home.page';
 
 		$this->createDirectory($basePath, 0755);
-		$this->createDirectory($assetPath,0777);
-		$this->createDirectory($protectedPath,0755);
-		$this->createDirectory($runtimePath,0777);
-		$this->createDirectory($pagesPath,0755);
+		$this->createDirectory($assetPath, 0777);
+		$this->createDirectory($protectedPath, 0755);
+		$this->createDirectory($runtimePath, 0777);
+		$this->createDirectory($pagesPath, 0755);
 
 		$this->createFile($indexFile, $this->renderIndexFile());
 		$this->createFile($configFile, $this->renderConfigFile($appName));
@@ -277,7 +277,7 @@ 
 
 	protected function renderIndexFile()
 	{
-		$framework = realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR.'prado.php';
+		$framework=realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR.'prado.php';
 return '<?php
 
 $frameworkPath=\''.$framework.'\';
@@ -376,10 +376,10 @@ 
  */
 class PradoCommandLineCreateTests extends PradoCommandLineAction
 {
-	protected $action = '-t';
-	protected $parameters = array('directory');
-	protected $optional = array();
-	protected $description = 'Create test fixtures in the given <directory>.';
+	protected $action='-t';
+	protected $parameters=array('directory');
+	protected $optional=array();
+	protected $description='Create test fixtures in the given <directory>.';
 
 	public function performAction($args)
 	{
@@ -390,22 +390,22 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if(strlen(trim($dir))==0)
 			return;
 
-		$rootPath = realpath(dirname(trim($dir)));
-		$basePath = $rootPath.'/'.basename($dir);
+		$rootPath=realpath(dirname(trim($dir)));
+		$basePath=$rootPath.'/'.basename($dir);
 
-		$tests = $basePath.'/tests';
-		$unit_tests = $tests.'/unit';
-		$functional_tests = $tests.'/functional';
+		$tests=$basePath.'/tests';
+		$unit_tests=$tests.'/unit';
+		$functional_tests=$tests.'/functional';
 
-		$this->createDirectory($tests,0755);
-		$this->createDirectory($unit_tests,0755);
-		$this->createDirectory($functional_tests,0755);
+		$this->createDirectory($tests, 0755);
+		$this->createDirectory($unit_tests, 0755);
+		$this->createDirectory($functional_tests, 0755);
 
-		$unit_test_index = $tests.'/unit.php';
-		$functional_test_index = $tests.'/functional.php';
+		$unit_test_index=$tests.'/unit.php';
+		$functional_test_index=$tests.'/functional.php';
 
 		$this->createFile($unit_test_index, $this->renderUnitTestFixture());
 		$this->createFile($functional_test_index, $this->renderFunctionalTestFixture());
@@ -413,7 +413,7 @@ 
 
 	protected function renderUnitTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/unit_tests.php';
+		$tester=realpath(dirname(dirname(__FILE__))).'/tests/test_tools/unit_tests.php';
 return '<?php
 
 include_once \''.$tester.'\';
@@ -428,7 +428,7 @@ 
 
 	protected function renderFunctionalTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/functional_tests.php';
+		$tester=realpath(dirname(dirname(__FILE__))).'/tests/test_tools/functional_tests.php';
 return '<?php
 
 include_once \''.$tester.'\';
@@ -450,10 +450,10 @@ 
  */
 class PradoCommandLinePhpShell extends PradoCommandLineAction
 {
-	protected $action = 'shell';
-	protected $parameters = array();
-	protected $optional = array('directory');
-	protected $description = 'Runs a PHP interactive interpreter. Initializes the Prado application in the given [directory].';
+	protected $action='shell';
+	protected $parameters=array();
+	protected $optional=array('directory');
+	protected $description='Runs a PHP interactive interpreter. Initializes the Prado application in the given [directory].';
 
 	public function performAction($args)
 	{
@@ -473,23 +473,23 @@ 
  */
 class PradoCommandLineActiveRecordGen extends PradoCommandLineAction
 {
-	protected $action = 'generate';
-	protected $parameters = array('table', 'output');
-	protected $optional = array('directory', 'soap');
-	protected $description = 'Generate Active Record skeleton for <table> to <output> file using application.xml in [directory]. May also generate [soap] properties.';
+	protected $action='generate';
+	protected $parameters=array('table', 'output');
+	protected $optional=array('directory', 'soap');
+	protected $description='Generate Active Record skeleton for <table> to <output> file using application.xml in [directory]. May also generate [soap] properties.';
 	private $_soap=false;
 
 	public function performAction($args)
 	{
-		$app_dir = count($args) > 3 ? $this->getAppDir($args[3]) : $this->getAppDir();
-		$this->_soap = count($args) > 4;
-		if($app_dir !== false)
+		$app_dir=count($args) > 3 ? $this->getAppDir($args[3]) : $this->getAppDir();
+		$this->_soap=count($args) > 4;
+		if($app_dir!==false)
 		{
-			$config = $this->getActiveRecordConfig($app_dir);
-			$output = $this->getOutputFile($app_dir, $args[2]);
+			$config=$this->getActiveRecordConfig($app_dir);
+			$output=$this->getOutputFile($app_dir, $args[2]);
 			if(is_file($output))
 				echo "** File $output already exists, skiping. \n";
-			else if($config !== false && $output !== false)
+			else if($config!==false && $output!==false)
 				$this->generateActiveRecord($config, $args[1], $output);
 		}
 		return true;
@@ -499,7 +499,7 @@ 
 	{
 		if(is_dir($dir))
 			return realpath($dir);
-		if(false !== ($app_dir = realpath($dir.'/protected/')) && is_dir($app_dir))
+		if(false!==($app_dir=realpath($dir.'/protected/')) && is_dir($app_dir))
 			return $app_dir;
 		echo '** Unable to find directory "'.$dir."\".\n";
 		return false;
@@ -507,9 +507,9 @@ 
 
 	protected function getXmlFile($app_dir)
 	{
-		if(false !== ($xml = realpath($app_dir.'/application.xml')) && is_file($xml))
+		if(false!==($xml=realpath($app_dir.'/application.xml')) && is_file($xml))
 			return $xml;
-		if(false !== ($xml = realpath($app_dir.'/protected/application.xml')) && is_file($xml))
+		if(false!==($xml=realpath($app_dir.'/protected/application.xml')) && is_file($xml))
 			return $xml;
 		echo '** Unable to find application.xml in '.$app_dir."\n";
 		return false;
@@ -517,9 +517,9 @@ 
 
 	protected function getActiveRecordConfig($app_dir)
 	{
-		if(false === ($xml=$this->getXmlFile($app_dir)))
+		if(false===($xml=$this->getXmlFile($app_dir)))
 			return false;
-		if(false !== ($app=$this->initializePradoApplication($app_dir)))
+		if(false!==($app=$this->initializePradoApplication($app_dir)))
 		{
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
 			foreach($app->getModules() as $module)
@@ -534,8 +534,8 @@ 
 	{
 		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
 				return $namespace;
-		$file = Prado::getPathOfNamespace($namespace, ".php");
-		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
+		$file=Prado::getPathOfNamespace($namespace, ".php");
+		if($file!==null && false!==($path=realpath(dirname($file))) && is_dir($path))
 		{
 			if(strpos($path, $app_dir)===0)
 				return $file;
@@ -546,24 +546,24 @@ 
 
 	protected function generateActiveRecord($config, $tablename, $output)
 	{
-		$manager = TActiveRecordManager::getInstance();
+		$manager=TActiveRecordManager::getInstance();
 		if($manager->getDbConnection()) {
-			$gateway = $manager->getRecordGateway();
-			$tableInfo = $gateway->getTableInfo($manager->getDbConnection(), $tablename);
-			if(count($tableInfo->getColumns()) === 0)
+			$gateway=$manager->getRecordGateway();
+			$tableInfo=$gateway->getTableInfo($manager->getDbConnection(), $tablename);
+			if(count($tableInfo->getColumns())===0)
 			{
 				echo '** Unable to find table or view "'.$tablename.'" in "'.$manager->getDbConnection()->getConnectionString()."\".\n";
 				return false;
 			}
 			else
 			{
-				$properties = array();
+				$properties=array();
 				foreach($tableInfo->getColumns() as $field=>$column)
-					$properties[] = $this->generateProperty($field,$column);
+					$properties[]=$this->generateProperty($field, $column);
 			}
 
-			$classname = basename($output, '.php');
-			$class = $this->generateClass($properties, $tablename, $classname);
+			$classname=basename($output, '.php');
+			$class=$this->generateClass($properties, $tablename, $classname);
 			echo "  Writing class $classname to file $output\n";
 			file_put_contents($output, $class);
 		} else {
@@ -571,14 +571,14 @@ 
 		}
 	}
 
-	protected function generateProperty($field,$column)
+	protected function generateProperty($field, $column)
 	{
-		$prop = '';
-		$name = '$'.$field;
-		$type = $column->getPHPType();
+		$prop='';
+		$name='$'.$field;
+		$type=$column->getPHPType();
 		if($this->_soap)
 		{
-			$prop .= <<<EOD
+			$prop.=<<<EOD
 
 	/**
 	 * @var $type $name
@@ -587,14 +587,14 @@ 
 
 EOD;
 		}
-		$prop .= "\tpublic $name;";
+		$prop.="\tpublic $name;";
 		return $prop;
 	}
 
 	protected function generateClass($properties, $tablename, $class)
 	{
-		$props = implode("\n", $properties);
-		$date = date('Y-m-d h:i:s');
+		$props=implode("\n", $properties);
+		$date=date('Y-m-d h:i:s');
 return <<<EOD
 <?php
 /**
@@ -625,38 +625,38 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction
 {
-    protected $action = 'generateAll';
-    protected $parameters = array('output');
-    protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
-    protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
-    private $_soap = false;
-    private $_prefix = '';
-    private $_postfix = '';
-    private $_overwrite = false;
+    protected $action='generateAll';
+    protected $parameters=array('output');
+    protected $optional=array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
+    protected $description="Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
+    private $_soap=false;
+    private $_prefix='';
+    private $_postfix='';
+    private $_overwrite=false;
 
     public function performAction($args) {
-        $app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
-        $this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
-        $this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
-        $this->_prefix = count($args) > 5 ? $args[5] : '';
-        $this->_postfix = count($args) > 6 ? $args[6] : '';
+        $app_dir=count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
+        $this->_soap=count($args) > 3 ? ($args[3]=="soap" || $args[3]=="true" ? true : false) : false;
+        $this->_overwrite=count($args) > 4 ? ($args[4]=="overwrite" || $args[4]=="true" ? true : false) : false;
+        $this->_prefix=count($args) > 5 ? $args[5] : '';
+        $this->_postfix=count($args) > 6 ? $args[6] : '';
 
-        if ($app_dir !== false) {
-            $config = $this->getActiveRecordConfig($app_dir);
+        if($app_dir!==false) {
+            $config=$this->getActiveRecordConfig($app_dir);
 
-            $manager = TActiveRecordManager::getInstance();
-            $con = $manager->getDbConnection();
-            $con->Active = true;
+            $manager=TActiveRecordManager::getInstance();
+            $con=$manager->getDbConnection();
+            $con->Active=true;
 
             switch($con->getDriverName())
            	{
 				case 'mysqli':
 				case 'mysql':
-					$command = $con->createCommand("SHOW TABLES");
+					$command=$con->createCommand("SHOW TABLES");
 					break;
 				case 'sqlite': //sqlite 3
 				case 'sqlite2': //sqlite 2
-					$command = $con->createCommand("SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'");
+					$command=$con->createCommand("SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'");
 					break;
 				case 'pgsql':
 				case 'mssql': // Mssql driver on windows hosts
@@ -669,17 +669,17 @@ 
 					
            	}
 
-            $dataReader = $command->query();
+            $dataReader=$command->query();
             $dataReader->bindColumn(1, $table);
-            $tables = array();
-            while ($dataReader->read() !== false) {
-                $tables[] = $table;
+            $tables=array();
+            while($dataReader->read()!==false) {
+                $tables[]=$table;
             }
-            $con->Active = False;
-            foreach ($tables as $key => $table) {
-                $output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-                if ($config !== false && $output !== false) {
-                    $this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+            $con->Active=False;
+            foreach($tables as $key => $table) {
+                $output=$args[1].".".$this->_prefix.ucfirst($table).$this->_postfix;
+                if($config!==false && $output!==false) {
+                    $this->generate("generate ".$table." ".$output." ".$this->_soap." ".$this->_overwrite);
                 }
             }
         }
@@ -688,16 +688,16 @@ 
 
     public function generate($l)
     {
-		$input = explode(" ", trim($l));
+		$input=explode(" ", trim($l));
 		if(count($input) > 2)
 		{
-			$app_dir = '.';
+			$app_dir='.';
 			if(Prado::getApplication()!==null)
-				$app_dir = dirname(Prado::getApplication()->getBasePath());
-			$args = array($input[0],$input[1], $input[2],$app_dir);
-			if(count($input)>3)
-				$args = array($input[0],$input[1], $input[2],$app_dir,'soap');
-			$cmd = new PradoCommandLineActiveRecordGen;
+				$app_dir=dirname(Prado::getApplication()->getBasePath());
+			$args=array($input[0], $input[1], $input[2], $app_dir);
+			if(count($input) > 3)
+				$args=array($input[0], $input[1], $input[2], $app_dir, 'soap');
+			$cmd=new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
 		}
 		else
@@ -707,45 +707,45 @@ 
     }
 
     protected function getAppDir($dir=".") {
-        if (is_dir($dir))
+        if(is_dir($dir))
             return realpath($dir);
-        if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+        if(false!==($app_dir=realpath($dir.'/protected/')) && is_dir($app_dir))
             return $app_dir;
-        echo '** Unable to find directory "' . $dir . "\".\n";
+        echo '** Unable to find directory "'.$dir."\".\n";
         return false;
     }
 
     protected function getXmlFile($app_dir) {
-        if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+        if(false!==($xml=realpath($app_dir.'/application.xml')) && is_file($xml))
             return $xml;
-        if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+        if(false!==($xml=realpath($app_dir.'/protected/application.xml')) && is_file($xml))
             return $xml;
-        echo '** Unable to find application.xml in ' . $app_dir . "\n";
+        echo '** Unable to find application.xml in '.$app_dir."\n";
         return false;
     }
 
     protected function getActiveRecordConfig($app_dir) {
-        if (false === ($xml = $this->getXmlFile($app_dir)))
+        if(false===($xml=$this->getXmlFile($app_dir)))
             return false;
-        if (false !== ($app = $this->initializePradoApplication($app_dir))) {
+        if(false!==($app=$this->initializePradoApplication($app_dir))) {
             Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-            foreach ($app->getModules() as $module)
-                if ($module instanceof TActiveRecordConfig)
+            foreach($app->getModules() as $module)
+                if($module instanceof TActiveRecordConfig)
                     return $module;
-            echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+            echo '** Unable to find TActiveRecordConfig module in '.$xml."\n";
         }
         return false;
     }
 
     protected function getOutputFile($app_dir, $namespace) {
-        if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
+        if(is_file($namespace) && strpos($namespace, $app_dir)===0)
             return $namespace;
-        $file = Prado::getPathOfNamespace($namespace, "");
-        if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-            if (strpos($path, $app_dir) === 0)
+        $file=Prado::getPathOfNamespace($namespace, "");
+        if($file!==null && false!==($path=realpath(dirname($file))) && is_dir($path)) {
+            if(strpos($path, $app_dir)===0)
                 return $file;
         }
-        echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+        echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
         return false;
     }