pradosoft / prado

framework/Web/UI/ActiveControls/TScalarDiff.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 	 */
 	public function getDifference()
 	{
-		if(gettype($this->_new) === gettype($this->_old)
-			&& $this->_new === $this->_old)
+		if(gettype($this->_new)===gettype($this->_old)
+			&& $this->_new===$this->_old)
 			return $this->_null;
 		else
 			return $this->_new;

framework/Web/UI/ActiveControls/TViewStateDiff.php

Spacing +3 added lines, -3 removed lines

@@ -41,9 +41,9 @@
 	 */
 	public function __construct($new, $old, $null)
 	{
-		$this->_new = $new;
-		$this->_old = $old;
-		$this->_null = $null;
+		$this->_new=$new;
+		$this->_old=$old;
+		$this->_null=$null;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TActiveDataGridPager.php

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 	 */
 	public function getClientSide()
 	{
-		if($this->_callbackoptions === null)
-			$this->_callbackoptions = new TCallbackOptions;
+		if($this->_callbackoptions===null)
+			$this->_callbackoptions=new TCallbackOptions;
 		return $this->_callbackoptions->getClientSide();
 	}
 }
\ No newline at end of file

framework/Web/UI/TClientSideOptions.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	protected function setFunction($name, $code)
 	{
 		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+			$code=TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
 
@@ -52,7 +52,7 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
+		if($this->_options)
 			return $this->_options->itemAt($name);
 		else
 			return null;
@@ -72,8 +72,8 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = new TMap;
+		if(!$this->_options)
+			$this->_options=new TMap;
 		return $this->_options;
 	}
 

Doc Comments +2 added lines

@@ -39,6 +39,7 @@ 
 	 * javascript statements.
 	 * @param string option name
 	 * @param string javascript statements.
+	 * @param string $name
 	 */
 	protected function setFunction($name, $code)
 	{
@@ -48,6 +49,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string gets a particular option, null if not set.
 	 */
 	protected function getOption($name)

framework/Web/TUrlMappingPatternSecureConnection.php

Spacing +5 added lines, -5 removed lines

@@ -27,29 +27,29 @@
 	 * Keep current SecureConnection status
 	 * means no prefixing
 	 */
-	const Automatic = 'Automatic';
+	const Automatic='Automatic';
 
 	/**
 	 * Force use secured connection
 	 * always prefixing with https://example.com/path/to/app
 	 */
-	const Enable = 'Enable';
+	const Enable='Enable';
 
 	/**
 	 * Force use unsecured connection
 	 * always prefixing with http://example.com/path/to/app
 	 */
-	const Disable = 'Disable';
+	const Disable='Disable';
 
 	/**
 	 * Force use secured connection, if in unsecured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const EnableIfNotSecure = 'EnableIfNotSecure';
+	const EnableIfNotSecure='EnableIfNotSecure';
 
 	/**
 	 * Force use unsecured connection, if in secured mode
 	 * prefixing with https://example.com/path/to/app
 	 */
-	const DisableIfSecure = 'DisableIfSecure';
+	const DisableIfSecure='DisableIfSecure';
 }
\ No newline at end of file

framework/Collections/TPagedList.php

Doc Comments +4 added lines, -1 removed lines

@@ -96,6 +96,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setCustomPaging($value)
 	{
@@ -143,6 +144,7 @@ 
 	 * Raises <b>OnPageIndexChanged</b> event.
 	 * This event is raised each time when the list changes to a different page.
 	 * @param TPagedListPageChangedEventParameter event parameter
+	 * @param TPagedListPageChangedEventParameter|null $param
 	 */
 	public function onPageIndexChanged($param)
 	{
@@ -155,6 +157,7 @@ 
 	 * and needs the new page of data. This event can only be raised when
 	 * {@link setCustomPaging CustomPaging} is true.
 	 * @param TPagedListFetchDataEventParameter event parameter
+	 * @param TPagedListFetchDataEventParameter $param
 	 */
 	public function onFetchData($param)
 	{
@@ -290,7 +293,7 @@ 
 	}
 
 	/**
-	 * @return Iterator iterator
+	 * @return \ArrayIterator iterator
 	 */
 	public function getIterator()
 	{

Spacing +31 added lines, -31 removed lines

@@ -63,26 +63,26 @@ 
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_customPaging = false;
+	private $_customPaging=false;
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize = 10;
+	private $_pageSize=10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex = -1;
+	private $_currentPageIndex=-1;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount = -1;
+	private $_virtualCount=-1;
 
 	/**
 	 * Constructor.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
 	 */
-	public function __construct($data = null, $readOnly = false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		parent::__construct($data, true);
 	}
@@ -100,7 +100,7 @@ 
 	 */
 	public function setCustomPaging($value)
 	{
-		$this->_customPaging = TPropertyValue::ensureBoolean($value);
+		$this->_customPaging=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_pageSize = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
+			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
 	}
@@ -136,7 +136,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
+		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false)
 			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
 	}
 
@@ -169,21 +169,21 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex === $this->_currentPageIndex)
+		if($pageIndex===$this->_currentPageIndex)
 			return $pageIndex;
 		if($this->_customPaging)
 		{
 			if($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param = new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
+				$param=new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
-				if(($data = $param->getData()) !== null)
+				if(($data=$param->getData())!==null)
 				{
 					$this->setReadOnly(false);
 					$this->copyFrom($data);
 					$this->setReadOnly(true);
-					$oldPage = $this->_currentPageIndex;
-					$this->_currentPageIndex = $pageIndex;
+					$oldPage=$this->_currentPageIndex;
+					$this->_currentPageIndex=$pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
 				}
@@ -197,7 +197,7 @@ 
 		{
 			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
-				$this->_currentPageIndex = $pageIndex;
+				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
 			}
@@ -237,9 +237,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
-		$this->_virtualCount = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
+		$this->_virtualCount=$value;
 	}
 
 	/**
@@ -250,12 +250,12 @@ 
 		if($this->_customPaging)
 		{
 			if($this->_virtualCount >= 0)
-				return (int)(($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		return $this->_currentPageIndex === 0;
+		return $this->_currentPageIndex===0;
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex === $this->getPageCount() - 1;
+		return $this->_currentPageIndex===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex === $this->getPageCount() - 1)
+			if($this->_currentPageIndex===$this->getPageCount() - 1)
 				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
@@ -299,7 +299,7 @@ 
 			return parent::getIterator();
 		else
 		{
-			$data = $this->toArray();
+			$data=$this->toArray();
 			return new \ArrayIterator($data);
 		}
 	}
@@ -325,9 +325,9 @@ 
 	 */
 	public function indexOf($item)
 	{
-		$c = $this->getCount();
-		for($i = 0;$i < $c;++$i)
-			if($this->itemAt($i) === $item)
+		$c=$this->getCount();
+		for($i=0; $i < $c; ++$i)
+			if($this->itemAt($i)===$item)
 				return $i;
 		return -1;
 	}
@@ -360,10 +360,10 @@ 
 	 */
 	public function toArray()
 	{
-		$c = $this->getCount();
-		$array = [];
-		for($i = 0;$i < $c;++$i)
-			$array[$i] = $this->itemAt($i);
+		$c=$this->getCount();
+		$array=[];
+		for($i=0; $i < $c; ++$i)
+			$array[$i]=$this->itemAt($i);
 		return $array;
 	}
 }
\ No newline at end of file

Braces +5 added lines, -10 removed lines

@@ -186,22 +186,18 @@ 
 					$this->_currentPageIndex = $pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
-				}
-				else
+				} else
 					return false;
-			}
-			else
+			} else
 				return false;
-		}
-		else
+		} else
 		{
 			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
 				$this->_currentPageIndex = $pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
-			}
-			else
+			} else
 				return false;
 		}
 	}
@@ -253,8 +249,7 @@ 
 				return (int)(($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
-		}
-		else
+		} else
 			return (int)((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 

framework/Web/THttpRequest.php

Doc Comments +4 added lines, -2 removed lines

@@ -266,6 +266,7 @@ 
 
 	/**
 	 * Saves the current UrlManager instance to cache.
+	 * @param TUrlManager $manager
 	 * @return boolean true if UrlManager instance was cached, false otherwise.
 	 */
 	protected function cacheUrlManager($manager)
@@ -357,7 +358,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{
@@ -718,6 +719,7 @@ 
 	 * @param array GET parameters, null if not needed
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to false.
+	 * @param string $serviceID
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
@@ -820,7 +822,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{

Spacing +112 added lines, -112 removed lines

@@ -76,8 +76,8 @@ 
  */
 class THttpRequest extends \Prado\TApplicationComponent implements \IteratorAggregate, \ArrayAccess, \Countable, \Prado\IModule
 {
-	const CGIFIX__PATH_INFO = 1;
-	const CGIFIX__SCRIPT_NAME = 2;
+	const CGIFIX__PATH_INFO=1;
+	const CGIFIX__SCRIPT_NAME=2;
 	/**
 	 * @var TUrlManager the URL manager module
 	 */
@@ -85,11 +85,11 @@ 
 	/**
 	 * @var string the ID of the URL manager module
 	 */
-	private $_urlManagerID = '';
+	private $_urlManagerID='';
 	/**
 	 * @var string Separator used to separate GET variable name and value when URL format is Path.
 	 */
-	private $_separator = ',';
+	private $_separator=',';
 	/**
 	 * @var string requested service ID
 	 */
@@ -114,15 +114,15 @@ 
 	 * @var boolean whether the session ID should be kept in cookie only
 	 */
 	private $_cookieOnly;
-	private $_urlFormat = THttpRequestUrlFormat::Get;
+	private $_urlFormat=THttpRequestUrlFormat::Get;
 	private $_services;
-	private $_requestResolved = false;
-	private $_enableCookieValidation = false;
-	private $_cgiFix = 0;
+	private $_requestResolved=false;
+	private $_enableCookieValidation=false;
+	private $_cgiFix=0;
 	/**
 	 * @var boolean whether to cache the TUrlManager class (useful with a lot of TUrlMappings)
 	 */
-	private $_enableCache = false;
+	private $_enableCache=false;
 	/**
 	 * @var string request URL
 	 */
@@ -136,7 +136,7 @@ 
 	/**
 	 * @var array contains all request variables
 	 */
-	private $_items = [];
+	private $_items=[];
 
 	/**
 	 * @return string id of this module
@@ -151,7 +151,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -162,13 +162,13 @@ 
 	public function init($config)
 	{
 		// Fill in default request info when the script is run in command line
-		if(php_sapi_name() === 'cli')
+		if(php_sapi_name()==='cli')
 		{
-			$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-			$_SERVER['REQUEST_METHOD'] = 'GET';
-			$_SERVER['SERVER_NAME'] = 'localhost';
-			$_SERVER['SERVER_PORT'] = 80;
-			$_SERVER['HTTP_USER_AGENT'] = '';
+			$_SERVER['REMOTE_ADDR']='127.0.0.1';
+			$_SERVER['REQUEST_METHOD']='GET';
+			$_SERVER['SERVER_NAME']='localhost';
+			$_SERVER['SERVER_PORT']=80;
+			$_SERVER['HTTP_USER_AGENT']='';
 		}
 
 		// Info about server variables:
@@ -178,29 +178,29 @@ 
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
 		if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri = $_SERVER['REQUEST_URI'];
+			$this->_requestUri=$_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING'])?'':'?' . $_SERVER['QUERY_STRING']);
+			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']);
 
 		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
 		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo = $_SERVER['PATH_INFO'];
-		elseif(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
+			$this->_pathInfo=$_SERVER['PATH_INFO'];
+		elseif(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo=substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
-			$this->_pathInfo = '';
+			$this->_pathInfo='';
 
 		if(get_magic_quotes_gpc())
 		{
 			if(isset($_GET))
-				$_GET = $this->stripSlashes($_GET);
+				$_GET=$this->stripSlashes($_GET);
 			if(isset($_POST))
-				$_POST = $this->stripSlashes($_POST);
+				$_POST=$this->stripSlashes($_POST);
 			if(isset($_REQUEST))
-				$_REQUEST = $this->stripSlashes($_REQUEST);
+				$_REQUEST=$this->stripSlashes($_REQUEST);
 			if(isset($_COOKIE))
-				$_COOKIE = $this->stripSlashes($_COOKIE);
+				$_COOKIE=$this->stripSlashes($_COOKIE);
 		}
 
 		$this->getApplication()->setRequest($this);
@@ -214,7 +214,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map([$this,'stripSlashes'], $data):stripslashes($data);
+		return is_array($data) ?array_map([$this, 'stripSlashes'], $data) : stripslashes($data);
 	}
 
 	/**
@@ -222,21 +222,21 @@ 
 	 */
 	public function getUrl()
 	{
-		if($this->_url === null)
+		if($this->_url===null)
 		{
-			$secure = $this->getIsSecureConnection();
-			$url = $secure?'https://':'http://';
+			$secure=$this->getIsSecureConnection();
+			$url=$secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
-				$url .= $_SERVER['SERVER_NAME'];
-				$port = $_SERVER['SERVER_PORT'];
-				if(($port != 80 && !$secure) || ($port != 443 && $secure))
-					$url .= ':' . $port;
+				$url.=$_SERVER['SERVER_NAME'];
+				$port=$_SERVER['SERVER_PORT'];
+				if(($port!=80 && !$secure) || ($port!=443 && $secure))
+					$url.=':'.$port;
 			}
 			else
-				$url .= $_SERVER['HTTP_HOST'];
-			$url .= $this->getRequestUri();
-			$this->_url = new TUri($url);
+				$url.=$_SERVER['HTTP_HOST'];
+			$url.=$this->getRequestUri();
+			$this->_url=new TUri($url);
 		}
 		return $this->_url;
 	}
@@ -248,7 +248,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -272,15 +272,15 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					if($manager instanceof TUrlMapping && $fn=$manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
-						$dependencies = new TFileCacheDependency($fn);
+						$fn=Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
+						$dependencies=new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -296,10 +296,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 TUrlManager)
 					return $manager;
 			}
@@ -325,7 +325,7 @@ 
 	 */
 	public function setUrlManager($value)
 	{
-		$this->_urlManagerID = $value;
+		$this->_urlManagerID=$value;
 	}
 
 	/**
@@ -333,19 +333,19 @@ 
 	 */
 	public function getUrlManagerModule()
 	{
-		if($this->_urlManager === null)
+		if($this->_urlManager===null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager()) === null)
+			if(($this->_urlManager=$this->loadCachedUrlManager())===null)
 			{
 				if(empty($this->_urlManagerID))
 				{
-					$this->_urlManager = new TUrlManager;
+					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
 				}
 				else
 				{
-					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager === null)
+					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
+					if($this->_urlManager===null)
 						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
 					if(!($this->_urlManager instanceof TUrlManager))
 						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
@@ -374,7 +374,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat = TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpRequestUrlFormat');
 	}
 
 	/**
@@ -391,8 +391,8 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value) === 1)
-			$this->_separator = $value;
+		if(strlen($value)===1)
+			$this->_separator=$value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
 	}
@@ -402,19 +402,19 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
 	 * @param boolean $mimetypeOnly whether to return only the mimetype (default: true)
 	 * @return string content type (e.g. 'application/json' or 'text/html; encoding=gzip') or null if not specified
 	 */
-	public function getContentType($mimetypeOnly = true)
+	public function getContentType($mimetypeOnly=true)
 	{
 		if(!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if($mimetypeOnly===true && ($_pos=strpos(';', $_SERVER['CONTENT_TYPE']))!==false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -441,7 +441,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -449,30 +449,30 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
 	 * @param integer|null Either {@link CASE_UPPER} or {@link CASE_LOWER} or as is null (default)
 	 * @return array
 	 */
-	public function getHeaders($case = null)
+	public function getHeaders($case=null)
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
-			$result = apache_request_headers();
+		if($result===null && function_exists('apache_request_headers')) {
+			$result=apache_request_headers();
 		}
-		elseif($result === null) {
-			$result = [];
+		elseif($result===null) {
+			$result=[];
 			foreach($_SERVER as $key => $value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
-					$result[$key] = $value;
+				if(strncasecmp($key, 'HTTP_', 5)!==0) continue;
+					$key=str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
+					$result[$key]=$value;
 			}
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -493,13 +493,13 @@ 
 	 * 						false - force http
 	 * @return string schema and hostname of the requested URL
 	 */
-	public function getBaseUrl($forceSecureConnection = null)
+	public function getBaseUrl($forceSecureConnection=null)
 	{
-		$url = $this->getUrl();
-		$scheme = ($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
-		$host = $url->getHost();
-		if (($port = $url->getPort())) $host .= ':' . $port;
-		return $scheme . '://' . $host;
+		$url=$this->getUrl();
+		$scheme=($forceSecureConnection) ? "https" : (($forceSecureConnection===null) ? $url->getScheme() : 'http');
+		$host=$url->getHost();
+		if(($port=$url->getPort())) $host.=':'.$port;
+		return $scheme.'://'.$host;
 	}
 
 	/**
@@ -510,7 +510,7 @@ 
 		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -520,9 +520,9 @@ 
 	 * 						false - force http
 	 * @return string entry script URL (w/ host part)
 	 */
-	public function getAbsoluteApplicationUrl($forceSecureConnection = null)
+	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
 	{
-		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
+		return $this->getBaseUrl($forceSecureConnection).$this->getApplicationUrl();
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -554,7 +554,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -563,7 +563,7 @@ 
 	 */
 	public function getServerSoftware()
 	{
-		return isset($_SERVER['SERVER_SOFTWARE'])?$_SERVER['SERVER_SOFTWARE']:null;
+		return isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null;
 	}
 
 	/**
@@ -587,7 +587,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -603,7 +603,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -612,7 +612,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -640,7 +640,7 @@ 
 	 */
 	public function setEnableCookieValidation($value)
 	{
-		$this->_enableCookieValidation = TPropertyValue::ensureBoolean($value);
+		$this->_enableCookieValidation=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -660,7 +660,7 @@ 
 	 */
 	public function setCgiFix($value)
 	{
-		$this->_cgiFix = TPropertyValue::ensureInteger($value);
+		$this->_cgiFix=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -668,15 +668,15 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
+		if($this->_cookies===null)
 		{
-			$this->_cookies = new THttpCookieCollection;
+			$this->_cookies=new THttpCookieCollection;
 			if($this->getEnableCookieValidation())
 			{
-				$sm = $this->getApplication()->getSecurityManager();
+				$sm=$this->getApplication()->getSecurityManager();
 				foreach($_COOKIE as $key => $value)
 				{
-					if(($value = $sm->validateData($value)) !== false)
+					if(($value=$sm->validateData($value))!==false)
 						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
@@ -730,13 +730,13 @@ 
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
-	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
+	public function constructUrl($serviceID, $serviceParam, $getItems=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		if ($this->_cookieOnly === null)
-				$this->_cookieOnly = (int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url, '?') === false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if($this->_cookieOnly===null)
+				$this->_cookieOnly=(int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url=$this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if(defined('SID') && SID!='' && !$this->_cookieOnly)
+			return $url.(strpos($url, '?')===false ? '?' : ($encodeAmpersand ? '&' : '&')).SID;
 		else
 			return $url;
 	}
@@ -764,12 +764,12 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from " . $_SERVER['REMOTE_ADDR'], 'Prado\Web\THttpRequest');
-		$getParams = $this->parseUrl();
+		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'], 'Prado\Web\THttpRequest');
+		$getParams=$this->parseUrl();
 		foreach($getParams as $name => $value)
-			$_GET[$name] = $value;
-		$this->_items = array_merge($_GET, $_POST);
-		$this->_requestResolved = true;
+			$_GET[$name]=$value;
+		$this->_items=array_merge($_GET, $_POST);
+		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
 		{
 			if($this->contains($serviceID))
@@ -804,7 +804,7 @@ 
 	 */
 	public function setServiceID($value)
 	{
-		$this->_serviceID = $value;
+		$this->_serviceID=$value;
 	}
 
 	/**
@@ -821,7 +821,7 @@ 
 	 */
 	public function setServiceParameter($value)
 	{
-		$this->_serviceParam = $value;
+		$this->_serviceParam=$value;
 	}
 
 	//------ The following methods enable THttpRequest to be TMap-like -----
@@ -881,7 +881,7 @@ 
 	 */
 	public function add($key, $value)
 	{
-		$this->_items[$key] = $value;
+		$this->_items[$key]=$value;
 	}
 
 	/**
@@ -894,7 +894,7 @@ 
 	{
 		if(isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
-			$value = $this->_items[$key];
+			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
 		}

Braces +6 added lines, -12 removed lines

@@ -232,8 +232,7 @@ 
 				$port = $_SERVER['SERVER_PORT'];
 				if(($port != 80 && !$secure) || ($port != 443 && $secure))
 					$url .= ':' . $port;
-			}
-			else
+			} else
 				$url .= $_SERVER['HTTP_HOST'];
 			$url .= $this->getRequestUri();
 			$this->_url = new TUri($url);
@@ -341,8 +340,7 @@ 
 				{
 					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager === null)
@@ -462,8 +460,7 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = [];
 			foreach($_SERVER as $key => $value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -575,8 +572,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -679,8 +675,7 @@ 
 					if(($value = $sm->validateData($value)) !== false)
 						$this->_cookies->add(new THttpCookie($key, $value));
 				}
-			}
-			else
+			} else
 			{
 				foreach($_COOKIE as $key => $value)
 					$this->_cookies->add(new THttpCookie($key, $value));
@@ -897,8 +892,7 @@ 
 			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Doc Comments +2 added lines

@@ -260,6 +260,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -272,6 +273,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{

Braces +2 added lines, -4 removed lines

@@ -243,14 +243,12 @@
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			elseif($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			} elseif($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
-		}
-		elseif($this->getAutoPostBack())
+		} elseif($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 

Spacing +34 added lines, -34 removed lines

@@ -131,9 +131,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;
@@ -236,17 +236,17 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		$token=$param->getCallbackParameter();
+		if(is_array($token) && count($token)==2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if($token[1]==='__TJuiAutoComplete_onSuggest__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			elseif($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			elseif($token[1]==='__TJuiAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -302,8 +302,8 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel === null)
-			$this->_resultPanel = $this->createResultPanel();
+		if($this->_resultPanel===null)
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -312,7 +312,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = new TPanel;
+		$panel=new TPanel;
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -323,8 +323,8 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater === null)
-			$this->_repeater = $this->createRepeater();
+		if($this->_repeater===null)
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -333,7 +333,7 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = new TRepeater;
+		$repeater=new TRepeater;
 		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
@@ -374,14 +374,14 @@ 
 	{
 		if($this->getActiveControl()->canUpdateClientSide(true))
 		{
-			$data = [];
-			$items = $this->getSuggestions()->getItems();
-			$writer = new TTextWriter;
-			for($i = 0; $i < $items->Count; $i++)
+			$data=[];
+			$items=$this->getSuggestions()->getItems();
+			$writer=new TTextWriter;
+			for($i=0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
-				$item = $writer->flush();
-				$data[] = [ 'id' => $i, 'label' => $item];
+				$item=$writer->flush();
+				$data[]=['id' => $i, 'label' => $item];
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -393,25 +393,25 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator=$this->getSeparator()))
+			$options['Separators']=$separator;
 
 		if($this->getAutoPostBack())
 		{
-			$options = array_merge($options, parent::getPostBackOptions());
-			$options['AutoPostBack'] = true;
+			$options=array_merge($options, parent::getPostBackOptions());
+			$options['AutoPostBack']=true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
-		$options['minLength'] = $this->getMinChars();
-		$options['delay'] = $this->getFrequency() * 1000.0;
-		$options['appendTo'] = '#' . $this->getResultPanel()->getClientID();
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		if(strlen($textCssClass=$this->getTextCssClass()))
+			$options['textCssClass']=$textCssClass;
+		$options['minLength']=$this->getMinChars();
+		$options['delay']=$this->getFrequency() * 1000.0;
+		$options['appendTo']='#'.$this->getResultPanel()->getClientID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		return $options;
 	}
 

framework/Web/UI/WebControls/TButton.php

Doc Comments +1 added lines

@@ -222,6 +222,7 @@
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param \Prado\Web\UI\TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

Spacing +10 added lines, -10 removed lines

@@ -102,12 +102,12 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page = $this->getPage();
+		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', strtolower($this->getButtonType()));
-		if(($uniqueID = $this->getUniqueID()) !== '')
+		if(($uniqueID=$this->getUniqueID())!=='')
 			$writer->addAttribute('name', $uniqueID);
-		if($this->getButtonTag() === TButtonTag::Button)
+		if($this->getButtonTag()===TButtonTag::Button)
 		  $this->addParsedObject($this->getText());
 		else
 		  $writer->addAttribute('value', $this->getText());
@@ -148,7 +148,7 @@ 
 	{
 		if($this->getCausesValidation())
 		{
-			$group = $this->getValidationGroup();
+			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
@@ -176,7 +176,7 @@ 
 	 */
 	protected function needPostBackScript()
 	{
-		return $this->canCauseValidation() || ($this->getButtonType() !== TButtonType::Submit &&
+		return $this->canCauseValidation() || ($this->getButtonType()!==TButtonType::Submit &&
 			($this->hasEventHandler('OnClick') || $this->hasEventHandler('OnCommand')))
 			|| $this->getIsDefaultButton();
 	}
@@ -188,10 +188,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['ValidationGroup']=$this->getValidationGroup();
 
 		return $options;
 	}
@@ -204,7 +204,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getButtonTag() === TButtonTag::Button)
+		if($this->getButtonTag()===TButtonTag::Button)
 			parent::renderContents($writer);
 	}
 

Braces +2 added lines, -4 removed lines

@@ -115,8 +115,7 @@ 
 		{
 			if($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
-		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 
 		parent::addAttributesToRender($writer);
@@ -150,8 +149,7 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
-		}
-		else
+		} else
 			return false;
 	}