pradosoft / prado

framework/Web/UI/ActiveControls/TActiveControlAdapter.php

Doc Comments +1 added lines

@@ -175,6 +175,7 @@
 
 	/**
 	 * @param string state tracker class.
+	 * @param string $value
 	 */
 	public function setStateTracker($value)
 	{

Braces +1 added lines, -2 removed lines

@@ -76,8 +76,7 @@
 				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
 			else
 				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
-		}
-		else
+		} else
 			$this->_activeControlType = $type;
 	}
 

Spacing +17 added lines, -17 removed lines

@@ -52,14 +52,14 @@ 
 	/**
 	 * @var string view state tracker class.
 	 */
-	private $_stateTrackerClass = 'TCallbackPageStateTracker';
+	private $_stateTrackerClass='TCallbackPageStateTracker';
 
 	/**
 	 * Constructor.
 	 * @param IActiveControl active control to adapt.
 	 * @param string Base active control class name.
 	 */
-	public function __construct(IActiveControl $control, $baseCallbackClass = null)
+	public function __construct(IActiveControl $control, $baseCallbackClass=null)
 	{
 		parent::__construct($control);
 		$this->setBaseControlClass($baseCallbackClass);
@@ -70,15 +70,15 @@ 
 	 */
 	protected function setBaseControlClass($type)
 	{
-		if($type === null)
+		if($type===null)
 		{
 			if($this->getControl() instanceof ICallbackEventHandler)
-				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
+				$this->_activeControlType='Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
 			else
-				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
+				$this->_activeControlType='Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
 		}
 		else
-			$this->_activeControlType = $type;
+			$this->_activeControlType=$type;
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 		{
 			parent::render($writer);
 		} else {
-			$writer->write("<span id=\"" . $this->_control->getClientID() . "\" style=\"display:none\"></span>");
+			$writer->write("<span id=\"".$this->_control->getClientID()."\" style=\"display:none\"></span>");
 		}
 	}
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function setBaseActiveControl($control)
 	{
-		$this->_baseActiveControl = $control;
+		$this->_baseActiveControl=$control;
 	}
 
 	/**
@@ -116,10 +116,10 @@ 
 	 */
 	public function getBaseActiveControl()
 	{
-		if($this->_baseActiveControl === null)
+		if($this->_baseActiveControl===null)
 		{
-			$type = $this->_activeControlType;
-			$this->_baseActiveControl = new $type($this->getControl());
+			$type=$this->_activeControlType;
+			$this->_baseActiveControl=new $type($this->getControl());
 		}
 		return $this->_baseActiveControl;
 	}
@@ -131,10 +131,10 @@ 
 	{
 		if($this->getPage()->getIsCallback())
 		{
-			$target = $this->getPage()->getCallbackEventTarget();
+			$target=$this->getPage()->getCallbackEventTarget();
 			if($target instanceof ICallbackEventHandler)
 			{
-				$client = $target->getActiveControl()->getClientSide();
+				$client=$target->getActiveControl()->getClientSide();
 				return $client->getEnablePageStateUpdate();
 			}
 		}
@@ -148,8 +148,8 @@ 
 	{
 		if($this->getIsTrackingPageState())
 		{
-		  $stateTrackerClass = $this->_stateTrackerClass;
-			$this->_stateTracker = new $stateTrackerClass($this->getControl());
+		  $stateTrackerClass=$this->_stateTrackerClass;
+			$this->_stateTracker=new $stateTrackerClass($this->getControl());
 			$this->_stateTracker->trackChanges();
 		}
 		parent::onLoad($param);
@@ -161,7 +161,7 @@ 
 	 */
 	public function saveState()
 	{
-		if(($this->_stateTracker !== null)
+		if(($this->_stateTracker!==null)
 			&& $this->getControl()->getActiveControl()->canUpdateClientSide(true))
 		{
 			$this->_stateTracker->respondToChanges();
@@ -182,6 +182,6 @@ 
 	 */
 	public function setStateTracker($value)
 	{
-		$this->_stateTrackerClass = TPropertyValue::ensureString($value);
+		$this->_stateTrackerClass=TPropertyValue::ensureString($value);
 	}
 }

framework/Web/UI/ActiveControls/TActiveDropDownList.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	/**
 	 * No client class for this control.
 	 * This method overrides the parent implementation.
-	 * @return null no javascript class name.
+	 * @return string no javascript class name.
 	 */
 	protected function getClientClassName()
 	{

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	protected function createListItemCollection()
 	{
-		$collection = new TActiveListItemCollection;
+		$collection=new TActiveListItemCollection;
 		$collection->setControl($this);
 		return $collection;
 	}
@@ -107,7 +107,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->getAutoPostBack())
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TActiveListBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	/**
 	 * Javascript client class for this control.
 	 * This method overrides the parent implementation.
-	 * @return null no javascript class name.
+	 * @return string no javascript class name.
 	 */
 	protected function getClientClassName()
 	{

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	protected function createListItemCollection()
 	{
-		$collection = new TActiveListItemCollection;
+		$collection=new TActiveListItemCollection;
 		$collection->setControl($this);
 		return $collection;
 	}
@@ -89,15 +89,15 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		if(parent::getSelectionMode() === $value)
+		if(parent::getSelectionMode()===$value)
 			return;
 
 		parent::setSelectionMode($value);
-		$multiple = $this->getIsMultiSelect();
-		$id = $this->getUniqueID(); $multi_id = $id . '[]';
+		$multiple=$this->getIsMultiSelect();
+		$id=$this->getUniqueID(); $multi_id=$id.'[]';
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
-			$client = $this->getPage()->getCallbackClient();
+			$client=$this->getPage()->getCallbackClient();
 			$client->setAttribute($this, 'multiple', $multiple ? 'multiple' : false);
 			$client->setAttribute($this, 'name', $multiple ? $multi_id : $id);
 		}
@@ -151,7 +151,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->getAutoPostBack())
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TTriggeredCallback.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	}
 
 	/**
-	 * @return array list of trigger callback options.
+	 * @return string list of trigger callback options.
 	 */
 	protected function getTriggerOptions()
 	{

Spacing +6 added lines, -6 removed lines

@@ -49,10 +49,10 @@ 
 	 */
 	protected function getTargetControl()
 	{
-		$id = $this->getControlID();
-		if(($control = $this->findControl($id)) instanceof TControl)
+		$id=$this->getControlID();
+		if(($control=$this->findControl($id)) instanceof TControl)
 			return $control->getClientID();
-		if($id === '')
+		if($id==='')
 		{
 			throw new TConfigurationException(
 				'ttriggeredcallback_invalid_controlid', get_class($this));
@@ -65,9 +65,9 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['ControlID'] = $this->getTargetControl();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['ControlID']=$this->getTargetControl();
 		return $options;
 	}
 }

framework/Web/UI/JuiControls/TJuiDialog.php

Doc Comments +3 added lines

@@ -158,6 +158,9 @@
 		$this->triggerClientMethod('close');
 	}
 
+	/**
+	 * @param string $method
+	 */
 	private function triggerClientMethod($method)
 	{
 		$cs = $this->getPage()->getClientScript();

Braces +1 added lines, -2 removed lines

@@ -193,8 +193,7 @@
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }

Spacing +11 added lines, -11 removed lines

@@ -72,9 +72,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options = $this->getViewState('JuiOptions')) === null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
-		  $options = new TJuiControlOptions($this);
+		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
 		}
 		return $options;
@@ -103,14 +103,14 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 		// always make the dialog a child of the form, or its inner inputs won't be collected
 		if(!isset($options['appendTo']))
-			$options['appendTo'] = 'form:first';
+			$options['appendTo']='form:first';
 
 		foreach($this->getControls() as $control)
 			if($control instanceof TJuiDialogButton)
-				$options['buttons'][] = $control->getPostBackOptions();
+				$options['buttons'][]=$control->getPostBackOptions();
 
 		return $options;
 	}
@@ -124,9 +124,9 @@ 
 		parent::addAttributesToRender($writer);
 
 		$writer->addAttribute('id', $this->getClientID());
-		$options = TJavaScript::encode($this->getPostBackOptions());
-		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
+		$options=TJavaScript::encode($this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -144,7 +144,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}
@@ -167,8 +167,8 @@ 
 
 	private function triggerClientMethod($method)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery(document).ready(function() { jQuery('#" . $this->getClientId() . "').dialog('" . $method . "'); })";
+		$cs=$this->getPage()->getClientScript();
+		$code="jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 

framework/Web/UI/TTemplateControlInheritable.php

Doc Comments +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	/**
 	 * This method creates the template object for the given class
 	 *
-	 * @param string $p_class The class to create the template from
+	 * @param string $parentClass
 	 * @return void
 	 * @throws TConfigurationException if a template control directive is invalid
 	 */

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function createChildControls()
 	{
-		if(null === ($_template = $this->getTemplate())) {
+		if(null===($_template=$this->getTemplate())) {
 			return $this->doCreateChildControlsFor(get_class($this));
 		}
 
@@ -66,7 +66,7 @@ 
 	 */
 	public function doCreateChildControlsFor($parentClass)
 	{
-		if(false !== ($_parentClass = get_parent_class($parentClass)) && 'TTemplateControl' != $_parentClass) {
+		if(false!==($_parentClass=get_parent_class($parentClass)) && 'TTemplateControl'!=$_parentClass) {
 			$this->doCreateChildControlsFor($_parentClass);
 		}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function doTemplateForClass($parentClass)
 	{
-		if(null !== ($_template = $this->getService()->getTemplateManager()->getTemplateByClassName($parentClass))) {
+		if(null!==($_template=$this->getService()->getTemplateManager()->getTemplateByClassName($parentClass))) {
 			foreach($_template->getDirective() as $_name => $_value) {
 				if(!is_string($_value)) {
 					throw new TConfigurationException('templatecontrol_directive_invalid', get_class(this), $_name);
@@ -105,11 +105,11 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(null !== ($_template = $this->getTemplate())) {
+		if(null!==($_template=$this->getTemplate())) {
 			return $_template->getIsSourceTemplate();
 		}
 
-		return ($_template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_parent_class($this)))
+		return ($_template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_parent_class($this)))
 			? $_template->getIsSourceTemplate()
 			: false;
 	}

framework/Web/UI/WebControls/TBaseDataList.php

Doc Comments +1 added lines

@@ -166,6 +166,7 @@
 	 * Otherwise, an exception will be raised.
 	 * @param mixed data item
 	 * @param mixed field name
+	 * @param string $field
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */

Spacing +2 added lines, -2 removed lines

@@ -149,9 +149,9 @@
 	 */
 	public function getDataKeys()
 	{
-		if(($dataKeys = $this->getViewState('DataKeys', null)) === null)
+		if(($dataKeys=$this->getViewState('DataKeys', null))===null)
 		{
-			$dataKeys = new TList;
+			$dataKeys=new TList;
 			$this->setViewState('DataKeys', $dataKeys, null);
 		}
 		return $dataKeys;

framework/Web/UI/WebControls/TCheckBox.php

Doc Comments +6 added lines, -1 removed lines

@@ -117,7 +117,7 @@ 
 
 	/**
 	 * Returns the value of the property that needs validation.
-	 * @return mixed the property value to be validated
+	 * @return boolean the property value to be validated
 	 */
 	public function getValidationPropertyValue()
 	{
@@ -184,6 +184,7 @@ 
 
 	/**
 	 * @param TTextAlign the alignment of the text caption. Valid values include Left and Right.
+	 * @param TTextAlign $value
 	 */
 	public function setTextAlign($value)
 	{
@@ -244,6 +245,7 @@ 
 	/**
 	 * Sets a value indicating whether clicking on the checkbox will post the page.
 	 * @param boolean whether clicking on the checkbox will post the page.
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -261,6 +263,7 @@ 
 	/**
 	 * Sets the value indicating whether postback event trigger by this checkbox will cause input validation.
 	 * @param boolean whether postback event trigger by this checkbox will cause input validation.
+	 * @param boolean $value
 	 */
 	public function setCausesValidation($value)
 	{
@@ -277,6 +280,7 @@ 
 
 	/**
 	 * @param string the group of validators which the checkbox causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -410,6 +414,7 @@ 
 
 	/**
 	 * @param boolean whether to render javascript.
+	 * @param boolean $value
 	 */
 	public function setEnableClientScript($value)
 	{

Spacing +38 added lines, -38 removed lines

@@ -45,8 +45,8 @@ 
  */
 class TCheckBox extends \Prado\Web\UI\WebControls\TWebControl implements \Prado\Web\UI\IPostBackDataHandler, \Prado\Web\UI\IValidatable, \Prado\IDataRenderer, \Prado\Web\UI\ISurroundable
 {
-	private $_dataChanged = false;
-	private $_isValid = true;
+	private $_dataChanged=false;
+	private $_isValid=true;
 
 	/**
 	 * @return string tag name of the button
@@ -65,11 +65,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		$checked = $this->getChecked();
-		if($newChecked = isset($values[$key]))
+		$checked=$this->getChecked();
+		if($newChecked=isset($values[$key]))
 			$this->setValue($values[$key]);
 		$this->setChecked($newChecked);
-		return $this->_dataChanged = ($newChecked !== $checked);
+		return $this->_dataChanged=($newChecked!==$checked);
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 	 */
 	public function getSurroundingTagID()
 	{
-	return $this->getSpanNeeded() ? $this->getClientID() . '_parent' : $this->getClientID();
+	return $this->getSpanNeeded() ? $this->getClientID().'_parent' : $this->getClientID();
 	}
 
 	/**
@@ -315,31 +315,31 @@ 
 		$this->getPage()->ensureRenderInForm($this);
 		if($this->getHasStyle())
 			$this->getStyle()->addAttributesToRender($writer);
-		if(($tooltip = $this->getToolTip()) !== '')
+		if(($tooltip=$this->getToolTip())!=='')
 			$writer->addAttribute('title', $tooltip);
 		if($this->getHasAttributes())
 		{
-			$attributes = $this->getAttributes();
-			$value = $attributes->remove('value');
+			$attributes=$this->getAttributes();
+			$value=$attributes->remove('value');
 			// onclick js should only be added to input tag
-			if(($onclick = $attributes->remove('onclick')) === null)
-				$onclick = '';
+			if(($onclick=$attributes->remove('onclick'))===null)
+				$onclick='';
 			if($attributes->getCount())
 				$writer->addAttributes($attributes);
-			if($value !== null)
+			if($value!==null)
 				$attributes->add('value', $value);
 		}
 		else
-			$onclick = '';
-	if($needspan = $this->getSpanNeeded())
+			$onclick='';
+	if($needspan=$this->getSpanNeeded())
 	{
 	  $writer->addAttribute('id', $this->getSurroundingTagID());
 	  $writer->renderBeginTag($this->getSurroundingTag());
 	}
-		$clientID = $this->getClientID();
-		if(($text = $this->getText()) !== '')
+		$clientID=$this->getClientID();
+		if(($text=$this->getText())!=='')
 		{
-			if($this->getTextAlign() === TTextAlign::Left)
+			if($this->getTextAlign()===TTextAlign::Left)
 			{
 				$this->renderLabel($writer, $clientID, $text);
 				$this->renderInputTag($writer, $clientID, $onclick);
@@ -361,11 +361,11 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		if($attributes = $this->getViewState('LabelAttributes', null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			return $attributes;
 		else
 		{
-			$attributes = new TAttributeCollection;
+			$attributes=new TAttributeCollection;
 			$this->setViewState('LabelAttributes', $attributes, null);
 			return $attributes;
 		}
@@ -376,11 +376,11 @@ 
 	 */
 	public function getInputAttributes()
 	{
-		if($attributes = $this->getViewState('InputAttributes', null))
+		if($attributes=$this->getViewState('InputAttributes', null))
 			return $attributes;
 		else
 		{
-			$attributes = new TAttributeCollection;
+			$attributes=new TAttributeCollection;
 			$this->setViewState('InputAttributes', $attributes, null);
 			return $attributes;
 		}
@@ -391,11 +391,11 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value = $this->getValue()) !== '')
+		if(($value=$this->getValue())!=='')
 			return $value;
 		else
 		{
-			$attributes = $this->getViewState('InputAttributes', null);
+			$attributes=$this->getViewState('InputAttributes', null);
 			if($attributes && $attributes->contains('value'))
 				return $attributes->itemAt('value');
 			elseif($this->hasAttribute('value'))
@@ -428,7 +428,7 @@ 
 	 * @return bool wether this control needs a surrounding span tag
 	 */
 	protected function getSpanNeeded() {
-		return $this->getText() !== '';
+		return $this->getText()!=='';
 	}
 
 	/**
@@ -440,7 +440,7 @@ 
 	protected function renderLabel($writer, $clientID, $text)
 	{
 		$writer->addAttribute('for', $clientID);
-		if($attributes = $this->getViewState('LabelAttributes', null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('label');
 		$writer->write($text);
@@ -455,21 +455,21 @@ 
 	 */
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		if($clientID !== '')
+		if($clientID!=='')
 			$writer->addAttribute('id', $clientID);
 		$writer->addAttribute('type', 'checkbox');
-		if(($value = $this->getValueAttribute()) !== '')
+		if(($value=$this->getValueAttribute())!=='')
 			$writer->addAttribute('value', $value);
 		if(!empty($onclick))
 			$writer->addAttribute('onclick', $onclick);
-		if(($uniqueID = $this->getUniqueID()) !== '')
+		if(($uniqueID=$this->getUniqueID())!=='')
 			$writer->addAttribute('name', $uniqueID);
 		if($this->getChecked())
 			$writer->addAttribute('checked', 'checked');
 		if(!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 
-		$page = $this->getPage();
+		$page=$this->getPage();
 		if($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
@@ -478,11 +478,11 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey = $this->getAccessKey()) !== '')
+		if(($accesskey=$this->getAccessKey())!=='')
 			$writer->addAttribute('accesskey', $accesskey);
-		if(($tabindex = $this->getTabIndex()) > 0)
+		if(($tabindex=$this->getTabIndex()) > 0)
 			$writer->addAttribute('tabindex', "$tabindex");
-		if($attributes = $this->getViewState('InputAttributes', null))
+		if($attributes=$this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
@@ -493,7 +493,7 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -513,10 +513,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -328,8 +328,7 @@ 
 				$writer->addAttributes($attributes);
 			if($value !== null)
 				$attributes->add('value', $value);
-		}
-		else
+		} else
 			$onclick = '';
 	if($needspan = $this->getSpanNeeded())
 	{
@@ -343,14 +342,12 @@ 
 			{
 				$this->renderLabel($writer, $clientID, $text);
 				$this->renderInputTag($writer, $clientID, $onclick);
-			}
-			else
+			} else
 			{
 				$this->renderInputTag($writer, $clientID, $onclick);
 				$this->renderLabel($writer, $clientID, $text);
 			}
-		}
-		else
+		} else
 			$this->renderInputTag($writer, $clientID, $onclick);
 		if($needspan)
 			$writer->renderEndTag();

framework/Web/UI/WebControls/TCompareValidator.php

Doc Comments +2 added lines

@@ -186,6 +186,8 @@
 	 * Parse the pair of values into the appropriate value type.
 	 * @param string value one
 	 * @param string second value
+	 * @param string $value1
+	 * @param string $value2
 	 * @return array appropriate type of the value pair, array($value1, $value2);
 	 */
 	protected function getComparisonValues($value1, $value2)

Spacing +22 added lines, -22 removed lines

@@ -151,26 +151,26 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
+		if(($value=$this->getValidationValue($this->getValidationTarget()))==='')
 			return true;
 
-		if(($controlToCompare = $this->getControlToCompare()) !== '')
+		if(($controlToCompare=$this->getControlToCompare())!=='')
 		{
-			if(($control2 = $this->findControl($controlToCompare)) === null)
+			if(($control2=$this->findControl($controlToCompare))===null)
 				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2 = $this->getValidationValue($control2)) === '')
+			if(($value2=$this->getValidationValue($control2))==='')
 				return false;
 		}
 		else
-			$value2 = $this->getValueToCompare();
+			$value2=$this->getValueToCompare();
 
-		$values = $this->getComparisonValues($value, $value2);
+		$values=$this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
-				return $values[0] == $values[1];
+				return $values[0]==$values[1];
 			case TValidationCompareOperator::NotEqual:
-				return $values[0] != $values[1];
+				return $values[0]!=$values[1];
 			case TValidationCompareOperator::GreaterThan:
 				return $values[0] > $values[1];
 			case TValidationCompareOperator::GreaterThanEqual:
@@ -199,10 +199,10 @@ 
 			case TValidationDataType::Float:
 				return [floatval($value1), floatval($value2)];
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
-				if($dateFormat !== '')
+				$dateFormat=$this->getDateFormat();
+				if($dateFormat!=='')
 				{
-					$formatter = new TSimpleDateFormatter($dateFormat);
+					$formatter=new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
 				}
 				else
@@ -217,19 +217,19 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		if(($name = $this->getControlToCompare()) !== '')
+		$options=parent::getClientScriptOptions();
+		if(($name=$this->getControlToCompare())!=='')
 		{
-			if(($control = $this->findControl($name)) !== null)
-				$options['ControlToCompare'] = $control->getClientID();
+			if(($control=$this->findControl($name))!==null)
+				$options['ControlToCompare']=$control->getClientID();
 		}
-		if(($value = $this->getValueToCompare()) !== '')
-			$options['ValueToCompare'] = $value;
-		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
-			$options['Operator'] = $operator;
-		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
-			$options['DateFormat'] = $dateFormat;
+		if(($value=$this->getValueToCompare())!=='')
+			$options['ValueToCompare']=$value;
+		if(($operator=$this->getOperator())!==TValidationCompareOperator::Equal)
+			$options['Operator']=$operator;
+		$options['DataType']=$this->getDataType();
+		if(($dateFormat=$this->getDateFormat())!=='')
+			$options['DateFormat']=$dateFormat;
 		return $options;
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
 			if(($value2 = $this->getValidationValue($control2)) === '')
 				return false;
-		}
-		else
+		} else
 			$value2 = $this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
@@ -204,8 +203,7 @@ 
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
-				}
-				else
+				} else
 					return [strtotime($value1), strtotime($value2)];
 		}
 		return [$value1, $value2];