pradosoft / prado

framework/Web/Javascripts/packages.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 //package base folder in prado alias notation
-$folders = [
+$folders=[
 	'prado' => 'Prado\\Web\\Javascripts\\source\\prado',
 	'jquery' => 'Vendor\\bower-asset\\jquery\\dist',
 	'jquery-ui' => 'Vendor\\bower-asset\\jquery-ui',
@@ -13,7 +13,7 @@ 
 ];
 
 //package names and its contents (files relative to the current directory)
-$packages = [
+$packages=[
 	// base prado scripts
 	'prado' => [
 		'prado/prado.js',
@@ -112,7 +112,7 @@ 
 ];
 
 //package names and their dependencies
-$dependencies = [
+$dependencies=[
 	'jquery' => ['jquery'],
 	'prado' => ['jquery', 'prado'],
 	'bootstrap' => ['jquery', 'bootstrap'],

framework/Web/Javascripts/css-packages.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 //package base folder in prado alias notation
-$folders = [
+$folders=[
 	'jquery-ui' => 'Vendor\\bower-asset\\jquery-ui',
 	'bootstrap' => 'Vendor\\bower-asset\\bootstrap\\dist',
 	'highlightjs' => 'Vendor\\bower-asset\\highlightjs',
 ];
 
 //package names and its contents (files relative to the current directory)
-$packages = [
+$packages=[
 	'jquery-ui' => [
 		'jquery-ui/themes/base/jquery-ui.css',
 	],
@@ -73,7 +73,7 @@ 
 ];
 
 //package names and their dependencies
-$dependencies = [
+$dependencies=[
 		'jquery-ui' => ['jquery-ui'],
 		'jquery.ui.accordion' => ['jquery.ui.core', 'jquery.ui.accordion'],
 		'jquery.ui.autocomplete' => ['jquery.ui.core', 'jquery.ui.autocomplete'],

framework/Web/THttpRequestUrlFormat.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
  */
 class THttpRequestUrlFormat extends \Prado\TEnumerable
 {
-	const Get = 'Get';
-	const Path = 'Path';
-	const HiddenPath = 'HiddenPath';
+	const Get='Get';
+	const Path='Path';
+	const HiddenPath='HiddenPath';
 }
\ No newline at end of file

framework/Web/THttpUtility.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 class THttpUtility
 {
-	private static $_encodeTable = ['<' => '&lt;','>' => '&gt;','"' => '&quot;'];
-	private static $_decodeTable = ['&lt;' => '<','&gt;' => '>','&quot;' => '"'];
-	private static $_stripTable = ['&lt;' => '','&gt;' => '','&quot;' => ''];
+	private static $_encodeTable=['<' => '&lt;', '>' => '&gt;', '"' => '&quot;'];
+	private static $_decodeTable=['&lt;' => '<', '&gt;' => '>', '&quot;' => '"'];
+	private static $_stripTable=['&lt;' => '', '&gt;' => '', '&quot;' => ''];
 
 	/**
 	 * HTML-encodes a string.

framework/Web/THttpResponseAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function __construct($response)
 	{
-		$this->_response = $response;
+		$this->_response=$response;
 	}
 
 	/**

framework/Web/UI/TTheme.php

Spacing +59 added lines, -59 removed lines

@@ -46,11 +46,11 @@ 
 	/**
 	 * prefix for cache variable name used to store parsed themes
 	 */
-	const THEME_CACHE_PREFIX = 'prado:theme:';
+	const THEME_CACHE_PREFIX='prado:theme:';
 	/**
 	 * Extension name of skin files
 	 */
-	const SKIN_FILE_EXT = '.skin';
+	const SKIN_FILE_EXT='.skin';
 	/**
 	 * @var string theme path
 	 */
@@ -66,15 +66,15 @@ 
 	/**
 	 * @var string theme name
 	 */
-	private $_name = '';
+	private $_name='';
 	/**
 	 * @var array list of css files
 	 */
-	private $_cssFiles = [];
+	private $_cssFiles=[];
 	/**
 	 * @var array list of js files
 	 */
-	private $_jsFiles = [];
+	private $_jsFiles=[];
 
 	/**
 	 * Constructor.
@@ -84,75 +84,75 @@ 
 	 */
 	public function __construct($themePath, $themeUrl)
 	{
-		$this->_themeUrl = $themeUrl;
-		$this->_themePath = realpath($themePath);
-		$this->_name = basename($themePath);
-		$cacheValid = false;
+		$this->_themeUrl=$themeUrl;
+		$this->_themePath=realpath($themePath);
+		$this->_name=basename($themePath);
+		$cacheValid=false;
 		// TODO: the following needs to be cleaned up (Qiang)
-		if(($cache = $this->getApplication()->getCache()) !== null)
+		if(($cache=$this->getApplication()->getCache())!==null)
 		{
-			$array = $cache->get(self::THEME_CACHE_PREFIX . $themePath);
+			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
 			if(is_array($array))
 			{
-				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				list($skins, $cssFiles, $jsFiles, $timestamp)=$array;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
 				{
-					if(($dir = opendir($themePath)) === false)
+					if(($dir=opendir($themePath))===false)
 						throw new TIOException('theme_path_inexistent', $themePath);
-					$cacheValid = true;
-					while(($file = readdir($dir)) !== false)
+					$cacheValid=true;
+					while(($file=readdir($dir))!==false)
 					{
-						if($file === '.' || $file === '..')
+						if($file==='.' || $file==='..')
 							continue;
-						elseif(basename($file, '.css') !== $file)
-							$this->_cssFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, '.js') !== $file)
-							$this->_jsFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath . DIRECTORY_SEPARATOR . $file) > $timestamp)
+						elseif(basename($file, '.css')!==$file)
+							$this->_cssFiles[]=$themeUrl.'/'.$file;
+						elseif(basename($file, '.js')!==$file)
+							$this->_jsFiles[]=$themeUrl.'/'.$file;
+						elseif(basename($file, self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file) > $timestamp)
 						{
-							$cacheValid = false;
+							$cacheValid=false;
 							break;
 						}
 					}
 					closedir($dir);
 					if($cacheValid)
-						$this->_skins = $skins;
+						$this->_skins=$skins;
 				}
 				else
 				{
-					$cacheValid = true;
-					$this->_cssFiles = $cssFiles;
-					$this->_jsFiles = $jsFiles;
-					$this->_skins = $skins;
+					$cacheValid=true;
+					$this->_cssFiles=$cssFiles;
+					$this->_jsFiles=$jsFiles;
+					$this->_skins=$skins;
 				}
 			}
 		}
 		if(!$cacheValid)
 		{
-			$this->_cssFiles = [];
-			$this->_jsFiles = [];
-			$this->_skins = [];
-			if(($dir = opendir($themePath)) === false)
+			$this->_cssFiles=[];
+			$this->_jsFiles=[];
+			$this->_skins=[];
+			if(($dir=opendir($themePath))===false)
 				throw new TIOException('theme_path_inexistent', $themePath);
-			while(($file = readdir($dir)) !== false)
+			while(($file=readdir($dir))!==false)
 			{
-				if($file === '.' || $file === '..')
+				if($file==='.' || $file==='..')
 					continue;
-				elseif(basename($file, '.css') !== $file)
-					$this->_cssFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, '.js') !== $file)
-					$this->_jsFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, self::SKIN_FILE_EXT) !== $file)
+				elseif(basename($file, '.css')!==$file)
+					$this->_cssFiles[]=$themeUrl.'/'.$file;
+				elseif(basename($file, '.js')!==$file)
+					$this->_jsFiles[]=$themeUrl.'/'.$file;
+				elseif(basename($file, self::SKIN_FILE_EXT)!==$file)
 				{
-					$template = new TTemplate(file_get_contents($themePath . '/' . $file), $themePath, $themePath . '/' . $file);
+					$template=new TTemplate(file_get_contents($themePath.'/'.$file), $themePath, $themePath.'/'.$file);
 					foreach($template->getItems() as $skin)
 					{
 						if(!isset($skin[2]))  // a text string, ignored
 							continue;
-						elseif($skin[0] !== -1)
+						elseif($skin[0]!==-1)
 							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
-						$type = $skin[1];
-						$id = isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						$type=$skin[1];
+						$id=isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
 						if(isset($this->_skins[$type][$id]))
 							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
@@ -163,15 +163,15 @@ 
 								throw new TConfigurationException('theme_databind_forbidden',dirname($themePath),$type,$id);
 						}
 						*/
-						$this->_skins[$type][$id] = $skin[2];
+						$this->_skins[$type][$id]=$skin[2];
 					}
 				}
 			}
 			closedir($dir);
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
-			if($cache !== null)
-				$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins,$this->_cssFiles,$this->_jsFiles,time()]);
+			if($cache!==null)
+				$cache->set(self::THEME_CACHE_PREFIX.$themePath, [$this->_skins, $this->_cssFiles, $this->_jsFiles, time()]);
 		}
 	}
 
@@ -188,7 +188,7 @@ 
 	 */
 	protected function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 
 	/**
@@ -204,7 +204,7 @@ 
 	 */
 	protected function setBaseUrl($value)
 	{
-		$this->_themeUrl = rtrim($value, '/');
+		$this->_themeUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	 */
 	protected function setBasePath($value)
 	{
-		$this->_themePath = $value;
+		$this->_themePath=$value;
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	protected function setSkins($value)
 	{
-		$this->_skins = $value;
+		$this->_skins=$value;
 	}
 
 	/**
@@ -250,9 +250,9 @@ 
 	 */
 	public function applySkin($control)
 	{
-		$type = get_class($control);
-		if(($id = $control->getSkinID()) === '')
-			$id = 0;
+		$type=get_class($control);
+		if(($id=$control->getSkinID())==='')
+			$id=0;
 		if(isset($this->_skins[$type][$id]))
 		{
 			foreach($this->_skins[$type][$id] as $name => $value)
@@ -263,10 +263,10 @@ 
 					switch($value[0])
 					{
 						case TTemplate::CONFIG_EXPRESSION:
-							$value = $this->evaluateExpression($value[1]);
+							$value=$this->evaluateExpression($value[1]);
 							break;
 						case TTemplate::CONFIG_ASSET:
-							$value = $this->_themeUrl . '/' . ltrim($value[1], '/');
+							$value=$this->_themeUrl.'/'.ltrim($value[1], '/');
 							break;
 						case TTemplate::CONFIG_DATABIND:
 							$control->bindProperty($name, $value[1]);
@@ -287,13 +287,13 @@ 
 				}
 				if(!is_array($value))
 				{
-					if(strpos($name, '.') === false)	// is simple property or custom attribute
+					if(strpos($name, '.')===false)	// is simple property or custom attribute
 					{
 						if($control->hasProperty($name))
 						{
 							if($control->canSetProperty($name))
 							{
-								$setter = 'set' . $name;
+								$setter='set'.$name;
 								$control->$setter($value);
 							}
 							else
@@ -325,7 +325,7 @@ 
 	 */
 	protected function setStyleSheetFiles($value)
 	{
-		$this->_cssFiles = $value;
+		$this->_cssFiles=$value;
 	}
 
 	/**
@@ -341,6 +341,6 @@ 
 	 */
 	protected function setJavaScriptFiles($value)
 	{
-		$this->_jsFiles = $value;
+		$this->_jsFiles=$value;
 	}
 }
\ No newline at end of file

Braces +5 added lines, -10 removed lines

@@ -117,8 +117,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins = $skins;
-				}
-				else
+				} else
 				{
 					$cacheValid = true;
 					$this->_cssFiles = $cssFiles;
@@ -295,20 +294,16 @@ 
 							{
 								$setter = 'set' . $name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly', $type, $name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined', $type, $name);
-					}
-					else	// complex property
+					} else	// complex property
 						$control->setSubProperty($name, $value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/TCompositeControl.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer = null)
+	protected function initRecursive($namingContainer=null)
 	{
 		$this->ensureChildControls();
 		parent::initRecursive($namingContainer);

framework/Web/UI/TTemplateControl.php

Spacing +56 added lines, -56 removed lines

@@ -33,12 +33,12 @@ 
 	/**
 	 * template file extension.
 	 */
-	const EXT_TEMPLATE = '.tpl';
+	const EXT_TEMPLATE='.tpl';
 
 	/**
 	 * @var ITemplate the parsed template structure shared by the same control class
 	 */
-	private static $_template = [];
+	private static $_template=[];
 	/**
 	 * @var ITemplate the parsed template structure specific for this control instance
 	 */
@@ -50,15 +50,15 @@ 
 	/**
 	 * @var string master control class name
 	 */
-	private $_masterClass = '';
+	private $_masterClass='';
 	/**
 	 * @var array list of TContent controls
 	 */
-	private $_contents = [];
+	private $_contents=[];
 	/**
 	 * @var array list of TContentPlaceHolder controls
 	 */
-	private $_placeholders = [];
+	private $_placeholders=[];
 
 	/**
 	 * Returns the template object associated with this control object.
@@ -66,11 +66,11 @@ 
 	 */
 	public function getTemplate()
 	{
-		if($this->_localTemplate === null)
+		if($this->_localTemplate===null)
 		{
-			$class = get_class($this);
+			$class=get_class($this);
 			if(!isset(self::$_template[$class]))
-				self::$_template[$class] = $this->loadTemplate();
+				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
 		}
 		else
@@ -85,7 +85,7 @@ 
 	 */
 	public function setTemplate($value)
 	{
-		$this->_localTemplate = $value;
+		$this->_localTemplate=$value;
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(($template = $this->getTemplate()) !== null)
+		if(($template=$this->getTemplate())!==null)
 			return $template->getIsSourceTemplate();
 		else
 			return false;
@@ -106,7 +106,7 @@ 
 	 */
 	public function getTemplateDirectory()
 	{
-		if(($template = $this->getTemplate()) !== null)
+		if(($template=$this->getTemplate())!==null)
 			return $template->getContextPath();
 		else
 			return '';
@@ -118,8 +118,8 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template " . get_class($this), '\Prado\Web\UI\TTemplateControl');
-		$template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
+		Prado::trace("Loading template ".get_class($this), '\Prado\Web\UI\TTemplateControl');
+		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
 
@@ -130,7 +130,7 @@ 
 	 */
 	public function createChildControls()
 	{
-		if($tpl = $this->getTemplate())
+		if($tpl=$this->getTemplate())
 		{
 			foreach($tpl->getDirective() as $name => $value)
 			{
@@ -153,7 +153,7 @@ 
 		if(isset($this->_contents[$id]))
 			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
-			$this->_contents[$id] = $object;
+			$this->_contents[$id]=$object;
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 		if(isset($this->_placeholders[$id]))
 			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
-			$this->_placeholders[$id] = $object;
+			$this->_placeholders[$id]=$object;
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 */
 	public function setMasterClass($value)
 	{
-		$this->_masterClass = $value;
+		$this->_masterClass=$value;
 	}
 
 	/**
@@ -204,9 +204,9 @@ 
 	{
 		if(isset($this->_placeholders[$id]))
 		{
-			$placeholder = $this->_placeholders[$id];
-			$controls = $placeholder->getParent()->getControls();
-			$loc = $controls->remove($placeholder);
+			$placeholder=$this->_placeholders[$id];
+			$controls=$placeholder->getParent()->getControls();
+			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc, $content);
 		}
 		else
@@ -221,15 +221,15 @@ 
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer = null)
+	protected function initRecursive($namingContainer=null)
 	{
 		$this->ensureChildControls();
-		if($this->_masterClass !== '')
+		if($this->_masterClass!=='')
 		{
-			$master = Prado::createComponent($this->_masterClass);
+			$master=Prado::createComponent($this->_masterClass);
 			if(!($master instanceof TTemplateControl))
 				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
-			$this->_master = $master;
+			$this->_master=$master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
@@ -248,38 +248,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;
@@ -288,9 +288,9 @@ 
 										break;
 								}
 						}
-						catch (Exception $ex)
+						catch(Exception $ex)
 						{
-								if ($throwExceptions)
+								if($throwExceptions)
 										throw $ex;
 						}
 				}
@@ -302,26 +302,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

@@ -72,8 +72,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class] = $this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -208,8 +207,7 @@ 
 			$controls = $placeholder->getParent()->getControls();
 			$loc = $controls->remove($placeholder);
 			$controls->insertAt($loc, $content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
@@ -235,8 +233,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id => $content)
 				$master->injectContent($id, $content);
-		}
-		elseif(!empty($this->_contents))
+		} elseif(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -264,8 +261,7 @@ 
 												$control->Checked = (boolean) $arObj->{$key};
 										elseif ($control instanceof TDatePicker)
 												$control->Date = $arObj->{$key};
-								}
-								else
+								} else
 								{
 										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
 										{
@@ -287,8 +283,7 @@ 
 										}
 										break;
 								}
-						}
-						catch (Exception $ex)
+						} catch (Exception $ex)
 						{
 								if ($throwExceptions)
 										throw $ex;
@@ -318,8 +313,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/TTemplateManager.php

Spacing +20 added lines, -20 removed lines

@@ -39,11 +39,11 @@ 
 	/**
 	 * Template file extension
 	 */
-	const TEMPLATE_FILE_EXT = '.tpl';
+	const TEMPLATE_FILE_EXT='.tpl';
 	/**
 	 * Prefix of the cache variable name for storing parsed templates
 	 */
-	const TEMPLATE_CACHE_PREFIX = 'prado:template:';
+	const TEMPLATE_CACHE_PREFIX='prado:template:';
 
 	/**
 	 * Initializes the module.
@@ -62,8 +62,8 @@ 
 	 */
 	public function getTemplateByClassName($className)
 	{
-		$class = new \ReflectionClass($className);
-		$tplFile = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $class->getShortName() . self::TEMPLATE_FILE_EXT;
+		$class=new \ReflectionClass($className);
+		$tplFile=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$class->getShortName().self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
 
@@ -73,38 +73,38 @@ 
 	 */
 	public function getTemplateByFileName($fileName)
 	{
-		if(($fileName = $this->getLocalizedTemplate($fileName)) !== null)
+		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
 			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
-			if(($cache = $this->getApplication()->getCache()) === null)
+			if(($cache=$this->getApplication()->getCache())===null)
 				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
-				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
+				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
 				if(is_array($array))
 				{
-					list($template, $timestamps) = $array;
-					if($this->getApplication()->getMode() === TApplicationMode::Performance)
+					list($template, $timestamps)=$array;
+					if($this->getApplication()->getMode()===TApplicationMode::Performance)
 						return $template;
-					$cacheValid = true;
+					$cacheValid=true;
 					foreach($timestamps as $tplFile => $timestamp)
 					{
 						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
-							$cacheValid = false;
+							$cacheValid=false;
 							break;
 						}
 					}
 					if($cacheValid)
 						return $template;
 				}
-				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
-				$includedFiles = $template->getIncludedFiles();
-				$timestamps = [];
-				$timestamps[$fileName] = filemtime($fileName);
+				$template=new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
+				$includedFiles=$template->getIncludedFiles();
+				$timestamps=[];
+				$timestamps[$fileName]=filemtime($fileName);
 				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile] = filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
+					$timestamps[$includedFile]=filemtime($includedFile);
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, [$template, $timestamps]);
 				return $template;
 			}
 		}
@@ -119,11 +119,11 @@ 
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
+		if(($app=$this->getApplication()->getGlobalization(false))===null)
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file = realpath($file)) !== false && is_file($file))
+			if(($file=realpath($file))!==false && is_file($file))
 				return $file;
 		}
 		return null;