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)

Spacing +132 added lines, -132 removed lines

@@ -25,11 +25,11 @@ 
 	/**
 	 * directory containing Prado javascript files
 	 */
-	const SCRIPT_PATH='Web/Javascripts/source';
+	const SCRIPT_PATH = 'Web/Javascripts/source';
 	/**
 	 * file containing javascript packages and their cross dependencies
 	 */
-	const PACKAGES_FILE='Web/Javascripts/packages.php';
+	const PACKAGES_FILE = 'Web/Javascripts/packages.php';
 	/**
 	 * @var TPage page who owns this manager
 	 */
@@ -37,39 +37,39 @@ 
 	/**
 	 * @var array registered hidden fields, indexed by hidden field names
 	 */
-	private $_hiddenFields=array();
+	private $_hiddenFields = array();
 	/**
 	 * @var array javascript blocks to be rendered at the beginning of the form
 	 */
-	private $_beginScripts=array();
+	private $_beginScripts = array();
 	/**
 	 * @var array javascript blocks to be rendered at the end of the form
 	 */
-	private $_endScripts=array();
+	private $_endScripts = array();
 	/**
 	 * @var array javascript files to be rendered in the form
 	 */
-	private $_scriptFiles=array();
+	private $_scriptFiles = array();
 	/**
 	 * @var array javascript files to be rendered in page head section
 	 */
-	private $_headScriptFiles=array();
+	private $_headScriptFiles = array();
 	/**
 	 * @var array javascript blocks to be rendered in page head section
 	 */
-	private $_headScripts=array();
+	private $_headScripts = array();
 	/**
 	 * @var array CSS files
 	 */
-	private $_styleSheetFiles=array();
+	private $_styleSheetFiles = array();
 	/**
 	 * @var array CSS declarations
 	 */
-	private $_styleSheets=array();
+	private $_styleSheets = array();
 	/**
 	 * @var array registered PRADO script libraries
 	 */
-	private $_registeredPradoScripts=array();
+	private $_registeredPradoScripts = array();
 	/**
 	 * Client-side javascript library dependencies, loads from PACKAGES_FILE;
 	 * @var array
@@ -83,7 +83,7 @@ 
 
 	private $_renderedHiddenFields;
 
-	private $_renderedScriptFiles=array();
+	private $_renderedScriptFiles = array();
 
 	private $_expandedPradoScripts;
 
@@ -93,7 +93,7 @@ 
 	 */
 	public function __construct(TPage $owner)
 	{
-		$this->_page=$owner;
+		$this->_page = $owner;
 	}
 
 	/**
@@ -124,8 +124,8 @@ 
 	public function registerPradoScript($name)
 	{
 		$this->registerPradoScriptInternal($name);
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
 	/**
@@ -134,27 +134,27 @@ 
 	protected function registerPradoScriptInternal($name)
 	{
 		// $this->checkIfNotInRender();
-		if(!isset($this->_registeredPradoScripts[$name]))
+		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);
+				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
+				list($packages, $deps) = include($packageFile);
 				self::$_pradoScripts = $deps;
 				self::$_pradoPackages = $packages;
 			}
 
 			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
+				$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())
+			if (($packages = array_keys($this->_registeredPradoScripts)) !== array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
-				$packagesUrl=array();
-				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				$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 (self::$_pradoScripts[$p] as $dep)
@@ -163,29 +163,29 @@ 
 						if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
-							if($isDebug)
+							if ($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								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))
+									if (!is_file($filePath = $path . '/min/' . $script))
 									{
-										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
+										$dirPath = dirname($filePath);
+										if (!is_dir($dirPath))
 											mkdir($dirPath, PRADO_CHMOD, true);
-										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
+										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base . '/' . $script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
-									$packagesUrl[]=$url;
+									$packagesUrl[] = $url;
 								}
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach ($packagesUrl as $url)
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
@@ -195,7 +195,7 @@ 
 	 */
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$base = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::SCRIPT_PATH;
 		$assets = Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
@@ -220,16 +220,16 @@ 
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl())===false)
+		if (strpos($base, $assets->getBaseUrl()) === false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
+			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);
 		}
 	}
 
@@ -239,7 +239,7 @@ 
 	 * @param array additional callback options
 	 * @return string javascript statement that creates a new callback request.
 	 */
-	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
+	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options = null)
 	{
 		$options = !is_array($options) ? array() : $options;
 		$class = new ReflectionClass($callbackHandler);
@@ -258,13 +258,13 @@ 
 	 */
 	public function registerCallbackControl($class, $options)
 	{
-		$optionString=TJavaScript::encode($options);
-		$code="new {$class}({$optionString});";
-		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
+		$optionString = TJavaScript::encode($options);
+		$code = "new {$class}({$optionString});";
+		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
 		$this->registerPradoScriptInternal('ajax');
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
 	/**
@@ -273,21 +273,21 @@ 
 	 * @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)
-			$options['FormID']=$form->getClientID();
-		$optionString=TJavaScript::encode($options);
-		$code="new {$class}({$optionString});";
+		if (!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
+			$options['FormID'] = $form->getClientID();
+		$optionString = TJavaScript::encode($options);
+		$code = "new {$class}({$optionString});";
 
-		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
+		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
 	/**
@@ -298,23 +298,23 @@ 
 	 */
 	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;
+		if (is_string($button))
+			$buttonID = $button;
 		else
 		{
 			$button->setIsDefaultButton(true);
-			$buttonID=$button->getUniqueID();
+			$buttonID = $button->getUniqueID();
 		}
 		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
 		$code = "new Prado.WebUI.DefaultButton($options);";
 
-		$this->_endScripts['prado:'.$panelID]=$code;
+		$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);
 	}
 
 	/**
@@ -339,12 +339,12 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
+		if ($target instanceof TControl)
+			$target = $target->getClientID();
+		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
 	/**
@@ -369,15 +369,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;
+		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);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
 	/**
@@ -385,12 +385,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;
+		$this->_styleSheets[$key] = $css;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
 	/**
@@ -405,8 +405,8 @@ 
 				$this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
+		foreach (Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
+			if (substr($url, strlen($url) - 4) == '.css')
 				$stylesheets[] = $url;
 
 		$stylesheets = array_unique($stylesheets);
@@ -428,13 +428,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;
+		$this->_headScriptFiles[$key] = $url;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
 	/**
@@ -442,13 +442,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;
+		$this->_headScripts[$key] = $script;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
 	/**
@@ -458,10 +458,10 @@ 
 	 */
 	public function registerScriptFile($key, $url)
 	{
-		$this->_scriptFiles[$key]=$url;
+		$this->_scriptFiles[$key] = $url;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
 	/**
@@ -469,13 +469,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;
+		$this->_beginScripts[$key] = $script;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
 	/**
@@ -483,12 +483,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;
+		$this->_endScripts[$key] = $script;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
 	/**
@@ -497,12 +497,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;
+		$this->_hiddenFields[$name] = $value;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
 	/**
@@ -598,13 +598,13 @@ 
 	 */
 	public function renderStyleSheetFiles($writer)
 	{
-		$str='';
-		foreach($this->_styleSheetFiles as $url)
+		$str = '';
+		foreach ($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
+			if (is_array($url))
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
 			else
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
 		}
 		$writer->write($str);
 	}
@@ -614,8 +614,8 @@ 
 	 */
 	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");
+		if (count($this->_styleSheets))
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 
 	/**
@@ -647,13 +647,13 @@ 
 	public function markScriptFileAsRendered($url)
 	{
 		$this->_renderedScriptFiles[$url] = $url;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
 	protected function renderScriptFiles($writer, Array $scripts)
 	{
-		foreach($scripts as $script)
+		foreach ($scripts as $script)
 		{
 			$writer->write(TJavaScript::renderScriptFile($script));
 			$this->markScriptFileAsRendered($script);
@@ -670,10 +670,10 @@ 
 	 */
 	public function renderAllPendingScriptFiles($writer)
 	{
-		if(!empty($this->_scriptFiles))
+		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);
 		}
 	}
 
@@ -711,12 +711,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);
 	}
 
 	/**
@@ -724,9 +724,9 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param TControl the control forcing the flush (used only in error messages)
 	 */
-	public function flushScriptFiles($writer, $control=null)
+	public function flushScriptFiles($writer, $control = null)
 	{
-		if(!$this->_page->getIsCallback())
+		if (!$this->_page->getIsCallback())
 		{
 			$this->_page->ensureRenderInForm($control);
 			$this->renderAllPendingScriptFiles($writer);
@@ -739,24 +739,24 @@ 
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
 		if ($initial) $this->_renderedHiddenFields = array();
-		$str='';
-		foreach($this->_hiddenFields as $name=>$value)
+		$str = '';
+		foreach ($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
-			$id=strtr($name,':','_');
-			if(is_array($value))
+			if (in_array($name, $this->_renderedHiddenFields)) continue;
+			$id = strtr($name, ':', '_');
+			if (is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				foreach ($value as $v)
+					$str .= '<input type="hidden" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			else
 			{
-				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				$str .= '<input type="hidden" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if ($str !== '')
+			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
 	}
 
 	public function getHiddenFields()
@@ -802,7 +802,7 @@ 
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
+		if (!TJavaScript::isJsLiteral($code))
 			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}

Braces +70 added lines, -51 removed lines

@@ -144,10 +144,11 @@ 
 				self::$_pradoPackages = $packages;
 			}
 
-			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
-			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			if (isset(self::$_pradoScripts[$name])) {
+							$this->_registeredPradoScripts[$name]=true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			}
 
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
@@ -159,22 +160,25 @@ 
 				{
 					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;
+						}
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl)) {
+																	$packagesUrl[]=$url;
+								}
 							} else {
 								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
 										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
-											mkdir($dirPath, PRADO_CHMOD, true);
+										if(!is_dir($dirPath)) {
+																					mkdir($dirPath, PRADO_CHMOD, true);
+										}
 										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
@@ -184,8 +188,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url,$url);
+				}
 			}
 		}
 	}
@@ -226,8 +231,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -278,8 +282,9 @@ 
 		if($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
-			$options['FormID']=$form->getClientID();
+		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null) {
+					$options['FormID']=$form->getClientID();
+		}
 		$optionString=TJavaScript::encode($options);
 		$code="new {$class}({$optionString});";
 
@@ -300,9 +305,9 @@ 
 	{
 		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
 
-		if(is_string($button))
-			$buttonID=$button;
-		else
+		if(is_string($button)) {
+					$buttonID=$button;
+		} else
 		{
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
@@ -339,8 +344,9 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target=$target->getClientID();
+		if($target instanceof TControl) {
+					$target=$target->getClientID();
+		}
 		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
 
 		$params=func_get_args();
@@ -371,10 +377,11 @@ 
 	 */
 	public function registerStyleSheetFile($key,$url,$media='')
 	{
-		if($media==='')
-			$this->_styleSheetFiles[$key]=$url;
-		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+		if($media==='') {
+					$this->_styleSheetFiles[$key]=$url;
+		} else {
+					$this->_styleSheetFiles[$key]=array($url,$media);
+		}
 
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
@@ -405,9 +412,10 @@ 
 				$this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
+		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url) {
+					if (substr($url,strlen($url)-4)=='.css')
 				$stylesheets[] = $url;
+		}
 
 		$stylesheets = array_unique($stylesheets);
 
@@ -601,10 +609,11 @@ 
 		$str='';
 		foreach($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
-			else
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+			if(is_array($url)) {
+							$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
+			} else {
+							$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+			}
 		}
 		$writer->write($str);
 	}
@@ -614,8 +623,9 @@ 
 	 */
 	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");
+		if(count($this->_styleSheets)) {
+					$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+		}
 	}
 
 	/**
@@ -738,25 +748,30 @@ 
 	 */
 	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;
+			if (in_array($name,$this->_renderedHiddenFields)) {
+				continue;
+			}
 			$id=strtr($name,':','_');
 			if(is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+				foreach($value as $v) {
+									$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				}
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if($str!=='') {
+					$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		}
 	}
 
 	public function getHiddenFields()
@@ -769,8 +784,9 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
-			throw new Exception('Operation invalid when page is already rendering');
+		if ($form = $this->_page->InFormRender) {
+					throw new Exception('Operation invalid when page is already rendering');
+		}
 	}
 }
 
@@ -802,8 +818,9 @@ 
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		if(!TJavaScript::isJsLiteral($code)) {
+					$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		}
 		$this->setOption($name, $code);
 	}
 
@@ -812,10 +829,11 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
-			return $this->_options->itemAt($name);
-		else
-			return null;
+		if ($this->_options) {
+					return $this->_options->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -832,8 +850,9 @@ 
 	 */
 	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;
 	}
 

tests/simple_unit/ActiveRecord/ActiveRecordDynamicCallTestCase.php

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 Prado::using('System.Data.ActiveRecord.TActiveRecord');
-require_once(dirname(__FILE__).'/records/DepartmentRecord.php');
-require_once(dirname(__FILE__).'/records/DepSections.php');
+require_once(dirname(__FILE__) . '/records/DepartmentRecord.php');
+require_once(dirname(__FILE__) . '/records/DepSections.php');
 
 class ActiveRecordDynamicCallTestCase extends UnitTestCase
 {
 	function setup()
 	{
-		$conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test');
+		$conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test', 'test');
 		TActiveRecordManager::getInstance()->setDbConnection($conn);
 	}
 
@@ -28,7 +28,7 @@ 
 	function test_dynamic_multiple_field_call()
 	{
 		$finder = DepartmentRecord::finder();
-		$rs = $finder->findByNameAndActive('Marketing',true);
+		$rs = $finder->findByNameAndActive('Marketing', true);
 		$this->assertNotNull($rs);
 	}
 
@@ -40,7 +40,7 @@ 
 			$rs = $finder->findByNameAndActive('Marketing');
 			$this->fail();
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 			$this->pass();
 		}
@@ -49,7 +49,7 @@ 
 	function test_dynamic_call_extras_parameters_ok()
 	{
 		$finder = DepartmentRecord::finder();
-		$rs = $finder->findByNameAndActive('Marketing',true,true);
+		$rs = $finder->findByNameAndActive('Marketing', true, true);
 		$this->assertNotNull($rs);
 	}
 

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
 		{
 			$this->projectDao->addUserToProject($project->ID, 'asd');
 			$this->fail();
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$this->pass();
 		}

tests/simple_unit/ActiveRecord/FindBySqlTestCase.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 Prado::using('System.Data.ActiveRecord.TActiveRecord');
-require_once(dirname(__FILE__).'/records/DepartmentRecord.php');
-require_once(dirname(__FILE__).'/records/UserRecord.php');
+require_once(dirname(__FILE__) . '/records/DepartmentRecord.php');
+require_once(dirname(__FILE__) . '/records/UserRecord.php');
 
 class UserRecord2 extends UserRecord
 {
@@ -13,14 +13,14 @@ 
 	public $category;
 	public $item;
 
-	const TABLE='items';
+	const TABLE = 'items';
 }
 
 class FindBySqlTestCase extends UnitTestCase
 {
 	function setup()
 	{
-		$conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test');
+		$conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test', 'test');
 		TActiveRecordManager::getInstance()->setDbConnection($conn);
 	}
 

tests/FunctionalTests/tickets/protected/pages/Ticket719.php

Spacing +5 added lines, -5 removed lines

@@ -10,13 +10,13 @@ 
 		$list = array();
 		$count = 0;
 		$token = strtolower($token);
-		foreach($info->getCountries() as $country)
+		foreach ($info->getCountries() as $country)
 		{
-			if(strpos(strtolower($country), $token) === 0)
+			if (strpos(strtolower($country), $token) === 0)
 			{
 				$list[] = $country;
 				$count++;
-				if($count > 10) break;
+				if ($count > 10) break;
 			}
 		}
 		return $list;
@@ -33,8 +33,8 @@ 
 	}
 	
 	
-	public function validForm ($sender, $param)
+	public function validForm($sender, $param)
 	{
-		$this->Result->Text = "TextBox Content : ".$this->textbox->getText()."  -- Autocomplete Content :".$this->autocomplete->getText();
+		$this->Result->Text = "TextBox Content : " . $this->textbox->getText() . "  -- Autocomplete Content :" . $this->autocomplete->getText();
 	}
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			{
 				$list[] = $country;
 				$count++;
-				if($count > 10) break;
+				if($count > 10) {
+					break;
+				}
 			}
 		}
 		return $list;

tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 	{
 		$values = $sender->getSelectedValues();
 		var_dump($values);
-		$this->label1->setText("Selection: ".implode(', ', $values));
+		$this->label1->setText("Selection: " . implode(', ', $values));
 	}
 
 	function select_index_4()

tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.php

Spacing +5 added lines, -5 removed lines

@@ -9,12 +9,12 @@ 
 	{
 		$sender->setDataSource($this->matchCountries($param->Token));
 		$sender->dataBind();
-		$this->label1->Text = "suggestion for ".$param->Token;
+		$this->label1->Text = "suggestion for " . $param->Token;
 	}
 
 	public function callback_requested($sender, $param)
 	{
-		$this->label1->Text = "Label 1: ".$sender->Text;
+		$this->label1->Text = "Label 1: " . $sender->Text;
 	}
 
 	protected function matchCountries($token)
@@ -23,13 +23,13 @@ 
 		$list = array();
 		$count = 0;
 		$token = strtolower($token);
-		foreach($info->getCountries() as $country)
+		foreach ($info->getCountries() as $country)
 		{
-			if(strpos(strtolower($country), $token) === 0)
+			if (strpos(strtolower($country), $token) === 0)
 			{
 				$list[] = $country;
 				$count++;
-				if($count > 10) break;
+				if ($count > 10) break;
 			}
 		}
 		return $list;

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			{
 				$list[] = $country;
 				$count++;
-				if($count > 10) break;
+				if($count > 10) {
+					break;
+				}
 			}
 		}
 		return $list;

demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample4.php

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 
 class Sample4 extends Sample2
 {
-	protected function sortData($data,$key)
+	protected function sortData($data, $key)
 	{
 		usort($data, function($a, $b) use ($key) {
 			if ($a[$key] == $b[$key]) {
@@ -16,9 +16,9 @@ 
 		return $data;
 	}
 
-	public function sortDataGrid($sender,$param)
+	public function sortDataGrid($sender, $param)
 	{
-		$this->DataGrid->DataSource=$this->sortData($this->Data,$param->SortExpression);
+		$this->DataGrid->DataSource = $this->sortData($this->Data, $param->SortExpression);
 		$this->DataGrid->dataBind();
 	}
 }

demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample4.php

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 
 class Sample4 extends Sample2
 {
-	protected function sortData($data,$key)
+	protected function sortData($data, $key)
 	{
 		usort($data, function($a, $b) use ($key) {
 			if ($a[$key] == $b[$key]) {
@@ -16,9 +16,9 @@ 
 		return $data;
 	}
 
-	public function sortDataGrid($sender,$param)
+	public function sortDataGrid($sender, $param)
 	{
-		$this->DataGrid->DataSource=$this->sortData($this->Data,$param->SortExpression);
+		$this->DataGrid->DataSource = $this->sortData($this->Data, $param->SortExpression);
 		$this->DataGrid->dataBind();
 	}
 }