pradosoft / prado

framework/Web/UI/TClientScriptManager.php

Doc Comments +6 added lines

@@ -215,6 +215,7 @@ 
 
 	/**
 	 * @param string javascript package path.
+	 * @param string $base
 	 * @return array tuple($path,$url).
 	 */
 	protected function getPackagePathUrl($base)
@@ -496,6 +497,8 @@ 
 	 * @param string a unique key identifying the hidden field
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function registerHiddenField($name,$value)
 	{
@@ -735,6 +738,7 @@ 
 
 	/**
 	 * @param THtmlWriter writer for the rendering purpose
+	 * @param boolean $initial
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
@@ -799,6 +803,7 @@ 
 	 * javascript statements.
 	 * @param string option name
 	 * @param string javascript statements.
+	 * @param string $name
 	 */
 	protected function setFunction($name, $code)
 	{
@@ -808,6 +813,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string gets a particular option, null if not set.
 	 */
 	protected function getOption($name)

Braces +2 added lines, -4 removed lines

@@ -226,8 +226,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -748,8 +747,7 @@ 
 			{
 				foreach($value as $v)
 					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}

Spacing +104 added lines, -104 removed lines

@@ -144,7 +144,7 @@ 
 	{
 		$this->registerPradoScriptInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
 	/**
@@ -155,39 +155,39 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredPradoScripts[$name]))
 		{
-			if(self::$_pradoScripts === null)
+			if(self::$_pradoScripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoScripts = $deps;
-				self::$_pradoPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoScripts=$deps;
+				self::$_pradoPackages=$packages;
 			}
 
-			if (isset(self::$_pradoScripts[$name]))
+			if(isset(self::$_pradoScripts[$name]))
 				$this->_registeredPradoScripts[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoScripts[$p] as $dep)
+					foreach(self::$_pradoScripts[$p] as $dep)
 					{
-						foreach (self::$_pradoPackages[$dep] as $script)
-						if (!isset($this->_expandedPradoScripts[$script]))
+						foreach(self::$_pradoPackages[$dep] as $script)
+						if(!isset($this->_expandedPradoScripts[$script]))
 						{
-							$this->_expandedPradoScripts[$script] = true;
+							$this->_expandedPradoScripts[$script]=true;
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/'.$script, $packagesUrl))
 									$packagesUrl[]=$url;
 							} else {
-								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/min/'.$script, $packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
@@ -204,7 +204,7 @@ 
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
@@ -214,8 +214,8 @@ 
 	 */
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 
@@ -225,9 +225,9 @@ 
 	 */
 	public function getScriptUrls()
 	{
-		$scripts = array_values($this->_headScriptFiles);
-		$scripts = array_merge($scripts, array_values($this->_scriptFiles));
-		$scripts = array_unique($scripts);
+		$scripts=array_values($this->_headScriptFiles);
+		$scripts=array_merge($scripts, array_values($this->_scriptFiles));
+		$scripts=array_unique($scripts);
 
 		return $scripts;
 	}
@@ -238,17 +238,17 @@ 
 	 */
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
+		$assets=Prado::getApplication()->getAssetManager();
 		if(strpos($base, $assets->getBaseUrl())===false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
-				$base = $dir;
+			if(($dir=Prado::getPathOfNameSpace($base))!==null) {
+				$base=$dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
 		}
 		else
 		{
-			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+			return array($assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base);
 		}
 	}
 
@@ -260,13 +260,13 @@ 
 	 */
 	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
 	{
-		$options = !is_array($options) ? array() : $options;
-		$class = new ReflectionClass($callbackHandler);
-		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
-		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavaScript::encode($options);
+		$options=!is_array($options) ? array() : $options;
+		$class=new ReflectionClass($callbackHandler);
+		$clientSide=$callbackHandler->getActiveControl()->getClientSide();
+		$options=array_merge($options, $clientSide->getOptions()->toArray());
+		$optionString=TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
-		$id = $callbackHandler->getUniqueID();
+		$id=$callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
 	}
 
@@ -283,7 +283,7 @@ 
 		$this->registerPradoScriptInternal('ajax');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
 	/**
@@ -292,9 +292,9 @@ 
 	 * @param string javascript class responsible for the control being registered for postback
 	 * @param array postback options
 	 */
-	public function registerPostBackControl($class,$options)
+	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if($class===null) {
 			return;
 		}
 		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
@@ -306,7 +306,7 @@ 
 		$this->registerPradoScriptInternal('prado');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID=is_string($panel) ? $panel : $panel->getUniqueID();
 
 		if(is_string($button))
 			$buttonID=$button;
@@ -326,14 +326,14 @@ 
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
 		}
-		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
-		$code = "new Prado.WebUI.DefaultButton($options);";
+		$options=TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
+		$code="new Prado.WebUI.DefaultButton($options);";
 
 		$this->_endScripts['prado:'.$panelID]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params=array($panelID,$buttonID);
-		$this->_page->registerCachingAction('Page.ClientScript','registerDefaultButton',$params);
+		$params=array($panelID, $buttonID);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
 	/**
@@ -343,11 +343,11 @@ 
 	 */
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
-		$options['ID'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
-		$options['EventTarget'] = $buttonID;
-		$options['Event'] = 'click';
+		$options['ID']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Panel']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Target']=TControl::convertUniqueIdToClientId($buttonID);
+		$options['EventTarget']=$buttonID;
+		$options['Event']='click';
 		return $options;
 	}
 
@@ -360,10 +360,10 @@ 
 		$this->registerPradoScriptInternal('jquery');
 		if($target instanceof TControl)
 			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
+		$this->_endScripts['prado:focus']='jQuery(\'#'.$target.'\').focus();';
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	{
 		$this->registerPradoStyleInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoStyle',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoStyle', $params);
 	}
 
 	/**
@@ -386,43 +386,43 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredPradoStyles[$name]))
 		{
-			$base = $this->getPradoScriptAssetUrl();
+			$base=$this->getPradoScriptAssetUrl();
 
-			if(self::$_pradoStyles === null)
+			if(self::$_pradoStyles===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoStyles = $deps;
-				self::$_pradoStylePackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoStyles=$deps;
+				self::$_pradoStylePackages=$packages;
 			}
 
-			if (isset(self::$_pradoStyles[$name]))
+			if(isset(self::$_pradoStyles[$name]))
 				$this->_registeredPradoStyles[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradostyle_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredPradoStyles))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoStyles[$p] as $dep)
+					foreach(self::$_pradoStyles[$p] as $dep)
 					{
-						foreach (self::$_pradoStylePackages[$dep] as $style)
-						if (!isset($this->_expandedPradoStyles[$style]))
+						foreach(self::$_pradoStylePackages[$dep] as $style)
+						if(!isset($this->_expandedPradoStyles[$style]))
 						{
-							$this->_expandedPradoStyles[$style] = true;
+							$this->_expandedPradoStyles[$style]=true;
 							// TODO minify css?
-							if (!in_array($url=$baseUrl.'/'.$style,$packagesUrl))
+							if(!in_array($url=$baseUrl.'/'.$style, $packagesUrl))
 								$packagesUrl[]=$url;
 						}
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerStyleSheetFile($url,$url);
+					$this->registerStyleSheetFile($url, $url);
 			}
 		}
 	}
@@ -449,15 +449,15 @@ 
 	 * @param string URL to the CSS file
 	 * @param string media type of the CSS (such as 'print', 'screen', etc.). Defaults to empty, meaning the CSS applies to all media types.
 	 */
-	public function registerStyleSheetFile($key,$url,$media='')
+	public function registerStyleSheetFile($key, $url, $media='')
 	{
 		if($media==='')
 			$this->_styleSheetFiles[$key]=$url;
 		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+			$this->_styleSheetFiles[$key]=array($url, $media);
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
 	/**
@@ -465,12 +465,12 @@ 
 	 * @param string a unique key identifying the CSS block
 	 * @param string CSS block
 	 */
-	public function registerStyleSheet($key,$css,$media='')
+	public function registerStyleSheet($key, $css, $media='')
 	{
 		$this->_styleSheets[$key]=$css;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
 	/**
@@ -479,17 +479,17 @@ 
 	 */
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(
 				create_function('$e', 'return is_array($e) ? $e[0] : $e;'),
 				$this->_styleSheetFiles)
 		);
 
 		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
-				$stylesheets[] = $url;
+			if(substr($url, strlen($url) - 4)=='.css')
+				$stylesheets[]=$url;
 
-		$stylesheets = array_unique($stylesheets);
+		$stylesheets=array_unique($stylesheets);
 
 		return $stylesheets;
 	}
@@ -508,13 +508,13 @@ 
 	 * @param string a unique key identifying the file
 	 * @param string URL to the javascript file
 	 */
-	public function registerHeadScriptFile($key,$url)
+	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
 	/**
@@ -522,13 +522,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerHeadScript($key,$script)
+	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
 	/**
@@ -541,7 +541,7 @@ 
 		$this->_scriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
 	/**
@@ -549,13 +549,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerBeginScript($key,$script)
+	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_beginScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
 	/**
@@ -563,12 +563,12 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerEndScript($key,$script)
+	public function registerEndScript($key, $script)
 	{
 		$this->_endScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
 	/**
@@ -577,12 +577,12 @@ 
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
 	 */
-	public function registerHiddenField($name,$value)
+	public function registerHiddenField($name, $value)
 	{
 		$this->_hiddenFields[$name]=$value;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
 	/**
@@ -695,7 +695,7 @@ 
 	public function renderStyleSheets($writer)
 	{
 		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -703,7 +703,7 @@ 
 	 */
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 
 	/**
@@ -726,9 +726,9 @@ 
 
 	public function markScriptFileAsRendered($url)
 	{
-		$this->_renderedScriptFiles[$url] = $url;
+		$this->_renderedScriptFiles[$url]=$url;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
 	protected function renderScriptFiles($writer, Array $scripts)
@@ -752,8 +752,8 @@ 
 	{
 		if(!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles,$this->getRenderedScriptFiles());
-			$this->renderScriptFiles($writer,$addedScripts);
+			$addedScripts=array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
 
@@ -791,12 +791,12 @@ 
 
 	public function renderHiddenFieldsBegin($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,true);
+		$this->renderHiddenFieldsInt($writer, true);
 	}
 
 	public function renderHiddenFieldsEnd($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,false);
+		$this->renderHiddenFieldsInt($writer, false);
 	}
 
 	/**
@@ -818,12 +818,12 @@ 
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
-		if ($initial) $this->_renderedHiddenFields = array();
+		if($initial) $this->_renderedHiddenFields=array();
 		$str='';
 		foreach($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
-			$id=strtr($name,':','_');
+			if(in_array($name, $this->_renderedHiddenFields)) continue;
+			$id=strtr($name, ':', '_');
 			if(is_array($value))
 			{
 				foreach($value as $v)
@@ -833,7 +833,7 @@ 
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
-			$this->_renderedHiddenFields[] = $name;
+			$this->_renderedHiddenFields[]=$name;
 		}
 		if($str!=='')
 			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
@@ -849,7 +849,7 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new Exception('Operation invalid when page is already rendering');
 	}
 }
@@ -883,7 +883,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);
 	}
 
@@ -892,7 +892,7 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
+		if($this->_options)
 			return $this->_options->itemAt($name);
 		else
 			return null;
@@ -912,8 +912,8 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = Prado::createComponent('System.Collections.TMap');
+		if(!$this->_options)
+			$this->_options=Prado::createComponent('System.Collections.TMap');
 		return $this->_options;
 	}
 

framework/Web/UI/TPage.php

Doc Comments +15 added lines

@@ -278,6 +278,9 @@ 
 		$this->unloadRecursive();
 	}
 
+	/**
+	 * @param string $enc
+	 */
 	protected static function decodeUTF8($data, $enc)
 	{
 		if(is_array($data))
@@ -451,6 +454,7 @@ 
 	 * Returns a list of registered validators.
 	 * If validation group is specified, only the validators in that group will be returned.
 	 * @param string validation group
+	 * @param string $validationGroup
 	 * @return TList registered validators in the requested group. If the group is null, all validators will be returned.
 	 */
 	public function getValidators($validationGroup=null)
@@ -562,6 +566,7 @@ 
 	 * Applies a skin in the current theme to a control.
 	 * This method should only be used by framework developers.
 	 * @param TControl a control to be applied skin with
+	 * @param TControl $control
 	 */
 	public function applyControlSkin($control)
 	{
@@ -856,6 +861,7 @@ 
 	 * Processes post data.
 	 * @param TMap post data to be processed
 	 * @param boolean whether this method is invoked before {@link onLoad OnLoad}.
+	 * @param boolean $beforeLoad
 	 */
 	protected function processPostData($postData,$beforeLoad)
 	{
@@ -981,6 +987,7 @@ 
 	/**
 	 * Sets input focus on a control after the page is rendered to users.
 	 * @param TControl|string control to receive focus, or the ID of the element on the page to receive focus
+	 * @param TControl $value
 	 */
 	public function setFocus($value)
 	{
@@ -1066,6 +1073,7 @@ 
 	 * Sets the state to be stored on the client side.
 	 * This method should only be used by framework and control developers.
 	 * @param string the state to be stored on the client side
+	 * @param string $state
 	 */
 	public function setClientState($state)
 	{
@@ -1185,6 +1193,8 @@ 
 	 * referring to the context object (e.g. Page, Page.ClientScript).
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
+	 * @param string $context
+	 * @param string $funcName
 	 */
 	public function registerCachingAction($context,$funcName,$funcParams)
 	{
@@ -1230,15 +1240,18 @@ 
 {
 	/**
 	 * @param TPage the page that this persister works for
+	 * @return TPage
 	 */
 	public function getPage();
 	/**
 	 * @param TPage the page that this persister works for
+	 * @return void
 	 */
 	public function setPage(TPage $page);
 	/**
 	 * Saves state to persistent storage.
 	 * @param mixed state to be stored
+	 * @return void
 	 */
 	public function save($state);
 	/**
@@ -1272,6 +1285,7 @@ 
 	/**
 	 * @param TPage
 	 * @param mixed state data
+	 * @param TPage $page
 	 * @return string serialized data
 	 */
 	public static function serialize($page,$data)
@@ -1291,6 +1305,7 @@ 
 	/**
 	 * @param TPage
 	 * @param string serialized data
+	 * @param TPage $page
 	 * @return mixed unserialized state data, null if data is corrupted
 	 */
 	public static function unserialize($page,$data)

Indentation +9 added lines, -9 removed lines

@@ -303,15 +303,15 @@
 
 		$this->setAdapter(new TActivePageAdapter($this));
 
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-        if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
-
-        // Decode Callback postData from UTF-8 to current Charset
-        if (($g=$this->getApplication()->getGlobalization(false))!==null &&
-            strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+		if(strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+
+		// Decode Callback postData from UTF-8 to current Charset
+		if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8')
+				foreach ($this->_postData as $k=>$v)
+					$this->_postData[$k]=self::decodeUTF8($v, $enc);
 
 		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
 		$this->onPreInit(null);

Spacing +98 added lines, -98 removed lines

@@ -181,8 +181,8 @@ 
 	 */
 	public function run($writer)
 	{
-		Prado::trace("Running page life cycles",'System.Web.UI.TPage');
-		$this->_writer = $writer;
+		Prado::trace("Running page life cycles", 'System.Web.UI.TPage');
+		$this->_writer=$writer;
 
 		$this->determinePostBackMode();
 
@@ -196,85 +196,85 @@ 
 		else
 			$this->processNormalRequest($writer);
 
-		$this->_writer = null;
+		$this->_writer=null;
 	}
 
 	protected function processNormalRequest($writer)
 	{
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
-		Prado::trace("Page renderControl()",'System.Web.UI.TPage');
+		Prado::trace("Page renderControl()", 'System.Web.UI.TPage');
 		$this->renderControl($writer);
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
 	protected function processPostBackRequest($writer)
 	{
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
 		$this->_restPostData=new TMap;
-		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');
+		Prado::trace("Page loadPageState()", 'System.Web.UI.TPage');
 		$this->loadPageState();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_postData,true);
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_postData, true);
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_restPostData,false);
-		Prado::trace("Page raiseChangedEvents()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_restPostData, false);
+		Prado::trace("Page raiseChangedEvents()", 'System.Web.UI.TPage');
 		$this->raiseChangedEvents();
-		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');
+		Prado::trace("Page raisePostBackEvent()", 'System.Web.UI.TPage');
 		$this->raisePostBackEvent();
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
-		Prado::trace("Page renderControl()",'System.Web.UI.TPage');
+		Prado::trace("Page renderControl()", 'System.Web.UI.TPage');
 		$this->renderControl($writer);
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
@@ -286,7 +286,7 @@ 
 				$data[$k]=self::decodeUTF8($v, $enc);
 			return $data;
 		} elseif(is_string($data)) {
-			return iconv('UTF-8',$enc.'//IGNORE',$data);
+			return iconv('UTF-8', $enc.'//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -303,39 +303,39 @@ 
 
 		$this->setAdapter(new TActivePageAdapter($this));
 
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+        $callbackEventParameter=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
         if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string) $callbackEventParameter);
 
         // Decode Callback postData from UTF-8 to current Charset
-        if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+        if(($g=$this->getApplication()->getGlobalization(false))!==null &&
             strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
+                foreach($this->_postData as $k=>$v)
                 	$this->_postData[$k]=self::decodeUTF8($v, $enc);
 
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
 		$this->_restPostData=new TMap;
-		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');
+		Prado::trace("Page loadPageState()", 'System.Web.UI.TPage');
 		$this->loadPageState();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_postData,true);
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_postData, true);
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
 
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_restPostData,false);
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_restPostData, false);
 
-		Prado::trace("Page raiseChangedEvents()",'System.Web.UI.TPage');
+		Prado::trace("Page raiseChangedEvents()", 'System.Web.UI.TPage');
 		$this->raiseChangedEvents();
 
 
@@ -345,17 +345,17 @@ 
 		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');
 		$this->raisePostBackEvent();
 */
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
 /*
@@ -364,7 +364,7 @@ 
 */
 		$this->getAdapter()->renderCallbackResponse($writer);
 
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
@@ -375,7 +375,7 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if($this->getAdapter()!==null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -457,7 +457,7 @@ 
 	{
 		if(!$this->_validators)
 			$this->_validators=new TList;
-		if(empty($validationGroup) === true)
+		if(empty($validationGroup)===true)
 			return $this->_validators;
 		else
 		{
@@ -477,7 +477,7 @@ 
 	 */
 	public function validate($validationGroup=null)
 	{
-		Prado::trace("Page validate()",'System.Web.UI.TPage');
+		Prado::trace("Page validate()", 'System.Web.UI.TPage');
 		$this->_validated=true;
 		if($this->_validators && $this->_validators->getCount())
 		{
@@ -535,7 +535,7 @@ 
 	 */
 	public function setTheme($value)
 	{
-		$this->_theme=empty($value)?null:$value;
+		$this->_theme=empty($value) ? null : $value;
 	}
 
 
@@ -555,7 +555,7 @@ 
 	 */
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet=empty($value)?null:$value;
+		$this->_styleSheet=empty($value) ? null : $value;
 	}
 
 	/**
@@ -586,13 +586,13 @@ 
 	public function getClientScript()
 	{
 		if(!$this->_clientScript) {
-			$className = $classPath = $this->getService()->getClientScriptManagerClass();
+			$className=$classPath=$this->getService()->getClientScriptManagerClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if(($pos=strrpos($className, '.'))!==false)
+				$className=substr($className, $pos + 1);
 
- 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager')))
-				throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+ 			if(!class_exists($className, false) || ($className!=='TClientScriptManager' && !is_subclass_of($className, 'TClientScriptManager')))
+				throw new THttpException(404, 'page_csmanagerclass_invalid', $classPath);
 
 			$this->_clientScript=new $className($this);
 		}
@@ -610,7 +610,7 @@ 
 	 */
 	public function onPreInit($param)
 	{
-		$this->raiseEvent('OnPreInit',$this,$param);
+		$this->raiseEvent('OnPreInit', $this, $param);
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function onInitComplete($param)
 	{
-		$this->raiseEvent('OnInitComplete',$this,$param);
+		$this->raiseEvent('OnInitComplete', $this, $param);
 	}
 
 	/**
@@ -636,7 +636,7 @@ 
 	 */
 	public function onPreLoad($param)
 	{
-		$this->raiseEvent('OnPreLoad',$this,$param);
+		$this->raiseEvent('OnPreLoad', $this, $param);
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 	 */
 	public function onLoadComplete($param)
 	{
-		$this->raiseEvent('OnLoadComplete',$this,$param);
+		$this->raiseEvent('OnLoadComplete', $this, $param);
 	}
 
 	/**
@@ -662,23 +662,23 @@ 
 	 */
 	public function onPreRenderComplete($param)
 	{
-		$this->raiseEvent('OnPreRenderComplete',$this,$param);
+		$this->raiseEvent('OnPreRenderComplete', $this, $param);
 		$cs=$this->getClientScript();
 		$theme=$this->getTheme();
 		if($theme instanceof ITheme)
 		{
 			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
 			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+				$cs->registerHeadScriptFile($url, $url);
 		}
 		$styleSheet=$this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
 			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
 			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+				$cs->registerHeadScriptFile($url, $url);
 		}
 
 		if($cs->getRequiresHead() && $this->getHead()===null)
@@ -695,9 +695,9 @@ 
 	 */
 	private function getCssMediaType($url)
 	{
-		$segs=explode('.',basename($url));
+		$segs=explode('.', basename($url));
 		if(isset($segs[2]))
-			return $segs[count($segs)-2];
+			return $segs[count($segs) - 2];
 		else
 			return '';
 	}
@@ -711,7 +711,7 @@ 
 	 */
 	public function onSaveStateComplete($param)
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,$param);
+		$this->raiseEvent('OnSaveStateComplete', $this, $param);
 	}
 
 	/**
@@ -749,7 +749,7 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		$this->setViewState('ControlsRequiringPostBack',$this->_controlsRegisteredForPostData,array());
+		$this->setViewState('ControlsRequiringPostBack', $this->_controlsRegisteredForPostData, array());
 	}
 
 	/**
@@ -760,7 +760,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack',array());
+		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack', array());
 	}
 
 	/**
@@ -768,9 +768,9 @@ 
 	 */
 	protected function loadPageState()
 	{
-		Prado::trace("Loading state",'System.Web.UI.TPage');
+		Prado::trace("Loading state", 'System.Web.UI.TPage');
 		$state=$this->getStatePersister()->load();
-		$this->loadStateRecursive($state,$this->getEnableViewState());
+		$this->loadStateRecursive($state, $this->getEnableViewState());
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	protected function savePageState()
 	{
-		Prado::trace("Saving state",'System.Web.UI.TPage');
+		Prado::trace("Saving state", 'System.Web.UI.TPage');
 		$state=&$this->saveStateRecursive($this->getEnableViewState());
 		$this->getStatePersister()->save($state);
 	}
@@ -801,11 +801,11 @@ 
 	 */
 	public function registerRequiresPostData($control)
 	{
-		$id=is_string($control)?$control:$control->getUniqueID();
+		$id=is_string($control) ? $control : $control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id]=true;
 		$params=func_get_args();
 		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page','registerRequiresPostData',array($id));
+			$item->registerAction('Page', 'registerRequiresPostData', array($id));
 	}
 
 	/**
@@ -857,7 +857,7 @@ 
 	 * @param TMap post data to be processed
 	 * @param boolean whether this method is invoked before {@link onLoad OnLoad}.
 	 */
-	protected function processPostData($postData,$beforeLoad)
+	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData=true;
 		if($beforeLoad)
@@ -870,18 +870,18 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
+					if($control->loadPostData($key, $postData))
 						$this->_controlsPostDataChanged[]=$control;
 				}
 				else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  // not calling setPostBackEventTarget() because the control may be removed later
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
+				$this->_restPostData->add($key, $value);
 		}
 
 		foreach($this->_controlsRequiringPostData as $key=>$value)
@@ -890,11 +890,11 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
+					if($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
 				}
 				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
+					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -945,7 +945,7 @@ 
 	public function ensureRenderInForm($control)
 	{
 		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
+			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
 	}
 
 	/**
@@ -956,7 +956,7 @@ 
 		if($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
 		$this->_formRendered=true;
-		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE,$this->getClientState());
+		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
 		$this->_inFormRender=true;
 	}
 
@@ -1186,12 +1186,12 @@ 
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
 	 */
-	public function registerCachingAction($context,$funcName,$funcParams)
+	public function registerCachingAction($context, $funcName, $funcParams)
 	{
 		if($this->_cachingStack)
 		{
 			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
 
@@ -1210,7 +1210,7 @@ 
 	 */
 	public function flushWriter()
 	{
-		if ($this->_writer)
+		if($this->_writer)
 			$this->Response->write($this->_writer->flush());
 	}
 
@@ -1274,7 +1274,7 @@ 
 	 * @param mixed state data
 	 * @return string serialized data
 	 */
-	public static function serialize($page,$data)
+	public static function serialize($page, $data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
 		if($page->getEnableStateValidation())
@@ -1293,7 +1293,7 @@ 
 	 * @param string serialized data
 	 * @return mixed unserialized state data, null if data is corrupted
 	 */
-	public static function unserialize($page,$data)
+	public static function unserialize($page, $data)
 	{
 		$str=base64_decode($data);
 		if($str==='')

Braces +8 added lines, -16 removed lines

@@ -192,8 +192,7 @@ 
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
-		}
-		else
+		} else
 			$this->processNormalRequest($writer);
 
 		$this->_writer = null;
@@ -485,8 +484,7 @@ 
 			{
 				foreach($this->_validators as $validator)
 					$validator->validate();
-			}
-			else
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
@@ -514,8 +512,7 @@ 
 						return false;
 			}
 			return true;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 
@@ -872,15 +869,13 @@ 
 				{
 					if($control->loadPostData($key,$postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else if($control instanceof IPostBackEventHandler &&
+				} else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
-			}
-			else if($beforeLoad)
+			} else if($beforeLoad)
 				$this->_restPostData->add($key,$value);
 		}
 
@@ -892,8 +887,7 @@ 
 				{
 					if($control->loadPostData($key,$this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -972,8 +966,7 @@ 
 			else
 				$focus=$this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
-		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
+		} else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
@@ -1309,8 +1302,7 @@ 
 			{
 				if(($str=$sm->validateData($str))!==false)
 					return unserialize($str);
-			}
-			else
+			} else
 				return unserialize($str);
 		}
 		return null;

framework/Web/UI/TTemplateControl.php

Doc Comments +3 added lines, -1 removed lines

@@ -144,6 +144,7 @@ 
 	 * Registers a content control.
 	 * @param string ID of the content
 	 * @param TContent
+	 * @param string $id
 	 */
 	public function registerContent($id,TContent $object)
 	{
@@ -158,6 +159,7 @@ 
 	 * This method should only be used by framework and control developers.
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
+	 * @param string $id
 	 */
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{
@@ -184,7 +186,7 @@ 
 	}
 
 	/**
-	 * @return TTemplateControl|null master control associated with this control, null if none
+	 * @return TTemplateControl master control associated with this control, null if none
 	 */
 	public function getMaster()
 	{

Indentation +84 added lines, -84 removed lines

@@ -238,90 +238,90 @@
 		parent::initRecursive($namingContainer);
 	}
         
-        /**
-         * Function to update view controls with data in a given AR object.
-         * View controls and AR object need to have the same name in IDs and Attrs respectively.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to update view controls with data in a given AR object.
+		 * View controls and AR object need to have the same name in IDs and Attrs respectively.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 
-        /**
-         * Function to try to update an AR object with data in view controls.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to try to update an AR object with data in view controls.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 

Spacing +44 added lines, -44 removed lines

@@ -115,7 +115,7 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template ".get_class($this),'System.Web.UI.TTemplateControl');
+		Prado::trace("Loading template ".get_class($this), 'System.Web.UI.TTemplateControl');
 		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
@@ -132,9 +132,9 @@ 
 			foreach($tpl->getDirective() as $name=>$value)
 			{
 				if(is_string($value))
-					$this->setSubProperty($name,$value);
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
@@ -145,10 +145,10 @@ 
 	 * @param string ID of the content
 	 * @param TContent
 	 */
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
 		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
 			$this->_contents[$id]=$object;
 	}
@@ -159,10 +159,10 @@ 
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
 	 */
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
 			$this->_placeholders[$id]=$object;
 	}
@@ -197,17 +197,17 @@ 
 	 * @param string ID of the content control
 	 * @param TContent the content to be injected
 	 */
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
 		if(isset($this->_placeholders[$id]))
 		{
 			$placeholder=$this->_placeholders[$id];
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
 	/**
@@ -231,10 +231,10 @@ 
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+				$master->injectContent($id, $content);
 		}
 		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         
@@ -245,38 +245,38 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
+        public function tryToUpdateView($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key != "RELATIONS")
+                                if($key!="RELATIONS")
                                 {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
+                                        $control=$this->{$key};
+                                        if($control instanceof TTextBox)
+                                                $control->Text=$arObj->{$key};
+                                        elseif($control instanceof TCheckBox)
+                                                $control->Checked=(boolean) $arObj->{$key};
+                                        elseif($control instanceof TDatePicker)
+                                                $control->Date=$arObj->{$key};
                                 }
                                 else
                                 {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+                                        foreach($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
+                                                $relControl=$this->{$relKey};
+                                                switch($relValues[0])
                                                 {
                                                         case TActiveRecord::BELONGS_TO:
                                                         case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
+                                                                $relControl->Text=$arObj->{$relKey};
                                                                 break;
                                                         case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
+                                                                if($relControl instanceof TListControl)
                                                                 {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
+                                                                        $relControl->DataSource=$arObj->{$relKey};
                                                                         $relControl->dataBind();
                                                                 }
                                                                 break;
@@ -285,9 +285,9 @@ 
                                         break;
                                 }
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }
@@ -299,26 +299,26 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
+        public function tryToUpdateAR($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key == "RELATIONS")
+                                if($key=="RELATIONS")
                                         break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
+                                $control=$this->{$key};
+                                if($control instanceof TTextBox)
+                                        $arObj->{$key}=$control->Text;
+                                elseif($control instanceof TCheckBox)
+                                        $arObj->{$key}=$control->Checked;
+                                elseif($control instanceof TDatePicker)
+                                        $arObj->{$key}=$control->Date;
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }

Braces +6 added lines, -12 removed lines

@@ -69,8 +69,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -205,8 +204,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 
@@ -232,8 +230,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
 				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -261,8 +258,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -284,8 +280,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -315,8 +310,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;

framework/Web/UI/TTemplateControlInheritable.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +5 added lines, -5 removed lines

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

framework/Web/UI/TTemplateManager.php

Doc Comments +11 added lines

@@ -69,6 +69,7 @@ 
 
 	/**
 	 * Loads the template from the specified file.
+	 * @param string $fileName
 	 * @return ITemplate template parsed from the specified file, null if the file doesn't exist.
 	 */
 	public function getTemplateByFileName($fileName)
@@ -415,6 +416,7 @@ 
 	 * @param TControl control to be configured
 	 * @param string property name
 	 * @param mixed property initial value
+	 * @param TControl $control
 	 */
 	protected function configureControl($control,$name,$value)
 	{
@@ -431,6 +433,7 @@ 
 	 * @param TComponent component to be configured
 	 * @param string property name
 	 * @param mixed property initial value
+	 * @param TComponent $component
 	 */
 	protected function configureComponent($component,$name,$value)
 	{
@@ -817,6 +820,8 @@ 
 	/**
 	 * Parses the attributes of a tag from a string.
 	 * @param string the string to be parsed.
+	 * @param string $str
+	 * @param string $offset
 	 * @return array attribute values indexed by names.
 	 */
 	protected function parseAttributes($str,$offset)
@@ -851,6 +856,9 @@ 
 		return $attributes;
 	}
 
+	/**
+	 * @param string $content
+	 */
 	protected function parseTemplateProperty($content,$offset)
 	{
 		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
@@ -860,6 +868,7 @@ 
 	/**
 	 * Parses a single attribute.
 	 * @param string the string to be parsed.
+	 * @param string $value
 	 * @return array attribute initialization
 	 */
 	protected function parseAttribute($value)
@@ -1002,6 +1011,8 @@ 
 	 * @param Exception template exception
 	 * @param int line number
 	 * @param string template string if no source file is used
+	 * @param Exception $e
+	 * @param integer $line
 	 */
 	protected function handleException($e,$line,$input=null)
 	{

Indentation +8 added lines, -8 removed lines

@@ -167,7 +167,7 @@ 
 {
 	/**
 	 *  '<!--.*?--!>' - template comments
-		 *  '<!--.*?-->'  - HTML comments
+	 *  '<!--.*?-->'  - HTML comments
 	 *	'<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>' - component tags
 	 *	'<\/?prop:([\w\.]+)\s*>'  - property tags
 	 *	'<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>'  - directives
@@ -1080,15 +1080,15 @@ 
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
 	  if(!isset($behaviors['_um']))
-	    return false;
+		return false;
 	  foreach($behaviors['_um'] as $name=>$list)
 	  {
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
-	    foreach($list as $param)
-	    {
-	      if(method_exists($param->getBehavior(),$method))
-	        return true;
-	    }
+		if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
+		foreach($list as $param)
+		{
+		  if(method_exists($param->getBehavior(),$method))
+			return true;
+		}
 	  }
 	  return false;
 	}

Braces +28 added lines, -56 removed lines

@@ -107,8 +107,7 @@ 
 				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
 				return $template;
 			}
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -357,8 +356,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key]=$component;
-				}
-				else if($component instanceof TComponent)
+				} else if($component instanceof TComponent)
 				{
 					$controls[$key]=$component;
 					if(isset($properties['id']))
@@ -376,8 +374,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -388,8 +385,7 @@ 
 						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent===$parentControl)
 						$directChildren[]=$object[1];
@@ -500,8 +496,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			if (substr($name,0,2)=='js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
@@ -549,8 +544,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name,$value);
 	}
 
@@ -611,8 +605,7 @@ 
 						$stack[] = $type;
 						$container=$c-1;
 					}
-				}
-				else if(strpos($str,'</com:')===0)	// closing component tag
+				} else if(strpos($str,'</com:')===0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
@@ -631,8 +624,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag);
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)	// directive
+				} else if(strpos($str,'<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -642,8 +634,7 @@ 
 					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
-				}
-				else if(strpos($str,'<%')===0)	// expression
+				} else if(strpos($str,'<%')===0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
@@ -668,8 +659,7 @@ 
 						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
 						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
 					}
-				}
-				else if(strpos($str,'<prop:')===0)	// opening property
+				} else if(strpos($str,'<prop:')===0)	// opening property
 				{
 					if(strrpos($str,'/>')===strlen($str)-2)  //subproperties
 					{
@@ -691,8 +681,7 @@ 
 								throw new TConfigurationException('template_property_duplicated',$name);
 							$tpl[$container][2][$name]=$value;
 						}
-					}
-					else  // regular property
+					} else  // regular property
 					{
 						$prop=strtolower($match[3][0]);
 						$stack[] = '@'.$prop;
@@ -704,8 +693,7 @@ 
 							$expectPropEnd=true;
 						}
 					}
-				}
-				else if(strpos($str,'</prop:')===0)	// closing property
+				} else if(strpos($str,'</prop:')===0)	// closing property
 				{
 					$prop=strtolower($match[3][0]);
 					if(empty($stack))
@@ -732,23 +720,20 @@ 
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated',$prop);
 								$tpl[$container][2][$prop]=$value;
-							}
-							else	// a property for the template control
+							} else	// a property for the template control
 								$this->_directive[$prop]=$value;
 							$textStart=$matchEnd+1;
 						}
 						$expectPropEnd=false;
 					}
-				}
-				else if(strpos($str,'<!--')===0)	// comments
+				} else if(strpos($str,'<!--')===0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart>$textStart)
 						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
 					$textStart=$matchEnd+1;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected',$match);
 			}
 			if(!empty($stack))
@@ -759,8 +744,7 @@ 
 			}
 			if($textStart<strlen($input))
 				$tpl[$c++]=array($container,substr($input,$textStart));
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -793,14 +777,12 @@ 
 				{
 					$parent=null;
 					$objects[$id]=$object;
-				}
-				else
+				} else
 				{
 					$parent=$object[0];
 					$merged=array($parent,array($object[1]));
 				}
-			}
-			else
+			} else
 				$merged[1][]=$object[1];
 		}
 		if($parent!==null)
@@ -839,8 +821,7 @@ 
 					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
 				else
 					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
-			}
-			else
+			} else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
 					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
@@ -889,8 +870,7 @@ 
 				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
 			else
 				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
-		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		} else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
@@ -903,8 +883,7 @@ 
 				$literal = trim(substr($value,3,strlen($value)-5));
 				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 
@@ -926,16 +905,14 @@ 
 					$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown',$type,$name);
 					else if(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
-				}
-				else
+				} else
 				{
 					// a simple property
 					if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
@@ -944,8 +921,7 @@ 
 							throw new TConfigurationException('template_property_readonly',$type,$name);
 						else
 							throw new TConfigurationException('template_property_unknown',$type,$name);
-					}
-					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
+					} else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name,'id')===0)
 							throw new TConfigurationException('template_controlid_invalid',$type);
@@ -954,8 +930,7 @@ 
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		} else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
@@ -967,8 +942,7 @@ 
 					$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 					throw new TConfigurationException('template_event_forbidden',$type,$name);
 				else
 				{
@@ -982,8 +956,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required',$type);
 	}
 
@@ -1018,8 +991,7 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}

Spacing +200 added lines, -200 removed lines

@@ -75,21 +75,21 @@ 
 	{
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
-			Prado::trace("Loading template $fileName",'System.Web.UI.TTemplateManager');
+			Prado::trace("Loading template $fileName", 'System.Web.UI.TTemplateManager');
 			if(($cache=$this->getApplication()->getCache())===null)
-				return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
 				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
 				if(is_array($array))
 				{
-					list($template,$timestamps)=$array;
+					list($template, $timestamps)=$array;
 					if($this->getApplication()->getMode()===TApplicationMode::Performance)
 						return $template;
 					$cacheValid=true;
 					foreach($timestamps as $tplFile=>$timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile)>$timestamp)
+						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
 							$cacheValid=false;
 							break;
@@ -98,13 +98,13 @@ 
 					if($cacheValid)
 						return $template;
 				}
-				$template=new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				$template=new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles=$template->getIncludedFiles();
 				$timestamps=array();
 				$timestamps[$fileName]=filemtime($fileName);
 				foreach($includedFiles as $includedFile)
 					$timestamps[$includedFile]=filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, array($template, $timestamps));
 				return $template;
 			}
 		}
@@ -120,7 +120,7 @@ 
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app=$this->getApplication()->getGlobalization(false))===null)
-			return is_file($filename)?$filename:null;
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
 			if(($file=realpath($file))!==false && is_file($file))
@@ -234,7 +234,7 @@ 
 	 * @param boolean whether this template is a source template, i.e., this template is loaded from
 	 * some external storage rather than from within another template.
 	 */
-	public function __construct($template,$contextPath,$tplFile=null,$startingLine=0,$sourceTemplate=true)
+	public function __construct($template, $contextPath, $tplFile=null, $startingLine=0, $sourceTemplate=true)
 	{
 		$this->_sourceTemplate=$sourceTemplate;
 		$this->_contextPath=$contextPath;
@@ -302,7 +302,7 @@ 
 	 * @param TControl the control who owns the template
 	 * @param TControl the control who will become the root parent of the controls on the template. If null, it uses the template control.
 	 */
-	public function instantiateIn($tplControl,$parentControl=null)
+	public function instantiateIn($tplControl, $parentControl=null)
 	{
 		$this->_tplControl=$tplControl;
 		if($parentControl===null)
@@ -332,7 +332,7 @@ 
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$tplControl->registerObject($properties['id'], $component);
 					}
 					if(isset($properties['skinid']))
 					{
@@ -347,7 +347,7 @@ 
 
 					$component->applyStyleSheetSkin($page);
 					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+						$this->configureControl($component, $name, $value);
 
 					$component->trackViewState(true);
 
@@ -365,12 +365,12 @@ 
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$tplControl->registerObject($properties['id'], $component);
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
 					foreach($properties as $name=>$value)
-						$this->configureComponent($component,$name,$value);
+						$this->configureComponent($component, $name, $value);
 					if($parent===$parentControl)
 						$directChildren[]=$component;
 					else
@@ -416,14 +416,14 @@ 
 	 * @param string property name
 	 * @param mixed property initial value
 	 */
-	protected function configureControl($control,$name,$value)
+	protected function configureControl($control, $name, $value)
 	{
-		if(strncasecmp($name,'on',2)===0)		// is an event
-			$this->configureEvent($control,$name,$value,$control);
-		else if(($pos=strrpos($name,'.'))===false)	// is a simple property or custom attribute
-			$this->configureProperty($control,$name,$value);
+		if(strncasecmp($name, 'on', 2)===0)		// is an event
+			$this->configureEvent($control, $name, $value, $control);
+		else if(($pos=strrpos($name, '.'))===false)	// is a simple property or custom attribute
+			$this->configureProperty($control, $name, $value);
 		else	// is a subproperty
-			$this->configureSubProperty($control,$name,$value);
+			$this->configureSubProperty($control, $name, $value);
 	}
 
 	/**
@@ -432,12 +432,12 @@ 
 	 * @param string property name
 	 * @param mixed property initial value
 	 */
-	protected function configureComponent($component,$name,$value)
+	protected function configureComponent($component, $name, $value)
 	{
-		if(strpos($name,'.')===false)	// is a simple property or custom attribute
-			$this->configureProperty($component,$name,$value);
+		if(strpos($name, '.')===false)	// is a simple property or custom attribute
+			$this->configureProperty($component, $name, $value);
 		else	// is a subproperty
-			$this->configureSubProperty($component,$name,$value);
+			$this->configureSubProperty($component, $name, $value);
 	}
 
 	/**
@@ -447,12 +447,12 @@ 
 	 * @param string event handler
 	 * @param TControl context control
 	 */
-	protected function configureEvent($control,$name,$value,$contextControl)
+	protected function configureEvent($control, $name, $value, $contextControl)
 	{
-		if(strpos($value,'.')===false)
-			$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
+		if(strpos($value, '.')===false)
+			$control->attachEventHandler($name, array($contextControl, 'TemplateControl.'.$value));
 		else
-			$control->attachEventHandler($name,array($contextControl,$value));
+			$control->attachEventHandler($name, array($contextControl, $value));
 	}
 
 	/**
@@ -461,18 +461,18 @@ 
 	 * @param string property name
 	 * @param mixed property initial value
 	 */
-	protected function configureProperty($component,$name,$value)
+	protected function configureProperty($component, $name, $value)
 	{
 		if(is_array($value))
 		{
 			switch($value[0])
 			{
 				case self::CONFIG_DATABIND:
-					$component->bindProperty($name,$value[1]);
+					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
 					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+						$component->autoBindProperty($name, $value[1]);
 					else
 					{
 						$setter='set'.$name;
@@ -497,15 +497,15 @@ 
 					$component->$setter(Prado::localize($value[1]));
 					break;
 				default:	// an error if reaching here
-					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
 		{
-			if (substr($name,0,2)=='js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
-					$value = new TJavaScriptLiteral($value);
+			if(substr($name, 0, 2)=='js')
+				if($value and !($value instanceof TJavaScriptLiteral))
+					$value=new TJavaScriptLiteral($value);
 			$setter='set'.$name;
 			$component->$setter($value);
 		}
@@ -517,41 +517,41 @@ 
 	 * @param string subproperty name
 	 * @param mixed subproperty initial value
 	 */
-	protected function configureSubProperty($component,$name,$value)
+	protected function configureSubProperty($component, $name, $value)
 	{
 		if(is_array($value))
 		{
 			switch($value[0])
 			{
 				case self::CONFIG_DATABIND:		// databinding
-					$component->bindProperty($name,$value[1]);
+					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:		// expression
 					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+						$component->autoBindProperty($name, $value[1]);
 					else
-						$component->setSubProperty($name,$this->_tplControl->evaluateExpression($value[1]));
+						$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
 					break;
 				case self::CONFIG_TEMPLATE:
-					$component->setSubProperty($name,$value[1]);
+					$component->setSubProperty($name, $value[1]);
 					break;
 				case self::CONFIG_ASSET:		// asset URL
 					$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
-					$component->setSubProperty($name,$url);
+					$component->setSubProperty($name, $url);
 					break;
 				case self::CONFIG_PARAMETER:		// application parameter
-					$component->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+					$component->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
-					$component->setSubProperty($name,Prado::localize($value[1]));
+					$component->setSubProperty($name, Prado::localize($value[1]));
 					break;
 				default:	// an error if reaching here
-					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
-			$component->setSubProperty($name,$value);
+			$component->setSubProperty($name, $value);
 	}
 
 	/**
@@ -579,7 +579,7 @@ 
 	{
 		$input=$this->preprocess($input);
 		$tpl=&$this->_tpl;
-		$n=preg_match_all(self::REGEX_RULES,$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
+		$n=preg_match_all(self::REGEX_RULES, $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
 		$expectPropEnd=false;
 		$textStart=0;
 				$stack=array();
@@ -589,186 +589,186 @@ 
 		$this->_directive=null;
 		try
 		{
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
 				$match=&$matches[$i];
 				$str=$match[0][0];
 				$matchStart=$match[0][1];
-				$matchEnd=$matchStart+strlen($str)-1;
-				if(strpos($str,'<com:')===0)	// opening component tag
+				$matchEnd=$matchStart + strlen($str) - 1;
+				if(strpos($str, '<com:')===0)	// opening component tag
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$type=$match[1][0];
-					$attributes=$this->parseAttributes($match[2][0],$match[2][1]);
-					$this->validateAttributes($type,$attributes);
-					$tpl[$c++]=array($container,$type,$attributes);
-					if($str[strlen($str)-2]!=='/')  // open tag
+					$attributes=$this->parseAttributes($match[2][0], $match[2][1]);
+					$this->validateAttributes($type, $attributes);
+					$tpl[$c++]=array($container, $type, $attributes);
+					if($str[strlen($str) - 2]!=='/')  // open tag
 					{
-						$stack[] = $type;
-						$container=$c-1;
+						$stack[]=$type;
+						$container=$c - 1;
 					}
 				}
-				else if(strpos($str,'</com:')===0)	// closing component tag
+				else if(strpos($str, '</com:')===0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$type=$match[1][0];
 
 					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</com:$type>");
+						throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
 
 					$name=array_pop($stack);
 					if($name!==$type)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
 					$container=$tpl[$container][0];
 				}
-				else if(strpos($str,'<%@')===0)	// directive
+				else if(strpos($str, '<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
-					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
+					$this->_directive=$this->parseAttributes($match[4][0], $match[4][1]);
 				}
-				else if(strpos($str,'<%')===0)	// expression
+				else if(strpos($str, '<%')===0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$literal=trim($match[5][0]);
 					if($str[2]==='=')	// expression
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,$literal));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, $literal));
 					else if($str[2]==='%')  // statements
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_STATEMENTS,$literal));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_STATEMENTS, $literal));
 					else if($str[2]==='#')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_DATABINDING,$literal));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_DATABINDING, $literal));
 					else if($str[2]==='$')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "\$this->getApplication()->getParameters()->itemAt('$literal')"));
 					else if($str[2]==='~')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "\$this->publishFilePath('$this->_contextPath/$literal')"));
 					else if($str[2]==='/')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"));
 					else if($str[2]==='[')
 					{
-						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
+						$literal=strtr(trim(substr($literal, 0, strlen($literal) - 1)), array("'"=>"\'", "\\"=>"\\\\"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"));
 					}
 				}
-				else if(strpos($str,'<prop:')===0)	// opening property
+				else if(strpos($str, '<prop:')===0)	// opening property
 				{
-					if(strrpos($str,'/>')===strlen($str)-2)  //subproperties
+					if(strrpos($str, '/>')===strlen($str) - 2)  //subproperties
 					{
 						if($expectPropEnd)
 							continue;
-						if($matchStart>$textStart)
-							$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-						$textStart=$matchEnd+1;
+						if($matchStart > $textStart)
+							$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+						$textStart=$matchEnd + 1;
 						$prop=strtolower($match[6][0]);
-						$attrs=$this->parseAttributes($match[7][0],$match[7][1]);
+						$attrs=$this->parseAttributes($match[7][0], $match[7][1]);
 						$attributes=array();
 						foreach($attrs as $name=>$value)
 							$attributes[$prop.'.'.$name]=$value;
 						$type=$tpl[$container][1];
-						$this->validateAttributes($type,$attributes);
+						$this->validateAttributes($type, $attributes);
 						foreach($attributes as $name=>$value)
 						{
 							if(isset($tpl[$container][2][$name]))
-								throw new TConfigurationException('template_property_duplicated',$name);
+								throw new TConfigurationException('template_property_duplicated', $name);
 							$tpl[$container][2][$name]=$value;
 						}
 					}
 					else  // regular property
 					{
 						$prop=strtolower($match[3][0]);
-						$stack[] = '@'.$prop;
+						$stack[]='@'.$prop;
 						if(!$expectPropEnd)
 						{
-							if($matchStart>$textStart)
-								$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-							$textStart=$matchEnd+1;
+							if($matchStart > $textStart)
+								$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+							$textStart=$matchEnd + 1;
 							$expectPropEnd=true;
 						}
 					}
 				}
-				else if(strpos($str,'</prop:')===0)	// closing property
+				else if(strpos($str, '</prop:')===0)	// closing property
 				{
 					$prop=strtolower($match[3][0]);
 					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</prop:$prop>");
+						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
 					$name=array_pop($stack);
 					if($name!=='@'.$prop)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
-					if(($last=count($stack))<1 || $stack[$last-1][0]!=='@')
+					if(($last=count($stack)) < 1 || $stack[$last - 1][0]!=='@')
 					{
-						if($matchStart>$textStart)
+						if($matchStart > $textStart)
 						{
-							$value=substr($input,$textStart,$matchStart-$textStart);
-							if(substr($prop,-8,8)==='template')
-								$value=$this->parseTemplateProperty($value,$textStart);
+							$value=substr($input, $textStart, $matchStart - $textStart);
+							if(substr($prop, -8, 8)==='template')
+								$value=$this->parseTemplateProperty($value, $textStart);
 							else
 								$value=$this->parseAttribute($value);
-							if($container>=0)
+							if($container >= 0)
 							{
 								$type=$tpl[$container][1];
-								$this->validateAttributes($type,array($prop=>$value));
+								$this->validateAttributes($type, array($prop=>$value));
 								if(isset($tpl[$container][2][$prop]))
-									throw new TConfigurationException('template_property_duplicated',$prop);
+									throw new TConfigurationException('template_property_duplicated', $prop);
 								$tpl[$container][2][$prop]=$value;
 							}
 							else	// a property for the template control
 								$this->_directive[$prop]=$value;
-							$textStart=$matchEnd+1;
+							$textStart=$matchEnd + 1;
 						}
 						$expectPropEnd=false;
 					}
 				}
-				else if(strpos($str,'<!--')===0)	// comments
+				else if(strpos($str, '<!--')===0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 				}
 				else
-					throw new TConfigurationException('template_matching_unexpected',$match);
+					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
 			{
 				$name=array_pop($stack);
-				$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-				throw new TConfigurationException('template_closingtag_expected',$tag);
+				$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+				throw new TConfigurationException('template_closingtag_expected', $tag);
 			}
-			if($textStart<strlen($input))
-				$tpl[$c++]=array($container,substr($input,$textStart));
+			if($textStart < strlen($input))
+				$tpl[$c++]=array($container, substr($input, $textStart));
 		}
 		catch(Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
 			if($matchEnd===0)
-				$line=$this->_startingLine+1;
+				$line=$this->_startingLine + 1;
 			else
-				$line=$this->_startingLine+count(explode("\n",substr($input,0,$matchEnd+1)));
-			$this->handleException($e,$line,$input);
+				$line=$this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
+			$this->handleException($e, $line, $input);
 		}
 
 		if($this->_directive===null)
@@ -785,9 +785,9 @@ 
 				if($parent!==null)
 				{
 					if(count($merged[1])===1 && is_string($merged[1][0]))
-						$objects[$id-1]=array($merged[0],$merged[1][0]);
+						$objects[$id - 1]=array($merged[0], $merged[1][0]);
 					else
-						$objects[$id-1]=array($merged[0],new TCompositeLiteral($merged[1]));
+						$objects[$id - 1]=array($merged[0], new TCompositeLiteral($merged[1]));
 				}
 				if(isset($object[2]))
 				{
@@ -797,7 +797,7 @@ 
 				else
 				{
 					$parent=$object[0];
-					$merged=array($parent,array($object[1]));
+					$merged=array($parent, array($object[1]));
 				}
 			}
 			else
@@ -806,9 +806,9 @@ 
 		if($parent!==null)
 		{
 			if(count($merged[1])===1 && is_string($merged[1][0]))
-				$objects[$id]=array($merged[0],$merged[1][0]);
+				$objects[$id]=array($merged[0], $merged[1][0]);
 			else
-				$objects[$id]=array($merged[0],new TCompositeLiteral($merged[1]));
+				$objects[$id]=array($merged[0], new TCompositeLiteral($merged[1]));
 		}
 		$tpl=$objects;
 		return $objects;
@@ -819,31 +819,31 @@ 
 	 * @param string the string to be parsed.
 	 * @return array attribute values indexed by names.
 	 */
-	protected function parseAttributes($str,$offset)
+	protected function parseAttributes($str, $offset)
 	{
 		if($str==='')
 			return array();
 		$pattern='/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes=array();
-		$n=preg_match_all($pattern,$str,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
-		for($i=0;$i<$n;++$i)
+		$n=preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+		for($i=0; $i < $n; ++$i)
 		{
 			$match=&$matches[$i];
 			$name=strtolower($match[1][0]);
 			if(isset($attributes[$name]))
-				throw new TConfigurationException('template_property_duplicated',$name);
+				throw new TConfigurationException('template_property_duplicated', $name);
 			$value=$match[2][0];
-			if(substr($name,-8,8)==='template')
+			if(substr($name, -8, 8)==='template')
 			{
 				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
+					$attributes[$name]=$this->parseTemplateProperty(substr($value, 1, strlen($value) - 2), $match[2][1] + 1);
 				else
-					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
+					$attributes[$name]=$this->parseTemplateProperty($value, $match[2][1]);
 			}
 			else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
+					$attributes[$name]=$this->parseAttribute(substr($value, 1, strlen($value) - 2));
 				else
 					$attributes[$name]=$this->parseAttribute($value);
 			}
@@ -851,10 +851,10 @@ 
 		return $attributes;
 	}
 
-	protected function parseTemplateProperty($content,$offset)
+	protected function parseTemplateProperty($content, $offset)
 	{
-		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
-		return array(self::CONFIG_TEMPLATE,new TTemplate($content,$this->_contextPath,$this->_tplFile,$line,false));
+		$line=$this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
+		return array(self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false));
 	}
 
 	/**
@@ -864,12 +864,12 @@ 
 	 */
 	protected function parseAttribute($value)
 	{
-		if(($n=preg_match_all('/<%[#=].*?%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0)
+		if(($n=preg_match_all('/<%[#=].*?%>/msS', $value, $matches, PREG_OFFSET_CAPTURE)) > 0)
 		{
 			$isDataBind=false;
 			$textStart=0;
 			$expr='';
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
 				$match=$matches[0][$i];
 				$token=$match[0];
@@ -877,114 +877,114 @@ 
 				$length=strlen($token);
 				if($token[2]==='#')
 					$isDataBind=true;
-				if($offset>$textStart)
-					$expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
-				$expr.='.('.substr($token,3,$length-5).')';
-				$textStart=$offset+$length;
+				if($offset > $textStart)
+					$expr.=".'".strtr(substr($value, $textStart, $offset - $textStart), array("'"=>"\\'", "\\"=>"\\\\"))."'";
+				$expr.='.('.substr($token, 3, $length - 5).')';
+				$textStart=$offset + $length;
 			}
 			$length=strlen($value);
-			if($length>$textStart)
-				$expr.=".'".strtr(substr($value,$textStart,$length-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
+			if($length > $textStart)
+				$expr.=".'".strtr(substr($value, $textStart, $length - $textStart), array("'"=>"\\'", "\\"=>"\\\\"))."'";
 			if($isDataBind)
-				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
+				return array(self::CONFIG_DATABIND, ltrim($expr, '.'));
 			else
-				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
+				return array(self::CONFIG_EXPRESSION, ltrim($expr, '.'));
 		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
-				return array(self::CONFIG_ASSET,trim(substr($value,3,strlen($value)-5)));
+				return array(self::CONFIG_ASSET, trim(substr($value, 3, strlen($value) - 5)));
 			elseif($value[2]==='[')
-				return array(self::CONFIG_LOCALIZATION,trim(substr($value,3,strlen($value)-6)));
+				return array(self::CONFIG_LOCALIZATION, trim(substr($value, 3, strlen($value) - 6)));
 			elseif($value[2]==='$')
-				return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
+				return array(self::CONFIG_PARAMETER, trim(substr($value, 3, strlen($value) - 5)));
 			elseif($value[2]==='/') {
-				$literal = trim(substr($value,3,strlen($value)-5));
-				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'");
+				$literal=trim(substr($value, 3, strlen($value) - 5));
+				return array(self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'");
 			}
 		}
 		else
 			return $value;
 	}
 
-	protected function validateAttributes($type,$attributes)
+	protected function validateAttributes($type, $attributes)
 	{
 		Prado::using($type);
-		if(($pos=strrpos($type,'.'))!==false)
-			$className=substr($type,$pos+1);
+		if(($pos=strrpos($type, '.'))!==false)
+			$className=substr($type, $pos + 1);
 		else
 			$className=$type;
 		$class=new ReflectionClass($className);
-		if(is_subclass_of($className,'TControl') || $className==='TControl')
+		if(is_subclass_of($className, 'TControl') || $className==='TControl')
 		{
 			foreach($attributes as $name=>$att)
 			{
-				if(($pos=strpos($name,'.'))!==false)
+				if(($pos=strpos($name, '.'))!==false)
 				{
 					// a subproperty, so the first segment must be readable
-					$subname=substr($name,0,$pos);
+					$subname=substr($name, 0, $pos);
 					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
+				else if(strncasecmp($name, 'on', 2)===0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
-						throw new TConfigurationException('template_event_unknown',$type,$name);
+						throw new TConfigurationException('template_event_unknown', $type, $name);
 					else if(!is_string($att))
-						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
+						throw new TConfigurationException('template_eventhandler_invalid', $type, $name);
 				}
 				else
 				{
 					// a simple property
-					if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
+					if(!($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class, 'set'.$name)))
 					{
-						if ($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+						if($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
-						if(strcasecmp($name,'id')===0)
-							throw new TConfigurationException('template_controlid_invalid',$type);
-						else if(strcasecmp($name,'skinid')===0)
-							throw new TConfigurationException('template_controlskinid_invalid',$type);
+						if(strcasecmp($name, 'id')===0)
+							throw new TConfigurationException('template_controlid_invalid', $type);
+						else if(strcasecmp($name, 'skinid')===0)
+							throw new TConfigurationException('template_controlskinid_invalid', $type);
 					}
 				}
 			}
 		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		else if(is_subclass_of($className, 'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
 				if(is_array($att) && ($att[0]===self::CONFIG_DATABIND))
-					throw new TConfigurationException('template_databind_forbidden',$type,$name);
-				if(($pos=strpos($name,'.'))!==false)
+					throw new TConfigurationException('template_databind_forbidden', $type, $name);
+				if(($pos=strpos($name, '.'))!==false)
 				{
 					// a subproperty, so the first segment must be readable
-					$subname=substr($name,0,$pos);
+					$subname=substr($name, 0, $pos);
 					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
-					throw new TConfigurationException('template_event_forbidden',$type,$name);
+				else if(strncasecmp($name, 'on', 2)===0)
+					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
 					// id is still alowed for TComponent, even if id property doesn't exist
-					if(strcasecmp($name,'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)))
+					if(strcasecmp($name, 'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class, 'set'.$name)))
 					{
 						if($class->hasMethod('get'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 				}
 			}
 		}
 		else
-			throw new TConfigurationException('template_component_required',$type);
+			throw new TConfigurationException('template_component_required', $type);
 	}
 
 	/**
@@ -1003,28 +1003,28 @@ 
 	 * @param int line number
 	 * @param string template string if no source file is used
 	 */
-	protected function handleException($e,$line,$input=null)
+	protected function handleException($e, $line, $input=null)
 	{
 		$srcFile=$this->_tplFile;
 
-		if(($n=count($this->_includedFiles))>0) // need to adjust error row number and file name
+		if(($n=count($this->_includedFiles)) > 0) // need to adjust error row number and file name
 		{
-			for($i=$n-1;$i>=0;--$i)
+			for($i=$n - 1; $i >= 0; --$i)
 			{
-				if($this->_includeAtLine[$i]<=$line)
+				if($this->_includeAtLine[$i] <= $line)
 				{
-					if($line<$this->_includeAtLine[$i]+$this->_includeLines[$i])
+					if($line < $this->_includeAtLine[$i] + $this->_includeLines[$i])
 					{
-						$line=$line-$this->_includeAtLine[$i]+1;
+						$line=$line - $this->_includeAtLine[$i] + 1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
 					}
 					else
-						$line=$line-$this->_includeLines[$i]+1;
+						$line=$line - $this->_includeLines[$i] + 1;
 				}
 			}
 		}
-		$exception=new TTemplateException('template_format_invalid',$e->getMessage());
+		$exception=new TTemplateException('template_format_invalid', $e->getMessage());
 		$exception->setLineNumber($line);
 		if(!empty($srcFile))
 			$exception->setTemplateFile($srcFile);
@@ -1040,29 +1040,29 @@ 
 	 */
 	protected function preprocess($input)
 	{
-		if($n=preg_match_all('/<%include(.*?)%>/',$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE))
+		if($n=preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
-				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]),TTemplateManager::TEMPLATE_FILE_EXT);
+				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
 				if($filePath!==null && is_file($filePath))
 					$this->_includedFiles[]=$filePath;
 				else
 				{
-					$errorLine=count(explode("\n",substr($input,0,$matches[$i][0][1]+1)));
-					$this->handleException(new TConfigurationException('template_include_invalid',trim($matches[$i][1][0])),$errorLine,$input);
+					$errorLine=count(explode("\n", substr($input, 0, $matches[$i][0][1] + 1)));
+					$this->handleException(new TConfigurationException('template_include_invalid', trim($matches[$i][1][0])), $errorLine, $input);
 				}
 			}
 			$base=0;
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
 				$ext=file_get_contents($this->_includedFiles[$i]);
 				$length=strlen($matches[$i][0][0]);
-				$offset=$base+$matches[$i][0][1];
-				$this->_includeAtLine[$i]=count(explode("\n",substr($input,0,$offset)));
-				$this->_includeLines[$i]=count(explode("\n",$ext));
-				$input=substr_replace($input,$ext,$offset,$length);
-				$base+=strlen($ext)-$length;
+				$offset=$base + $matches[$i][0][1];
+				$this->_includeAtLine[$i]=count(explode("\n", substr($input, 0, $offset)));
+				$this->_includeLines[$i]=count(explode("\n", $ext));
+				$input=substr_replace($input, $ext, $offset, $length);
+				$base+=strlen($ext) - $length;
 			}
 		}
 
@@ -1075,7 +1075,7 @@ 
 	 * @param string $method
 	 * @return boolean
 	 */
-	protected function isClassBehaviorMethod(ReflectionClass $class,$method)
+	protected function isClassBehaviorMethod(ReflectionClass $class, $method)
 	{
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
@@ -1086,7 +1086,7 @@ 
 	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
 	    foreach($list as $param)
 	    {
-	      if(method_exists($param->getBehavior(),$method))
+	      if(method_exists($param->getBehavior(), $method))
 	        return true;
 	    }
 	  }

framework/Web/UI/WebControls/assets/captcha.php

Doc Comments +20 added lines

@@ -54,6 +54,9 @@ 
 	return $caseSensitive?$token:strtoupper($token);
 }
 
+/**
+ * @param string $hex
+ */
 function hash2string($hex,$alphabet)
 {
 	if(strlen($alphabet)<2)
@@ -121,6 +124,11 @@ 
 	imagedestroy($image);
 }
 
+/**
+ * @param resource $image
+ * @param double $width
+ * @param double $height
+ */
 function addBackground($image,$width,$height,$opaque,$noisy,$hasGrid,$hasScribble,$morph)
 {
 	$background=imagecreatetruecolor($width*2,$height*2);
@@ -148,6 +156,9 @@ 
 		imagecolortransparent($image,$white);
 }
 
+/**
+ * @param resource $image
+ */
 function addNoise($image,$width,$height)
 {
 	for($x=0;$x<$width;++$x)
@@ -164,6 +175,9 @@ 
 	}
 }
 
+/**
+ * @param resource $image
+ */
 function addGrid($image,$width,$height)
 {
 	for($i=0;$i<$width;$i+=rand(15,25))
@@ -182,6 +196,9 @@ 
 	}
 }
 
+/**
+ * @param resource $image
+ */
 function addScribble($image,$width,$height)
 {
 	for($i=0;$i<8;$i++)
@@ -199,6 +216,9 @@ 
 	}
 }
 
+/**
+ * @param resource $image
+ */
 function morphImage($image,$width,$height)
 {
 	$tempImage=imagecreatetruecolor($width,$height);

Indentation +14 added lines, -14 removed lines

@@ -100,21 +100,21 @@ 
 	$font=dirname(__FILE__).DIRECTORY_SEPARATOR.'verase.ttf';
 
 	if(function_exists('imagefilter'))
-    	imagefilter($image,IMG_FILTER_GAUSSIAN_BLUR);
+		imagefilter($image,IMG_FILTER_GAUSSIAN_BLUR);
 
 	$hasShadow=($theme&THEME_SHADOWED_TEXT);
-    for($i=0;$i<$length;$i++)
+	for($i=0;$i<$length;$i++)
 	{
-        $color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
-        $size=rand($fontWidth-10,$fontWidth);
-        $angle=rand(-30,30);
-        $x=$padding+$i*$fontWidth;
-        $y=rand($fontHeight-15,$fontHeight-10);
-        imagettftext($image,$size,$angle,$x,$y,$color,$font,$token[$i]);
-        if($hasShadow)
-        	imagettftext($image,$size,$angle,$x+2,$y+2,$color,$font,$token[$i]);
-        imagecolordeallocate($image,$color);
-    }
+		$color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
+		$size=rand($fontWidth-10,$fontWidth);
+		$angle=rand(-30,30);
+		$x=$padding+$i*$fontWidth;
+		$y=rand($fontHeight-15,$fontHeight-10);
+		imagettftext($image,$size,$angle,$x,$y,$color,$font,$token[$i]);
+		if($hasShadow)
+			imagettftext($image,$size,$angle,$x+2,$y+2,$color,$font,$token[$i]);
+		imagecolordeallocate($image,$color);
+	}
 
 	header('Content-Type: image/png');
 	imagepng($image);
@@ -158,8 +158,8 @@ 
 			{
 				$color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
 				imagesetpixel($image,$x,$y,$color);
-	            imagecolordeallocate($image,$color);
-	        }
+				imagecolordeallocate($image,$color);
+			}
 		}
 	}
 }

Spacing +98 added lines, -99 removed lines

@@ -9,12 +9,12 @@ 
  * @package System.Web.UI.WebControls.assets
  */
 
-define('THEME_OPAQUE_BACKGROUND',0x0001);
-define('THEME_NOISY_BACKGROUND',0x0002);
-define('THEME_HAS_GRID',0x0004);
-define('THEME_HAS_SCRIBBLE',0x0008);
-define('THEME_MORPH_BACKGROUND',0x0010);
-define('THEME_SHADOWED_TEXT',0x0020);
+define('THEME_OPAQUE_BACKGROUND', 0x0001);
+define('THEME_NOISY_BACKGROUND', 0x0002);
+define('THEME_HAS_GRID', 0x0004);
+define('THEME_HAS_SCRIBBLE', 0x0008);
+define('THEME_MORPH_BACKGROUND', 0x0010);
+define('THEME_SHADOWED_TEXT', 0x0020);
 
 require_once(dirname(__FILE__).'/captcha_key.php');
 
@@ -24,10 +24,10 @@ 
 if(isset($_GET['options']))
 {
 	$str=base64_decode($_GET['options']);
-	if(strlen($str)>32)
+	if(strlen($str) > 32)
 	{
-		$hash=substr($str,0,32);
-		$str=substr($str,32);
+		$hash=substr($str, 0, 32);
+		$str=substr($str, 32);
 		if(md5($privateKey.$str)===$hash)
 		{
 			$options=unserialize($str);
@@ -37,83 +37,82 @@ 
 			$alphabet=$options['alphabet'];
 			$fontSize=$options['fontSize'];
 			$theme=$options['theme'];
-			if(($randomSeed=$options['randomSeed'])>0)
+			if(($randomSeed=$options['randomSeed']) > 0)
 				srand($randomSeed);
 			else
-				srand((int)(microtime()*1000000));
-			$token=generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive);
+				srand((int) (microtime() * 1000000));
+			$token=generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive);
 		}
 	}
 }
 
-displayToken($token,$fontSize,$theme);
+displayToken($token, $fontSize, $theme);
 
-function generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive)
+function generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive)
 {
-	$token=substr(hash2string(md5($publicKey.$privateKey),$alphabet).hash2string(md5($privateKey.$publicKey),$alphabet),0,$tokenLength);
-	return $caseSensitive?$token:strtoupper($token);
+	$token=substr(hash2string(md5($publicKey.$privateKey), $alphabet).hash2string(md5($privateKey.$publicKey), $alphabet), 0, $tokenLength);
+	return $caseSensitive ? $token : strtoupper($token);
 }
 
-function hash2string($hex,$alphabet)
+function hash2string($hex, $alphabet)
 {
-	if(strlen($alphabet)<2)
+	if(strlen($alphabet) < 2)
 		$alphabet='234578adefhijmnrtABDEFGHJLMNRT';
 	$hexLength=strlen($hex);
 	$base=strlen($alphabet);
 	$result='';
-	for($i=0;$i<$hexLength;$i+=6)
+	for($i=0; $i < $hexLength; $i+=6)
 	{
-		$number=hexdec(substr($hex,$i,6));
+		$number=hexdec(substr($hex, $i, 6));
 		while($number)
 		{
-			$result.=$alphabet[$number%$base];
-			$number=floor($number/$base);
+			$result.=$alphabet[$number % $base];
+			$number=floor($number / $base);
 		}
 	}
 	return $result;
 }
 
-function displayToken($token,$fontSize,$theme)
+function displayToken($token, $fontSize, $theme)
 {
-	if(($fontSize=(int)$fontSize)<22)
+	if(($fontSize=(int) $fontSize) < 22)
 		$fontSize=22;
-	if($fontSize>100)
+	if($fontSize > 100)
 		$fontSize=100;
 	$length=strlen($token);
 	$padding=10;
 	$fontWidth=$fontSize;
-	$fontHeight=floor($fontWidth*1.5);
-	$width=$fontWidth*$length+$padding*2;
+	$fontHeight=floor($fontWidth * 1.5);
+	$width=$fontWidth * $length + $padding * 2;
 	$height=$fontHeight;
-	$image=imagecreatetruecolor($width,$height);
+	$image=imagecreatetruecolor($width, $height);
 
-	addBackground
-	(
+	addBackground(
 		$image, $width, $height,
-		$theme&THEME_OPAQUE_BACKGROUND,
-		$theme&THEME_NOISY_BACKGROUND,
-		$theme&THEME_HAS_GRID,
-		$theme&THEME_HAS_SCRIBBLE,
-		$theme&THEME_MORPH_BACKGROUND
+		$theme & THEME_OPAQUE_BACKGROUND,
+		$theme & THEME_NOISY_BACKGROUND,
+		$theme & THEME_HAS_GRID,
+		$theme & THEME_HAS_SCRIBBLE,
+		$theme & THEME_MORPH_BACKGROUND
 	);
 
 	$font=dirname(__FILE__).DIRECTORY_SEPARATOR.'verase.ttf';
 
 	if(function_exists('imagefilter'))
-    	imagefilter($image,IMG_FILTER_GAUSSIAN_BLUR);
+    	imagefilter($image, IMG_FILTER_GAUSSIAN_BLUR);
 
-	$hasShadow=($theme&THEME_SHADOWED_TEXT);
-    for($i=0;$i<$length;$i++)
+	$hasShadow=($theme & THEME_SHADOWED_TEXT);
+    for($i=0; $i < $length; $i++)
 	{
-        $color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
-        $size=rand($fontWidth-10,$fontWidth);
-        $angle=rand(-30,30);
-        $x=$padding+$i*$fontWidth;
-        $y=rand($fontHeight-15,$fontHeight-10);
-        imagettftext($image,$size,$angle,$x,$y,$color,$font,$token[$i]);
+        $color=imagecolorallocate($image, rand(150, 220), rand(150, 220), rand(150, 220));
+        $size=rand($fontWidth - 10, $fontWidth);
+        $angle=rand(-30, 30);
+        $x=$padding + $i * $fontWidth;
+        $y=rand($fontHeight - 15, $fontHeight - 10);
+        imagettftext($image, $size, $angle, $x, $y, $color, $font, $token[$i]);
         if($hasShadow)
-        	imagettftext($image,$size,$angle,$x+2,$y+2,$color,$font,$token[$i]);
-        imagecolordeallocate($image,$color);
+        	imagettftext($image, $size, $angle, $x + 2, $y + 2, $color, $font, $token[$i]);
+        imagecolordeallocate($image, $color);
     }
 
 	header('Content-Type: image/png');
@@ -121,103 +120,103 @@ 
 	imagedestroy($image);
 }
 
-function addBackground($image,$width,$height,$opaque,$noisy,$hasGrid,$hasScribble,$morph)
+function addBackground($image, $width, $height, $opaque, $noisy, $hasGrid, $hasScribble, $morph)
 {
-	$background=imagecreatetruecolor($width*2,$height*2);
-	$white=imagecolorallocate($background,255,255,255);
-	imagefill($background,0,0,$white);
+	$background=imagecreatetruecolor($width * 2, $height * 2);
+	$white=imagecolorallocate($background, 255, 255, 255);
+	imagefill($background, 0, 0, $white);
 
 	if($opaque)
-		imagefill($background,0,0,imagecolorallocate($background,100,100,100));
+		imagefill($background, 0, 0, imagecolorallocate($background, 100, 100, 100));
 
 	if($noisy)
-		addNoise($background,$width*2,$height*2);
+		addNoise($background, $width * 2, $height * 2);
 
 	if($hasGrid)
-		addGrid($background,$width*2,$height*2);
+		addGrid($background, $width * 2, $height * 2);
 
 	if($hasScribble)
-		addScribble($background,$width*2,$height*2);
+		addScribble($background, $width * 2, $height * 2);
 
 	if($morph)
-		morphImage($background,$width*2,$height*2);
+		morphImage($background, $width * 2, $height * 2);
 
-	imagecopy($image,$background,0,0,30,30,$width,$height);
+	imagecopy($image, $background, 0, 0, 30, 30, $width, $height);
 
 	if(!$opaque)
-		imagecolortransparent($image,$white);
+		imagecolortransparent($image, $white);
 }
 
-function addNoise($image,$width,$height)
+function addNoise($image, $width, $height)
 {
-	for($x=0;$x<$width;++$x)
+	for($x=0; $x < $width; ++$x)
 	{
-		for($y=0;$y<$height;++$y)
+		for($y=0; $y < $height; ++$y)
 		{
-			if(rand(0,100)<25)
+			if(rand(0, 100) < 25)
 			{
-				$color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
-				imagesetpixel($image,$x,$y,$color);
-	            imagecolordeallocate($image,$color);
+				$color=imagecolorallocate($image, rand(150, 220), rand(150, 220), rand(150, 220));
+				imagesetpixel($image, $x, $y, $color);
+	            imagecolordeallocate($image, $color);
 	        }
 		}
 	}
 }
 
-function addGrid($image,$width,$height)
+function addGrid($image, $width, $height)
 {
-	for($i=0;$i<$width;$i+=rand(15,25))
+	for($i=0; $i < $width; $i+=rand(15, 25))
 	{
-		imagesetthickness($image,rand(2,6));
-		$color=imagecolorallocate($image,rand(100,180),rand(100,180),rand(100,180));
-		imageline($image,$i+rand(-10,20),0,$i+rand(-10,20),$height,$color);
-		imagecolordeallocate($image,$color);
+		imagesetthickness($image, rand(2, 6));
+		$color=imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
+		imageline($image, $i + rand(-10, 20), 0, $i + rand(-10, 20), $height, $color);
+		imagecolordeallocate($image, $color);
 	}
-	for($i=0;$i<$height;$i+=rand(15,25))
+	for($i=0; $i < $height; $i+=rand(15, 25))
 	{
-		imagesetthickness($image,rand(2,6));
-		$color=imagecolorallocate($image,rand(100,180),rand(100,180),rand(100,180));
-		imageline($image,0,$i+rand(-10,20),$width,$i+rand(-10,20),$color);
-		imagecolordeallocate($image,$color);
+		imagesetthickness($image, rand(2, 6));
+		$color=imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
+		imageline($image, 0, $i + rand(-10, 20), $width, $i + rand(-10, 20), $color);
+		imagecolordeallocate($image, $color);
 	}
 }
 
-function addScribble($image,$width,$height)
+function addScribble($image, $width, $height)
 {
-	for($i=0;$i<8;$i++)
+	for($i=0; $i < 8; $i++)
 	{
-		$color=imagecolorallocate($image,rand(100,180),rand(100,180),rand(100,180));
+		$color=imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
 		$points=array();
-		for($j=1;$j<rand(5,10);$j++)
+		for($j=1; $j < rand(5, 10); $j++)
 		{
-			$points[]=rand(2*(20*($i+1)),2*(50*($i+1)));
-			$points[]=rand(30,$height+30);
+			$points[]=rand(2 * (20 * ($i + 1)), 2 * (50 * ($i + 1)));
+			$points[]=rand(30, $height + 30);
 		}
-		imagesetthickness($image,rand(2,6));
-		imagepolygon($image,$points,intval(sizeof($points)/2),$color);
-		imagecolordeallocate($image,$color);
+		imagesetthickness($image, rand(2, 6));
+		imagepolygon($image, $points, intval(sizeof($points) / 2), $color);
+		imagecolordeallocate($image, $color);
 	}
 }
 
-function morphImage($image,$width,$height)
+function morphImage($image, $width, $height)
 {
-	$tempImage=imagecreatetruecolor($width,$height);
-	$chunk=rand(1,5);
-	for($x=$y=0;$x<$width;$x+=$chunk)
+	$tempImage=imagecreatetruecolor($width, $height);
+	$chunk=rand(1, 5);
+	for($x=$y=0; $x < $width; $x+=$chunk)
 	{
-		$chunk=rand(1,5);
-		$y+=rand(-1,1);
-		if($y>=$height)	$y=$height-5;
-		if($y<0) $y=5;
-		imagecopy($tempImage,$image,$x,0,$x,$y,$chunk,$height);
+		$chunk=rand(1, 5);
+		$y+=rand(-1, 1);
+		if($y >= $height)	$y=$height - 5;
+		if($y < 0) $y=5;
+		imagecopy($tempImage, $image, $x, 0, $x, $y, $chunk, $height);
 	}
-	for($x=$y=0;$y<$height;$y+=$chunk)
+	for($x=$y=0; $y < $height; $y+=$chunk)
 	{
-		$chunk=rand(1,5);
-		$x+=rand(-1,1);
-		if($x>=$width)	$x=$width-5;
-		if($x<0) $x=5;
-		imagecopy($image,$tempImage,$x,$y,0,$y,$width,$chunk);
+		$chunk=rand(1, 5);
+		$x+=rand(-1, 1);
+		if($x >= $width)	$x=$width - 5;
+		if($x < 0) $x=5;
+		imagecopy($image, $tempImage, $x, $y, 0, $y, $width, $chunk);
 	}
 }
 

framework/Web/UI/WebControls/TBaseDataList.php

Doc Comments +1 added lines

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

Spacing +7 added lines, -7 removed lines

@@ -134,7 +134,7 @@ 
 	 */
 	public function getDataKeyField()
 	{
-		return $this->getViewState('DataKeyField','');
+		return $this->getViewState('DataKeyField', '');
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setDataKeyField($value)
 	{
-		$this->setViewState('DataKeyField',$value,'');
+		$this->setViewState('DataKeyField', $value, '');
 	}
 
 	/**
@@ -150,10 +150,10 @@ 
 	 */
 	public function getDataKeys()
 	{
-		if(($dataKeys=$this->getViewState('DataKeys',null))===null)
+		if(($dataKeys=$this->getViewState('DataKeys', null))===null)
 		{
 			$dataKeys=new TList;
-			$this->setViewState('DataKeys',$dataKeys,null);
+			$this->setViewState('DataKeys', $dataKeys, null);
 		}
 		return $dataKeys;
 	}
@@ -169,9 +169,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$this->raiseEvent('OnSelectedIndexChanged',$this,$param);
+		$this->raiseEvent('OnSelectedIndexChanged', $this, $param);
 	}
 }
 

framework/Web/UI/WebControls/TBaseValidator.php

Doc Comments +5 added lines, -2 removed lines

@@ -182,6 +182,7 @@ 
 	 * TBaseValidator::$_clientClass, be sure to update the corresponding
 	 * "Javascript/validation3.js" file as well.
 	 * @param TControl control to validate.
+	 * @param TControl $control
 	 * @return string control type for client-side validation.
 	 */
 	private function getClientControlClass($control)
@@ -259,7 +260,7 @@ 
 	/**
 	 * Update the ControlToValidate component's css class depending
 	 * if the ControlCssClass property is set, and whether this is valid.
-	 * @return boolean true if change, false otherwise.
+	 * @return boolean|null true if change, false otherwise.
 	 */
 	protected function updateControlCssClass()
 	{
@@ -384,6 +385,7 @@ 
 	 * The ID path is the dot-connected IDs of the controls reaching from
 	 * the validator's naming container to the target control.
 	 * @param string the ID path
+	 * @param string $value
 	 */
 	public function setControlToValidate($value)
 	{
@@ -549,6 +551,7 @@ 
 
 	/**
 	 * @param string the css class that is applied to the control being validated in case the validation fails
+	 * @param string $value
 	 */
 	public function setControlCssClass($value)
 	{
@@ -691,7 +694,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +54 added lines, -54 removed lines

@@ -91,7 +91,7 @@ 
 	 * them specially.
 	 * @var array list of control class names
 	 */
-	private static $_clientClass = array('THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList');
+	private static $_clientClass=array('THtmlArea', 'THtmlArea4', 'TDatePicker', 'TListBox', 'TCheckBoxList');
 
 	/**
 	 * Constructor.
@@ -136,10 +136,10 @@ 
 		$display=$this->getDisplay();
 		$visible=$this->getEnabled(true) && !$this->getIsValid();
 		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display','none');
+			$writer->addStyleAttribute('display', 'none');
 		else if(!$visible)
-			$writer->addStyleAttribute('visibility','hidden');
-		$writer->addAttribute('id',$this->getClientID());
+			$writer->addStyleAttribute('visibility', 'hidden');
+		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
 		$this->renderClientControlScript($writer);
 	}
@@ -150,29 +150,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;
 	}
@@ -211,7 +211,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientSide===null)
-			$this->_clientSide = $this->createClientSide();
+			$this->_clientSide=$this->createClientSide();
 		return $this->_clientSide;
 	}
 
@@ -231,15 +231,15 @@ 
 	 */
 	public function renderClientControlScript($writer)
 	{
-		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
+		$scripts=$this->getPage()->getClientScript();
+		if($this->getEnableClientScript())
 			$scripts->registerPradoScript('validator');
 		$formID=$this->getPage()->getForm()->getClientID();
-		$scriptKey = "TBaseValidator:$formID";
+		$scriptKey="TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
-			$manager['FormID'] = $formID;
-			$options = TJavaScript::encode($manager);
+			$manager['FormID']=$formID;
+			$options=TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
 		if($this->getEnableClientScript())
@@ -250,7 +250,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,12 +268,12 @@ 
 			$control=$this->getValidationTarget();
 			if($control instanceof TWebControl)
 			{
-				$class = preg_replace ('/ '.preg_quote($cssClass).'/', '',$control->getCssClass());
+				$class=preg_replace('/ '.preg_quote($cssClass).'/', '', $control->getCssClass());
 				if(!$this->getIsValid())
 				{
-					$class .= ' '.$cssClass;
+					$class.=' '.$cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
+				} elseif($control->getIsValid())
 					$control->setCssClass($class);
 			}
 		}
@@ -284,11 +284,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);
 		}
 	}
@@ -307,7 +307,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		throw new TNotSupportedException('basevalidator_forcontrol_unsupported',get_class($this));
+		throw new TNotSupportedException('basevalidator_forcontrol_unsupported', get_class($this));
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function getDisplay()
 	{
-		return $this->getViewState('Display',TValidatorDisplayStyle::Fixed);
+		return $this->getViewState('Display', TValidatorDisplayStyle::Fixed);
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 	 */
 	public function setDisplay($value)
 	{
-		$this->setViewState('Display',TPropertyValue::ensureEnum($value,'TValidatorDisplayStyle'),TValidatorDisplayStyle::Fixed);
+		$this->setViewState('Display', TPropertyValue::ensureEnum($value, 'TValidatorDisplayStyle'), TValidatorDisplayStyle::Fixed);
 	}
 
 	/**
@@ -343,7 +343,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -359,7 +359,7 @@ 
 	 */
 	public function getErrorMessage()
 	{
-		return $this->getViewState('ErrorMessage','');
+		return $this->getViewState('ErrorMessage', '');
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 	 */
 	public function setErrorMessage($value)
 	{
-		$this->setViewState('ErrorMessage',$value,'');
+		$this->setViewState('ErrorMessage', $value, '');
 	}
 
 	/**
@@ -376,7 +376,7 @@ 
 	 */
 	public function getControlToValidate()
 	{
-		return $this->getViewState('ControlToValidate','');
+		return $this->getViewState('ControlToValidate', '');
 	}
 
 	/**
@@ -387,7 +387,7 @@ 
 	 */
 	public function setControlToValidate($value)
 	{
-		$this->setViewState('ControlToValidate',$value,'');
+		$this->setViewState('ControlToValidate', $value, '');
 	}
 
 	/**
@@ -395,7 +395,7 @@ 
 	 */
 	public function getFocusOnError()
 	{
-		return $this->getViewState('FocusOnError',false);
+		return $this->getViewState('FocusOnError', false);
 	}
 
 	/**
@@ -403,7 +403,7 @@ 
 	 */
 	public function setFocusOnError($value)
 	{
-		$this->setViewState('FocusOnError',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('FocusOnError', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -413,13 +413,13 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id=$this->getViewState('FocusElementID',''))==='')
+		if(($id=$this->getViewState('FocusElementID', ''))==='')
 		{
 			$target=$this->getValidationTarget();
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
-			if($target instanceof TCheckBoxList && $target->getItemCount()>0)
+			if($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
 				$id=$target->getClientID().'_c0';
 			} else {
@@ -443,7 +443,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -451,7 +451,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -481,7 +481,7 @@ 
 		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
 			return $control;
 		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));
+			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 		if($control instanceof IValidatable)
 			return $control->getValidationPropertyValue();
 		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 	}
 
 	/**
@@ -544,7 +544,7 @@ 
 	 */
 	public function getControlCssClass()
 	{
-		return $this->getViewState('ControlCssClass','');
+		return $this->getViewState('ControlCssClass', '');
 	}
 
 	/**
@@ -552,7 +552,7 @@ 
 	 */
 	public function setControlCssClass($value)
 	{
-		$this->setViewState('ControlCssClass',$value,'');
+		$this->setViewState('ControlCssClass', $value, '');
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 	 */
 	public function onValidationSuccess()
 	{
-		$this->raiseEvent('OnValidationSuccess',$this,null);
+		$this->raiseEvent('OnValidationSuccess', $this, null);
 	}
 
 	/**
@@ -575,7 +575,7 @@ 
 	 */
 	public function onValidationError()
 	{
-		$this->raiseEvent('OnValidationError',$this,null);
+		$this->raiseEvent('OnValidationError', $this, null);
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 */
 	public function onValidate()
 	{
-		$this->raiseEvent('OnValidate',$this,null);
+		$this->raiseEvent('OnValidate', $this, null);
 	}
 
 	/**
@@ -695,7 +695,7 @@ 
 	 */
 	public function getObserveChanges()
 	{
-		$changes = $this->getOption('ObserveChanges');
+		$changes=$this->getOption('ObserveChanges');
 		return ($changes===null) ? true : $changes;
 	}
 }

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

framework/Web/UI/WebControls/TBulletedList.php

Doc Comments +2 added lines

@@ -216,6 +216,7 @@ 
 	 * This method is invoked when the {@link getDisplayMode DisplayMode} is 'LinkButton'
 	 * and end-users click on one of the buttons.
 	 * @param TBulletedListEventParameter event parameter.
+	 * @param TBulletedListEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -425,6 +426,7 @@ 
 	/**
 	 * Constructor.
 	 * @param integer index of the item clicked
+	 * @param integer $index
 	 */
 	public function __construct($index)
 	{

Spacing +43 added lines, -43 removed lines

@@ -61,7 +61,7 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TBulletedListEventParameter((int)$param));
+		$this->onClick(new TBulletedListEventParameter((int) $param));
 	}
 
 	/**
@@ -102,45 +102,45 @@ 
 		switch($this->getBulletStyle())
 		{
 			case TBulletStyle::None:
-				$writer->addStyleAttribute('list-style-type','none');
+				$writer->addStyleAttribute('list-style-type', 'none');
 				$needStart=true;
 				break;
 			case TBulletStyle::Numbered:
-				$writer->addStyleAttribute('list-style-type','decimal');
+				$writer->addStyleAttribute('list-style-type', 'decimal');
 				$needStart=true;
 				break;
 			case TBulletStyle::LowerAlpha:
-				$writer->addStyleAttribute('list-style-type','lower-alpha');
+				$writer->addStyleAttribute('list-style-type', 'lower-alpha');
 				$needStart=true;
 				break;
 			case TBulletStyle::UpperAlpha:
-				$writer->addStyleAttribute('list-style-type','upper-alpha');
+				$writer->addStyleAttribute('list-style-type', 'upper-alpha');
 				$needStart=true;
 				break;
 			case TBulletStyle::LowerRoman:
-				$writer->addStyleAttribute('list-style-type','lower-roman');
+				$writer->addStyleAttribute('list-style-type', 'lower-roman');
 				$needStart=true;
 				break;
 			case TBulletStyle::UpperRoman:
-				$writer->addStyleAttribute('list-style-type','upper-roman');
+				$writer->addStyleAttribute('list-style-type', 'upper-roman');
 				$needStart=true;
 				break;
 			case TBulletStyle::Disc:
-				$writer->addStyleAttribute('list-style-type','disc');
+				$writer->addStyleAttribute('list-style-type', 'disc');
 				break;
 			case TBulletStyle::Circle:
-				$writer->addStyleAttribute('list-style-type','circle');
+				$writer->addStyleAttribute('list-style-type', 'circle');
 				break;
 			case TBulletStyle::Square:
-				$writer->addStyleAttribute('list-style-type','square');
+				$writer->addStyleAttribute('list-style-type', 'square');
 				break;
 			case TBulletStyle::CustomImage:
 				$url=$this->getBulletImageUrl();
-				$writer->addStyleAttribute('list-style-image',"url($url)");
+				$writer->addStyleAttribute('list-style-image', "url($url)");
 				break;
 		}
 		if($needStart && ($start=$this->getFirstBulletNumber())!=1)
-			$writer->addAttribute('start',"$start");
+			$writer->addAttribute('start', "$start");
 		parent::addAttributesToRender($writer);
 	}
 
@@ -149,7 +149,7 @@ 
 	 */
 	public function getBulletImageUrl()
 	{
-		return $this->getViewState('BulletImageUrl','');
+		return $this->getViewState('BulletImageUrl', '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setBulletImageUrl($value)
 	{
-		$this->setViewState('BulletImageUrl',$value,'');
+		$this->setViewState('BulletImageUrl', $value, '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getBulletStyle()
 	{
-		return $this->getViewState('BulletStyle',TBulletStyle::NotSet);
+		return $this->getViewState('BulletStyle', TBulletStyle::NotSet);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setBulletStyle($value)
 	{
-		$this->setViewState('BulletStyle',TPropertyValue::ensureEnum($value,'TBulletStyle'),TBulletStyle::NotSet);
+		$this->setViewState('BulletStyle', TPropertyValue::ensureEnum($value, 'TBulletStyle'), TBulletStyle::NotSet);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 */
 	public function getDisplayMode()
 	{
-		return $this->getViewState('DisplayMode',TBulletedListDisplayMode::Text);
+		return $this->getViewState('DisplayMode', TBulletedListDisplayMode::Text);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function setDisplayMode($value)
 	{
-		$this->setViewState('DisplayMode',TPropertyValue::ensureEnum($value,'TBulletedListDisplayMode'),TBulletedListDisplayMode::Text);
+		$this->setViewState('DisplayMode', TPropertyValue::ensureEnum($value, 'TBulletedListDisplayMode'), TBulletedListDisplayMode::Text);
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	 */
 	public function getFirstBulletNumber()
 	{
-		return $this->getViewState('FirstBulletNumber',1);
+		return $this->getViewState('FirstBulletNumber', 1);
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	 */
 	public function setFirstBulletNumber($value)
 	{
-		$this->setViewState('FirstBulletNumber',TPropertyValue::ensureInteger($value),1);
+		$this->setViewState('FirstBulletNumber', TPropertyValue::ensureInteger($value), 1);
 	}
 
 	/**
@@ -219,7 +219,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 			if($item->getHasAttributes())
 				$writer->addAttributes($item->getAttributes());
 			$writer->renderBeginTag('li');
-			$this->renderBulletText($writer,$item,$index);
+			$this->renderBulletText($writer, $item, $index);
 			$writer->renderEndTag();
 			$writer->writeLine();
 		}
@@ -278,7 +278,7 @@ 
 	 * @param TListItem item to be rendered
 	 * @param integer index of the item being rendered
 	 */
-	protected function renderBulletText($writer,$item,$index)
+	protected function renderBulletText($writer, $item, $index)
 	{
 		switch($this->getDisplayMode())
 		{
@@ -300,7 +300,7 @@ 
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 		else
 		{
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 			$writer->renderBeginTag('span');
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 			$writer->renderEndTag();
@@ -310,15 +310,15 @@ 
 	protected function renderHyperLinkItem($writer, $item, $index)
 	{
 		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
-			$writer->addAttribute('href',$item->getValue());
+			$writer->addAttribute('href', $item->getValue());
 			if(($target=$this->getTarget())!=='')
-				$writer->addAttribute('target',$target);
+				$writer->addAttribute('target', $target);
 		}
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -327,17 +327,17 @@ 
 	protected function renderLinkButtonItem($writer, $item, $index)
 	{
 		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
-			$this->_currentRenderItemIndex = $index;
+			$this->_currentRenderItemIndex=$index;
 			$writer->addAttribute('id', $this->getClientID().$index);
 			$writer->addAttribute('href', "javascript:;//".$this->getClientID().$index);
-			$cs = $this->getPage()->getClientScript();
-			$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+			$cs=$this->getPage()->getClientScript();
+			$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 		}
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -348,19 +348,19 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['EventParameter'] = $this->_currentRenderItemIndex;
-		$options['ID'] = $this->getClientID().$this->_currentRenderItemIndex;
-		$options['StopEvent'] = true;
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['EventParameter']=$this->_currentRenderItemIndex;
+		$options['ID']=$this->getClientID().$this->_currentRenderItemIndex;
+		$options['StopEvent']=true;
 		return $options;
 	}
 
 	protected function canCauseValidation()
 	{
-		$group = $this->getValidationGroup();
-		$hasValidators = $this->getPage()->getValidators($group)->getCount()>0;
+		$group=$this->getValidationGroup();
+		$hasValidators=$this->getPage()->getValidators($group)->getCount() > 0;
 		return $this->getCausesValidation() && $hasValidators;
 	}