pradosoft / prado

framework/Web/THttpResponse.php

Spacing +50 added lines, -50 removed lines

@@ -167,7 +167,7 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_start();
 		$this->_initialized = true;
 		$this->getApplication()->setResponse($this);
@@ -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']));
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset = (strToLower($charset) === 'false') ? false : (string) $charset;
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
 			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
@@ -281,14 +281,14 @@ 
 		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])) {
+		if (isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason === null || $reason === '') {
+		} else {
+			if ($reason === null || $reason === '') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
 			$reason = TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
+			if (strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
 				throw new TInvalidDataValueException("response_status_reason_barchars");
 			}
 			$this->_reason = $reason;
@@ -308,7 +308,7 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
+		if ($this->_cookies === null)
 			$this->_cookies = new THttpCookieCollection($this);
 		return $this->_cookies;
 	}
@@ -353,31 +353,31 @@ 
 			'xls' => 'application/vnd.ms-excel',
 		];
 
-		if($mimeType === null)
+		if ($mimeType === null)
 		{
 			$mimeType = 'text/plain';
-			if(function_exists('mime_content_type'))
+			if (function_exists('mime_content_type'))
 				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+			elseif (($ext = strrchr($fileName, '.')) !== false)
 			{
 				$ext = substr($ext, 1);
-				if(isset($defaultMimeTypes[$ext]))
+				if (isset($defaultMimeTypes[$ext]))
 					$mimeType = $defaultMimeTypes[$ext];
 			}
 		}
 
-		if($clientFileName === null)
+		if ($clientFileName === null)
 			$clientFileName = basename($fileName);
 		else
 			$clientFileName = basename($clientFileName);
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if ($fileSize === null || $fileSize < 0)
+			$fileSize = ($content === null ?filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
-		if(is_array($headers))
+		if (is_array($headers))
 		{
-			foreach($headers as $h)
+			foreach ($headers as $h)
 				header($h);
 		}
 		else
@@ -389,10 +389,10 @@ 
 			$this->_contentTypeHeaderSent = true;
 		}
 
-		header('Content-Length: ' . $fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header('Content-Length: '.$fileSize);
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
+		if ($content === null)
 			readfile($fileName);
 		else
 			echo $content;
@@ -406,7 +406,7 @@ 
 	 */
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->httpRedirect($url);
 		else
 			$this->httpRedirect($url);
@@ -431,27 +431,27 @@ 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
 		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
+		if ($url[0] === '/')
+			$url = $this->getRequest()->getBaseUrl().$url;
 		if ($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
-			if($isIIS)
+			if ($isIIS)
 			{
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
 						? $this->_status
 						: 302
 					]);
 			}
-			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
-			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
-			header('Location: ' . str_replace('&amp;', '&', $url));
+			if ($isIIS)
+				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
+			header('Location: '.str_replace('&amp;', '&', $url));
 		}
 
-		if(!$this->getApplication()->getRequestCompleted())
+		if (!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
 
 		exit();
@@ -472,7 +472,7 @@ 
 	 */
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
 		else
 			$this->flushContent($continueBuffering);
@@ -496,7 +496,7 @@ 
 	{
 		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
 		$this->ensureHeadersSent();
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
 			if (ob_get_length() > 0)
@@ -530,10 +530,10 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if ($this->getRequest()->getHttpProtocolVersion() === null)
 			$protocol = 'HTTP/1.1';
 
-		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
 		$this->_httpHeaderSent = true;
 	}
@@ -552,18 +552,18 @@ 
 	 */
 	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);
+		if ($charset === false) {
+			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
+		if ($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
 			$charset = $globalization->getCharset();
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
-		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
+		if ($charset === '') $charset = self::DEFAULT_CHARSET;
+		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
 		$this->_contentTypeHeaderSent = true;
 	}
@@ -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() : '';
 	}
 
 	/**
@@ -585,7 +585,7 @@ 
 	 */
 	public function clear()
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_clean();
 		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
 	}
@@ -598,17 +598,17 @@ 
 	{
 		$result = [];
 		$headers = headers_list();
-		foreach($headers as $header) {
+		foreach ($headers as $header) {
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+			if (isset($result[$key]))
+				$result[$key] .= ', '.$value;
 			else
 				$result[$key] = $value;
 		}
 
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -647,7 +647,7 @@ 
 	public function addCookie($cookie)
 	{
 		$request = $this->getRequest();
-		if($request->getEnableCookieValidation())
+		if ($request->getEnableCookieValidation())
 		{
 			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
@@ -714,9 +714,9 @@ 
 	 */
 	public function createHtmlWriter($type = null)
 	{
-		if($type === null)
+		if ($type === null)
 			$type = $this->getHtmlWriterType();
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else
 			return $this->createNewHtmlWriter($type, $this);

Braces +102 added lines, -77 removed lines

@@ -167,8 +167,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_bufferOutput)
-			ob_start();
+		if($this->_bufferOutput) {
+					ob_start();
+		}
 		$this->_initialized = true;
 		$this->getApplication()->setResponse($this);
 	}
@@ -211,8 +212,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
-			throw new \Exception('Unable to alter content-type as it has been already sent');
+		if ($this->_contentTypeHeaderSent) {
+					throw new \Exception('Unable to alter content-type as it has been already sent');
+		}
 		$this->_contentType = $type;
 	}
 
@@ -254,10 +256,11 @@ 
 	 */
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
-		else
-			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
+		} else {
+					$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+		}
 	}
 
 	/**
@@ -278,12 +281,13 @@ 
 	 */
 	public function setStatusCode($status, $reason = null)
 	{
-		if ($this->_httpHeaderSent)
-			throw new \Exception('Unable to alter response as HTTP header already sent');
+		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");
 			}
@@ -308,8 +312,9 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
-			$this->_cookies = new THttpCookieCollection($this);
+		if($this->_cookies === null) {
+					$this->_cookies = new THttpCookieCollection($this);
+		}
 		return $this->_cookies;
 	}
 
@@ -321,8 +326,9 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
-			$this->ensureHeadersSent();
+		if (!$this->_bufferOutput and !$this->_httpHeaderSent) {
+					$this->ensureHeadersSent();
+		}
 		echo $str;
 	}
 
@@ -356,31 +362,34 @@ 
 		if($mimeType === null)
 		{
 			$mimeType = 'text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+			if(function_exists('mime_content_type')) {
+							$mimeType = mime_content_type($fileName);
+			} elseif(($ext = strrchr($fileName, '.')) !== false)
 			{
 				$ext = substr($ext, 1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType = $defaultMimeTypes[$ext];
+				if(isset($defaultMimeTypes[$ext])) {
+									$mimeType = $defaultMimeTypes[$ext];
+				}
 			}
 		}
 
-		if($clientFileName === null)
-			$clientFileName = basename($fileName);
-		else
-			$clientFileName = basename($clientFileName);
+		if($clientFileName === null) {
+					$clientFileName = basename($fileName);
+		} else {
+					$clientFileName = basename($clientFileName);
+		}
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if($fileSize === null || $fileSize < 0) {
+					$fileSize = ($content === null?filesize($fileName):strlen($content));
+		}
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
 		{
-			foreach($headers as $h)
-				header($h);
-		}
-		else
+			foreach($headers as $h) {
+							header($h);
+			}
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -392,10 +401,11 @@ 
 		header('Content-Length: ' . $fileSize);
 		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
-			readfile($fileName);
-		else
-			echo $content;
+		if($content === null) {
+					readfile($fileName);
+		} else {
+					echo $content;
+		}
 	}
 
 	/**
@@ -406,10 +416,11 @@ 
 	 */
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->httpRedirect($url);
-		else
-			$this->httpRedirect($url);
+		if($this->getHasAdapter()) {
+					$this->_adapter->httpRedirect($url);
+		} else {
+					$this->httpRedirect($url);
+		}
 	}
 
 	/**
@@ -431,8 +442,9 @@ 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
 		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
+		if($url[0] === '/') {
+					$url = $this->getRequest()->getBaseUrl() . $url;
+		}
 		if ($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
@@ -446,13 +458,15 @@ 
 			}
 			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
-			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
+			if($isIIS) {
+							header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
+			}
 			header('Location: ' . str_replace('&amp;', '&', $url));
 		}
 
-		if(!$this->getApplication()->getRequestCompleted())
-			$this->getApplication()->onEndRequest();
+		if(!$this->getApplication()->getRequestCompleted()) {
+					$this->getApplication()->onEndRequest();
+		}
 
 		exit();
 	}
@@ -472,10 +486,11 @@ 
 	 */
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->flushContent($continueBuffering);
-		else
-			$this->flushContent($continueBuffering);
+		if($this->getHasAdapter()) {
+					$this->_adapter->flushContent($continueBuffering);
+		} else {
+					$this->flushContent($continueBuffering);
+		}
 	}
 
 	/**
@@ -505,14 +520,14 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
+				} else {
+									ob_flush();
 				}
-				else
-					ob_flush();
 				flush();
 			}
+		} else {
+					flush();
 		}
-		else
-			flush();
 	}
 
 	/**
@@ -520,8 +535,9 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
-			$this->sendHttpHeader();
+		if (!$this->_httpHeaderSent) {
+					$this->sendHttpHeader();
+		}
 	}
 
 	/**
@@ -530,8 +546,9 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol = 'HTTP/1.1';
+		if($this->getRequest()->getHttpProtocolVersion() === null) {
+					$protocol = 'HTTP/1.1';
+		}
 
 		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
@@ -543,8 +560,9 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
-			$this->sendContentTypeHeader();
+		if (!$this->_contentTypeHeaderSent) {
+					$this->sendContentTypeHeader();
+		}
 	}
 
 	/**
@@ -559,10 +577,13 @@ 
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
-			$charset = $globalization->getCharset();
+		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null) {
+					$charset = $globalization->getCharset();
+		}
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
+		if($charset === '') {
+			$charset = self::DEFAULT_CHARSET;
+		}
 		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
 
 		$this->_contentTypeHeaderSent = true;
@@ -585,8 +606,9 @@ 
 	 */
 	public function clear()
 	{
-		if($this->_bufferOutput)
-			ob_clean();
+		if($this->_bufferOutput) {
+					ob_clean();
+		}
 		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
 	}
 
@@ -602,14 +624,16 @@ 
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
-			else
-				$result[$key] = $value;
+			if(isset($result[$key])) {
+							$result[$key] .= ', ' . $value;
+			} else {
+							$result[$key] = $value;
+			}
 		}
 
-		if($case !== null)
-			return array_change_key_case($result, $case);
+		if($case !== null) {
+					return array_change_key_case($result, $case);
+		}
 
 		return $result;
 	}
@@ -659,8 +683,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -714,12 +737,14 @@ 
 	 */
 	public function createHtmlWriter($type = null)
 	{
-		if($type === null)
-			$type = $this->getHtmlWriterType();
-		if($this->getHasAdapter())
-			return $this->_adapter->createNewHtmlWriter($type, $this);
-		else
-			return $this->createNewHtmlWriter($type, $this);
+		if($type === null) {
+					$type = $this->getHtmlWriterType();
+		}
+		if($this->getHasAdapter()) {
+					return $this->_adapter->createNewHtmlWriter($type, $this);
+		} else {
+					return $this->createNewHtmlWriter($type, $this);
+		}
 	}
 
 	/**

framework/Web/TCacheHttpSession.php

Spacing +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_cacheModuleID === '')
+		if ($this->_cacheModuleID === '')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
-		elseif(($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
+		elseif (($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
 			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
-		elseif($cache instanceof ICache)
+		elseif ($cache instanceof ICache)
 			$this->_cache = $cache;
 		else
 			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
@@ -100,7 +100,7 @@ 
 	 */
 	public function _read($id)
 	{
-		return (string)$this->_cache->get($this->calculateKey($id));
+		return (string) $this->_cache->get($this->calculateKey($id));
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	protected function calculateKey($id)
 	{
-		return $this->_prefix . ':' . $id;
+		return $this->_prefix.':'.$id;
 	}
 }
 

Braces +9 added lines, -8 removed lines

@@ -57,14 +57,15 @@
 	 */
 	public function init($config)
 	{
-		if($this->_cacheModuleID === '')
-			throw new TConfigurationException('cachesession_cachemoduleid_required');
-		elseif(($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
-		elseif($cache instanceof ICache)
-			$this->_cache = $cache;
-		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
+		if($this->_cacheModuleID === '') {
+					throw new TConfigurationException('cachesession_cachemoduleid_required');
+		} elseif(($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null) {
+					throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
+		} elseif($cache instanceof ICache) {
+					$this->_cache = $cache;
+		} else {
+					throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
+		}
 		$this->setUseCustomStorage(true);
 		parent::init($config);
 	}

framework/Web/THttpSession.php

Spacing +28 added lines, -28 removed lines

@@ -125,7 +125,7 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_autoStart)
+		if ($this->_autoStart)
 			$this->open();
 		$this->_initialized = true;
 		$this->getApplication()->setSession($this);
@@ -137,13 +137,13 @@ 
 	 */
 	public function open()
 	{
-		if(!$this->_started)
+		if (!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler([$this,'_open'], [$this,'_close'], [$this,'_read'], [$this,'_write'], [$this,'_destroy'], [$this,'_gc']);
-			if($this->_cookie !== null)
+			if ($this->_customStorage)
+				session_set_save_handler([$this, '_open'], [$this, '_close'], [$this, '_read'], [$this, '_write'], [$this, '_destroy'], [$this, '_gc']);
+			if ($this->_cookie !== null)
 				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
-			if(ini_get('session.auto_start') !== '1')
+			if (ini_get('session.auto_start') !== '1')
 				session_start();
 			$this->_started = true;
 		}
@@ -154,7 +154,7 @@ 
 	 */
 	public function close()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_write_close();
 			$this->_started = false;
@@ -166,7 +166,7 @@ 
 	 */
 	public function destroy()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_destroy();
 			$this->_started = false;
@@ -209,7 +209,7 @@ 
 	 */
 	public function setSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
 		else
 			session_id($value);
@@ -229,9 +229,9 @@ 
 	 */
 	public function setSessionName($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		elseif(ctype_alnum($value))
+		elseif (ctype_alnum($value))
 			session_name($value);
 		else
 			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
@@ -251,11 +251,11 @@ 
 	 */
 	public function setSavePath($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		elseif(is_dir($value))
+		elseif (is_dir($value))
 			session_save_path(realpath($value));
-		elseif(null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns))
+		elseif (null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns))
 			session_save_path(realpath($ns));
 		else
 			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
@@ -285,7 +285,7 @@ 
 	 */
 	public function getCookie()
 	{
-		if($this->_cookie === null)
+		if ($this->_cookie === null)
 			$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
@@ -295,9 +295,9 @@ 
 	 */
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies') === '0')
+		if (ini_get('session.use_cookies') === '0')
 			return THttpSessionCookieMode::None;
-		elseif(ini_get('session.use_only_cookies') === '0')
+		elseif (ini_get('session.use_only_cookies') === '0')
 			return THttpSessionCookieMode::Allow;
 		else
 			return THttpSessionCookieMode::Only;
@@ -309,17 +309,17 @@ 
 	 */
 	public function setCookieMode($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
 			$value = TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpSessionCookieMode');
-			if($value === THttpSessionCookieMode::None)
+			if ($value === THttpSessionCookieMode::None)
 	  {
 				ini_set('session.use_cookies', '0');
 			  ini_set('session.use_only_cookies', '0');
 	  }
-			elseif($value === THttpSessionCookieMode::Allow)
+			elseif ($value === THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '0');
@@ -347,7 +347,7 @@ 
 	 */
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
 		else
 			$this->_autoStart = TPropertyValue::ensureBoolean($value);
@@ -368,12 +368,12 @@ 
 	 */
 	public function setGCProbability($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
 		else
 		{
 			$value = TPropertyValue::ensureInteger($value);
-			if($value >= 0 && $value <= 100)
+			if ($value >= 0 && $value <= 100)
 			{
 				ini_set('session.gc_probability', $value);
 				ini_set('session.gc_divisor', '100');
@@ -400,14 +400,14 @@ 
 	 */
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_transid_unchangeable');
 		else
 		{
 			$value = TPropertyValue::ensureBoolean($value);
 			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid', $value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 
@@ -425,7 +425,7 @@ 
 	 */
 	public function setTimeout($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
 			ini_set('session.gc_maxlifetime', $value);
@@ -565,7 +565,7 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($_SESSION[$key]))
+		if (isset($_SESSION[$key]))
 		{
 			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
@@ -580,7 +580,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
+		foreach (array_keys($_SESSION) as $key)
 			unset($_SESSION[$key]);
 	}
 

Braces +74 added lines, -63 removed lines

@@ -125,8 +125,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_autoStart)
-			$this->open();
+		if($this->_autoStart) {
+					$this->open();
+		}
 		$this->_initialized = true;
 		$this->getApplication()->setSession($this);
 		register_shutdown_function([$this, "close"]);
@@ -139,12 +140,15 @@ 
 	{
 		if(!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler([$this,'_open'], [$this,'_close'], [$this,'_read'], [$this,'_write'], [$this,'_destroy'], [$this,'_gc']);
-			if($this->_cookie !== null)
-				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
-			if(ini_get('session.auto_start') !== '1')
-				session_start();
+			if($this->_customStorage) {
+							session_set_save_handler([$this,'_open'], [$this,'_close'], [$this,'_read'], [$this,'_write'], [$this,'_destroy'], [$this,'_gc']);
+			}
+			if($this->_cookie !== null) {
+							session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
+			}
+			if(ini_get('session.auto_start') !== '1') {
+							session_start();
+			}
 			$this->_started = true;
 		}
 	}
@@ -209,10 +213,11 @@ 
 	 */
 	public function setSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
-		else
-			session_id($value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
+		} else {
+					session_id($value);
+		}
 	}
 
 	/**
@@ -229,12 +234,13 @@ 
 	 */
 	public function setSessionName($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		elseif(ctype_alnum($value))
-			session_name($value);
-		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
+		} elseif(ctype_alnum($value)) {
+					session_name($value);
+		} else {
+					throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
+		}
 	}
 
 	/**
@@ -251,14 +257,15 @@ 
 	 */
 	public function setSavePath($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		elseif(is_dir($value))
-			session_save_path(realpath($value));
-		elseif(null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns))
-			session_save_path(realpath($ns));
-		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_savepath_unchangeable');
+		} elseif(is_dir($value)) {
+					session_save_path(realpath($value));
+		} elseif(null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns)) {
+					session_save_path(realpath($ns));
+		} else {
+					throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
+		}
 	}
 
 	/**
@@ -285,8 +292,9 @@ 
 	 */
 	public function getCookie()
 	{
-		if($this->_cookie === null)
-			$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
+		if($this->_cookie === null) {
+					$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
+		}
 		return $this->_cookie;
 	}
 
@@ -295,12 +303,13 @@ 
 	 */
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies') === '0')
-			return THttpSessionCookieMode::None;
-		elseif(ini_get('session.use_only_cookies') === '0')
-			return THttpSessionCookieMode::Allow;
-		else
-			return THttpSessionCookieMode::Only;
+		if(ini_get('session.use_cookies') === '0') {
+					return THttpSessionCookieMode::None;
+		} elseif(ini_get('session.use_only_cookies') === '0') {
+					return THttpSessionCookieMode::Allow;
+		} else {
+					return THttpSessionCookieMode::Only;
+		}
 	}
 
 	/**
@@ -309,22 +318,20 @@ 
 	 */
 	public function setCookieMode($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
+		} else
 		{
 			$value = TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpSessionCookieMode');
 			if($value === THttpSessionCookieMode::None)
 	  {
 				ini_set('session.use_cookies', '0');
 			  ini_set('session.use_only_cookies', '0');
-	  }
-			elseif($value === THttpSessionCookieMode::Allow)
+	  } elseif($value === THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '1');
@@ -347,10 +354,11 @@ 
 	 */
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
-		else
-			$this->_autoStart = TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpsession_autostart_unchangeable');
+		} else {
+					$this->_autoStart = TPropertyValue::ensureBoolean($value);
+		}
 	}
 
 	/**
@@ -368,18 +376,18 @@ 
 	 */
 	public function setGCProbability($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
+		} else
 		{
 			$value = TPropertyValue::ensureInteger($value);
 			if($value >= 0 && $value <= 100)
 			{
 				ini_set('session.gc_probability', $value);
 				ini_set('session.gc_divisor', '100');
+			} else {
+							throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 			}
-			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 
@@ -400,13 +408,14 @@ 
 	 */
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_transid_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_transid_unchangeable');
+		} else
 		{
 			$value = TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
-					throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only) {
+								throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			}
 			ini_set('session.use_trans_sid', $value?'1':'0');
 		}
 	}
@@ -425,10 +434,11 @@ 
 	 */
 	public function setTimeout($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
-		else
-			ini_set('session.gc_maxlifetime', $value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
+		} else {
+					ini_set('session.gc_maxlifetime', $value);
+		}
 	}
 
 	/**
@@ -570,9 +580,9 @@ 
 			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -580,8 +590,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
-			unset($_SESSION[$key]);
+		foreach(array_keys($_SESSION) as $key) {
+					unset($_SESSION[$key]);
+		}
 	}
 
 	/**

framework/Web/TAssetManager.php

Spacing +43 added lines, -43 removed lines

@@ -89,12 +89,12 @@ 
 	public function init($config)
 	{
 		$application = $this->getApplication();
-		if($this->_basePath === null)
-			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
+		if ($this->_basePath === null)
+			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+		if (!is_writable($this->_basePath) || !is_dir($this->_basePath))
 			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
-		if($this->_baseUrl === null)
-			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		if ($this->_baseUrl === null)
+			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized = true;
 	}
@@ -115,12 +115,12 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
 		else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
+			if ($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
 				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
@@ -139,7 +139,7 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
 			$this->_baseUrl = rtrim($value, '/');
@@ -161,28 +161,28 @@ 
 	 */
 	public function publishFilePath($path, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$path]))
+		if (isset($this->_published[$path]))
 			return $this->_published[$path];
-		elseif(empty($path) || ($fullpath = realpath($path)) === false)
+		elseif (empty($path) || ($fullpath = realpath($path)) === false)
 			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
-		elseif(is_file($fullpath))
+		elseif (is_file($fullpath))
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dst = $this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if (!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
+			return $this->_published[$path] = $this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
 		{
 			$dir = $this->hash($fullpath);
-			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			if (!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
 				Prado::trace("Publishing directory $fullpath", 'Prado\Web\TAssetManager');
-				$this->copyDirectory($fullpath, $this->_basePath . DIRECTORY_SEPARATOR . $dir);
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$path] = $this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -214,10 +214,10 @@ 
 	public function getPublishedPath($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+		if (is_file($path))
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
 		else
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
 	}
 
 	/**
@@ -230,10 +230,10 @@ 
 	public function getPublishedUrl($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
+		if (is_file($path))
+			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
 		else
-			return $this->_baseUrl . '/' . $this->hash($path);
+			return $this->_baseUrl.'/'.$this->hash($path);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x', crc32($dir . Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -256,13 +256,13 @@ 
 	 */
 	protected function copyFile($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		$dstFile = $dst . DIRECTORY_SEPARATOR . basename($src);
-		if(@filemtime($dstFile) < @filemtime($src))
+		$dstFile = $dst.DIRECTORY_SEPARATOR.basename($src);
+		if (@filemtime($dstFile) < @filemtime($src))
 		{
 			Prado::trace("Publishing file $src to $dstFile", 'Prado\Web\TAssetManager');
 			@copy($src, $dstFile);
@@ -279,27 +279,27 @@ 
 	 */
 	public function copyDirectory($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		if($folder = @opendir($src))
+		if ($folder = @opendir($src))
 		{
-			while($file = @readdir($folder))
+			while ($file = @readdir($folder))
 			{
-				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
+				if ($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
 					continue;
-				elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
+				elseif (is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
+					if (@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
-						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
+						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -320,24 +320,24 @@ 
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$md5sum]))
+		if (isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
-		elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
+		elseif (($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
 			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dst = $this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if (!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
-				if(@filemtime($dst . DIRECTORY_SEPARATOR . $fileName) < @filemtime($fullpath))
+				if (@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
 					$this->copyFile($fullpath, $dst);
 					$this->deployTarFile($tarfile, $dst);
 				}
 			}
-			return $this->_published[$md5sum] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$md5sum] = $this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -350,7 +350,7 @@ 
 	 */
 	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath = realpath($path)) === false || !is_file($fullpath))
+		if (($fullpath = realpath($path)) === false || !is_file($fullpath))
 			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{

Braces +52 added lines, -45 removed lines

@@ -89,12 +89,15 @@ 
 	public function init($config)
 	{
 		$application = $this->getApplication();
-		if($this->_basePath === null)
-			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
-		if($this->_baseUrl === null)
-			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		if($this->_basePath === null) {
+					$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+		}
+		if(!is_writable($this->_basePath) || !is_dir($this->_basePath)) {
+					throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
+		}
+		if($this->_baseUrl === null) {
+					$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		}
 		$application->setAssetManager($this);
 		$this->_initialized = true;
 	}
@@ -115,13 +118,14 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
+			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath)) {
+							throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
+			}
 		}
 	}
 
@@ -139,10 +143,11 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
-		else
-			$this->_baseUrl = rtrim($value, '/');
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
+		} else {
+					$this->_baseUrl = rtrim($value, '/');
+		}
 	}
 
 	/**
@@ -161,20 +166,20 @@ 
 	 */
 	public function publishFilePath($path, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$path]))
-			return $this->_published[$path];
-		elseif(empty($path) || ($fullpath = realpath($path)) === false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
-		elseif(is_file($fullpath))
+		if(isset($this->_published[$path])) {
+					return $this->_published[$path];
+		} elseif(empty($path) || ($fullpath = realpath($path)) === false) {
+					throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
+		} elseif(is_file($fullpath))
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
 			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
-				$this->copyFile($fullpath, $dst);
+			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance) {
+							$this->copyFile($fullpath, $dst);
+			}
 			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
-		}
-		else
+		} else
 		{
 			$dir = $this->hash($fullpath);
 			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -214,10 +219,11 @@ 
 	public function getPublishedPath($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
-		else
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+		if(is_file($path)) {
+					return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+		} else {
+					return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+		}
 	}
 
 	/**
@@ -230,10 +236,11 @@ 
 	public function getPublishedUrl($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
-		else
-			return $this->_baseUrl . '/' . $this->hash($path);
+		if(is_file($path)) {
+					return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
+		} else {
+					return $this->_baseUrl . '/' . $this->hash($path);
+		}
 	}
 
 	/**
@@ -288,18 +295,18 @@ 
 		{
 			while($file = @readdir($folder))
 			{
-				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
-					continue;
-				elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
+				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git') {
+									continue;
+				} elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
 				{
 					if(@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
 					{
 						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
+				} else {
+									$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 				}
-				else
-					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);
 		} else {
@@ -320,11 +327,11 @@ 
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$md5sum]))
-			return $this->_published[$md5sum];
-		elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
-		else
+		if(isset($this->_published[$md5sum])) {
+					return $this->_published[$md5sum];
+		} elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath)) {
+					throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
+		} else
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
@@ -350,9 +357,9 @@ 
 	 */
 	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath = realpath($path)) === false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid', $path);
-		else
+		if(($fullpath = realpath($path)) === false || !is_file($fullpath)) {
+					throw new TIOException('assetmanager_tarfile_invalid', $path);
+		} else
 		{
 			$tar = new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);

framework/Caching/TEtcdCache.php

Spacing +5 added lines, -5 removed lines

@@ -139,7 +139,7 @@ 
 	 */
 	protected function getValue($key)
 	{
-		$result = $this->request('GET', $this->_dir . '/' . $key);
+		$result = $this->request('GET', $this->_dir.'/'.$key);
 	return property_exists($result, 'errorCode') ? false : unserialize($result->node->value);
 	}
 
@@ -156,7 +156,7 @@ 
 	{
 	$value = ['value' => serialize($value)];
 	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+		$result = $this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -173,7 +173,7 @@ 
 	{
 	$value = ['value' => serialize($value), 'prevExist' => 'false'];
 	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+		$result = $this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -185,7 +185,7 @@ 
 	 */
 	protected function deleteValue($key)
 	{
-		$this->request('DELETE', $this->_dir . '/' . $key);
+		$this->request('DELETE', $this->_dir.'/'.$key);
 	return true;
 	}
 
@@ -195,7 +195,7 @@ 
 	 */
 	public function flush()
 	{
-	 $this->request('DELETE', $this->_dir . '?recursive=true');
+	 $this->request('DELETE', $this->_dir.'?recursive=true');
 	}
   
   /**

Braces +9 added lines, -3 removed lines

@@ -79,7 +79,9 @@ 
     */
 	public function init($config)
 	{
-		if (!function_exists('curl_version')) throw new TConfigurationException('curl_extension_required');
+		if (!function_exists('curl_version')) {
+			throw new TConfigurationException('curl_extension_required');
+		}
 		parent::init($config);
 	}
   
@@ -155,7 +157,9 @@ 
 	protected function setValue($key, $value, $expire)
 	{
 	$value = ['value' => serialize($value)];
-	if ($expire > 0) $value['ttl'] = $expire;
+	if ($expire > 0) {
+		$value['ttl'] = $expire;
+	}
 		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
 	return !property_exists($result, 'errorCode');
 	}
@@ -172,7 +176,9 @@ 
 	protected function addValue($key, $value, $expire)
 	{
 	$value = ['value' => serialize($value), 'prevExist' => 'false'];
-	if ($expire > 0) $value['ttl'] = $expire;
+	if ($expire > 0) {
+		$value['ttl'] = $expire;
+	}
 		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
 	return !property_exists($result, 'errorCode');
 	}

framework/Caching/TRedisCache.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
    */
   public function setSocket($value)
   {
-	if($this->_initialized)
+	if ($this->_initialized)
 	  throw new TInvalidOperationException('rediscache_socket_unchangeable');
 	else
 	  $this->_socket = TPropertyValue::ensureString($value);

Braces +31 added lines, -24 removed lines

@@ -113,8 +113,9 @@ 
    */
   public function __destruct()
   {
-	if ($this->_cache instanceof \Redis)
-	  $this->_cache->close();
+	if ($this->_cache instanceof \Redis) {
+		  $this->_cache->close();
+	}
   }
 
   /**
@@ -126,13 +127,15 @@ 
    */
   public function init($config)
   {
-	if (!extension_loaded('redis') || !class_exists('\Redis', false))
-	  throw new TConfigurationException('rediscache_extension_required');
+	if (!extension_loaded('redis') || !class_exists('\Redis', false)) {
+		  throw new TConfigurationException('rediscache_extension_required');
+	}
 	$this->_cache = new \Redis();
-	if ($this->_socket !== null)
-	  $this->_cache->connect($this->_socket);
-	else
-	  $this->_cache->connect($this->_host, $this->_port);
+	if ($this->_socket !== null) {
+		  $this->_cache->connect($this->_socket);
+	} else {
+		  $this->_cache->connect($this->_host, $this->_port);
+	}
 	$this->_cache->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP);
 	$this->_cache->select($this->_index);
 	parent::init($config);
@@ -157,10 +160,11 @@ 
    */
   public function setHost($value)
   {
-	if ($this->_initialized)
-	  throw new TInvalidOperationException('rediscache_host_unchangeable');
-	else
-	  $this->_host = $value;
+	if ($this->_initialized) {
+		  throw new TInvalidOperationException('rediscache_host_unchangeable');
+	} else {
+		  $this->_host = $value;
+	}
   }
 
   /**
@@ -177,10 +181,11 @@ 
    */
   public function setPort($value)
   {
-	if ($this->_initialized)
-	  throw new TInvalidOperationException('rediscache_port_unchangeable');
-	else
-	  $this->_port = TPropertyValue::ensureInteger($value);
+	if ($this->_initialized) {
+		  throw new TInvalidOperationException('rediscache_port_unchangeable');
+	} else {
+		  $this->_port = TPropertyValue::ensureInteger($value);
+	}
   }
 
   /**
@@ -197,10 +202,11 @@ 
    */
   public function setSocket($value)
   {
-	if($this->_initialized)
-	  throw new TInvalidOperationException('rediscache_socket_unchangeable');
-	else
-	  $this->_socket = TPropertyValue::ensureString($value);
+	if($this->_initialized) {
+		  throw new TInvalidOperationException('rediscache_socket_unchangeable');
+	} else {
+		  $this->_socket = TPropertyValue::ensureString($value);
+	}
   }
 
   /**
@@ -217,10 +223,11 @@ 
    */
   public function setIndex($value)
   {
-	if ($this->_initialized)
-	  throw new TInvalidOperationException('rediscache_index_unchangeable');
-	else
-	  $this->_index = TPropertyValue::ensureInteger($value);
+	if ($this->_initialized) {
+		  throw new TInvalidOperationException('rediscache_index_unchangeable');
+	} else {
+		  $this->_index = TPropertyValue::ensureInteger($value);
+	}
   }
 
   /**

framework/Caching/TEACache.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
     */
 	public function init($config)
 	{
-		if(!function_exists('eaccelerator_get'))
+		if (!function_exists('eaccelerator_get'))
 			throw new TConfigurationException('eacceleratorcache_extension_required');
 		parent::init($config);
 	}
@@ -122,7 +122,7 @@ 
 		eaccelerator_gc();
 		// now, remove leftover cache-keys
 		$keys = eaccelerator_list_keys();
-		foreach($keys as $key)
+		foreach ($keys as $key)
 			$this->deleteValue(substr($key['name'], 1));
 		return true;
 	}

Braces +6 added lines, -4 removed lines

@@ -56,8 +56,9 @@ 
     */
 	public function init($config)
 	{
-		if(!function_exists('eaccelerator_get'))
-			throw new TConfigurationException('eacceleratorcache_extension_required');
+		if(!function_exists('eaccelerator_get')) {
+					throw new TConfigurationException('eacceleratorcache_extension_required');
+		}
 		parent::init($config);
 	}
 
@@ -122,8 +123,9 @@ 
 		eaccelerator_gc();
 		// now, remove leftover cache-keys
 		$keys = eaccelerator_list_keys();
-		foreach($keys as $key)
-			$this->deleteValue(substr($key['name'], 1));
+		foreach($keys as $key) {
+					$this->deleteValue(substr($key['name'], 1));
+		}
 		return true;
 	}
 }

framework/Caching/TMemCache.php

Spacing +26 added lines, -26 removed lines

@@ -137,7 +137,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_cache !== null && !$this->_useMemcached)
+		if ($this->_cache !== null && !$this->_useMemcached)
 			$this->_cache->close();
 	}
 
@@ -152,30 +152,30 @@ 
 	 */
 	public function init($config)
 	{
-		if(!extension_loaded('memcache') && !$this->_useMemcached)
+		if (!extension_loaded('memcache') && !$this->_useMemcached)
 			throw new TConfigurationException('memcache_extension_required');
-		if(!extension_loaded('memcached') && $this->_useMemcached)
+		if (!extension_loaded('memcached') && $this->_useMemcached)
 			throw new TConfigurationException('memcached_extension_required');
 		
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
-		if(count($this->_servers))
+		if (count($this->_servers))
 		{
-			foreach($this->_servers as $server)
+			foreach ($this->_servers as $server)
 			{
-				Prado::trace('Adding server ' . $server['Host'] . ' from serverlist', '\Prado\Caching\TMemCache');
-				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', '\Prado\Caching\TMemCache');
+				if ($this->_cache->addServer($server['Host'], $server['Port'], $server['Persistent'],
 					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
 					throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
 			}
 		}
 		else
 		{
-			Prado::trace('Adding server ' . $this->_host, '\Prado\Caching\TMemCache');
-			if($this->_cache->addServer($this->_host, $this->_port) === false)
+			Prado::trace('Adding server '.$this->_host, '\Prado\Caching\TMemCache');
+			if ($this->_cache->addServer($this->_host, $this->_port) === false)
 				throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
 		}
-		if($this->_threshold !== 0)
+		if ($this->_threshold !== 0)
 			$this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
 		$this->_initialized = true;
 		parent::init($config);
@@ -188,29 +188,29 @@ 
 	 */
 	private function loadConfig($xml)
 	{
-		if($xml instanceof TXmlElement)
+		if ($xml instanceof TXmlElement)
 		{
-			foreach($xml->getElementsByTagName('server') as $serverConfig)
+			foreach ($xml->getElementsByTagName('server') as $serverConfig)
 			{
 				$properties = $serverConfig->getAttributes();
-				if(($host = $properties->remove('Host')) === null)
+				if (($host = $properties->remove('Host')) === null)
 					throw new TConfigurationException('memcache_serverhost_required');
-				if(($port = $properties->remove('Port')) === null)
+				if (($port = $properties->remove('Port')) === null)
 					throw new TConfigurationException('memcache_serverport_required');
-				if(!is_numeric($port))
+				if (!is_numeric($port))
 					throw new TConfigurationException('memcache_serverport_invalid');
-				$server = ['Host' => $host,'Port' => $port,'Weight' => 1,'Timeout' => 1800,'RetryInterval' => 15,'Persistent' => true];
+				$server = ['Host' => $host, 'Port' => $port, 'Weight' => 1, 'Timeout' => 1800, 'RetryInterval' => 15, 'Persistent' => true];
 				$checks = [
 					'Weight' => 'memcache_serverweight_invalid',
 					'Timeout' => 'memcache_servertimeout_invalid',
 					'RetryInterval' => 'memcach_serverretryinterval_invalid'
 				];
-				foreach($checks as $property => $exception)
+				foreach ($checks as $property => $exception)
 				{
 					$value = $properties->remove($property);
-					if($value !== null && is_numeric($value))
+					if ($value !== null && is_numeric($value))
 						$server[$property] = $value;
-					elseif($value !== null)
+					elseif ($value !== null)
 						throw new TConfigurationException($exception);
 				}
 				$server['Persistent'] = TPropertyValue::ensureBoolean($properties->remove('Persistent'));
@@ -233,7 +233,7 @@ 
 	 */
 	public function setHost($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('memcache_host_unchangeable');
 		else
 			$this->_host = $value;
@@ -253,7 +253,7 @@ 
 	 */
 	public function setPort($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('memcache_port_unchangeable');
 		else
 			$this->_port = TPropertyValue::ensureInteger($value);
@@ -273,7 +273,7 @@ 
 	 */
 	public function setUseMemcached($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('memcache_host_unchangeable');
 		else
 			$this->_useMemcached = $value;
@@ -293,7 +293,7 @@ 
 	 */
 	public function setThreshold($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('memcache_threshold_unchangeable');
 		else
 			$this->_threshold = TPropertyValue::ensureInteger($value);
@@ -313,7 +313,7 @@ 
 	 */
 	public function setMinSavings($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('memcache_min_savings_unchangeable');
 		else
 			$this->_minSavings = TPropertyValue::ensureFloat($value);
@@ -341,7 +341,7 @@ 
 	 */
 	protected function setValue($key, $value, $expire)
 	{
-		if($this->_useMemcached) {
+		if ($this->_useMemcached) {
 			return $this->_cache->set($key, $value, $expire);
 		} else {
 			return $this->_cache->set($key, $value, 0, $expire);
@@ -359,7 +359,7 @@ 
 	 */
 	protected function addValue($key, $value, $expire)
 	{
-		if($this->_useMemcached) {
+		if ($this->_useMemcached) {
 			$this->_cache->add($key, $value, $expire);
 		} else {
 			return $this->_cache->add($key, $value, 0, $expire);

Braces +58 added lines, -44 removed lines

@@ -137,8 +137,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_cache !== null && !$this->_useMemcached)
-			$this->_cache->close();
+		if($this->_cache !== null && !$this->_useMemcached) {
+					$this->_cache->close();
+		}
 	}
 
 	/**
@@ -152,10 +153,12 @@ 
 	 */
 	public function init($config)
 	{
-		if(!extension_loaded('memcache') && !$this->_useMemcached)
-			throw new TConfigurationException('memcache_extension_required');
-		if(!extension_loaded('memcached') && $this->_useMemcached)
-			throw new TConfigurationException('memcached_extension_required');
+		if(!extension_loaded('memcache') && !$this->_useMemcached) {
+					throw new TConfigurationException('memcache_extension_required');
+		}
+		if(!extension_loaded('memcached') && $this->_useMemcached) {
+					throw new TConfigurationException('memcached_extension_required');
+		}
 		
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
@@ -165,18 +168,20 @@ 
 			{
 				Prado::trace('Adding server ' . $server['Host'] . ' from serverlist', '\Prado\Caching\TMemCache');
 				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
-					throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
+					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false) {
+									throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
+				}
 			}
-		}
-		else
+		} else
 		{
 			Prado::trace('Adding server ' . $this->_host, '\Prado\Caching\TMemCache');
-			if($this->_cache->addServer($this->_host, $this->_port) === false)
-				throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
+			if($this->_cache->addServer($this->_host, $this->_port) === false) {
+							throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
+			}
+		}
+		if($this->_threshold !== 0) {
+					$this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
 		}
-		if($this->_threshold !== 0)
-			$this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
 		$this->_initialized = true;
 		parent::init($config);
 	}
@@ -193,12 +198,15 @@ 
 			foreach($xml->getElementsByTagName('server') as $serverConfig)
 			{
 				$properties = $serverConfig->getAttributes();
-				if(($host = $properties->remove('Host')) === null)
-					throw new TConfigurationException('memcache_serverhost_required');
-				if(($port = $properties->remove('Port')) === null)
-					throw new TConfigurationException('memcache_serverport_required');
-				if(!is_numeric($port))
-					throw new TConfigurationException('memcache_serverport_invalid');
+				if(($host = $properties->remove('Host')) === null) {
+									throw new TConfigurationException('memcache_serverhost_required');
+				}
+				if(($port = $properties->remove('Port')) === null) {
+									throw new TConfigurationException('memcache_serverport_required');
+				}
+				if(!is_numeric($port)) {
+									throw new TConfigurationException('memcache_serverport_invalid');
+				}
 				$server = ['Host' => $host,'Port' => $port,'Weight' => 1,'Timeout' => 1800,'RetryInterval' => 15,'Persistent' => true];
 				$checks = [
 					'Weight' => 'memcache_serverweight_invalid',
@@ -208,10 +216,11 @@ 
 				foreach($checks as $property => $exception)
 				{
 					$value = $properties->remove($property);
-					if($value !== null && is_numeric($value))
-						$server[$property] = $value;
-					elseif($value !== null)
-						throw new TConfigurationException($exception);
+					if($value !== null && is_numeric($value)) {
+											$server[$property] = $value;
+					} elseif($value !== null) {
+											throw new TConfigurationException($exception);
+					}
 				}
 				$server['Persistent'] = TPropertyValue::ensureBoolean($properties->remove('Persistent'));
 				$this->_servers[] = $server;
@@ -233,10 +242,11 @@ 
 	 */
 	public function setHost($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('memcache_host_unchangeable');
-		else
-			$this->_host = $value;
+		if($this->_initialized) {
+					throw new TInvalidOperationException('memcache_host_unchangeable');
+		} else {
+					$this->_host = $value;
+		}
 	}
 
 	/**
@@ -253,10 +263,11 @@ 
 	 */
 	public function setPort($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('memcache_port_unchangeable');
-		else
-			$this->_port = TPropertyValue::ensureInteger($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('memcache_port_unchangeable');
+		} else {
+					$this->_port = TPropertyValue::ensureInteger($value);
+		}
 	}
 	
 	/**
@@ -273,10 +284,11 @@ 
 	 */
 	public function setUseMemcached($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('memcache_host_unchangeable');
-		else
-			$this->_useMemcached = $value;
+		if($this->_initialized) {
+					throw new TInvalidOperationException('memcache_host_unchangeable');
+		} else {
+					$this->_useMemcached = $value;
+		}
 	}
 	
 	/**
@@ -293,10 +305,11 @@ 
 	 */
 	public function setThreshold($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('memcache_threshold_unchangeable');
-		else
-			$this->_threshold = TPropertyValue::ensureInteger($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('memcache_threshold_unchangeable');
+		} else {
+					$this->_threshold = TPropertyValue::ensureInteger($value);
+		}
 	}
 
 	/**
@@ -313,10 +326,11 @@ 
 	 */
 	public function setMinSavings($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('memcache_min_savings_unchangeable');
-		else
-			$this->_minSavings = TPropertyValue::ensureFloat($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('memcache_min_savings_unchangeable');
+		} else {
+					$this->_minSavings = TPropertyValue::ensureFloat($value);
+		}
 	}
 
 	/**

framework/Caching/TChainedCacheDependency.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	public function getDependencies()
 	{
-		if($this->_dependencies === null)
+		if ($this->_dependencies === null)
 			$this->_dependencies = new TCacheDependencyList;
 		return $this->_dependencies;
 	}
@@ -49,10 +49,10 @@ 
 	 */
 	public function getHasChanged()
 	{
-		if($this->_dependencies !== null)
+		if ($this->_dependencies !== null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach ($this->_dependencies as $dependency)
+				if ($dependency->getHasChanged())
 					return true;
 		}
 		return false;

Braces +6 added lines, -4 removed lines

@@ -36,8 +36,9 @@ 
 	 */
 	public function getDependencies()
 	{
-		if($this->_dependencies === null)
-			$this->_dependencies = new TCacheDependencyList;
+		if($this->_dependencies === null) {
+					$this->_dependencies = new TCacheDependencyList;
+		}
 		return $this->_dependencies;
 	}
 
@@ -51,9 +52,10 @@ 
 	{
 		if($this->_dependencies !== null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach($this->_dependencies as $dependency) {
+							if($dependency->getHasChanged())
 					return true;
+			}
 		}
 		return false;
 	}