pradosoft / prado

framework/Web/UI/JuiControls/TJuiDraggable.php

Spacing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -114,7 +114,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -135,7 +135,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -144,7 +144,7 @@ 
 	 * Raises the OnDrag event
 	 * @param object $params event parameters
 	 */
-	public function onDrag ($params)
+	public function onDrag($params)
 	{
 		$this->raiseEvent('OnDrag', $this, $params);
 	}
@@ -153,7 +153,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -162,7 +162,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function onStop ($params)
+	public function onStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}

framework/Web/UI/JuiControls/TJuiDroppable.php

Spacing +8 added lines, -8 removed lines

@@ -92,7 +92,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -134,7 +134,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -155,7 +155,7 @@ 
 	 * Raises the OnActivate event
 	 * @param object $params event parameters
 	 */
-	public function onActivate ($params)
+	public function onActivate($params)
 	{
 		$this->raiseEvent('OnActivate', $this, $params);
 	}
@@ -164,7 +164,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -173,7 +173,7 @@ 
 	 * Raises the OnDeactivate event
 	 * @param object $params event parameters
 	 */
-	public function onDeactivate ($params)
+	public function onDeactivate($params)
 	{
 		$this->raiseEvent('OnDeactivate', $this, $params);
 	}
@@ -182,7 +182,7 @@ 
 	 * Raises the OnDrop event
 	 * @param object $params event parameters
 	 */
-	public function onDrop ($params)
+	public function onDrop($params)
 	{
 		$this->raiseEvent('OnDrop', $this, $params);
 	}
@@ -191,7 +191,7 @@ 
 	 * Raises the OnOut event
 	 * @param object $params event parameters
 	 */
-	public function OnOut ($params)
+	public function OnOut($params)
 	{
 		$this->raiseEvent('OnOut', $this, $params);
 	}
@@ -200,7 +200,7 @@ 
 	 * Raises the OnOver event
 	 * @param object $params event parameters
 	 */
-	public function OnOver ($params)
+	public function OnOver($params)
 	{
 		$this->raiseEvent('OnOver', $this, $params);
 	}

framework/Web/UI/JuiControls/TJuiProgressbar.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -110,7 +110,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";

framework/Web/UI/TClientScriptManager.php

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";
 			}

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 namespace Prado\Web\UI;
 use Prado\Prado;
 use Prado\TApplicationMode;
-use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Exceptions\TInvalidOperationException;
 use Prado\Web\Javascripts\TJavaScript;
 use Prado\Web\UI\ActiveControls\ICallbackEventHandler;

Doc Comments +10 added lines, -1 removed lines

@@ -154,6 +154,7 @@ 
 	 * Registers Prado javascript by library name. See "Web/Javascripts/packages.php"
 	 * for library names.
 	 * @param string script library name.
+	 * @param string $name
 	 */
 	public function registerPradoScript($name)
 	{
@@ -256,7 +257,7 @@ 
 
 	/**
 	 * @param string javascript or css package path.
-	 * @return array tuple($path,$url).
+	 * @return string[] tuple($path,$url).
 	 */
 	protected function getPackagePathUrl($base)
 	{
@@ -341,6 +342,7 @@ 
 	 * the javascript code registration.
 	 * @param string javascript class responsible for the control being registered for postback
 	 * @param array postback options
+	 * @param string $class
 	 */
 	public function registerPostBackControl($class,$options)
 	{
@@ -420,6 +422,7 @@ 
 	 * Registers Prado style by library name. See "Web/Javascripts/packages.php"
 	 * for library names.
 	 * @param string style library name.
+	 * @param string $name
 	 */
 	public function registerPradoStyle($name)
 	{
@@ -602,6 +605,7 @@ 
 	 * Registers a javascript script block at the beginning of the form
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
+	 * @param string $key
 	 */
 	public function registerBeginScript($key,$script)
 	{
@@ -630,6 +634,7 @@ 
 	 * @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
 	 */
 	public function registerHiddenField($name,$value)
 	{
@@ -641,6 +646,7 @@ 
 
 	/**
 	 * @param string a unique key
+	 * @param string $key
 	 * @return boolean whether there is a CSS file registered with the specified key
 	 */
 	public function isStyleSheetFileRegistered($key)
@@ -677,6 +683,7 @@ 
 
 	/**
 	 * @param string a unique key
+	 * @param string $key
 	 * @return boolean whether there is a javascript file registered with the specified key
 	 */
 	public function isScriptFileRegistered($key)
@@ -857,6 +864,7 @@ 
 	 * Flushes all pending script registrations
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param TControl the control forcing the flush (used only in error messages)
+	 * @param WebControls\TClientScript $control
 	 */
 	public function flushScriptFiles($writer, $control=null)
 	{
@@ -869,6 +877,7 @@ 
 
 	/**
 	 * @param THtmlWriter writer for the rendering purpose
+	 * @param boolean $initial
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{

Spacing +108 added lines, -108 removed lines

@@ -159,7 +159,7 @@ 
 	{
 		$this->registerPradoScriptInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
 	/**
@@ -170,43 +170,43 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredScripts[$name]))
 		{
-			if(self::$_scripts === null)
+			if(self::$_scripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($folders, $packages, $deps)= include($packageFile);
-				self::$_scriptsFolders = $folders;
-				self::$_scripts = $deps;
-				self::$_scriptsPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($folders, $packages, $deps)=include($packageFile);
+				self::$_scriptsFolders=$folders;
+				self::$_scripts=$deps;
+				self::$_scriptsPackages=$packages;
 			}
 
-			if (isset(self::$_scripts[$name]))
+			if(isset(self::$_scripts[$name]))
 				$this->_registeredScripts[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredScripts))!==array())
 			{
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_scripts[$p] as $dep)
+					foreach(self::$_scripts[$p] as $dep)
 					{
-						foreach (self::$_scriptsPackages[$dep] as $script)
+						foreach(self::$_scriptsPackages[$dep] as $script)
 						{
-							if (!isset($this->_expandedScripts[$script]))
+							if(!isset($this->_expandedScripts[$script]))
 							{
-								list($base, $subPath) = $this->getScriptPackageFolder($script);
-								list($path, $baseUrl) = $this->getPackagePathUrl($base);
+								list($base, $subPath)=$this->getScriptPackageFolder($script);
+								list($path, $baseUrl)=$this->getPackagePathUrl($base);
 
-								$this->_expandedScripts[$script] = true;
+								$this->_expandedScripts[$script]=true;
 								if($isDebug)
 								{
-									if (!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
+									if(!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
 										$packagesUrl[]=$url;
 								} else {
 								  $minPath=preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
-								  if (!in_array($url=$baseUrl.'/'.$minPath, $packagesUrl))
+								  if(!in_array($url=$baseUrl.'/'.$minPath, $packagesUrl))
 									{
 										if(!is_file($filePath=$path.DIRECTORY_SEPARATOR.$minPath))
 										{
@@ -221,7 +221,7 @@ 
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
@@ -234,8 +234,8 @@ 
 		if(!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
-		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 
@@ -247,8 +247,8 @@ 
 		if(!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
-		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedPath($base);
 	}
 
@@ -258,9 +258,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;
 	}
@@ -271,14 +271,14 @@ 
 	 */
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
+		$assets=Prado::getApplication()->getAssetManager();
 		if(strpos($base, $assets->getBaseUrl())===false)
 		{
 			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);
 		}
 	}
 
@@ -288,14 +288,14 @@ 
 	 */
 	protected function getScriptPackageFolder($script)
 	{
-		list($base, $subPath) = explode("/", $script, 2);
+		list($base, $subPath)=explode("/", $script, 2);
 
 		if(!array_key_exists($base, self::$_scriptsFolders))
-			throw new TInvalidOperationException('csmanager_pradostyle_invalid',$base);
+			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
-		$namespace = self::$_scriptsFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
-		  $namespace = $dir;
+		$namespace=self::$_scriptsFolders[$base];
+		if(($dir=Prado::getPathOfNameSpace($namespace))!==null) {
+		  $namespace=$dir;
 		}
 
 		return array($namespace, $subPath);
@@ -307,10 +307,10 @@ 
 	 */
 	protected function getStylePackageFolder($script)
 	{
-		list($base, $subPath) = explode("/", $script, 2);
+		list($base, $subPath)=explode("/", $script, 2);
 
 		if(!array_key_exists($base, self::$_stylesFolders))
-			throw new TInvalidOperationException('csmanager_pradostyle_invalid',$base);
+			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
 		return array(self::$_stylesFolders[$base], $subPath);
 	}
@@ -323,13 +323,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})";
 	}
 
@@ -346,7 +346,7 @@ 
 		$this->registerPradoScriptInternal('ajax');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
 	/**
@@ -355,9 +355,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)
@@ -369,7 +369,7 @@ 
 		$this->registerPradoScriptInternal('prado');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
 	/**
@@ -380,7 +380,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;
@@ -389,14 +389,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);
 	}
 
 	/**
@@ -406,11 +406,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;
 	}
 
@@ -423,10 +423,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);
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	{
 		$this->registerPradoStyleInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoStyle',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoStyle', $params);
 	}
 
 	/**
@@ -449,45 +449,45 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredStyles[$name]))
 		{
-			if(self::$_styles === null)
+			if(self::$_styles===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
-				list($folders, $packages,$deps)= include($packageFile);
-				self::$_stylesFolders = $folders;
-				self::$_styles = $deps;
-				self::$_stylesPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
+				list($folders, $packages, $deps)=include($packageFile);
+				self::$_stylesFolders=$folders;
+				self::$_styles=$deps;
+				self::$_stylesPackages=$packages;
 			}
 
-			if (isset(self::$_styles[$name]))
+			if(isset(self::$_styles[$name]))
 				$this->_registeredStyles[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradostyle_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredStyles))!==array())
 			{
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_styles[$p] as $dep)
+					foreach(self::$_styles[$p] as $dep)
 					{
-						foreach (self::$_stylesPackages[$dep] as $style)
+						foreach(self::$_stylesPackages[$dep] as $style)
 						{
-							if (!isset($this->_expandedStyles[$style]))
+							if(!isset($this->_expandedStyles[$style]))
 							{
-								list($base, $subPath) = $this->getStylePackageFolder($style);
-								list($path, $baseUrl) = $this->getPackagePathUrl($base);
+								list($base, $subPath)=$this->getStylePackageFolder($style);
+								list($path, $baseUrl)=$this->getPackagePathUrl($base);
 
-								$this->_expandedStyles[$style] = true;
+								$this->_expandedStyles[$style]=true;
 								// TODO minify css?
-								if (!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
+								if(!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
 									$packagesUrl[]=$url;
 							}
 						}
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerStyleSheetFile($url,$url);
+					$this->registerStyleSheetFile($url, $url);
 			}
 		}
 	}
@@ -514,15 +514,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);
 	}
 
 	/**
@@ -530,12 +530,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);
 	}
 
 	/**
@@ -544,17 +544,17 @@ 
 	 */
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(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;
 	}
@@ -573,13 +573,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);
 	}
 
 	/**
@@ -587,13 +587,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);
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 		$this->_scriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
 	/**
@@ -614,13 +614,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);
 	}
 
 	/**
@@ -628,12 +628,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);
 	}
 
 	/**
@@ -642,12 +642,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);
 	}
 
 	/**
@@ -760,7 +760,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");
 	}
 
 	/**
@@ -768,7 +768,7 @@ 
 	 */
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 
 	/**
@@ -791,9 +791,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)
@@ -817,8 +817,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);
 		}
 	}
 
@@ -856,12 +856,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);
 	}
 
 	/**
@@ -883,12 +883,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)
@@ -898,7 +898,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");
@@ -914,7 +914,7 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new \Exception('Operation invalid when page is already rendering');
 	}
 }

framework/Web/UI/TPageStatePersister.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function save($state)
 	{
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$state));
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $state));
 	}
 
 	/**
@@ -60,10 +60,10 @@ 
 	 */
 	public function load()
 	{
-		if(($data=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
+		if(($data=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
 			return $data;
 		else
-			throw new THttpException(400,'pagestatepersister_pagestate_corrupted');
+			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
 	}
 }
 

framework/Web/THttpUtility.php

Spacing +6 added lines, -6 removed lines

@@ -18,9 +18,9 @@ 
  */
 class THttpUtility
 {
-	private static $_encodeTable=array('<'=>'&lt;','>'=>'&gt;','"'=>'&quot;');
-	private static $_decodeTable=array('&lt;'=>'<','&gt;'=>'>','&quot;'=>'"');
-	private static $_stripTable=array('&lt;'=>'','&gt;'=>'','&quot;'=>'');
+	private static $_encodeTable=array('<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;');
+	private static $_decodeTable=array('&lt;'=>'<', '&gt;'=>'>', '&quot;'=>'"');
+	private static $_stripTable=array('&lt;'=>'', '&gt;'=>'', '&quot;'=>'');
 
 	/**
 	 * HTML-encodes a string.
@@ -32,7 +32,7 @@ 
 	 */
 	public static function htmlEncode($s)
 	{
-		return strtr($s,self::$_encodeTable);
+		return strtr($s, self::$_encodeTable);
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	 */
 	public static function htmlDecode($s)
 	{
-		return strtr($s,self::$_decodeTable);
+		return strtr($s, self::$_decodeTable);
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public static function htmlStrip($s)
 	{
-		return strtr($s,self::$_stripTable);
+		return strtr($s, self::$_stripTable);
 	}
 }
 

framework/Util/TDateTimeStamp.php

Spacing +34 added lines, -34 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal=array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf=array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -36,7 +36,7 @@ 
 	 */
 	public function getDayofWeek($year, $month, $day)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setDate($year, $month, $day);
 		return (int) $dt->format('w');
 	}
@@ -49,8 +49,8 @@ 
 	 */
 	public function isLeapYear($year)
 	{
-		$year = $this->digitCheck($year);
-		$dt = new DateTime();
+		$year=$this->digitCheck($year);
+		$dt=new DateTime();
 		$dt->setDate($year, 1, 1);
 		return (bool) $dt->format('L');
 	}
@@ -62,22 +62,22 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
-			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+		if($y < 100) {
+			$yr=(integer) date("Y");
+			$century=(integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
-				$c1 = $century + 1;
-				$c0 = $century;
+			if($yr % 100 > 50) {
+				$c1=$century + 1;
+				$c0=$century;
 			} else {
-				$c1 = $century;
-				$c0 = $century - 1;
+				$c1=$century;
+				$c0=$century - 1;
 			}
-			$c1 *= 100;
+			$c1*=100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if(($y + $c1) < $yr + 30) $y=$y + $c1;
+			else $y=$y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -92,7 +92,7 @@ 
 	 */
 	public function getGMTDiff($ts=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($ts)
 			$dt->setTimeStamp($ts);
 		else
@@ -106,9 +106,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if($txt===false) return getdate();
 
-		$dt = new DateTime($txt);
+		$dt=new DateTime($txt);
 
 		return array(
 			'seconds' => (int) $dt->format('s'),
@@ -128,11 +128,11 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d=false, $fast=false)
 	{
-		if ($d === false) return getdate();
+		if($d===false) return getdate();
 
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setTimestamp($d);
 
 		return array(
@@ -153,20 +153,20 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+		if($this->isLeapYear($y))
+			$marr=& self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr=& self::$_month_normal;
 
-		if ($m > 12 || $m < 1) return false;
+		if($m > 12 || $m < 1) return false;
 
-		if ($d > 31 || $d < 1) return false;
+		if($d > 31 || $d < 1) return false;
 
-		if ($marr[$m] < $d) return false;
+		if($marr[$m] < $d) return false;
 
-		if ($y < 1000 && $y > 3000) return false;
+		if($y < 1000 && $y > 3000) return false;
 
 		return true;
 	}
@@ -174,9 +174,9 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
@@ -187,9 +187,9 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon=false, $day=false, $year=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setDate($year!==false ? $year : date('Y'),

Indentation +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 
 	/**
 	 * @return integer|float a timestamp given a local time
-     */
+	 */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();

framework/Util/TCallChain.php

Spacing +10 added lines, -10 removed lines

@@ -44,9 +44,9 @@ 
 	 *			the object and method name as string
 	 *  @param array The array of arguments to the function call chain
 	 */
-	public function addCall($method,$args)
+	public function addCall($method, $args)
 	{
-		$this->add(array($method,$args));
+		$this->add(array($method, $args));
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	{
 		$args=func_get_args();
 		if($this->getCount()===0)
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 
 		if(!$this->_iterator)
 		{
@@ -103,15 +103,15 @@ 
 			do {
 				$handler=$this->_iterator->current();
 				$this->_iterator->next();
-				if(is_array($handler[0])&&$handler[0][0] instanceof IClassBehavior)
-					array_splice($handler[1],1,count($args),$args);
+				if(is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
+					array_splice($handler[1], 1, count($args), $args);
 				else
-					array_splice($handler[1],0,count($args),$args);
+					array_splice($handler[1], 0, count($args), $args);
 				$handler[1][]=$this;
-				$result=call_user_func_array($handler[0],$handler[1]);
+				$result=call_user_func_array($handler[0], $handler[1]);
 			} while($this->_iterator->valid());
 		else
-			$result = $args[0];
+			$result=$args[0];
 		return $result;
 	}
 
@@ -137,10 +137,10 @@ 
 	 * @param string method name of the unspecified object method
 	 * @param array arguments to the unspecified object method
 	 */
-	public function __dycall($method,$args)
+	public function __dycall($method, $args)
 	{
 		if($this->_method==$method)
-			return call_user_func_array(array($this,'call'),$args);
+			return call_user_func_array(array($this, 'call'), $args);
 		return null;
 	}
 }
\ No newline at end of file

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 
 namespace Prado\Util;
 use Prado\Collections\TList;
-use Prado\Collections\TListIterator;
 
 /**
  * TCallChain is a recursive event calling mechanism.  This class implements

framework/Util/TBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$this->_owner=$owner;
 		foreach($this->events() as $event=>$handler)
-			$owner->attachEventHandler($event,array($this,$handler));
+			$owner->attachEventHandler($event, array($this, $handler));
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event=>$handler)
-			$owner->detachEventHandler($event,array($this,$handler));
+			$owner->detachEventHandler($event, array($this, $handler));
 		$this->_owner=null;
 	}