pradosoft / prado

framework/Web/UI/JuiControls/TJuiDatePicker.php

Indentation +2 added lines, -2 removed lines

@@ -90,10 +90,10 @@
 	{
 		return array('altField', 'altFormat', 'appendText', 'autoSize', 'buttonImage', 'buttonImageOnly', 'buttonText', 'calculateWeek',
 								 'changeMonth', 'changeYear', 'closeText', 'constrainInput', 'currentText', 'dateFormat', 'dayNames', 'dayNamesMin',
-				         'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate',
+						 'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate',
 								 'minDate', 'monthNames', 'monthNamesShort', 'navigationAsDateFormat', 'nextText', 'numberOfMonths', 'prevText',
 								 'selectOtherMonths', 'shortYearCutoff', 'showAnim', 'showButtonPanel', 'showCurrentAtPos', 'showMonthAfterYear',
-				         'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix',
+						 'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix',
 								 'beforeShow', 'beforeShowDay', 'onChangeMonthYear', 'onClose', 'onSelect');
 	}
 

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
 	 * it will register an additional clientscript to set the language specific global default settings.
 	 * @var boolean true, if this is the first instance of TJuiDatePicker, false otherwise
 	 */
-	private static $_first = true;
+	private static $_first=true;
 
 	/**
 	 * Creates a new callback control, sets the adapter to
@@ -74,7 +74,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -168,8 +168,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -178,7 +178,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -253,8 +253,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -265,9 +265,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -278,10 +278,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 }
\ No newline at end of file

framework/Web/UI/JuiControls/TJuiDraggable.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJuiDraggable class file.
- *
- * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiDraggable class file.
+	 *
+	 * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');

Spacing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -114,7 +114,7 @@ 
 	{
 		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.");";
@@ -135,7 +135,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -144,7 +144,7 @@ 
 	 * Raises the OnDrag event
 	 * @param object $params event parameters
 	 */
-	public function onDrag ($params)
+	public function onDrag($params)
 	{
 		$this->raiseEvent('OnDrag', $this, $params);
 	}
@@ -153,7 +153,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -162,7 +162,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function onStop ($params)
+	public function onStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}

framework/Web/UI/ActiveControls/TActiveDataList.php

Indentation +34 added lines, -34 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * TActiveDataList class file
- *
- * @author Marcos Aurelio Nobre <marconobre@gmail.com>
- * @copyright Copyright &copy; 2008, PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TActiveDataList class file
+	 *
+	 * @author Marcos Aurelio Nobre <marconobre@gmail.com>
+	 * @copyright Copyright &copy; 2008, PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * TActiveDataList class
@@ -31,8 +31,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -40,7 +40,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -52,11 +52,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -65,7 +65,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -76,13 +76,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -92,14 +92,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -109,8 +109,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     parent::setDataSource($value);
     if($this->getActiveControl()->canUpdateClientSide()) {
       $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+      $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }

framework/Web/UI/ActiveControls/TActiveMultiView.php

Indentation +23 added lines, -23 removed lines

@@ -30,9 +30,9 @@ 
 class TActiveMultiView extends TMultiView implements IActiveControl
 {
 	/**
-	* Creates a new callback control, sets the adapter to
-	* TActiveControlAdapter.
-	*/
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter.
+	 */
 	public function __construct()
 	{
 		parent::__construct();
@@ -40,28 +40,28 @@ 
 	}
 
 	/**
-	* @return TBaseActiveControl standard active control options.
-	*/
+	 * @return TBaseActiveControl standard active control options.
+	 */
 	public function getActiveControl()
 	{
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
 	/**
-	* Returns the id of the surrounding container (span).
-	* @return string container id
-	*/
+	 * Returns the id of the surrounding container (span).
+	 * @return string container id
+	 */
 	protected function getContainerID()
 	{
 		return $this->ClientID.'_Container';
 	}
 
 	/**
-	* Renders the TActiveMultiView.
-	* If the MutliView did not pass the prerender phase yet, it will register itself for rendering later.
-	* Else it will call the {@link renderMultiView()} method which will do the rendering of the MultiView.
-	* @param THtmlWriter writer for the rendering purpose
-	*/
+	 * Renders the TActiveMultiView.
+	 * If the MutliView did not pass the prerender phase yet, it will register itself for rendering later.
+	 * Else it will call the {@link renderMultiView()} method which will do the rendering of the MultiView.
+	 * @param THtmlWriter writer for the rendering purpose
+	 */
 	public function render($writer)
 	{
 		if($this->getHasPreRendered()) {
@@ -74,10 +74,10 @@ 
 	}
 
 	/**
-	* Renders the TActiveMultiView by writing a span tag with the container id obtained from {@link getContainerID()}
-	* which will be called by the replacement method of the client script to update it's content.
-	* @param $writer THtmlWriter writer for the rendering purpose
-	*/
+	 * Renders the TActiveMultiView by writing a span tag with the container id obtained from {@link getContainerID()}
+	 * which will be called by the replacement method of the client script to update it's content.
+	 * @param $writer THtmlWriter writer for the rendering purpose
+	 */
 	protected function renderMultiView($writer)
 	{
 		$writer->addAttribute('id', $this->getContainerID());
@@ -87,9 +87,9 @@ 
 	}
 
 	/**
-	* @param integer the zero-based index of the current view in the view collection. -1 if no active view.
-	* @throws TInvalidDataValueException if the view index is invalid
-	*/
+	 * @param integer the zero-based index of the current view in the view collection. -1 if no active view.
+	 * @throws TInvalidDataValueException if the view index is invalid
+	 */
 	public function setActiveViewIndex($value)
 	{
 		$old=parent::getActiveViewIndex();
@@ -99,9 +99,9 @@ 
 	}
 
 	/**
-	* @param TView the view to be activated
-	* @throws TInvalidOperationException if the view is not in the view collection
-	*/
+	 * @param TView the view to be activated
+	 * @throws TInvalidOperationException if the view is not in the view collection
+	 */
 	public function setActiveView($value)
 	{
 		$old=parent::getActiveView();

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +6 added lines, -6 removed lines

@@ -67,10 +67,10 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderMultiView($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
 		}
 		else
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	*/
 	public function setActiveViewIndex($value)
 	{
-		if(parent::getActiveViewIndex() === $value)
+		if(parent::getActiveViewIndex()===$value)
 			return;
 
 		parent::setActiveViewIndex($value);
 		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
 
 	/**
@@ -106,11 +106,11 @@ 
 	*/
 	public function setActiveView($value)
 	{
-		if(parent::getActiveView() === $value)
+		if(parent::getActiveView()===$value)
 			return;
 
 		parent::setActiveView($value);
 		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
 }

framework/Web/UI/ActiveControls/TActiveDatePicker.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user modifies the text in the TActiveDatePicker control and
-     * then tabs out of the component. Defaults to true.
+	 * will occur whenever the user modifies the text in the TActiveDatePicker control and
+	 * then tabs out of the component. Defaults to true.
 	 */
 	public function getAutoPostBack()
 	{

Spacing +22 added lines, -22 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',true);
+		return $this->getViewState('AutoPostBack', true);
 	}
 
 	/**
@@ -48,7 +48,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -57,12 +57,12 @@ 
 	 */
 	protected function getDatePickerOptions()
 	{
-		$options = parent::getDatePickerOptions();
+		$options=parent::getDatePickerOptions();
 		$options['CausesValidation']=$this->getCausesValidation();
 		$options['ValidationGroup']=$this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['ShowCalendar'] = $this->getShowCalendar();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['ShowCalendar']=$this->getShowCalendar();
+		$options['AutoPostBack']=$this->getAutoPostBack();
 		return $options;
 	}
 
@@ -80,7 +80,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -88,21 +88,21 @@ 
 	 * Client-side Text property can only be updated after the OnLoad stage.
 	 * @param string text content for the textbox
 	 */
-	public function setText($value){
-		if(parent::getText() === $value)
+	public function setText($value) {
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData()){
+		if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData()) {
 			$cb=$this->getPage()->getCallbackClient();
 			$cb->setValue($this, $value);
-			if ($this->getInputMode()==TDatePickerInputMode::DropDownList)
+			if($this->getInputMode()==TDatePickerInputMode::DropDownList)
 			{
-				$s = Prado::createComponent('System.Util.TDateTimeStamp');
-				$date = $s->getDate($this->getTimeStampFromText());
+				$s=Prado::createComponent('System.Util.TDateTimeStamp');
+				$date=$s->getDate($this->getTimeStampFromText());
 				$id=$this->getClientID();
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'day', 'Value', $date['mday'], 'select');
-				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'month', 'Value', $date['mon']-1, 'select');
+				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'month', 'Value', $date['mon'] - 1, 'select');
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'year', 'Value', $date['year'], 'select');
 
 			}
@@ -115,7 +115,7 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
- 	public function raiseCallbackEvent($param){
+ 	public function raiseCallbackEvent($param) {
 		$this->onCallback($param);
 	}
 
@@ -126,7 +126,7 @@ 
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
 	 */
-	public function onCallback($param){
+	public function onCallback($param) {
 		$this->raiseEvent('OnCallback', $this, $param);
 	}
 
@@ -136,22 +136,22 @@ 
 
 	protected function registerCalendarClientScriptPre()
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPradoScript("activedatepicker");
 	}
 
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 		{
-			$spacer = $this->getAssetUrl('spacer.gif');
-			$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
+			$spacer=$this->getAssetUrl('spacer.gif');
+			$code="Prado.WebUI.TDatePicker.spacer = '$spacer';";
 			$cs->registerEndScript('TDatePicker.spacer', $code);
 		}
 
-		$options = TJavaScript::encode($this->getDatePickerOptions());
-		$code = "new Prado.WebUI.TActiveDatePicker($options);";
+		$options=TJavaScript::encode($this->getDatePickerOptions());
+		$code="new Prado.WebUI.TActiveDatePicker($options);";
 		$cs->registerEndScript("prado:".$this->getClientID(), $code);
 	}
 

framework/Web/UI/ActiveControls/TActivePanel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 
@@ -77,17 +77,17 @@ 
 		{
 			parent::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-			if ($this->getHasControls())
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
+			if($this->getHasControls())
 			{
 				// If we update a TActivePanel on callback,
 				// We shouldn't update all childs, because the whole content will be replaced by
 				// the parent
-				foreach ($this->findControlsByType('IActiveControl', false) as $control)
+				foreach($this->findControlsByType('IActiveControl', false) as $control)
 				{
 						$control->getActiveControl()->setEnableUpdate(false);
 				}

framework/Web/UI/ActiveControls/TActiveCheckBoxList.php

Indentation +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			&& $this->getPage()->getClientSupportsJavaScript())
 		{
 		  $this->getActiveControl()->registerCallbackClientScript(
-		    $this->getClientClassName(), $this->getPostBackOptions());
+			$this->getClientClassName(), $this->getPostBackOptions());
 		}
 	}
 

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
 	 * updated later.
 	 *@return boolean always true
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 	  return true;
 	}
@@ -87,7 +87,7 @@ 
 	 */
 	protected function createRepeatedControl()
 	{
-		$control = new TActiveCheckBoxListItem;
+		$control=new TActiveCheckBoxListItem;
 		$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
 		return $control;
 	}
@@ -151,9 +151,9 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		TCheckBox::renderInputTag($writer,$clientID,$onclick);
+		TCheckBox::renderInputTag($writer, $clientID, $onclick);
 	}
 }
 

framework/Web/TCacheHttpSession.php

Indentation +10 added lines, -10 removed lines

@@ -50,8 +50,8 @@ 
 	 * It reads the CacheModule property.
 	 * @param TXmlElement module configuration
 	 */
-    public function init($config)
-    {
+	public function init($config)
+	{
 		if($this->_cacheModuleID==='')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
 		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
@@ -62,7 +62,7 @@ 
 			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
-    }
+	}
 
 	/**
 	 * @return string the ID of the cache module.
@@ -95,7 +95,7 @@ 
 	 */
 	public function _read($id)
 	{
-	    return $this->_cache->get($this->calculateKey($id));
+		return $this->_cache->get($this->calculateKey($id));
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function _destroy($id)
 	{
-	    return $this->_cache->delete($this->calculateKey($id));
+		return $this->_cache->delete($this->calculateKey($id));
 	}
 
 	/**
@@ -125,15 +125,15 @@ 
 	 */
 	public function getKeyPrefix()
 	{
-	    return $this->_prefix;
+		return $this->_prefix;
 	}
 
 	/**
-     * @param string prefix of session variable name to avoid conflict with other cache data
-     */
+	 * @param string prefix of session variable name to avoid conflict with other cache data
+	 */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+		$this->_prefix=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	protected function calculateKey($id)
 	{
-	    return $this->_prefix.':'.$id;
+		return $this->_prefix.':'.$id;
 	}
 }
 

Spacing +4 added lines, -4 removed lines

@@ -55,11 +55,11 @@ 
 		if($this->_cacheModuleID==='')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
 		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
 		else if($cache instanceof ICache)
 			$this->_cache=$cache;
 		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
     }
@@ -104,9 +104,9 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
-		return $this->_cache->set($this->calculateKey($id),$data,$this->getTimeout());
+		return $this->_cache->set($this->calculateKey($id), $data, $this->getTimeout());
 	}
 
 	/**

framework/Data/ActiveRecord/TActiveRecord.php

Indentation +20 added lines, -20 removed lines

@@ -1026,28 +1026,28 @@
 		return isset(self::$_relations[get_class($this)][strtolower($property)]);
 	}
 	
-        /**
-        * Return record data as array
-        * @return array of column name and column values
-        * @since 3.2.4
-        */
-        public function toArray(){
-        	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
-            		$result[$columnName]=$this->getColumnValue($columnName);
-           	}
+		/**
+		 * Return record data as array
+		 * @return array of column name and column values
+		 * @since 3.2.4
+		 */
+		public function toArray(){
+			$result=array();
+			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+					$result[$columnName]=$this->getColumnValue($columnName);
+		   	}
         
-        	return $result;
-    	}
+			return $result;
+		}
     
-    	/**
-     	* Return record data as JSON
-     	* @return JSON
-     	* @since 3.2.4
-     	*/
-    	public function toJSON(){
-        	return json_encode($this->toArray());
-    	}
+		/**
+		 * Return record data as JSON
+		 * @return JSON
+		 * @since 3.2.4
+		 */
+		public function toJSON(){
+			return json_encode($this->toArray());
+		}
 }
 
 /**

Doc Comments +9 added lines, -1 removed lines

@@ -505,6 +505,7 @@ 
 	 * Delete multiple records using a criteria.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return int number of records deleted.
 	 */
 	public function deleteAll($criteria=null, $parameters=array())
@@ -571,6 +572,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
 	public function find($criteria,$parameters=array())
@@ -587,6 +589,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
 	public function findAll($criteria=null,$parameters=array())
@@ -700,6 +703,7 @@ 
 	 * Find the number of records.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function count($criteria=null,$parameters=array())
@@ -715,6 +719,7 @@ 
 	 * value equal to the $property value.
 	 * @param string relationship/property name corresponding to keys in $RELATION array.
 	 * @param array method call arguments.
+	 * @param string $name
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
 	protected function getRelationHandler($name,$args=array())
@@ -939,6 +944,7 @@ 
 	 * Raised before the record attempt to insert its data into the database.
 	 * To prevent the insert operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onInsert($param)
 	{
@@ -949,6 +955,7 @@ 
 	 * Raised before the record attempt to delete its data from the database.
 	 * To prevent the delete operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onDelete($param)
 	{
@@ -959,6 +966,7 @@ 
 	 * Raised before the record attempt to update its data in the database.
 	 * To prevent the update operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onUpdate($param)
 	{
@@ -1042,7 +1050,7 @@ 
     
     	/**
      	* Return record data as JSON
-     	* @return JSON
+     	* @return string
      	* @since 3.2.4
      	*/
     	public function toJSON(){

Spacing +86 added lines, -86 removed lines

@@ -194,14 +194,14 @@ 
 	 * @var TActiveRecordInvalidFinderResult
 	 * @since 3.1.5
 	 */
-	protected $_invalidFinderResult = null; // use protected so that serialization is fine
+	protected $_invalidFinderResult=null; // use protected so that serialization is fine
 
 	/**
 	 * Prevent __call() method creating __sleep() when serializing.
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0*\0_connection"));
+		return array_diff(parent::__sleep(), array("\0*\0_connection"));
 	}
 
 	/**
@@ -256,12 +256,12 @@ 
 	 * @param mixed property value.
 	 * @since 3.1.2
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
 		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
 			$this->$name=$value;
 		else
-			parent::__set($name,$value);
+			parent::__set($name, $value);
 	}
 
 	/**
@@ -288,7 +288,7 @@ 
 			$class=new ReflectionClass($className);
 			$relations=array();
 			foreach($class->getStaticPropertyValue('RELATIONS') as $key=>$value)
-				$relations[strtolower($key)]=array($key,$value);
+				$relations[strtolower($key)]=array($key, $value);
 			self::$_relations[$className]=$relations;
 		}
 	}
@@ -304,7 +304,7 @@ 
 		if(!is_array($data))
 			throw new TActiveRecordException('ar_data_invalid', get_class($this));
 		foreach($data as $name=>$value)
-			$this->setColumnValue($name,$value);
+			$this->setColumnValue($name, $value);
 	}
 
 
@@ -355,16 +355,16 @@ 
 	{
 		if($record===null || get_class($this)!==get_class($record))
 			return false;
-		$tableInfo = $this->getRecordTableInfo();
-		$pks = $tableInfo->getPrimaryKeys();
-		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
+		$tableInfo=$this->getRecordTableInfo();
+		$pks=$tableInfo->getPrimaryKeys();
+		$properties=count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
 		$equals=true;
 		foreach($properties as $prop)
 		{
 			if($strict)
-				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)===$record->getColumnValue($prop);
 			else
-				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)==$record->getColumnValue($prop);
 			if(!$equals)
 				return false;
 		}
@@ -382,10 +382,10 @@ 
 	 */
 	public static function finder($className=__CLASS__)
 	{
-		static $finders = array();
+		static $finders=array();
 		if(!isset($finders[$className]))
 		{
-			$f = Prado::createComponent($className);
+			$f=Prado::createComponent($className);
 			$finders[$className]=$f;
 		}
 		return $finders[$className];
@@ -415,14 +415,14 @@ 
 	 */
 	public function save()
 	{
-		$gateway = $this->getRecordGateway();
-		$param = new TActiveRecordChangeEventParameter();
+		$gateway=$this->getRecordGateway();
+		$param=new TActiveRecordChangeEventParameter();
 		if($this->_recordState===self::STATE_NEW)
 		{
 			$this->onInsert($param);
 			if($param->getIsValid() && $gateway->insert($this))
 			{
-				$this->_recordState = self::STATE_LOADED;
+				$this->_recordState=self::STATE_LOADED;
 				return true;
 			}
 		}
@@ -447,8 +447,8 @@ 
 	{
 		if($this->_recordState===self::STATE_LOADED)
 		{
-			$gateway = $this->getRecordGateway();
-			$param = new TActiveRecordChangeEventParameter();
+			$gateway=$this->getRecordGateway();
+			$param=new TActiveRecordChangeEventParameter();
 			$this->onDelete($param);
 			if($param->getIsValid() && $gateway->delete($this))
 			{
@@ -488,8 +488,8 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		return $this->getRecordGateway()->deleteRecordsByPk($this,(array)$keys);
+			$keys=func_get_args();
+		return $this->getRecordGateway()->deleteRecordsByPk($this, (array) $keys);
 	}
 
 	/**
@@ -498,7 +498,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -509,8 +509,8 @@ 
 	 */
 	public function deleteAll($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		return $this->getRecordGateway()->deleteRecordsByCriteria($this, $criteria);
 	}
 
@@ -534,7 +534,7 @@ 
 	{
 		$result=array();
 		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+			$result[]=$this->populateObject($data);
 		return $result;
 	}
 
@@ -573,12 +573,12 @@ 
 	 * @param mixed parameter values.
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
-	public function find($criteria,$parameters=array())
+	public function find($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria);
+		$data=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -589,12 +589,12 @@ 
 	 * @param mixed parameter values.
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
-	public function findAll($criteria=null,$parameters=array())
+	public function findAll($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria,true);
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
 	}
 
@@ -612,11 +612,11 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if($keys===null)
 			return null;
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$data = $this->getRecordGateway()->findRecordByPK($this,$keys);
+			$keys=func_get_args();
+		$data=$this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
 	}
 
@@ -640,8 +640,8 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$result = $this->getRecordGateway()->findRecordsByPks($this,(array)$keys);
+			$keys=func_get_args();
+		$result=$this->getRecordGateway()->findRecordsByPks($this, (array) $keys);
 		return $this->populateObjects($result);
 	}
 
@@ -653,12 +653,12 @@ 
 	 * @param array $parameters
 	 * @return TActiveRecord, null if no result is returned.
 	 */
-	public function findBySql($sql,$parameters=array())
+	public function findBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($sql, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordBySql($this,$criteria);
+		$data=$this->getRecordGateway()->findRecordBySql($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -670,11 +670,11 @@ 
 	 * @param array $parameters
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllBySql($sql,$parameters=array())
+	public function findAllBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($sql,$parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsBySql($this,$criteria);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($sql, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsBySql($this, $criteria);
 		return $this->populateObjects($result);
 	}
 
@@ -690,9 +690,9 @@ 
 	 * @param array matching field values.
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllByIndex($criteria,$fields,$values)
+	public function findAllByIndex($criteria, $fields, $values)
 	{
-		$result = $this->getRecordGateway()->findRecordsByIndex($this,$criteria,$fields,$values);
+		$result=$this->getRecordGateway()->findRecordsByIndex($this, $criteria, $fields, $values);
 		return $this->populateObjects($result);
 	}
 
@@ -702,12 +702,12 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria=null,$parameters=array())
+	public function count($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
-		return $this->getRecordGateway()->countRecords($this,$criteria);
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
 
 	/**
@@ -717,11 +717,11 @@ 
 	 * @param array method call arguments.
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
-	protected function getRelationHandler($name,$args=array())
+	protected function getRelationHandler($name, $args=array())
 	{
-		if(($context=$this->createRelationContext($name)) !== null)
+		if(($context=$this->createRelationContext($name))!==null)
 		{
-			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
+			$criteria=$this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
 		}
 		else
@@ -741,8 +741,8 @@ 
 	{
 		if(($definition=$this->getRecordRelation($name))!==null)
 		{
-			list($property, $relation) = $definition;
-			return new TActiveRecordRelationContext($this,$property,$relation);
+			list($property, $relation)=$definition;
+			return new TActiveRecordRelationContext($this, $property, $relation);
 		}
 		else
 			return null;
@@ -785,7 +785,7 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if( ($context=$this->createRelationContext($property)) !== null)
+		if(($context=$this->createRelationContext($property))!==null)
 			return $context->getRelationHandler()->fetchResultsInto($this);
 		else
 			return false;
@@ -820,31 +820,31 @@ 
 	 * @return mixed single record if method name starts with "findBy", 0 or more records
 	 * if method name starts with "findAllBy"
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
-		$delete =false;
-		if(strncasecmp($method,'with',4)===0)
+		$delete=false;
+		if(strncasecmp($method, 'with', 4)===0)
 		{
-			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
+			$property=$method[4]==='_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
 		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(strncasecmp($method,'findallby',9)===0)
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete=strncasecmp($method,'deleteby',8)===0)
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete=strncasecmp($method,'deleteallby',11)===0)
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		else if($findOne=strncasecmp($method, 'findby', 6)===0)
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		else if(strncasecmp($method, 'findallby', 9)===0)
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		else if($delete=strncasecmp($method, 'deleteby', 8)===0)
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		else if($delete=strncasecmp($method, 'deleteallby', 11)===0)
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
-				throw new TActiveRecordException('ar_invalid_finder_method',$method);
+			if($this->getInvalidFinderResult()==TActiveRecordInvalidFinderResult::Exception)
+				throw new TActiveRecordException('ar_invalid_finder_method', $method);
 			else
 				return null;
 		}
 
-		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else
@@ -858,7 +858,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if($this->_invalidFinderResult!==null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -873,10 +873,10 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
+		if($value===null)
+			$this->_invalidFinderResult=null;
 		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
+			$this->_invalidFinderResult=TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
 	}
 
 	/**
@@ -892,8 +892,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -987,7 +987,7 @@ 
 	 * @param mixed the corresponding column value
 	 * @since 3.1.1
 	 */
-	public function setColumnValue($columnName,$value)
+	public function setColumnValue($columnName, $value)
 	{
 		$className=get_class($this);
 		if(isset(self::$_columnMapping[$className][$columnName]))
@@ -1004,7 +1004,7 @@ 
 	{
 		$className=get_class($this);
 		$property=strtolower($property);
-		return isset(self::$_relations[$className][$property])?self::$_relations[$className][$property]:null;
+		return isset(self::$_relations[$className][$property]) ? self::$_relations[$className][$property] : null;
 	}
 
 	/**
@@ -1031,9 +1031,9 @@ 
         * @return array of column name and column values
         * @since 3.2.4
         */
-        public function toArray(){
+        public function toArray() {
         	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName) {
             		$result[$columnName]=$this->getColumnValue($columnName);
            	}
         
@@ -1045,7 +1045,7 @@ 
      	* @return JSON
      	* @since 3.2.4
      	*/
-    	public function toJSON(){
+    	public function toJSON() {
         	return json_encode($this->toArray());
     	}
 }
@@ -1080,7 +1080,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -1102,6 +1102,6 @@ 
  */
 class TActiveRecordInvalidFinderResult extends TEnumerable
 {
-	const Null = 'Null';
-	const Exception = 'Exception';
+	const Null='Null';
+	const Exception='Exception';
 }

Braces +7 added lines, -14 removed lines

@@ -425,14 +425,12 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		else if($this->_recordState===self::STATE_LOADED)
+		} else if($this->_recordState===self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
 			if($param->getIsValid() && $gateway->update($this))
 				return true;
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
@@ -455,8 +453,7 @@ 
 				$this->_recordState=self::STATE_DELETED;
 				return true;
 			}
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
@@ -723,8 +720,7 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
 			return $context->getRelationHandler($criteria);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -743,8 +739,7 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this,$property,$relation);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -827,8 +822,7 @@ 
 		{
 			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
 			return $this->getRelationHandler($property, $args);
-		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
+		} else if($findOne=strncasecmp($method,'findby',6)===0)
 			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
 		else if(strncasecmp($method,'findallby',9)===0)
 			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
@@ -894,8 +888,7 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();