pradosoft / prado

framework/Data/SqlMap/TSqlMapConfig.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;

Spacing +24 added lines, -24 removed lines

@@ -31,19 +31,19 @@ 
 {
 	private $_configFile;
 	private $_sqlmap;
-	private $_enableCache = false;
+	private $_enableCache=false;
 
 	/**
 	 * File extension of external configuration file
 	 */
-	const CONFIG_FILE_EXT = '.xml';
+	const CONFIG_FILE_EXT='.xml';
 
 	/**
 	 * @return string module ID + configuration file path.
 	 */
 	private function getCacheKey()
 	{
-		return $this->getID() . $this->getConfigFile();
+		return $this->getID().$this->getConfigFile();
 	}
 
 	/**
@@ -51,8 +51,8 @@ 
 	 */
 	public function clearCache()
 	{
-		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		$cache=$this->getApplication()->getCache();
+		if($cache!==null) {
 			$cache->delete($this->getCacheKey());
 		}
 	}
@@ -66,16 +66,16 @@ 
 	 * @since 3.1.7
 	 */
 	public function getSqlMapManager() {
-		if(($manager = $this->loadCachedSqlMapManager()) === null)
+		if(($manager=$this->loadCachedSqlMapManager())===null)
 		{
-			$manager = new TSqlMapManager($this->getDbConnection());
-			if(strlen($file = $this->getConfigFile()) > 0)
+			$manager=new TSqlMapManager($this->getDbConnection());
+			if(strlen($file=$this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif($this->getConnectionID()!=='') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -89,11 +89,11 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null) {
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					$dependencies=$manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -108,10 +108,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TSqlMapManager)
 					return $manager;
 			}
@@ -135,14 +135,14 @@ 
 	public function setConfigFile($value)
 	{
 		if(is_file($value))
-			$this->_configFile = $value;
+			$this->_configFile=$value;
 		else
 		{
-			$file = Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
+			$file=Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
+			if($file===null || !is_file($file))
 				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
 			else
-				$this->_configFile = $file;
+				$this->_configFile=$file;
 		}
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -177,8 +177,8 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap === null)
-			$this->_sqlmap = $this->createSqlMapGateway();
+		if($this->_sqlmap===null)
+			$this->_sqlmap=$this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}
 }

framework/Data/SqlMap/Configuration/TParameterMap.php

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
-		}
-		catch (TInvalidPropertyException $e)
+		} catch (TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',

Spacing +18 added lines, -18 removed lines

@@ -50,8 +50,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_properties = new TList;
-		$this->_propertyMap = new TMap;
+		$this->_properties=new TList;
+		$this->_propertyMap=new TMap;
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_ID = $value;
+		$this->_ID=$value;
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extend = $value;
+		$this->_extend=$value;
 	}
 
 	/**
@@ -145,15 +145,15 @@ 
 	 */
 	public function getPropertyValue($registry, $property, $parameterValue)
 	{
-		$value = $this->getObjectValue($parameterValue, $property);
+		$value=$this->getObjectValue($parameterValue, $property);
 
-		if(($handler = $this->createTypeHandler($property, $registry)) !== null)
-			$value = $handler->getParameter($value);
+		if(($handler=$this->createTypeHandler($property, $registry))!==null)
+			$value=$handler->getParameter($value);
 
-		$value = $this->nullifyDefaultValue($property, $value);
+		$value=$this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType()) !== null)
-			$value = $registry->convertToType($type, $value);
+		if(($type=$property->getType())!==null)
+			$value=$registry->convertToType($type, $value);
 
 		return $value;
 	}
@@ -167,10 +167,10 @@ 
 	 */
 	protected function createTypeHandler($property, $registry)
 	{
-		$type = $property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
-		$handler = $registry->getTypeHandler($type);
-		if($handler === null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+		$type=$property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
+		$handler=$registry->getTypeHandler($type);
+		if($handler===null && $property->getTypeHandler())
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -187,7 +187,7 @@ 
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
 		}
-		catch (TInvalidPropertyException $e)
+		catch(TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -207,10 +207,10 @@ 
 	 */
 	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue()) !== null)
+		if(($nullValue=$property->getNullValue())!==null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue===$value)
+				$value=null;
 		}
 		return $value;
 	}

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

Spacing +18 added lines, -18 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_columns = new TMap;
+		$this->_columns=new TMap;
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_ID = $value;
+		$this->_ID=$value;
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -162,15 +162,15 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
-			if($handler !== null)
+			if($handler!==null)
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -186,16 +186,16 @@ 
 	 */
 	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator()) !== null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry, $row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
-			if($subMap === null)
-				$subMap = $this;
-			elseif($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry, $row);
+			if($subMap===null)
+				$subMap=$this;
+			elseif($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}

framework/I18N/TDateFormat.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			&& strlen($datetime[1]) == 1)
 		{
 			$pattern = $datetime;
-		}
-		else //no subpattern, try the presets
+		} else //no subpattern, try the presets
 			$pattern = $this->getPreset($string);
 
 		//no presets found, use the string as the pattern

Spacing +34 added lines, -34 removed lines

@@ -72,11 +72,11 @@ 
 	 * A set of pattern presets and their respective formatting shorthand.
 	 * @var array
 	 */
-	private static $_patternPresets = [
-			'fulldate' => 'P','full' => 'P',
-			'longdate' => 'D','long' => 'd',
-			'mediumdate' => 'p','medium' => 'p',
-			'shortdate' => 'd','short' => 'd',
+	private static $_patternPresets=[
+			'fulldate' => 'P', 'full' => 'P',
+			'longdate' => 'D', 'long' => 'd',
+			'mediumdate' => 'p', 'medium' => 'p',
+			'shortdate' => 'd', 'short' => 'd',
 			'fulltime' => 'Q', 'longtime' => 'T',
 			'mediumtime' => 'q', 'shorttime' => 't'];
 
@@ -95,35 +95,35 @@ 
 	 */
 	public function getPattern()
 	{
-		$string = $this->getViewState('Pattern', '');
+		$string=$this->getViewState('Pattern', '');
 
-		$pattern = null;
+		$pattern=null;
 
 		//try the subpattern of "date time" presets
-		$subpatterns = explode(' ', $string, 2);
-		$datetime = [];
-		if(count($subpatterns) == 2)
+		$subpatterns=explode(' ', $string, 2);
+		$datetime=[];
+		if(count($subpatterns)==2)
 		{
-			$datetime[] = $this->getPreset($subpatterns[0]);
-			$datetime[] = $this->getPreset($subpatterns[1]);
+			$datetime[]=$this->getPreset($subpatterns[0]);
+			$datetime[]=$this->getPreset($subpatterns[1]);
 		}
 
 		//we have a good subpattern
-		if(count($datetime) == 2
-			&& strlen($datetime[0]) == 1
-			&& strlen($datetime[1]) == 1)
+		if(count($datetime)==2
+			&& strlen($datetime[0])==1
+			&& strlen($datetime[1])==1)
 		{
-			$pattern = $datetime;
+			$pattern=$datetime;
 		}
 		else //no subpattern, try the presets
-			$pattern = $this->getPreset($string);
+			$pattern=$this->getPreset($string);
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
-		if($pattern === null)
-			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
-			$pattern = null;
+		if($pattern===null)
+			$pattern=$string;
+		if(!is_array($pattern) && strlen($pattern)==0)
+			$pattern=null;
 		return $pattern;
 	}
 
@@ -134,10 +134,10 @@ 
 	 */
 	protected function getPreset($string)
 	{
-		$string = strtolower($string);
+		$string=strtolower($string);
 		foreach(self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
+			if($string==$pattern)
 				return $preset;
 		}
 	}
@@ -148,10 +148,10 @@ 
 	 */
 	public function getValue()
 	{
-		$value = $this->getViewState('Value', '');
+		$value=$this->getViewState('Value', '');
 		if(empty($value))
 		{
-			$defaultText = $this->getDefaultText();
+			$defaultText=$this->getDefaultText();
 			if(empty($defaultText))
 				return time();
 		}
@@ -219,29 +219,29 @@ 
 	 */
 	protected function getFormattedDate()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
-		if(self::$formatter === null)
-			self::$formatter = new DateFormat($app->getCulture());
+		if(self::$formatter===null)
+			self::$formatter=new DateFormat($app->getCulture());
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 
 		//return the specific cultural formatted date time
-		if(strlen($culture) && $app->getCulture() !== $culture)
+		if(strlen($culture) && $app->getCulture()!==$culture)
 		{
-			$formatter = new DateFormat($culture);
+			$formatter=new DateFormat($culture);
 			return $formatter->format($value,
 									  $this->getPattern(),
 									  $this->getCharset());
 		}
 		//return the application wide culture formatted date time.
-		$result = self::$formatter->format($value,
+		$result=self::$formatter->format($value,
 										$this->getPattern(),
 										$this->getCharset());
 		return $result;

framework/Web/UI/ActiveControls/TValueTriggeredCallback.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function setDecayRate($value)
 	{
-		$decay = TPropertyValue::ensureFloat($value);
+		$decay=TPropertyValue::ensureFloat($value);
 		if($decay < 0)
 			throw new TConfigurationException('callback_decay_be_not_negative', $this->getID());
 		$this->setViewState('Decay', $decay);
@@ -90,10 +90,10 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$options['PropertyName'] = $this->getPropertyName();
-		$options['Interval'] = $this->getInterval();
-		$options['Decay'] = $this->getDecayRate();
+		$options=parent::getTriggerOptions();
+		$options['PropertyName']=$this->getPropertyName();
+		$options['Interval']=$this->getInterval();
+		$options['Decay']=$this->getDecayRate();
 		return $options;
 	}
 

framework/Web/UI/ActiveControls/TActiveTableRow.php

Braces +2 added lines, -4 removed lines

@@ -119,8 +119,7 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -163,8 +162,7 @@ 
 			parent::render($writer);
 			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,

Spacing +16 added lines, -16 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		$parameter = new TActiveTableRowEventParameter($this->getResponse(), $param->getCallbackParameter(), $this->getRowIndex());
+		$parameter=new TActiveTableRowEventParameter($this->getResponse(), $param->getCallbackParameter(), $this->getRowIndex());
 		$this->onRowSelected($parameter);
 	}
 
@@ -117,7 +117,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if ($param instanceof TActiveTableCellEventParameter)
+		if($param instanceof TActiveTableCellEventParameter)
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
@@ -147,7 +147,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnRowSelected'))
+		if($this->hasEventHandler('OnRowSelected'))
 			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -160,10 +160,10 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getHasPreRendered())
+		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
+			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
@@ -171,9 +171,9 @@ 
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
-			if ($this->getHasControls())
+			if($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
+				foreach($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
 					$control->getActiveControl()->setEnableUpdate(false);
 			}
 		}
@@ -186,8 +186,8 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 
@@ -199,8 +199,8 @@ 
 	 */
 	public function getRowIndex()
 	{
-		foreach ($this->getTable()->getRows() as $key => $row)
-			if ($row == $this) return $key;
+		foreach($this->getTable()->getRows() as $key => $row)
+			if($row==$this) return $key;
 		throw new TConfigurationException('tactivetablerow_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	public function getTable()
 	{
-		if ($this->_table === null)
+		if($this->_table===null)
 		{
-			$table = $this->getParent();
-			while (!($table instanceof TTable) && $table !== null)
+			$table=$this->getParent();
+			while(!($table instanceof TTable) && $table!==null)
 			{
-				$table = $table->getParent();
+				$table=$table->getParent();
 			}
-			if ($table instanceof TTable) $this->_table = $table;
+			if($table instanceof TTable) $this->_table=$table;
 			else throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
 		}
 		return $this->_table;

framework/Web/UI/ActiveControls/TCallbackEventParameter.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
 	 */
 	public function __construct($response, $parameter)
 	{
-		$this->_response = $response;
-		$this->_parameter = $parameter;
+		$this->_response=$response;
+		$this->_parameter=$parameter;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TEventTriggeredCallback.php

Spacing +4 added lines, -4 removed lines

@@ -64,10 +64,10 @@
 	 */
 	protected function getTriggerOptions()
 	{
-		$options = parent::getTriggerOptions();
-		$name = preg_replace('/^on/', '', $this->getEventName());
-		$options['EventName'] = strtolower($name);
-		$options['StopEvent'] = $this->getPreventDefaultAction();
+		$options=parent::getTriggerOptions();
+		$name=preg_replace('/^on/', '', $this->getEventName());
+		$options['EventName']=strtolower($name);
+		$options['StopEvent']=$this->getPreventDefaultAction();
 		return $options;
 	}
 

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);

Spacing +54 added lines, -54 removed lines

@@ -81,11 +81,11 @@ 
 	/**
 	 * @var boolean whether the validation succeeds
 	 */
-	private $_isValid = true;
+	private $_isValid=true;
 	/**
 	 * @var boolean whether the validator has been registered with the page
 	 */
-	private $_registered = false;
+	private $_registered=false;
 	/**
 	 * @var TValidatorClientSide validator client-script options.
 	 */
@@ -95,7 +95,7 @@ 
 	 * them specially.
 	 * @var array list of control class names
 	 */
-	private static $_clientClass = ['THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList'];
+	private static $_clientClass=['THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList'];
 
 	/**
 	 * Constructor.
@@ -115,7 +115,7 @@ 
 	{
 		parent::onInit($param);
 		$this->getPage()->getValidators()->add($this);
-		$this->_registered = true;
+		$this->_registered=true;
 	}
 
 	/**
@@ -124,9 +124,9 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page = $this->getPage()) !== null)
+		if($this->_registered && ($page=$this->getPage())!==null)
 			$page->getValidators()->remove($this);
-		$this->_registered = false;
+		$this->_registered=false;
 		parent::onUnload($param);
 	}
 
@@ -137,9 +137,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$display = $this->getDisplay();
-		$visible = $this->getEnabled(true) && !$this->getIsValid();
-		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
+		$display=$this->getDisplay();
+		$visible=$this->getEnabled(true) && !$this->getIsValid();
+		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
 			$writer->addStyleAttribute('display', 'none');
 		elseif(!$visible)
 			$writer->addStyleAttribute('visibility', 'hidden');
@@ -154,29 +154,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;
 	}
@@ -193,7 +193,7 @@ 
 		foreach(self::$_clientClass as $type)
 			if($control instanceof $type)
 				return $type;
-		$reflectionClass = new \ReflectionClass($control);
+		$reflectionClass=new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
 	}
 
@@ -215,8 +215,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide===null)
+			$this->_clientSide=$this->createClientSide();
 		return $this->_clientSide;
 	}
 
@@ -236,15 +236,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";
+		$formID=$this->getPage()->getForm()->getClientID();
+		$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())
@@ -255,7 +255,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();
@@ -268,17 +268,17 @@ 
 	 */
 	protected function updateControlCssClass()
 	{
-		if(($cssClass = $this->getControlCssClass()) !== '')
+		if(($cssClass=$this->getControlCssClass())!=='')
 		{
-			$control = $this->getValidationTarget();
+			$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);
 			}
 		}
@@ -289,11 +289,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);
 		}
 	}
@@ -321,10 +321,10 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
+		$value=TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
 		if(!$value)
-			$this->_isValid = true;
+			$this->_isValid=true;
 	}
 
 	/**
@@ -418,17 +418,17 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id = $this->getViewState('FocusElementID', '')) === '')
+		if(($id=$this->getViewState('FocusElementID', ''))==='')
 		{
-			$target = $this->getValidationTarget();
+			$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)
 			{
-				$id = $target->getClientID() . '_c0';
+				$id=$target->getClientID().'_c0';
 			} else {
-				$id = $target->getClientID();
+				$id=$target->getClientID();
 			}
 		}
 		return $id;
@@ -473,7 +473,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -483,7 +483,7 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
+		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
 			return $control;
 		else
 			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
@@ -513,10 +513,10 @@ 
 		$this->onValidate();
 		if($this->getVisible(true) && $this->getEnabled(true))
 		{
-			$target = $this->getValidationTarget();
+			$target=$this->getValidationTarget();
 			// if the target is not a disabled web control
-			if($target === null ||
-				($target !== null &&
+			if($target===null ||
+				($target!==null &&
 				!($target instanceof TWebControl && !$target->getEnabled(true))))
 			{
 				if($this->evaluateIsValid())
@@ -600,9 +600,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if(($text=$this->getText())!=='')
 			$writer->write($text);
-		elseif(($text = $this->getErrorMessage()) !== '')
+		elseif(($text=$this->getErrorMessage())!=='')
 			$writer->write($text);
 		else
 			parent::renderContents($writer);