pradosoft / prado

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Spacing +1 added lines, -1 removed lines

@@ -310,7 +310,7 @@
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i = 0;$i < $total;$i++)
+			for($i = 0; $i < $total; $i++)
 				$success = $fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}

framework/Data/ActiveRecord/TActiveRecordGateway.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		elseif($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
 			if(empty($value))
@@ -361,7 +361,7 @@ 
 			else
 				$values[$name] = $value;
 		}
-		return [$values,$primary];
+		return [$values, $primary];
 	}
 
 	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo = false)

framework/Web/TUrlMapping.php

Spacing +3 added lines, -3 removed lines

@@ -247,8 +247,8 @@ 
 			{
 				foreach($config['urls'] as $url)
 				{
-					$class = isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:[];
+					$class = isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties = isset($url['properties']) ? $url['properties'] : [];
 					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
@@ -319,7 +319,7 @@ 
 					if(is_string($key))
 						$params[$key] = $value;
 				}
-				if (!$pattern->getIsWildCardPattern())
+				if(!$pattern->getIsWildCardPattern())
 					$params[$pattern->getServiceID()] = $pattern->getServiceParameter();
 				return $params;
 			}

framework/Web/Javascripts/TJavaScript.php

Spacing +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
 		if(is_string($value))
 			return self::quoteString($value);
 		elseif(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		elseif(is_array($value))
 		{
 			$results = '';
@@ -197,7 +197,7 @@ 
 			}
 		}
 		elseif(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
 				return self::encode(get_object_vars($value), $toMap);
@@ -214,7 +214,7 @@ 
 	 */
 	public static function jsonEncode($value, $options = 0)
 	{
-		if (($g = Prado::getApplication()->getGlobalization(false)) !== null &&
+		if(($g = Prado::getApplication()->getGlobalization(false)) !== null &&
 			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
@@ -232,7 +232,7 @@ 
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value = iconv($sourceEncoding, 'UTF-8', $value);
-		elseif (is_array($value))
+		elseif(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -256,7 +256,7 @@ 
 
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err = json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;

framework/Web/THttpResponse.php

Spacing +14 added lines, -14 removed lines

@@ -203,7 +203,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none','nocache','private','private_no_expire','public']));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none', 'nocache', 'private', 'private_no_expire', 'public']));
 	}
 
 	/**
@@ -211,7 +211,7 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new \Exception('Unable to alter content-type as it has been already sent');
 		$this->_contentType = $type;
 	}
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset = (strToLower($charset) === 'false') ? false : (string) $charset;
 	}
 
 	/**
@@ -278,12 +278,12 @@ 
 	 */
 	public function setStatusCode($status, $reason = null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new \Exception('Unable to alter response as HTTP header already sent');
 		$status = TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else {
 			if($reason === null || $reason === '') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -321,7 +321,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -372,7 +372,7 @@ 
 			$clientFileName = basename($clientFileName);
 
 		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+			$fileSize = ($content === null ?filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -433,7 +433,7 @@ 
 		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
 		if($url[0] === '/')
 			$url = $this->getRequest()->getBaseUrl() . $url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		if($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
 			if($isIIS)
@@ -499,9 +499,9 @@ 
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length() > 0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
@@ -520,7 +520,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -543,7 +543,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -552,7 +552,7 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType = $this->_contentType === null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType = $this->_contentType === null ?self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset = $this->getCharset();
 		if($charset === false) {
 			$this->appendHeader('Content-Type: ' . $contentType);
@@ -577,7 +577,7 @@ 
 	public function getContents()
 	{
 		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ?ob_get_contents() : '';
 	}
 
 	/**

framework/Web/TCacheHttpSession.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 	 */
 	public function _read($id)
 	{
-		return (string)$this->_cache->get($this->calculateKey($id));
+		return (string) $this->_cache->get($this->calculateKey($id));
 	}
 
 	/**

framework/Web/THttpRequest.php

Spacing +23 added lines, -23 removed lines

@@ -180,7 +180,7 @@ 
 		if(isset($_SERVER['REQUEST_URI']))
 			$this->_requestUri = $_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING'])?'':'?' . $_SERVER['QUERY_STRING']);
+			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']);
 
 		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
 			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
@@ -214,7 +214,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map([$this,'stripSlashes'], $data):stripslashes($data);
+		return is_array($data) ?array_map([$this, 'stripSlashes'], $data) : stripslashes($data);
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 		if($this->_url === null)
 		{
 			$secure = $this->getIsSecureConnection();
-			$url = $secure?'https://':'http://';
+			$url = $secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
 				$url .= $_SERVER['SERVER_NAME'];
@@ -277,7 +277,7 @@ 
 			{
 				$dependencies = null;
 				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+					if($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
 						$dependencies = new TFileCacheDependency($fn);
@@ -402,7 +402,7 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
@@ -496,9 +496,9 @@ 
 	public function getBaseUrl($forceSecureConnection = null)
 	{
 		$url = $this->getUrl();
-		$scheme = ($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
+		$scheme = ($forceSecureConnection) ? "https" : (($forceSecureConnection === null) ? $url->getScheme() : 'http');
 		$host = $url->getHost();
-		if (($port = $url->getPort())) $host .= ':' . $port;
+		if(($port = $url->getPort())) $host .= ':' . $port;
 		return $scheme . '://' . $host;
 	}
 
@@ -510,7 +510,7 @@ 
 		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -554,7 +554,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -563,7 +563,7 @@ 
 	 */
 	public function getServerSoftware()
 	{
-		return isset($_SERVER['SERVER_SOFTWARE'])?$_SERVER['SERVER_SOFTWARE']:null;
+		return isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null;
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 		{
 			return get_browser();
 		}
-		catch(TPhpErrorException $e)
+		catch (TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -587,7 +587,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -603,7 +603,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -612,7 +612,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -732,11 +732,11 @@ 
 	 */
 	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		if ($this->_cookieOnly === null)
-				$this->_cookieOnly = (int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		if($this->_cookieOnly === null)
+				$this->_cookieOnly = (int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
 		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
 		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url, '?') === false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+			return $url . (strpos($url, '?') === false ? '?' : ($encodeAmpersand ? '&' : '&')) . SID;
 		else
 			return $url;
 	}

framework/Web/UI/TTemplate.php

Spacing +44 added lines, -44 removed lines

@@ -337,9 +337,9 @@ 
 	protected function configureEvent($control, $name, $value, $contextControl)
 	{
 		if(strpos($value, '.') === false)
-			$control->attachEventHandler($name, [$contextControl,'TemplateControl.' . $value]);
+			$control->attachEventHandler($name, [$contextControl, 'TemplateControl.' . $value]);
 		else
-			$control->attachEventHandler($name, [$contextControl,$value]);
+			$control->attachEventHandler($name, [$contextControl, $value]);
 	}
 
 	/**
@@ -390,8 +390,8 @@ 
 		}
 		else
 		{
-			if (substr($name, 0, 2) == 'js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
+			if(substr($name, 0, 2) == 'js')
+				if($value and !($value instanceof TJavaScriptLiteral))
 					$value = new TJavaScriptLiteral($value);
 			$setter = 'set' . $name;
 			$component->$setter($value);
@@ -476,7 +476,7 @@ 
 		$this->_directive = null;
 		try
 		{
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$match = &$matches[$i];
 				$str = $match[0][0];
@@ -487,12 +487,12 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$type = $match[1][0];
 					$attributes = $this->parseAttributes($match[2][0], $match[2][1]);
 					$class = $this->validateAttributes($type, $attributes);
-					$tpl[$c++] = [$container,$class,$attributes];
+					$tpl[$c++] = [$container, $class, $attributes];
 					if($str[strlen($str) - 2] !== '/')  // open tag
 					{
 						$stack[] = $type;
@@ -504,7 +504,7 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$type = $match[1][0];
 
@@ -524,7 +524,7 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					if(isset($tpl[0]) || $this->_directive !== null)
 						throw new TConfigurationException('template_directive_nonunique');
@@ -535,25 +535,25 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$literal = trim($match[5][0]);
 					if($str[2] === '=')	// expression
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,$literal]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, $literal]];
 					elseif($str[2] === '%')  // statements
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_STATEMENTS,$literal]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_STATEMENTS, $literal]];
 					elseif($str[2] === '#')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_DATABINDING,$literal]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_DATABINDING, $literal]];
 					elseif($str[2] === '$')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "\$this->getApplication()->getParameters()->itemAt('$literal')"]];
 					elseif($str[2] === '~')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "\$this->publishFilePath('$this->_contextPath/$literal')"]];
 					elseif($str[2] === '/')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"]];
 					elseif($str[2] === '[')
 					{
-						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'","\\" => "\\\\"]);
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"]];
+						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'", "\\" => "\\\\"]);
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"]];
 					}
 				}
 				elseif(strpos($str, '<prop:') === 0)	// opening property
@@ -563,7 +563,7 @@ 
 						if($expectPropEnd)
 							continue;
 						if($matchStart > $textStart)
-							$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+							$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 						$textStart = $matchEnd + 1;
 						$prop = strtolower($match[6][0]);
 						$attrs = $this->parseAttributes($match[7][0], $match[7][1]);
@@ -586,7 +586,7 @@ 
 						if(!$expectPropEnd)
 						{
 							if($matchStart > $textStart)
-								$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+								$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 							$textStart = $matchEnd + 1;
 							$expectPropEnd = true;
 						}
@@ -632,7 +632,7 @@ 
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 				}
 				else
@@ -645,9 +645,9 @@ 
 				throw new TConfigurationException('template_closingtag_expected', $tag, "nothing");
 			}
 			if($textStart < strlen($input))
-				$tpl[$c++] = [$container,substr($input, $textStart)];
+				$tpl[$c++] = [$container, substr($input, $textStart)];
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -672,9 +672,9 @@ 
 				if($parent !== null)
 				{
 					if(count($merged[1]) === 1 && is_string($merged[1][0]))
-						$objects[$id - 1] = [$merged[0],$merged[1][0]];
+						$objects[$id - 1] = [$merged[0], $merged[1][0]];
 					else
-						$objects[$id - 1] = [$merged[0],new TCompositeLiteral($merged[1])];
+						$objects[$id - 1] = [$merged[0], new TCompositeLiteral($merged[1])];
 				}
 				if(isset($object[2]))
 				{
@@ -684,7 +684,7 @@ 
 				else
 				{
 					$parent = $object[0];
-					$merged = [$parent,[$object[1]]];
+					$merged = [$parent, [$object[1]]];
 				}
 			}
 			else
@@ -693,9 +693,9 @@ 
 		if($parent !== null)
 		{
 			if(count($merged[1]) === 1 && is_string($merged[1][0]))
-				$objects[$id] = [$merged[0],$merged[1][0]];
+				$objects[$id] = [$merged[0], $merged[1][0]];
 			else
-				$objects[$id] = [$merged[0],new TCompositeLiteral($merged[1])];
+				$objects[$id] = [$merged[0], new TCompositeLiteral($merged[1])];
 		}
 		$tpl = $objects;
 		return $objects;
@@ -713,7 +713,7 @@ 
 		$pattern = '/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes = [];
 		$n = preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-		for($i = 0;$i < $n;++$i)
+		for($i = 0; $i < $n; ++$i)
 		{
 			$match = &$matches[$i];
 			$name = strtolower($match[1][0]);
@@ -741,7 +741,7 @@ 
 	protected function parseTemplateProperty($content, $offset)
 	{
 		$line = $this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
-		return [self::CONFIG_TEMPLATE,new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false)];
+		return [self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false)];
 	}
 
 	/**
@@ -756,7 +756,7 @@ 
 			$isDataBind = false;
 			$textStart = 0;
 			$expr = '';
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$match = $matches[0][$i];
 				$token = $match[0];
@@ -765,30 +765,30 @@ 
 				if($token[2] === '#')
 					$isDataBind = true;
 				if($offset > $textStart)
-					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'", "\\" => "\\\\"]) . "'";
 				$expr .= '.(' . substr($token, 3, $length - 5) . ')';
 				$textStart = $offset + $length;
 			}
 			$length = strlen($value);
 			if($length > $textStart)
-				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'", "\\" => "\\\\"]) . "'";
 			if($isDataBind)
-				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
+				return [self::CONFIG_DATABIND, ltrim($expr, '.')];
 			else
-				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
+				return [self::CONFIG_EXPRESSION, ltrim($expr, '.')];
 		}
 		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
 		{
 			$value = $matches[1];
 			if($value[2] === '~')
-				return [self::CONFIG_ASSET,trim(substr($value, 3, strlen($value) - 5))];
+				return [self::CONFIG_ASSET, trim(substr($value, 3, strlen($value) - 5))];
 			elseif($value[2] === '[')
-				return [self::CONFIG_LOCALIZATION,trim(substr($value, 3, strlen($value) - 6))];
+				return [self::CONFIG_LOCALIZATION, trim(substr($value, 3, strlen($value) - 6))];
 			elseif($value[2] === '$')
-				return [self::CONFIG_PARAMETER,trim(substr($value, 3, strlen($value) - 5))];
+				return [self::CONFIG_PARAMETER, trim(substr($value, 3, strlen($value) - 5))];
 			elseif($value[2] === '/') {
 				$literal = trim(substr($value, 3, strlen($value) - 5));
-				return [self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
+				return [self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
 		}
 		else
@@ -825,9 +825,9 @@ 
 				else
 				{
 					// a simple property
-					if (! ($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
+					if(!($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
 					{
-						if ($class->hasMethod('get' . $name) || $class->hasMethod('getjs' . $name))
+						if($class->hasMethod('get' . $name) || $class->hasMethod('getjs' . $name))
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
@@ -897,7 +897,7 @@ 
 
 		if(($n = count($this->_includedFiles)) > 0) // need to adjust error row number and file name
 		{
-			for($i = $n - 1;$i >= 0;--$i)
+			for($i = $n - 1; $i >= 0; --$i)
 			{
 				if($this->_includeAtLine[$i] <= $line)
 				{
@@ -930,7 +930,7 @@ 
 	{
 		if($n = preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$filePath = Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
 				if($filePath !== null && is_file($filePath))
@@ -942,7 +942,7 @@ 
 				}
 			}
 			$base = 0;
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$ext = file_get_contents($this->_includedFiles[$i]);
 				$length = strlen($matches[$i][0][0]);

framework/Web/UI/TTemplateManager.php

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
 				$timestamps[$fileName] = filemtime($fileName);
 				foreach($includedFiles as $includedFile)
 					$timestamps[$includedFile] = filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
+				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template, $timestamps]);
 				return $template;
 			}
 		}
@@ -120,7 +120,7 @@ 
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
 			if(($file = realpath($file)) !== false && is_file($file))