pradosoft / prado

framework/Web/Services/TXmlRpcProtocol.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * Registers a new RPC method and handler details
 	 * @param string $methodName
-	 * @param array $handlerDetails containing the callback handler
 	 */
 	public function addMethod($methodName, $methodDetails)
 	{

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function __construct()
 	{
-		$this->_xmlrpcServer = xmlrpc_server_create();
+		$this->_xmlrpcServer=xmlrpc_server_create();
 	}
 
 	/**

Braces +3 added lines, -6 removed lines

@@ -72,16 +72,13 @@
 		try
 		{
 			return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null);
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured'));
 		}

framework/Web/THttpCookie.php

Doc Comments +1 added lines

@@ -90,6 +90,7 @@
 
 	/**
 	 * @param integer the time the cookie expires. This is a Unix timestamp so is in number of seconds since the epoch.
+	 * @param integer $value
 	 */
 	public function setExpire($value)
 	{

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * @var string domain of the cookie
 	 */
-	private $_domain = '';
+	private $_domain='';
 	/**
 	 * @var string name of the cookie
 	 */
@@ -36,23 +36,23 @@ 
 	/**
 	 * @var string value of the cookie
 	 */
-	private $_value = '';
+	private $_value='';
 	/**
 	 * @var integer expire of the cookie
 	 */
-	private $_expire = 0;
+	private $_expire=0;
 	/**
 	 * @var string path of the cookie
 	 */
-	private $_path = '/';
+	private $_path='/';
 	/**
 	 * @var boolean whether cookie should be sent via secure connection
 	 */
-	private $_secure = false;
+	private $_secure=false;
 	/**
 	 * @var boolean if true the cookie value will be unavailable to JavaScript
 	 */
-	private $_httpOnly = false;
+	private $_httpOnly=false;
 
 	/**
 	 * Constructor.
@@ -61,8 +61,8 @@ 
 	 */
 	public function __construct($name, $value)
 	{
-		$this->_name = $name;
-		$this->_value = $value;
+		$this->_name=$name;
+		$this->_value=$value;
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setDomain($value)
 	{
-		$this->_domain = $value;
+		$this->_domain=$value;
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setExpire($value)
 	{
-		$this->_expire = TPropertyValue::ensureInteger($value);
+		$this->_expire=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = $value;
+		$this->_value=$value;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function setPath($value)
 	{
-		$this->_path = $value;
+		$this->_path=$value;
 	}
 
 	/**
@@ -174,6 +174,6 @@ 
 	 */
 	public function setSecure($value)
 	{
-		$this->_secure = TPropertyValue::ensureBoolean($value);
+		$this->_secure=TPropertyValue::ensureBoolean($value);
 	}
 }
\ No newline at end of file

framework/Web/TUri.php

Doc Comments +1 added lines

@@ -87,6 +87,7 @@
 	 * Constructor.
 	 * Decomposes the specified URI into parts.
 	 * @param string URI to be represented
+	 * @param string $uri
 	 * @throws TInvalidDataValueException if URI is of bad format
 	 */
 	public function __construct($uri)

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var array list of default ports for known schemes
 	 */
-	private static $_defaultPort = [
+	private static $_defaultPort=[
 		'ftp' => 21,
 		'gopher' => 70,
 		'http' => 80,
@@ -92,18 +92,18 @@ 
 	 */
 	public function __construct($uri)
 	{
-		if(($ret = @parse_url($uri)) !== false)
+		if(($ret=@parse_url($uri))!==false)
 		{
 			// decoding???
-			$this->_scheme = isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host = isset($ret['host'])?$ret['host']:'';
-			$this->_port = isset($ret['port'])?$ret['port']:'';
-			$this->_user = isset($ret['user'])?$ret['user']:'';
-			$this->_pass = isset($ret['pass'])?$ret['pass']:'';
-			$this->_path = isset($ret['path'])?$ret['path']:'';
-			$this->_query = isset($ret['query'])?$ret['query']:'';
-			$this->_fragment = isset($ret['fragment'])?$ret['fragment']:'';
-			$this->_uri = $uri;
+			$this->_scheme=isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host=isset($ret['host']) ? $ret['host'] : '';
+			$this->_port=isset($ret['port']) ? $ret['port'] : '';
+			$this->_user=isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass=isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path=isset($ret['path']) ? $ret['path'] : '';
+			$this->_query=isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment=isset($ret['fragment']) ? $ret['fragment'] : '';
+			$this->_uri=$uri;
 		}
 		else
 		{

Braces +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 			$this->_query = isset($ret['query'])?$ret['query']:'';
 			$this->_fragment = isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri = $uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}

framework/Web/TUrlMappingPattern.php

Doc Comments +3 added lines, -1 removed lines

@@ -606,6 +606,7 @@ 
 
 	/**
 	 * @param string full regular expression mapping pattern.
+	 * @param string $value
 	 */
 	public function setRegularExpression($value)
 	{
@@ -715,6 +716,7 @@ 
 	 * Uses URL pattern (or full regular expression if available) to
 	 * match the given url path.
 	 * @param THttpRequest the request module
+	 * @param THttpRequest $request
 	 * @return array matched parameters, empty if no matches.
 	 */
 	public function getPatternMatches($request)
@@ -785,7 +787,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{

Spacing +83 added lines, -83 removed lines

@@ -125,7 +125,7 @@ 
 	/**
 	 * @var string service ID, default is 'page'.
 	 */
-	private $_serviceID = 'page';
+	private $_serviceID='page';
 	/**
 	 * @var string url pattern to match.
 	 */
@@ -141,25 +141,25 @@ 
 	/**
 	 * @var string regular expression pattern.
 	 */
-	private $_regexp = '';
+	private $_regexp='';
 
-	private $_customUrl = true;
+	private $_customUrl=true;
 
 	private $_manager;
 
-	private $_caseSensitive = true;
+	private $_caseSensitive=true;
 
-	private $_isWildCardPattern = false;
+	private $_isWildCardPattern=false;
 
-	private $_urlFormat = THttpRequestUrlFormat::Get;
+	private $_urlFormat=THttpRequestUrlFormat::Get;
 
-	private $_separator = '/';
+	private $_separator='/';
 
 	/**
 	 * @var TUrlMappingPatternSecureConnection
 	 * @since 3.2
 	 */
-	private $_secureConnection = TUrlMappingPatternSecureConnection::Automatic;
+	private $_secureConnection=TUrlMappingPatternSecureConnection::Automatic;
 
 	/**
 	 * Constructor.
@@ -167,7 +167,7 @@ 
 	 */
 	public function __construct(TUrlManager $manager)
 	{
-		$this->_manager = $manager;
+		$this->_manager=$manager;
 	}
 
 	/**
@@ -185,10 +185,10 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_serviceParameter === null)
+		if($this->_serviceParameter===null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter, '*') !== false)
-				$this->_isWildCardPattern = true;
+		if(strpos($this->_serviceParameter, '*')!==false)
+				$this->_isWildCardPattern=true;
 	}
 
 	/**
@@ -198,32 +198,32 @@ 
 	 */
 	protected function getParameterizedPattern()
 	{
-		$params = [];
-		$values = [];
-		if ($this->_parameters)
+		$params=[];
+		$values=[];
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key => $value)
 			{
-				$params[] = '{' . $key . '}';
-				$values[] = '(?P<' . $key . '>' . $value . ')';
+				$params[]='{'.$key.'}';
+				$values[]='(?P<'.$key.'>'.$value.')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
-				$params[] = '{*}';
+				$params[]='{*}';
 				// service parameter must not contain '=' and '/'
-				$values[] = '(?P<' . $this->getServiceID() . '>[^=/]+)';
+				$values[]='(?P<'.$this->getServiceID().'>[^=/]+)';
 		}
-		$params[] = '/';
-		$values[] = '\\/';
-		$regexp = str_replace($params, $values, trim($this->getPattern(), '/') . '/');
-		if ($this->_urlFormat === THttpRequestUrlFormat::Get)
-				$regexp = '/^' . $regexp . '$/u';
+		$params[]='/';
+		$values[]='\\/';
+		$regexp=str_replace($params, $values, trim($this->getPattern(), '/').'/');
+		if($this->_urlFormat===THttpRequestUrlFormat::Get)
+				$regexp='/^'.$regexp.'$/u';
 		else
-				$regexp = '/^' . $regexp . '(?P<urlparams>.*)$/u';
+				$regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';
 
 		if(!$this->getCaseSensitive())
-			$regexp .= 'i';
+			$regexp.='i';
 		return $regexp;
 	}
 
@@ -240,7 +240,7 @@ 
 	 */
 	public function setRegularExpression($value)
 	{
-		$this->_regexp = $value;
+		$this->_regexp=$value;
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setServiceParameter($value)
 	{
-		$this->_serviceParameter = $value;
+		$this->_serviceParameter=$value;
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function setServiceID($value)
 	{
-		$this->_serviceID = $value;
+		$this->_serviceID=$value;
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->_pattern = $value;
+		$this->_pattern=$value;
 	}
 
 	/**
@@ -312,9 +312,9 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
-			$this->_parameters = new TAttributeCollection;
+			$this->_parameters=new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
 		}
 		return $this->_parameters;
@@ -325,7 +325,7 @@ 
 	 */
 	public function setParameters($value)
 	{
-		$this->_parameters = $value;
+		$this->_parameters=$value;
 	}
 
 	/**
@@ -334,9 +334,9 @@ 
 	 */
 	public function getConstants()
 	{
-		if (!$this->_constants)
+		if(!$this->_constants)
 		{
-			$this->_constants = new TAttributeCollection;
+			$this->_constants=new TAttributeCollection;
 			$this->_constants->setCaseSensitive(true);
 		}
 		return $this->_constants;
@@ -350,30 +350,30 @@ 
 	 */
 	public function getPatternMatches($request)
 	{
-		$matches = [];
-		if(($pattern = $this->getRegularExpression()) !== '')
+		$matches=[];
+		if(($pattern=$this->getRegularExpression())!=='')
 			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/') . '/', $matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/').'/', $matches);
 
 		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID] = str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
+			$matches[$this->_serviceID]=str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
-		if (isset($matches['urlparams']))
+		if(isset($matches['urlparams']))
 		{
-			$params = explode('/', $matches['urlparams']);
-			if ($this->_separator === '/')
+			$params=explode('/', $matches['urlparams']);
+			if($this->_separator==='/')
 			{
-				while($key = array_shift($params))
-					$matches[$key] = ($value = array_shift($params)) ? $value : '';
+				while($key=array_shift($params))
+					$matches[$key]=($value=array_shift($params)) ? $value : '';
 			}
 			else
 			{
 				array_pop($params);
 				foreach($params as $param)
 				{
-					list($key, $value) = explode($this->_separator, $param, 2);
-					$matches[$key] = $value;
+					list($key, $value)=explode($this->_separator, $param, 2);
+					$matches[$key]=$value;
 				}
 			}
 			unset($matches['urlparams']);
@@ -382,7 +382,7 @@ 
 		if(count($matches) > 0 && $this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key => $value)
-				$matches[$key] = $value;
+				$matches[$key]=$value;
 		}
 
 		return $matches;
@@ -404,7 +404,7 @@ 
 	 */
 	public function setEnableCustomUrl($value)
 	{
-		$this->_customUrl = TPropertyValue::ensureBoolean($value);
+		$this->_customUrl=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -436,7 +436,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat = TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpRequestUrlFormat');
 	}
 
 	/**
@@ -453,8 +453,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');
 	}
@@ -474,7 +474,7 @@ 
 	 */
 	public function setSecureConnection($value)
 	{
-		$this->_secureConnection = TPropertyValue::ensureEnum($value, 'Prado\\Web\\TUrlMappingPatternSecureConnection');
+		$this->_secureConnection=TPropertyValue::ensureEnum($value, 'Prado\\Web\\TUrlMappingPatternSecureConnection');
 	}
 
 	/**
@@ -484,9 +484,9 @@ 
 	 */
 	public function supportCustomUrl($getItems)
 	{
-		if(!$this->_customUrl || $this->getPattern() === null)
+		if(!$this->_customUrl || $this->getPattern()===null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key => $value)
 			{
@@ -495,13 +495,13 @@ 
 			}
 		}
 
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key => $value)
 			{
-				if (!isset($getItems[$key]))
+				if(!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key] != $value)
+				if($getItems[$key]!=$value)
 					return false;
 			}
 		}
@@ -518,7 +518,7 @@ 
 	 */
 	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key => $value)
 			{
@@ -526,42 +526,42 @@ 
 			}
 		}
 
-		$extra = [];
-		$replace = [];
+		$extra=[];
+		$replace=[];
 		// for the GET variables matching the pattern, put them in the URL path
 		foreach($getItems as $key => $value)
 		{
-			if(($this->_parameters && $this->_parameters->contains($key)) || ($key === '*' && $this->getIsWildCardPattern()))
-				$replace['{' . $key . '}'] = $encodeGetItems ? rawurlencode($value) : $value;
+			if(($this->_parameters && $this->_parameters->contains($key)) || ($key==='*' && $this->getIsWildCardPattern()))
+				$replace['{'.$key.'}']=$encodeGetItems ? rawurlencode($value) : $value;
 			else
-				$extra[$key] = $value;
+				$extra[$key]=$value;
 		}
 
-		$url = $this->_manager->getUrlPrefix() . '/' . ltrim(strtr($this->getPattern(), $replace), '/');
+		$url=$this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
 		if(count($extra) > 0)
 		{
-			if ($this->_urlFormat === THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name => $value)
-					$url .= '/' . $name . $this->_separator . ($encodeGetItems?rawurlencode($value):$value);
+			if($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach($extra as $name => $value)
+					$url.='/'.$name.$this->_separator.($encodeGetItems ?rawurlencode($value) : $value);
 				return $url;
 			}
 
-			$url2 = '';
-			$amp = $encodeAmpersand?'&amp;':'&';
+			$url2='';
+			$amp=$encodeAmpersand ? '&amp;' : '&';
 			if($encodeGetItems)
 			{
 				foreach($extra as $name => $value)
 				{
 					if(is_array($value))
 					{
-						$name = rawurlencode($name . '[]');
+						$name=rawurlencode($name.'[]');
 						foreach($value as $v)
-							$url2 .= $amp . $name . '=' . rawurlencode($v);
+							$url2.=$amp.$name.'='.rawurlencode($v);
 					}
 					else
-						$url2 .= $amp . rawurlencode($name) . '=' . rawurlencode($value);
+						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
 			}
 			else
@@ -571,13 +571,13 @@ 
 					if(is_array($value))
 					{
 						foreach($value as $v)
-							$url2 .= $amp . $name . '[]=' . $v;
+							$url2.=$amp.$name.'[]='.$v;
 					}
 					else
-						$url2 .= $amp . $name . '=' . $value;
+						$url2.=$amp.$name.'='.$value;
 				}
 			}
-			$url = $url . '?' . substr($url2, strlen($amp));
+			$url=$url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -593,26 +593,26 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request===null) $request=Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection===null) $isSecureConnection=$request -> getIsSecureConnection();
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
 				if($isSecureConnection) return $url;
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
 				if(!$isSecureConnection) return $url;
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Disable:
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Automatic:
 			default:

Braces +7 added lines, -10 removed lines

@@ -364,10 +364,10 @@ 
 			$params = explode('/', $matches['urlparams']);
 			if ($this->_separator === '/')
 			{
-				while($key = array_shift($params))
-					$matches[$key] = ($value = array_shift($params)) ? $value : '';
-			}
-			else
+				while($key = array_shift($params)) {
+									$matches[$key] = ($value = array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -559,12 +559,10 @@ 
 						$name = rawurlencode($name . '[]');
 						foreach($value as $v)
 							$url2 .= $amp . $name . '=' . rawurlencode($v);
-					}
-					else
+					} else
 						$url2 .= $amp . rawurlencode($name) . '=' . rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name => $value)
 				{
@@ -572,8 +570,7 @@ 
 					{
 						foreach($value as $v)
 							$url2 .= $amp . $name . '[]=' . $v;
-					}
-					else
+					} else
 						$url2 .= $amp . $name . '=' . $value;
 				}
 			}

framework/Web/UI/ActiveControls/ICallbackEventHandler.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 	 * appropriate event(s) (e.g. OnClick, OnCommand) indicating the component
 	 * is responsible for the callback event.
 	 * @param TCallbackEventParameter the parameter associated with the callback event
+	 * @return void
 	 */
 	public function raiseCallbackEvent($eventArgument);
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveCheckBoxList.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 	 * updated later.
 	 *@return boolean always true
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 	  return true;
 	}
@@ -91,7 +91,7 @@ 
 	 */
 	protected function createRepeatedControl()
 	{
-		$control = new TActiveCheckBoxListItem;
+		$control=new TActiveCheckBoxListItem;
 		$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
 		return $control;
 	}

framework/Web/UI/ActiveControls/TActiveCustomValidatorClientSide.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@
 	 */
 	public function getObserveChanges()
 	{
-		$changes = $this->getOption('ObserveChanges');
-		return ($changes === null) ? true : $changes;
+		$changes=$this->getOption('ObserveChanges');
+		return ($changes===null) ? true : $changes;
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Doc Comments +2 added lines

@@ -233,6 +233,8 @@
 
 	/**
 	 * Appends data or javascript code to the body content surrounded with delimiters
+	 * @param \Prado\Web\THttpResponse $response
+	 * @param string $delimiter
 	 */
 	private function appendContentPart($response, $delimiter, $data)
 	{

Braces +2 added lines, -4 removed lines

@@ -256,14 +256,12 @@
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
+			} else
 			{
 				throw new TInvalidCallbackException(
 					'callback_invalid_handler', $callbackHandler->getUniqueID());
 			}
-		 }
-		 else
+		 } else
 		 {
 			$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 			throw new TInvalidCallbackException('callback_invalid_target', $target);

Spacing +47 added lines, -47 removed lines

@@ -37,40 +37,40 @@ 
 	/**
 	 * Callback response data header name.
 	 */
-	const CALLBACK_DATA_HEADER = 'X-PRADO-DATA';
+	const CALLBACK_DATA_HEADER='X-PRADO-DATA';
 	/**
 	 * Callback response client-side action header name.
 	 */
-	const CALLBACK_ACTION_HEADER = 'X-PRADO-ACTIONS';
+	const CALLBACK_ACTION_HEADER='X-PRADO-ACTIONS';
 	/**
 	 * Callback error header name.
 	 */
-	const CALLBACK_ERROR_HEADER = 'X-PRADO-ERROR';
+	const CALLBACK_ERROR_HEADER='X-PRADO-ERROR';
 	/**
 	 * Callback page state header name.
 	 */
-	const CALLBACK_PAGESTATE_HEADER = 'X-PRADO-PAGESTATE';
+	const CALLBACK_PAGESTATE_HEADER='X-PRADO-PAGESTATE';
 	/**
 	 * Script list header name.
 	 */
-	const CALLBACK_SCRIPTLIST_HEADER = 'X-PRADO-SCRIPTLIST';
+	const CALLBACK_SCRIPTLIST_HEADER='X-PRADO-SCRIPTLIST';
 	/**
 	 * Stylesheet list header name.
 	 */
-	const CALLBACK_STYLESHEETLIST_HEADER = 'X-PRADO-STYLESHEETLIST';
+	const CALLBACK_STYLESHEETLIST_HEADER='X-PRADO-STYLESHEETLIST';
 	/**
 	 * Stylesheet header name.
 	 */
-	const CALLBACK_STYLESHEET_HEADER = 'X-PRADO-STYLESHEET';
+	const CALLBACK_STYLESHEET_HEADER='X-PRADO-STYLESHEET';
 	/**
 	 * Hidden field list header name.
 	 */
-	const CALLBACK_HIDDENFIELDLIST_HEADER = 'X-PRADO-HIDDENFIELDLIST';
+	const CALLBACK_HIDDENFIELDLIST_HEADER='X-PRADO-HIDDENFIELDLIST';
 
 	/**
 	 * Callback redirect url header name.
 	 */
-	const CALLBACK_REDIRECT = 'X-PRADO-REDIRECT';
+	const CALLBACK_REDIRECT='X-PRADO-REDIRECT';
 
 	/**
 	 * @var ICallbackEventHandler callback event handler.
@@ -85,7 +85,7 @@ 
 	 */
 	private $_callbackClient;
 
-	private $_controlsToRender = [];
+	private $_controlsToRender=[];
 
 	/**
 	 * Constructor, trap errors and exception to let the callback response
@@ -96,7 +96,7 @@ 
 		parent::__construct($control);
 
 		//TODO: can this be done later?
-		$response = $this->getApplication()->getResponse();
+		$response=$this->getApplication()->getResponse();
 		$response->setAdapter(new TCallbackResponseAdapter($response));
 
 		$this->trapCallbackErrorsExceptions();
@@ -119,9 +119,9 @@ 
 	 */
 	public function registerControlToRender($control, $writer)
 	{
-		$id = $control->getUniqueID();
+		$id=$control->getUniqueID();
 		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = [$control,$writer];
+			$this->_controlsToRender[$id]=[$control, $writer];
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	public function renderCallbackResponse($writer)
 	{
 		Prado::trace("ActivePage renderCallbackResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl()) === null)
+		if(($url=$this->getResponse()->getAdapter()->getRedirectedUrl())===null)
 			$this->renderResponse($writer);
 		else
 			$this->redirect($url);
@@ -167,26 +167,26 @@ 
 		foreach($this->_controlsToRender as $rid => $forRender)
 			$forRender[0]->render($forRender[1]);
 
-		$response = $this->getResponse();
+		$response=$this->getResponse();
 
 		//send response data in header
 		if($response->getHasAdapter())
 		{
-			$responseData = $response->getAdapter()->getResponseData();
-			if($responseData !== null)
+			$responseData=$response->getAdapter()->getResponseData();
+			if($responseData!==null)
 			{
-				$data = TJavaScript::jsonEncode($responseData);
+				$data=TJavaScript::jsonEncode($responseData);
 
 				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);
 			}
 		}
 
 		//sends page state in header
-		if(($handler = $this->getCallbackEventTarget()) !== null)
+		if(($handler=$this->getCallbackEventTarget())!==null)
 		{
 			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
 			{
-				$pagestate = $this->getPage()->getClientState();
+				$pagestate=$this->getPage()->getClientState();
 				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
 			}
 		}
@@ -197,37 +197,37 @@ 
 		//output the end javascript
 		if($this->getPage()->getClientScript()->hasEndScripts())
 		{
-			$writer = $response->createHtmlWriter();
+			$writer=$response->createHtmlWriter();
 			$this->getPage()->getClientScript()->renderEndScriptsCallback($writer);
 			$this->getPage()->getCallbackClient()->evaluateScript($writer);
 		}
 
 		//output the actions
-		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();
-		$actions = TJavaScript::jsonEncode($executeJavascript);
+		$executeJavascript=$this->getCallbackClientHandler()->getClientFunctionsToExecute();
+		$actions=TJavaScript::jsonEncode($executeJavascript);
 		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);
 
 
-		$cs = $this->Page->getClientScript();
+		$cs=$this->Page->getClientScript();
 
 		// collect all stylesheet file references
-		$stylesheets = $cs->getStyleSheetUrls();
-		if (count($stylesheets) > 0)
+		$stylesheets=$cs->getStyleSheetUrls();
+		if(count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all stylesheet snippets references
-		$stylesheets = $cs->getStyleSheetCodes();
-		if (count($stylesheets) > 0)
+		$stylesheets=$cs->getStyleSheetCodes();
+		if(count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all script file references
-		$scripts = $cs->getScriptUrls();
-		if (count($scripts) > 0)
+		$scripts=$cs->getScriptUrls();
+		if(count($scripts) > 0)
 		$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
 
 		// collect all hidden field references
-		$fields = $cs->getHiddenFields();
-		if (count($fields) > 0)
+		$fields=$cs->getHiddenFields();
+		if(count($fields) > 0)
 		$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
 	}
 
@@ -236,7 +236,7 @@ 
 	 */
 	private function appendContentPart($response, $delimiter, $data)
 	{
-		$content = $response->createHtmlWriter();
+		$content=$response->createHtmlWriter();
 		$content->getWriter()->setBoundary($delimiter);
 		$content->write($data);
 	}
@@ -249,12 +249,12 @@ 
 	 */
 	private function raiseCallbackEvent()
 	{
-		 if(($callbackHandler = $this->getCallbackEventTarget()) !== null)
+		 if(($callbackHandler=$this->getCallbackEventTarget())!==null)
 		 {
 			if($callbackHandler instanceof ICallbackEventHandler)
 			{
-				$param = $this->getCallbackEventParameter();
-				$result = new TCallbackEventParameter($this->getResponse(), $param);
+				$param=$this->getCallbackEventParameter();
+				$result=new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
 			}
 			else
@@ -265,7 +265,7 @@ 
 		 }
 		 else
 		 {
-			$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
+			$target=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 			throw new TInvalidCallbackException('callback_invalid_target', $target);
 		 }
 	}
@@ -276,11 +276,11 @@ 
 	 */
 	public function getCallbackEventTarget()
 	{
-		if($this->_callbackEventTarget === null)
+		if($this->_callbackEventTarget===null)
 		{
-			$eventTarget = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
+			$eventTarget=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 			if(!empty($eventTarget))
-				$this->_callbackEventTarget = $this->getPage()->findControl($eventTarget);
+				$this->_callbackEventTarget=$this->getPage()->findControl($eventTarget);
 		}
 		return $this->_callbackEventTarget;
 	}
@@ -291,7 +291,7 @@ 
 	 */
 	public function setCallbackEventTarget(TControl $control)
 	{
-		$this->_callbackEventTarget = $control;
+		$this->_callbackEventTarget=$control;
 	}
 
 	/**
@@ -300,10 +300,10 @@ 
 	 */
 	public function getCallbackEventParameter()
 	{
-		if($this->_callbackEventParameter === null)
+		if($this->_callbackEventParameter===null)
 		{
-			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-			$this->_callbackEventParameter = $param;
+			$param=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+			$this->_callbackEventParameter=$param;
 		}
 		return $this->_callbackEventParameter;
 	}
@@ -313,7 +313,7 @@ 
 	 */
 	public function setCallbackEventParameter($value)
 	{
-		$this->_callbackEventParameter = $value;
+		$this->_callbackEventParameter=$value;
 	}
 
 	/**
@@ -323,8 +323,8 @@ 
 	 */
 	public function getCallbackClientHandler()
 	{
-		if($this->_callbackClient === null)
-			$this->_callbackClient = new TCallbackClientScript;
+		if($this->_callbackClient===null)
+			$this->_callbackClient=new TCallbackClientScript;
 		return $this->_callbackClient;
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveRadioButtonList.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 */
 	protected function createRepeatedControl()
 	{
-		$control = new TActiveRadioButtonItem;
+		$control=new TActiveRadioButtonItem;
 		$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
 		return $control;
 	}