pradosoft / prado

framework/Web/UI/WebControls/TContent.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	{
 		if(($id=$this->getID())==='')
 			throw new TConfigurationException('content_id_required');
-		$this->getTemplateControl()->registerContent($id,$this);
+		$this->getTemplateControl()->registerContent($id, $this);
 	}
 }
 

framework/Web/UI/WebControls/TListBox.php

Braces +4 added lines, -8 removed lines

@@ -101,8 +101,7 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged=true;
-				}
-				else
+				} else
 					return false;
 			}
 			if(!is_array($selections))
@@ -124,8 +123,7 @@ 
 						break;
 					}
 				}
-			}
-			else
+			} else
 				$flag=true;
 			if($flag)
 			{
@@ -133,13 +131,11 @@ 
 				$this->_dataChanged=true;
 			}
 			return $flag;
-		}
-		else if($this->getSelectedIndex()!==-1)
+		} else if($this->getSelectedIndex()!==-1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

Indentation +2 added lines, -2 removed lines

@@ -225,13 +225,13 @@
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -45,11 +45,11 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$rows=$this->getRows();
-		$writer->addAttribute('size',"$rows");
+		$writer->addAttribute('size', "$rows");
 		if($this->getSelectionMode()===TListSelectionMode::Multiple)
-			$writer->addAttribute('name',$this->getUniqueID().'[]');
+			$writer->addAttribute('name', $this->getUniqueID().'[]');
 		else
-			$writer->addAttribute('name',$this->getUniqueID());
+			$writer->addAttribute('name', $this->getUniqueID());
 		parent::addAttributesToRender($writer);
 	}
 
@@ -82,19 +82,19 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if(!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selections=isset($values[$key])?$values[$key]:null;
+		$selections=isset($values[$key]) ? $values[$key] : null;
 		if($selections!==null)
 		{
 			$items=$this->getItems();
 			if($this->getSelectionMode()===TListSelectionMode::Single)
 			{
-				$selection=is_array($selections)?$selections[0]:$selections;
-				$index=$items->findIndexByValue($selection,false);
+				$selection=is_array($selections) ? $selections[0] : $selections;
+				$index=$items->findIndexByValue($selection, false);
 				if($this->getSelectedIndex()!==$index)
 				{
 					$this->setSelectedIndex($index);
@@ -107,14 +107,14 @@ 
 				$selections=array($selections);
 			$list=array();
 			foreach($selections as $selection)
-				$list[]=$items->findIndexByValue($selection,false);
+				$list[]=$items->findIndexByValue($selection, false);
 			$list2=$this->getSelectedIndices();
 			$n=count($list);
 			$flag=false;
 			if($n===count($list2))
 			{
-				sort($list,SORT_NUMERIC);
-				for($i=0;$i<$n;++$i)
+				sort($list, SORT_NUMERIC);
+				for($i=0; $i < $n; ++$i)
 				{
 					if($list[$i]!==$list2[$i])
 					{
@@ -187,7 +187,7 @@ 
 	public function setRows($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value<=0)
+		if($value <= 0)
 			$value=4;
 		$this->setViewState('Rows', $value, 4);
 	}
@@ -205,7 +205,7 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		$this->setViewState('SelectionMode',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TListSelectionMode'),TListSelectionMode::Single);
+		$this->setViewState('SelectionMode', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TListSelectionMode'), TListSelectionMode::Single);
 	}
 
 	/**

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by \Prado\Web\UI\IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

framework/Web/UI/WebControls/TRadioButtonList.php

Spacing +2 added lines, -2 removed lines

@@ -57,9 +57,9 @@
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		$value=isset($values[$key])?$values[$key]:'';
+		$value=isset($values[$key]) ? $values[$key] : '';
 		$oldSelection=$this->getSelectedIndex();
 		$this->ensureDataBound();
 		foreach($this->getItems() as $index=>$item)

Doc Comments +1 added lines, -1 removed lines

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

framework/Web/UI/WebControls/TBaseValidator.php

Braces +2 added lines, -4 removed lines

@@ -518,16 +518,14 @@
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
 					if($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);

Doc Comments +5 added lines, -2 removed lines

@@ -185,6 +185,7 @@ 
 	 * TBaseValidator::$_clientClass, be sure to update the corresponding
 	 * "Javascript/validation3.js" file as well.
 	 * @param TControl control to validate.
+	 * @param \Prado\Web\UI\TControl $control
 	 * @return string control type for client-side validation.
 	 */
 	private function getClientControlClass($control)
@@ -263,7 +264,7 @@ 
 	/**
 	 * Update the ControlToValidate component's css class depending
 	 * if the ControlCssClass property is set, and whether this is valid.
-	 * @return boolean true if change, false otherwise.
+	 * @return boolean|null true if change, false otherwise.
 	 */
 	protected function updateControlCssClass()
 	{
@@ -388,6 +389,7 @@ 
 	 * The ID path is the dot-connected IDs of the controls reaching from
 	 * the validator's naming container to the target control.
 	 * @param string the ID path
+	 * @param string $value
 	 */
 	public function setControlToValidate($value)
 	{
@@ -476,7 +478,7 @@ 
 	}
 
 	/**
-	 * @return TControl control to be validated. Null if no control is found.
+	 * @return \Prado\Web\UI\TControl control to be validated. Null if no control is found.
 	 * @throws TConfigurationException if {@link getControlToValidate
 	 * ControlToValidate} is empty or does not point to a valid control
 	 */
@@ -553,6 +555,7 @@ 
 
 	/**
 	 * @param string the css class that is applied to the control being validated in case the validation fails
+	 * @param string $value
 	 */
 	public function setControlCssClass($value)
 	{

Spacing +54 added lines, -54 removed lines

@@ -94,7 +94,7 @@ 
 	 * them specially.
 	 * @var array list of control class names
 	 */
-	private static $_clientClass = array('THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList');
+	private static $_clientClass=array('THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList');
 
 	/**
 	 * Constructor.
@@ -139,10 +139,10 @@ 
 		$display=$this->getDisplay();
 		$visible=$this->getEnabled(true) && !$this->getIsValid();
 		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display','none');
+			$writer->addStyleAttribute('display', 'none');
 		else if(!$visible)
-			$writer->addStyleAttribute('visibility','hidden');
-		$writer->addAttribute('id',$this->getClientID());
+			$writer->addStyleAttribute('visibility', 'hidden');
+		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
 		$this->renderClientControlScript($writer);
 	}
@@ -153,29 +153,29 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$control = $this->getValidationTarget();
-		$options['ID'] = $this->getClientID();
-		$options['FormID'] = $this->getPage()->getForm()->getClientID();
-		$options['Display'] = $this->getDisplay();
-		$options['ErrorMessage'] = $this->getErrorMessage();
+		$control=$this->getValidationTarget();
+		$options['ID']=$this->getClientID();
+		$options['FormID']=$this->getPage()->getForm()->getClientID();
+		$options['Display']=$this->getDisplay();
+		$options['ErrorMessage']=$this->getErrorMessage();
 		if($this->getFocusOnError())
 		{
-			$options['FocusOnError'] = $this->getFocusOnError();
-			$options['FocusElementID'] = $this->getFocusElementID();
+			$options['FocusOnError']=$this->getFocusOnError();
+			$options['FocusElementID']=$this->getFocusElementID();
 		}
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		if($control)
-			$options['ControlToValidate'] = $control->getClientID();
-		$options['ControlCssClass'] = $this->getControlCssClass();
+			$options['ControlToValidate']=$control->getClientID();
+		$options['ControlCssClass']=$this->getControlCssClass();
 
-		$options['ControlType'] = $this->getClientControlClass($control);
-		$options['Enabled'] = $this->getEnabled(true);
+		$options['ControlType']=$this->getClientControlClass($control);
+		$options['Enabled']=$this->getEnabled(true);
 
 		//get date format from date picker target control
 		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
+			$options['DateFormat']=$control->getDateFormat();
 
-		$options = array_merge($options,$this->getClientSide()->getOptions()->toArray());
+		$options=array_merge($options, $this->getClientSide()->getOptions()->toArray());
 
 		return $options;
 	}
@@ -192,7 +192,7 @@ 
 		foreach(self::$_clientClass as $type)
 			if($control instanceof $type)
 				return $type;
-		$reflectionClass = new \ReflectionClass($control);
+		$reflectionClass=new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
 	}
 
@@ -215,7 +215,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientSide===null)
-			$this->_clientSide = $this->createClientSide();
+			$this->_clientSide=$this->createClientSide();
 		return $this->_clientSide;
 	}
 
@@ -235,15 +235,15 @@ 
 	 */
 	public function renderClientControlScript($writer)
 	{
-		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
+		$scripts=$this->getPage()->getClientScript();
+		if($this->getEnableClientScript())
 			$scripts->registerPradoScript('validator');
 		$formID=$this->getPage()->getForm()->getClientID();
-		$scriptKey = "TBaseValidator:$formID";
+		$scriptKey="TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
-			$manager['FormID'] = $formID;
-			$options = TJavaScript::encode($manager);
+			$manager['FormID']=$formID;
+			$options=TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
 		if($this->getEnableClientScript())
@@ -254,7 +254,7 @@ 
 	 * Override parent implementation to update the control CSS Class before
 	 * the validated control is rendered
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->updateControlCssClass();
@@ -272,12 +272,12 @@ 
 			$control=$this->getValidationTarget();
 			if($control instanceof TWebControl)
 			{
-				$class = preg_replace ('/ '.preg_quote($cssClass).'/', '',$control->getCssClass());
+				$class=preg_replace('/ '.preg_quote($cssClass).'/', '', $control->getCssClass());
 				if(!$this->getIsValid())
 				{
-					$class .= ' '.$cssClass;
+					$class.=' '.$cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
+				} elseif($control->getIsValid())
 					$control->setCssClass($class);
 			}
 		}
@@ -288,11 +288,11 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		$key = 'prado:'.$this->getClientID();
+		$key='prado:'.$this->getClientID();
 		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
 		{
-			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new '.$this->getClientClassName().'('.$options.');';
+			$options=TJavaScript::encode($this->getClientScriptOptions());
+			$script='new '.$this->getClientClassName().'('.$options.');';
 			$this->getPage()->getClientScript()->registerEndScript($key, $script);
 		}
 	}
@@ -311,7 +311,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		throw new TNotSupportedException('basevalidator_forcontrol_unsupported',get_class($this));
+		throw new TNotSupportedException('basevalidator_forcontrol_unsupported', get_class($this));
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	 */
 	public function getDisplay()
 	{
-		return $this->getViewState('Display',TValidatorDisplayStyle::Fixed);
+		return $this->getViewState('Display', TValidatorDisplayStyle::Fixed);
 	}
 
 	/**
@@ -339,7 +339,7 @@ 
 	 */
 	public function setDisplay($value)
 	{
-		$this->setViewState('Display',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TValidatorDisplayStyle'),TValidatorDisplayStyle::Fixed);
+		$this->setViewState('Display', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TValidatorDisplayStyle'), TValidatorDisplayStyle::Fixed);
 	}
 
 	/**
@@ -347,7 +347,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -355,7 +355,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -363,7 +363,7 @@ 
 	 */
 	public function getErrorMessage()
 	{
-		return $this->getViewState('ErrorMessage','');
+		return $this->getViewState('ErrorMessage', '');
 	}
 
 	/**
@@ -372,7 +372,7 @@ 
 	 */
 	public function setErrorMessage($value)
 	{
-		$this->setViewState('ErrorMessage',$value,'');
+		$this->setViewState('ErrorMessage', $value, '');
 	}
 
 	/**
@@ -380,7 +380,7 @@ 
 	 */
 	public function getControlToValidate()
 	{
-		return $this->getViewState('ControlToValidate','');
+		return $this->getViewState('ControlToValidate', '');
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	 */
 	public function setControlToValidate($value)
 	{
-		$this->setViewState('ControlToValidate',$value,'');
+		$this->setViewState('ControlToValidate', $value, '');
 	}
 
 	/**
@@ -399,7 +399,7 @@ 
 	 */
 	public function getFocusOnError()
 	{
-		return $this->getViewState('FocusOnError',false);
+		return $this->getViewState('FocusOnError', false);
 	}
 
 	/**
@@ -407,7 +407,7 @@ 
 	 */
 	public function setFocusOnError($value)
 	{
-		$this->setViewState('FocusOnError',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('FocusOnError', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -417,13 +417,13 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id=$this->getViewState('FocusElementID',''))==='')
+		if(($id=$this->getViewState('FocusElementID', ''))==='')
 		{
 			$target=$this->getValidationTarget();
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
-			if($target instanceof TCheckBoxList && $target->getItemCount()>0)
+			if($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
 				$id=$target->getClientID().'_c0';
 			} else {
@@ -447,7 +447,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -485,7 +485,7 @@ 
 		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
 			return $control;
 		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));
+			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
 	}
 
 	/**
@@ -499,7 +499,7 @@ 
 		if($control instanceof \Prado\Web\UI\IValidatable)
 			return $control->getValidationPropertyValue();
 		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 	}
 
 	/**
@@ -548,7 +548,7 @@ 
 	 */
 	public function getControlCssClass()
 	{
-		return $this->getViewState('ControlCssClass','');
+		return $this->getViewState('ControlCssClass', '');
 	}
 
 	/**
@@ -556,7 +556,7 @@ 
 	 */
 	public function setControlCssClass($value)
 	{
-		$this->setViewState('ControlCssClass',$value,'');
+		$this->setViewState('ControlCssClass', $value, '');
 	}
 
 	/**
@@ -571,7 +571,7 @@ 
 	 */
 	public function onValidationSuccess()
 	{
-		$this->raiseEvent('OnValidationSuccess',$this,null);
+		$this->raiseEvent('OnValidationSuccess', $this, null);
 	}
 
 	/**
@@ -579,7 +579,7 @@ 
 	 */
 	public function onValidationError()
 	{
-		$this->raiseEvent('OnValidationError',$this,null);
+		$this->raiseEvent('OnValidationError', $this, null);
 	}
 
 	/**
@@ -590,7 +590,7 @@ 
 	 */
 	public function onValidate()
 	{
-		$this->raiseEvent('OnValidate',$this,null);
+		$this->raiseEvent('OnValidate', $this, null);
 	}
 
 	/**

framework/Web/UI/WebControls/TClientScript.php

Spacing +5 added lines, -5 removed lines

@@ -105,11 +105,11 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$scripts = preg_split('/,|\s+/', $this->getPradoScripts());
-		$cs = $this->getPage()->getClientScript();
+		$scripts=preg_split('/,|\s+/', $this->getPradoScripts());
+		$cs=$this->getPage()->getClientScript();
 		foreach($scripts as $script)
 		{
-			if(($script = trim($script))!=='')
+			if(($script=trim($script))!=='')
 				$cs->registerPradoScript($script);
 		}
 	}
@@ -122,7 +122,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getFlushScriptFiles())
+		if($this->getFlushScriptFiles())
 			$this->getPage()->getClientScript()->flushScriptFiles($writer, $this);
 		$this->renderCustomScriptFile($writer);
 		$this->renderCustomScript($writer);
@@ -134,7 +134,7 @@ 
 	 */
 	protected function renderCustomScriptFile($writer)
 	{
-		if(($scriptUrl = $this->getScriptUrl())!=='')
+		if(($scriptUrl=$this->getScriptUrl())!=='')
 			$writer->write("<script type=\"text/javascript\" src=\"$scriptUrl\"></script>\n");
 	}
 

framework/Web/UI/WebControls/TMarkdown.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 	 */
 	public function processText($text)
 	{
-		$result = Parsedown::instance()->parse($text);
+		$result=Parsedown::instance()->parse($text);
 		return preg_replace_callback(
 				'/<pre><code class="language-(\w+)">((.|\n)*?)<\\/code><\\/pre>/im',
 				array($this, 'highlightCode'), $result);
@@ -64,7 +64,7 @@ 
 	 */
 	protected function highlightCode($matches)
 	{
-		$text = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+		$text=html_entity_decode($matches[2], ENT_QUOTES, 'UTF-8');
 		$this->setLanguage($matches[1]);
 		return parent::processText($text);
 	}

framework/Web/UI/WebControls/TListControlValidator.php

Spacing +36 added lines, -36 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function getMinSelection()
 	{
-		return $this->getViewState('MinSelection',-1);
+		return $this->getViewState('MinSelection', -1);
 	}
 
 	/**
@@ -84,9 +84,9 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
-		$this->setViewState('MinSelection',$value,-1);
+		$this->setViewState('MinSelection', $value, -1);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function getMaxSelection()
 	{
-		return $this->getViewState('MaxSelection',-1);
+		return $this->getViewState('MaxSelection', -1);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
-		$this->setViewState('MaxSelection',$value,-1);
+		$this->setViewState('MaxSelection', $value, -1);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function getRequiredSelections()
 	{
-		return $this->getViewState('RequiredSelections','');
+		return $this->getViewState('RequiredSelections', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setRequiredSelections($value)
 	{
-		$this->setViewState('RequiredSelections',$value,'');
+		$this->setViewState('RequiredSelections', $value, '');
 	}
 
 	/**
@@ -135,28 +135,28 @@ 
 	{
 		$control=$this->getValidationTarget();
 
-		$exists = true;
-		$values = $this->getSelection($control);
-		$count = count($values);
-		$required = $this->getRequiredValues();
+		$exists=true;
+		$values=$this->getSelection($control);
+		$count=count($values);
+		$required=$this->getRequiredValues();
 
 		//if required, check the values
 		if(!empty($required))
 		{
-			if($count < count($required) )
+			if($count < count($required))
 				return false;
 			foreach($required as $require)
-				$exists = $exists && in_array($require, $values);
+				$exists=$exists && in_array($require, $values);
 		}
 
-		$min = $this->getMinSelection();
-		$max = $this->getMaxSelection();
+		$min=$this->getMinSelection();
+		$max=$this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
+		if($min!==-1 && $max!==-1)
 			return $exists && $count >= $min && $count <= $max;
-		else if($min === -1 && $max !== -1)
+		else if($min===-1 && $max!==-1)
 			return $exists && $count <= $max;
-		else if($min !== -1 && $max === -1)
+		else if($min!==-1 && $max===-1)
 			return $exists && $count >= $min;
 		else
 			return $exists;
@@ -168,13 +168,13 @@ 
 	 */
 	protected function getSelection($control)
 	{
-		$values = array();
+		$values=array();
 
 		//get the data
 		foreach($control->getItems() as $item)
 		{
 			if($item->getSelected())
-				$values[] = $item->getValue();
+				$values[]=$item->getValue();
 		}
 		return $values;
 	}
@@ -184,10 +184,10 @@ 
 	 */
 	protected function getRequiredValues()
 	{
-		$required = array();
-		$string = $this->getRequiredSelections();
+		$required=array();
+		$string=$this->getRequiredSelections();
 		if(!empty($string))
-			$required = preg_split('/,\s*/', $string);
+			$required=preg_split('/,\s*/', $string);
 		return $required;
 	}
 
@@ -197,26 +197,26 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$control = $this->getValidationTarget();
+		$options=parent::getClientScriptOptions();
+		$control=$this->getValidationTarget();
 
 		if(!$control instanceof TListControl)
 		{
 			throw new TConfigurationException(
 				'listcontrolvalidator_invalid_control',
-				$this->getID(),$this->getControlToValidate(), get_class($control));
+				$this->getID(), $this->getControlToValidate(), get_class($control));
 		}
 
-		$min = $this->getMinSelection();
-		$max = $this->getMaxSelection();
-		if($min !== -1)
-			$options['Min']= $min;
-		if($max !== -1)
-			$options['Max']= $max;
-		$required = $this->getRequiredSelections();
+		$min=$this->getMinSelection();
+		$max=$this->getMaxSelection();
+		if($min!==-1)
+			$options['Min']=$min;
+		if($max!==-1)
+			$options['Max']=$max;
+		$required=$this->getRequiredSelections();
 		if(strlen($required) > 0)
-			$options['Required']= $required;
-		$options['TotalItems'] = $control->getItemCount();
+			$options['Required']=$required;
+		$options['TotalItems']=$control->getItemCount();
 
 		return $options;
 	}

Doc Comments +1 added lines

@@ -163,6 +163,7 @@
 
 	/**
 	 * @param TListControl control to validate
+	 * @param \Prado\Web\UI\TControl $control
 	 * @return array number of selected values and its values.
 	 */
 	protected function getSelection($control)

framework/Web/UI/WebControls/TLiteral.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -45,7 +45,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function getEncode()
 	{
-		return $this->getViewState('Encode',false);
+		return $this->getViewState('Encode', false);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setEncode($value)
 	{
-		$this->setViewState('Encode',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('Encode', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -106,8 +106,7 @@
 				$writer->write(THttpUtility::htmlEncode($text));
 			else
 				$writer->write($text);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }

framework/Web/UI/WebControls/TRegularExpressionValidator.php

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	public function getRegularExpression()
 	{
-		return $this->getViewState('RegularExpression','');
+		return $this->getViewState('RegularExpression', '');
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setRegularExpression($value)
 	{
-		$this->setViewState('RegularExpression',$value,'');
+		$this->setViewState('RegularExpression', $value, '');
 	}
 
 	/**
@@ -84,10 +84,10 @@ 
 	{
 		if(($value=$this->getValidationValue($this->getValidationTarget()))==='')
 			return true;
-		if(($expression=addcslashes($this->getRegularExpression(),"/"))!=='')
+		if(($expression=addcslashes($this->getRegularExpression(), "/"))!=='')
 		{
-			$mods = $this->getPatternModifiers();
-			return preg_match("/^$expression\$/{$mods}",$value);
+			$mods=$this->getPatternModifiers();
+			return preg_match("/^$expression\$/{$mods}", $value);
 		}
 		else
 			return true;
@@ -133,7 +133,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['ValidationExpression']=$this->getRegularExpression();
 		$options['PatternModifiers']=$this->getClientSidePatternModifiers();
 		return $options;

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		{
 			$mods = $this->getPatternModifiers();
 			return preg_match("/^$expression\$/{$mods}",$value);
-		}
-		else
+		} else
 			return true;
 	}