pradosoft / prado

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

framework/Caching/TXCache.php

Spacing +6 added lines, -6 removed lines

@@ -53,13 +53,13 @@ 
     */
 	public function init($config)
 	{
-		if(!function_exists('xcache_isset'))
+		if (!function_exists('xcache_isset'))
 			throw new TConfigurationException('xcache_extension_required');
 
-		$enabled = (int)ini_get('xcache.cacher') !== 0;
-		$var_size = (int)ini_get('xcache.var_size');
+		$enabled = (int) ini_get('xcache.cacher') !== 0;
+		$var_size = (int) ini_get('xcache.var_size');
 
-		if(!($enabled && $var_size > 0))
+		if (!($enabled && $var_size > 0))
 			throw new TConfigurationException('xcache_extension_not_enabled');
 
 		parent::init($config);
@@ -121,9 +121,9 @@ 
 	 */
 	public function flush()
 	{
-		for($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
+		for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
 		{
-			if(xcache_clear_cache(XC_TYPE_VAR, $i) === false)
+			if (xcache_clear_cache(XC_TYPE_VAR, $i) === false)
 				return false;
 		}
 		return true;

Braces +9 added lines, -6 removed lines

@@ -53,14 +53,16 @@ 
     */
 	public function init($config)
 	{
-		if(!function_exists('xcache_isset'))
-			throw new TConfigurationException('xcache_extension_required');
+		if(!function_exists('xcache_isset')) {
+					throw new TConfigurationException('xcache_extension_required');
+		}
 
 		$enabled = (int)ini_get('xcache.cacher') !== 0;
 		$var_size = (int)ini_get('xcache.var_size');
 
-		if(!($enabled && $var_size > 0))
-			throw new TConfigurationException('xcache_extension_not_enabled');
+		if(!($enabled && $var_size > 0)) {
+					throw new TConfigurationException('xcache_extension_not_enabled');
+		}
 
 		parent::init($config);
 	}
@@ -123,8 +125,9 @@ 
 	{
 		for($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++)
 		{
-			if(xcache_clear_cache(XC_TYPE_VAR, $i) === false)
-				return false;
+			if(xcache_clear_cache(XC_TYPE_VAR, $i) === false) {
+							return false;
+			}
 		}
 		return true;
 	}

framework/Caching/TCache.php

Spacing +11 added lines, -11 removed lines

@@ -61,11 +61,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_prefix === null)
+		if ($this->_prefix === null)
 			$this->_prefix = $this->getApplication()->getUniqueID();
-		if($this->_primary)
+		if ($this->_primary)
 		{
-			if($this->getApplication()->getCache() === null)
+			if ($this->getApplication()->getCache() === null)
 				$this->getApplication()->setCache($this);
 			else
 				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
@@ -114,7 +114,7 @@ 
 	 */
 	protected function generateUniqueKey($key)
 	{
-		return md5($this->_prefix . $key);
+		return md5($this->_prefix.$key);
 	}
 
 	/**
@@ -124,11 +124,11 @@ 
 	 */
 	public function get($id)
 	{
-		if(($data = $this->getValue($this->generateUniqueKey($id))) !== false)
+		if (($data = $this->getValue($this->generateUniqueKey($id))) !== false)
 		{
-			if(!is_array($data))
+			if (!is_array($data))
 				return false;
-			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
+			if (!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
 				return $data[0];
 		}
 		return false;
@@ -148,11 +148,11 @@ 
 	 */
 	public function set($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
+		if (empty($value) && $expire === 0)
 			$this->delete($id);
 		else
 		{
-			$data = [$value,$dependency];
+			$data = [$value, $dependency];
 			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
@@ -168,9 +168,9 @@ 
 	 */
 	public function add($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
+		if (empty($value) && $expire === 0)
 			return false;
-		$data = [$value,$dependency];
+		$data = [$value, $dependency];
 		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 

Braces +20 added lines, -15 removed lines

@@ -61,14 +61,16 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_prefix === null)
-			$this->_prefix = $this->getApplication()->getUniqueID();
+		if($this->_prefix === null) {
+					$this->_prefix = $this->getApplication()->getUniqueID();
+		}
 		if($this->_primary)
 		{
-			if($this->getApplication()->getCache() === null)
-				$this->getApplication()->setCache($this);
-			else
-				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
+			if($this->getApplication()->getCache() === null) {
+							$this->getApplication()->setCache($this);
+			} else {
+							throw new TConfigurationException('cache_primary_duplicated', get_class($this));
+			}
 		}
 	}
 
@@ -126,10 +128,12 @@ 
 	{
 		if(($data = $this->getValue($this->generateUniqueKey($id))) !== false)
 		{
-			if(!is_array($data))
-				return false;
-			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
-				return $data[0];
+			if(!is_array($data)) {
+							return false;
+			}
+			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged()) {
+							return $data[0];
+			}
 		}
 		return false;
 	}
@@ -148,9 +152,9 @@ 
 	 */
 	public function set($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
-			$this->delete($id);
-		else
+		if(empty($value) && $expire === 0) {
+					$this->delete($id);
+		} else
 		{
 			$data = [$value,$dependency];
 			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
@@ -168,8 +172,9 @@ 
 	 */
 	public function add($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
-			return false;
+		if(empty($value) && $expire === 0) {
+					return false;
+		}
 		$data = [$value,$dependency];
 		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}

framework/Caching/TDbCache.php

Spacing +41 added lines, -41 removed lines

@@ -130,7 +130,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_db !== null)
+		if ($this->_db !== null)
 			$this->_db->setActive(false);
 	}
 
@@ -185,46 +185,46 @@ 
 	 */
 	protected function initializeCache($force = false)
 	{
-		if($this->_cacheInitialized && !$force) return;
+		if ($this->_cacheInitialized && !$force) return;
 		$db = $this->getDbConnection();
 		try
 		{
-			$key = 'TDbCache:' . $this->_cacheTable . ':created';
-			if($force)
+			$key = 'TDbCache:'.$this->_cacheTable.':created';
+			if ($force)
 				$this -> _createCheck = false;
 			else
 				$this -> _createCheck = $this -> getApplication() -> getGlobalState($key, 0);
 
-			if($this->_autoCreate && !$this -> _createCheck) {
+			if ($this->_autoCreate && !$this -> _createCheck) {
 
-				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ') . $this -> id . ', ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
+				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ').$this -> id.', '.$this->_cacheTable, '\Prado\Caching\TDbCache');
 
-				$sql = 'SELECT 1 FROM ' . $this->_cacheTable . ' WHERE 0=1';
+				$sql = 'SELECT 1 FROM '.$this->_cacheTable.' WHERE 0=1';
 				$db->createCommand($sql)->queryScalar();
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			// DB table not exists
-			if($this->_autoCreate)
+			if ($this->_autoCreate)
 			{
-				Prado::trace('Autocreate: ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
+				Prado::trace('Autocreate: '.$this->_cacheTable, '\Prado\Caching\TDbCache');
 
 				$driver = $db->getDriverName();
-				if($driver === 'mysql')
+				if ($driver === 'mysql')
 					$blob = 'LONGBLOB';
-				elseif($driver === 'pgsql')
+				elseif ($driver === 'pgsql')
 					$blob = 'BYTEA';
 				else
 					$blob = 'BLOB';
 
-				$sql = 'CREATE TABLE ' . $this->_cacheTable . " (itemkey CHAR(128) PRIMARY KEY, value $blob, expire INTEGER)";
+				$sql = 'CREATE TABLE '.$this->_cacheTable." (itemkey CHAR(128) PRIMARY KEY, value $blob, expire INTEGER)";
 				$db->createCommand($sql)->execute();
 
-				$sql = 'CREATE INDEX IX_expire ON ' . $this->_cacheTable . ' (expire)';
+				$sql = 'CREATE INDEX IX_expire ON '.$this->_cacheTable.' (expire)';
 				$db->createCommand($sql)->execute();
 
 				$this -> _createCheck = true;
@@ -245,17 +245,17 @@ 
 	public function flushCacheExpired($force = false)
 	{
 		$interval = $this -> getFlushInterval();
-		if(!$force && $interval === 0) return;
+		if (!$force && $interval === 0) return;
 
-		$key = 'TDbCache:' . $this->_cacheTable . ':flushed';
+		$key = 'TDbCache:'.$this->_cacheTable.':flushed';
 		$now = time();
-		$next = $interval + (integer)$this -> getApplication() -> getGlobalState($key, 0);
+		$next = $interval + (integer) $this -> getApplication() -> getGlobalState($key, 0);
 
-		if($force || $next <= $now)
+		if ($force || $next <= $now)
 		{
-			if(!$this->_cacheInitialized) $this->initializeCache();
-			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ') . $this -> id . ', ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
-			$sql = 'DELETE FROM ' . $this->_cacheTable . ' WHERE expire<>0 AND expire<' . $now;
+			if (!$this->_cacheInitialized) $this->initializeCache();
+			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ').$this -> id.', '.$this->_cacheTable, '\Prado\Caching\TDbCache');
+			$sql = 'DELETE FROM '.$this->_cacheTable.' WHERE expire<>0 AND expire<'.$now;
 			$this->getDbConnection()->createCommand($sql)->execute();
 			$this -> getApplication() -> setGlobalState($key, $now);
 		}
@@ -292,10 +292,10 @@ 
 	 */
 	protected function createDbConnection()
 	{
-		if($this->_connID !== '')
+		if ($this->_connID !== '')
 		{
 			$config = $this->getApplication()->getModule($this->_connID);
-			if($config instanceof TDataSourceConfig)
+			if ($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
@@ -303,19 +303,19 @@ 
 		else
 		{
 			$db = new TDbConnection;
-			if($this->_connectionString !== '')
+			if ($this->_connectionString !== '')
 			{
 				$db->setConnectionString($this->_connectionString);
-				if($this->_username !== '')
+				if ($this->_username !== '')
 					$db->setUsername($this->_username);
-				if($this->_password !== '')
+				if ($this->_password !== '')
 					$db->setPassword($this->_password);
 			}
 			else
 			{
 				// default to SQLite3 database
-				$dbFile = $this->getApplication()->getRuntimePath() . '/sqlite3.cache';
-				$db->setConnectionString('sqlite:' . $dbFile);
+				$dbFile = $this->getApplication()->getRuntimePath().'/sqlite3.cache';
+				$db->setConnectionString('sqlite:'.$dbFile);
 			}
 			return $db;
 		}
@@ -326,7 +326,7 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_db === null)
+		if ($this->_db === null)
 			$this->_db = $this->createDbConnection();
 
 		$this->_db->setActive(true);
@@ -463,13 +463,13 @@ 
 	 */
 	protected function getValue($key)
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if (!$this->_cacheInitialized) $this->initializeCache();
 		try {
-			$sql = 'SELECT value FROM ' . $this->_cacheTable . ' WHERE itemkey=\'' . $key . '\' AND (expire=0 OR expire>' . time() . ') ORDER BY expire DESC';
+			$sql = 'SELECT value FROM '.$this->_cacheTable.' WHERE itemkey=\''.$key.'\' AND (expire=0 OR expire>'.time().') ORDER BY expire DESC';
 			$command = $this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -502,8 +502,8 @@ 
 	 */
 	protected function addValue($key, $value, $expire)
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
-		$expire = ($expire <= 0)?0:time() + $expire;
+		if (!$this->_cacheInitialized) $this->initializeCache();
+		$expire = ($expire <= 0) ? 0 : time() + $expire;
 		$sql = "INSERT INTO {$this->_cacheTable} (itemkey,value,expire) VALUES(:key,:value,$expire)";
 		try
 		{
@@ -513,7 +513,7 @@ 
 			$command->execute();
 			return true;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			try
 			{
@@ -521,7 +521,7 @@ 
 				$command->execute();
 				return true;
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				return false;
 			}
@@ -536,7 +536,7 @@ 
 	 */
 	protected function deleteValue($key)
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if (!$this->_cacheInitialized) $this->initializeCache();
 		try
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable} WHERE itemkey=:key");
@@ -544,7 +544,7 @@ 
 			$command->execute();
 			return true;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -558,13 +558,13 @@ 
 	 */
 	public function flush()
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if (!$this->_cacheInitialized) $this->initializeCache();
 		try
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			try
 			{
@@ -572,7 +572,7 @@ 
 				$command->execute();
 				return true;
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				return false;
 			}

Braces +61 added lines, -49 removed lines

@@ -130,8 +130,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_db !== null)
-			$this->_db->setActive(false);
+		if($this->_db !== null) {
+					$this->_db->setActive(false);
+		}
 	}
 
 	/**
@@ -185,15 +186,18 @@ 
 	 */
 	protected function initializeCache($force = false)
 	{
-		if($this->_cacheInitialized && !$force) return;
+		if($this->_cacheInitialized && !$force) {
+			return;
+		}
 		$db = $this->getDbConnection();
 		try
 		{
 			$key = 'TDbCache:' . $this->_cacheTable . ':created';
-			if($force)
-				$this -> _createCheck = false;
-			else
-				$this -> _createCheck = $this -> getApplication() -> getGlobalState($key, 0);
+			if($force) {
+							$this -> _createCheck = false;
+			} else {
+							$this -> _createCheck = $this -> getApplication() -> getGlobalState($key, 0);
+			}
 
 			if($this->_autoCreate && !$this -> _createCheck) {
 
@@ -205,8 +209,7 @@ 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -214,12 +217,13 @@ 
 				Prado::trace('Autocreate: ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
 
 				$driver = $db->getDriverName();
-				if($driver === 'mysql')
-					$blob = 'LONGBLOB';
-				elseif($driver === 'pgsql')
-					$blob = 'BYTEA';
-				else
-					$blob = 'BLOB';
+				if($driver === 'mysql') {
+									$blob = 'LONGBLOB';
+				} elseif($driver === 'pgsql') {
+									$blob = 'BYTEA';
+				} else {
+									$blob = 'BLOB';
+				}
 
 				$sql = 'CREATE TABLE ' . $this->_cacheTable . " (itemkey CHAR(128) PRIMARY KEY, value $blob, expire INTEGER)";
 				$db->createCommand($sql)->execute();
@@ -229,9 +233,9 @@ 
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
+			} else {
+							throw new TConfigurationException('db_cachetable_inexistent', $this->_cacheTable);
 			}
-			else
-				throw new TConfigurationException('db_cachetable_inexistent', $this->_cacheTable);
 		}
 		$this->_cacheInitialized = true;
 	}
@@ -245,7 +249,9 @@ 
 	public function flushCacheExpired($force = false)
 	{
 		$interval = $this -> getFlushInterval();
-		if(!$force && $interval === 0) return;
+		if(!$force && $interval === 0) {
+			return;
+		}
 
 		$key = 'TDbCache:' . $this->_cacheTable . ':flushed';
 		$now = time();
@@ -253,7 +259,9 @@ 
 
 		if($force || $next <= $now)
 		{
-			if(!$this->_cacheInitialized) $this->initializeCache();
+			if(!$this->_cacheInitialized) {
+				$this->initializeCache();
+			}
 			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ') . $this -> id . ', ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
 			$sql = 'DELETE FROM ' . $this->_cacheTable . ' WHERE expire<>0 AND expire<' . $now;
 			$this->getDbConnection()->createCommand($sql)->execute();
@@ -295,23 +303,24 @@ 
 		if($this->_connID !== '')
 		{
 			$config = $this->getApplication()->getModule($this->_connID);
-			if($config instanceof TDataSourceConfig)
-				return $config->getDbConnection();
-			else
-				throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
-		}
-		else
+			if($config instanceof TDataSourceConfig) {
+							return $config->getDbConnection();
+			} else {
+							throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
+			}
+		} else
 		{
 			$db = new TDbConnection;
 			if($this->_connectionString !== '')
 			{
 				$db->setConnectionString($this->_connectionString);
-				if($this->_username !== '')
-					$db->setUsername($this->_username);
-				if($this->_password !== '')
-					$db->setPassword($this->_password);
-			}
-			else
+				if($this->_username !== '') {
+									$db->setUsername($this->_username);
+				}
+				if($this->_password !== '') {
+									$db->setPassword($this->_password);
+				}
+			} else
 			{
 				// default to SQLite3 database
 				$dbFile = $this->getApplication()->getRuntimePath() . '/sqlite3.cache';
@@ -326,8 +335,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_db === null)
-			$this->_db = $this->createDbConnection();
+		if($this->_db === null) {
+					$this->_db = $this->createDbConnection();
+		}
 
 		$this->_db->setActive(true);
 		return $this->_db;
@@ -463,13 +473,14 @@ 
 	 */
 	protected function getValue($key)
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if(!$this->_cacheInitialized) {
+			$this->initializeCache();
+		}
 		try {
 			$sql = 'SELECT value FROM ' . $this->_cacheTable . ' WHERE itemkey=\'' . $key . '\' AND (expire=0 OR expire>' . time() . ') ORDER BY expire DESC';
 			$command = $this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -502,7 +513,9 @@ 
 	 */
 	protected function addValue($key, $value, $expire)
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if(!$this->_cacheInitialized) {
+			$this->initializeCache();
+		}
 		$expire = ($expire <= 0)?0:time() + $expire;
 		$sql = "INSERT INTO {$this->_cacheTable} (itemkey,value,expire) VALUES(:key,:value,$expire)";
 		try
@@ -512,16 +525,14 @@ 
 			$command->bindValue(':value', serialize($value), \PDO::PARAM_LOB);
 			$command->execute();
 			return true;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 				return false;
 			}
@@ -536,15 +547,16 @@ 
 	 */
 	protected function deleteValue($key)
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if(!$this->_cacheInitialized) {
+			$this->initializeCache();
+		}
 		try
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable} WHERE itemkey=:key");
 			$command->bindValue(':key', $key, \PDO::PARAM_STR);
 			$command->execute();
 			return true;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -558,21 +570,21 @@ 
 	 */
 	public function flush()
 	{
-		if(!$this->_cacheInitialized) $this->initializeCache();
+		if(!$this->_cacheInitialized) {
+			$this->initializeCache();
+		}
 		try
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 				return false;
 			}

framework/Caching/TDirectoryCacheDependency.php

Spacing +8 added lines, -8 removed lines

@@ -63,7 +63,7 @@ 
 	 */
 	public function setDirectory($directory)
 	{
-		if(($path = realpath($directory)) === false || !is_dir($path))
+		if (($path = realpath($directory)) === false || !is_dir($path))
 			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
 		$this->_directory = $path;
 		$this->_timestamps = $this->generateTimestamps($path);
@@ -154,20 +154,20 @@ 
 	 */
 	protected function generateTimestamps($directory, $level = 0)
 	{
-		if(($dir = opendir($directory)) === false)
+		if (($dir = opendir($directory)) === false)
 			throw new TIOException('directorycachedependency_directory_invalid', $directory);
 		$timestamps = [];
-		while(($file = readdir($dir)) !== false)
+		while (($file = readdir($dir)) !== false)
 		{
-			$path = $directory . DIRECTORY_SEPARATOR . $file;
-			if($file === '.' || $file === '..')
+			$path = $directory.DIRECTORY_SEPARATOR.$file;
+			if ($file === '.' || $file === '..')
 				continue;
-			elseif(is_dir($path))
+			elseif (is_dir($path))
 			{
-				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
+				if (($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
 			}
-			elseif($this->validateFile($path))
+			elseif ($this->validateFile($path))
 				$timestamps[$path] = filemtime($path);
 		}
 		closedir($dir);

Braces +14 added lines, -11 removed lines

@@ -63,8 +63,9 @@ 
 	 */
 	public function setDirectory($directory)
 	{
-		if(($path = realpath($directory)) === false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
+		if(($path = realpath($directory)) === false || !is_dir($path)) {
+					throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
+		}
 		$this->_directory = $path;
 		$this->_timestamps = $this->generateTimestamps($path);
 	}
@@ -154,21 +155,23 @@ 
 	 */
 	protected function generateTimestamps($directory, $level = 0)
 	{
-		if(($dir = opendir($directory)) === false)
-			throw new TIOException('directorycachedependency_directory_invalid', $directory);
+		if(($dir = opendir($directory)) === false) {
+					throw new TIOException('directorycachedependency_directory_invalid', $directory);
+		}
 		$timestamps = [];
 		while(($file = readdir($dir)) !== false)
 		{
 			$path = $directory . DIRECTORY_SEPARATOR . $file;
-			if($file === '.' || $file === '..')
-				continue;
-			elseif(is_dir($path))
+			if($file === '.' || $file === '..') {
+							continue;
+			} elseif(is_dir($path))
 			{
-				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
+				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path)) {
+									$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
+				}
+			} elseif($this->validateFile($path)) {
+							$timestamps[$path] = filemtime($path);
 			}
-			elseif($this->validateFile($path))
-				$timestamps[$path] = filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;

framework/Util/TLogRouter.php

Spacing +18 added lines, -18 removed lines

@@ -64,11 +64,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_configFile !== null)
+		if ($this->_configFile !== null)
 		{
-			if(is_file($this->_configFile))
+			if (is_file($this->_configFile))
 			{
-				if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 				{
 					$phpConfig = include $this->_configFile;
 					$this->loadConfig($phpConfig);
@@ -84,7 +84,7 @@ 
 				throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
-		$this->getApplication()->attachEventHandler('OnEndRequest', [$this,'collectLogs']);
+		$this->getApplication()->attachEventHandler('OnEndRequest', [$this, 'collectLogs']);
 	}
 
 	/**
@@ -94,19 +94,19 @@ 
 	 */
 	private function loadConfig($config)
 	{
-		if(is_array($config))
+		if (is_array($config))
 		{
-			if(isset($config['routes']) && is_array($config['routes']))
+			if (isset($config['routes']) && is_array($config['routes']))
 			{
-				foreach($config['routes'] as $route)
+				foreach ($config['routes'] as $route)
 				{
-					$properties = isset($route['properties'])?$route['properties']:[];
-					if(!isset($route['class']))
+					$properties = isset($route['properties']) ? $route['properties'] : [];
+					if (!isset($route['class']))
 						throw new TConfigurationException('logrouter_routeclass_required');
 					$route = Prado::createComponent($route['class']);
-					if(!($route instanceof TLogRoute))
+					if (!($route instanceof TLogRoute))
 						throw new TConfigurationException('logrouter_routetype_invalid');
-					foreach($properties as $name => $value)
+					foreach ($properties as $name => $value)
 						$route->setSubproperty($name, $value);
 					$this->_routes[] = $route;
 					$route->init($route);
@@ -115,15 +115,15 @@ 
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('route') as $routeConfig)
+			foreach ($config->getElementsByTagName('route') as $routeConfig)
 			{
 				$properties = $routeConfig->getAttributes();
-				if(($class = $properties->remove('class')) === null)
+				if (($class = $properties->remove('class')) === null)
 					throw new TConfigurationException('logrouter_routeclass_required');
 				$route = Prado::createComponent($class);
-				if(!($route instanceof TLogRoute))
+				if (!($route instanceof TLogRoute))
 					throw new TConfigurationException('logrouter_routetype_invalid');
-				foreach($properties as $name => $value)
+				foreach ($properties as $name => $value)
 					$route->setSubproperty($name, $value);
 				$this->_routes[] = $route;
 				$route->init($routeConfig);
@@ -139,7 +139,7 @@ 
 	 */
 	public function addRoute($route)
 	{
-		if(!($route instanceof TLogRoute))
+		if (!($route instanceof TLogRoute))
 			throw new TInvalidDataTypeException('logrouter_routetype_invalid');
 		$this->_routes[] = $route;
 		$route->init(null);
@@ -160,7 +160,7 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
+		if (($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
 			throw new TConfigurationException('logrouter_configfile_invalid', $value);
 	}
 
@@ -172,7 +172,7 @@ 
 	public function collectLogs($param)
 	{
 		$logger = Prado::getLogger();
-		foreach($this->_routes as $route)
+		foreach ($this->_routes as $route)
 			$route->collectLogs($logger);
 	}
 }
\ No newline at end of file

Braces +31 added lines, -24 removed lines

@@ -72,16 +72,15 @@ 
 				{
 					$phpConfig = include $this->_configFile;
 					$this->loadConfig($phpConfig);
-				}
-				else
+				} else
 				{
 					$dom = new TXmlDocument;
 					$dom->loadFromFile($this->_configFile);
 					$this->loadConfig($dom);
 				}
+			} else {
+							throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 			}
-			else
-				throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
 		$this->getApplication()->attachEventHandler('OnEndRequest', [$this,'collectLogs']);
@@ -101,30 +100,35 @@ 
 				foreach($config['routes'] as $route)
 				{
 					$properties = isset($route['properties'])?$route['properties']:[];
-					if(!isset($route['class']))
-						throw new TConfigurationException('logrouter_routeclass_required');
+					if(!isset($route['class'])) {
+											throw new TConfigurationException('logrouter_routeclass_required');
+					}
 					$route = Prado::createComponent($route['class']);
-					if(!($route instanceof TLogRoute))
-						throw new TConfigurationException('logrouter_routetype_invalid');
-					foreach($properties as $name => $value)
-						$route->setSubproperty($name, $value);
+					if(!($route instanceof TLogRoute)) {
+											throw new TConfigurationException('logrouter_routetype_invalid');
+					}
+					foreach($properties as $name => $value) {
+											$route->setSubproperty($name, $value);
+					}
 					$this->_routes[] = $route;
 					$route->init($route);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('route') as $routeConfig)
 			{
 				$properties = $routeConfig->getAttributes();
-				if(($class = $properties->remove('class')) === null)
-					throw new TConfigurationException('logrouter_routeclass_required');
+				if(($class = $properties->remove('class')) === null) {
+									throw new TConfigurationException('logrouter_routeclass_required');
+				}
 				$route = Prado::createComponent($class);
-				if(!($route instanceof TLogRoute))
-					throw new TConfigurationException('logrouter_routetype_invalid');
-				foreach($properties as $name => $value)
-					$route->setSubproperty($name, $value);
+				if(!($route instanceof TLogRoute)) {
+									throw new TConfigurationException('logrouter_routetype_invalid');
+				}
+				foreach($properties as $name => $value) {
+									$route->setSubproperty($name, $value);
+				}
 				$this->_routes[] = $route;
 				$route->init($routeConfig);
 			}
@@ -139,8 +143,9 @@ 
 	 */
 	public function addRoute($route)
 	{
-		if(!($route instanceof TLogRoute))
-			throw new TInvalidDataTypeException('logrouter_routetype_invalid');
+		if(!($route instanceof TLogRoute)) {
+					throw new TInvalidDataTypeException('logrouter_routetype_invalid');
+		}
 		$this->_routes[] = $route;
 		$route->init(null);
 	}
@@ -160,8 +165,9 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
-			throw new TConfigurationException('logrouter_configfile_invalid', $value);
+		if(($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null) {
+					throw new TConfigurationException('logrouter_configfile_invalid', $value);
+		}
 	}
 
 	/**
@@ -172,7 +178,8 @@ 
 	public function collectLogs($param)
 	{
 		$logger = Prado::getLogger();
-		foreach($this->_routes as $route)
-			$route->collectLogs($logger);
+		foreach($this->_routes as $route) {
+					$route->collectLogs($logger);
+		}
 	}
 }
\ No newline at end of file

framework/Util/TEmailLogRoute.php

Spacing +8 added lines, -8 removed lines

@@ -68,9 +68,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_from === '')
+		if ($this->_from === '')
 			$this->_from = ini_get('sendmail_from');
-		if($this->_from === '')
+		if ($this->_from === '')
 			throw new TConfigurationException('emaillogroute_sentfrom_required');
 	}
 
@@ -81,11 +81,11 @@ 
 	protected function processLogs($logs)
 	{
 		$message = '';
-		foreach($logs as $log)
+		foreach ($logs as $log)
 			$message .= $this->formatLogMessage($log[0], $log[1], $log[2], $log[3]);
 		$message = wordwrap($message, 70);
 		$returnPath = ini_get('sendmail_path') ? "Return-Path:{$this->_from}\r\n" : '';
-		foreach($this->_emails as $email)
+		foreach ($this->_emails as $email)
 			mail($email, $this->getSubject(), $message, "From:{$this->_from}\r\n{$returnPath}");
 
 	}
@@ -104,15 +104,15 @@ 
 	 */
 	public function setEmails($emails)
 	{
-		if(is_array($emails))
+		if (is_array($emails))
 			$this->_emails = $emails;
 		else
 		{
 			$this->_emails = [];
-			foreach(explode(',', $emails) as $email)
+			foreach (explode(',', $emails) as $email)
 			{
 				$email = trim($email);
-				if(preg_match(self::EMAIL_PATTERN, $email))
+				if (preg_match(self::EMAIL_PATTERN, $email))
 					$this->_emails[] = $email;
 			}
 		}
@@ -123,7 +123,7 @@ 
 	 */
 	public function getSubject()
 	{
-		if($this->_subject === null)
+		if ($this->_subject === null)
 			$this->_subject = self::DEFAULT_SUBJECT;
 		return $this->_subject;
 	}

Braces +21 added lines, -15 removed lines

@@ -68,10 +68,12 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_from === '')
-			$this->_from = ini_get('sendmail_from');
-		if($this->_from === '')
-			throw new TConfigurationException('emaillogroute_sentfrom_required');
+		if($this->_from === '') {
+					$this->_from = ini_get('sendmail_from');
+		}
+		if($this->_from === '') {
+					throw new TConfigurationException('emaillogroute_sentfrom_required');
+		}
 	}
 
 	/**
@@ -81,12 +83,14 @@ 
 	protected function processLogs($logs)
 	{
 		$message = '';
-		foreach($logs as $log)
-			$message .= $this->formatLogMessage($log[0], $log[1], $log[2], $log[3]);
+		foreach($logs as $log) {
+					$message .= $this->formatLogMessage($log[0], $log[1], $log[2], $log[3]);
+		}
 		$message = wordwrap($message, 70);
 		$returnPath = ini_get('sendmail_path') ? "Return-Path:{$this->_from}\r\n" : '';
-		foreach($this->_emails as $email)
-			mail($email, $this->getSubject(), $message, "From:{$this->_from}\r\n{$returnPath}");
+		foreach($this->_emails as $email) {
+					mail($email, $this->getSubject(), $message, "From:{$this->_from}\r\n{$returnPath}");
+		}
 
 	}
 
@@ -104,16 +108,17 @@ 
 	 */
 	public function setEmails($emails)
 	{
-		if(is_array($emails))
-			$this->_emails = $emails;
-		else
+		if(is_array($emails)) {
+					$this->_emails = $emails;
+		} else
 		{
 			$this->_emails = [];
 			foreach(explode(',', $emails) as $email)
 			{
 				$email = trim($email);
-				if(preg_match(self::EMAIL_PATTERN, $email))
-					$this->_emails[] = $email;
+				if(preg_match(self::EMAIL_PATTERN, $email)) {
+									$this->_emails[] = $email;
+				}
 			}
 		}
 	}
@@ -123,8 +128,9 @@ 
 	 */
 	public function getSubject()
 	{
-		if($this->_subject === null)
-			$this->_subject = self::DEFAULT_SUBJECT;
+		if($this->_subject === null) {
+					$this->_subject = self::DEFAULT_SUBJECT;
+		}
 		return $this->_subject;
 	}
 

framework/Util/TLogRoute.php

Spacing +10 added lines, -10 removed lines

@@ -90,16 +90,16 @@ 
 	 */
 	public function setLevels($levels)
 	{
-		if(is_int($levels))
+		if (is_int($levels))
 			$this->_levels = $levels;
 		else
 		{
 			$this->_levels = null;
 			$levels = strtolower($levels);
-			foreach(explode(',', $levels) as $level)
+			foreach (explode(',', $levels) as $level)
 			{
 				$level = trim($level);
-				if(isset(self::$_levelValues[$level]))
+				if (isset(self::$_levelValues[$level]))
 					$this->_levels |= self::$_levelValues[$level];
 			}
 		}
@@ -119,14 +119,14 @@ 
 	 */
 	public function setCategories($categories)
 	{
-		if(is_array($categories))
+		if (is_array($categories))
 			$this->_categories = $categories;
 		else
 		{
 			$this->_categories = null;
-			foreach(explode(',', $categories) as $category)
+			foreach (explode(',', $categories) as $category)
 			{
-				if(($category = trim($category)) !== '')
+				if (($category = trim($category)) !== '')
 					$this->_categories[] = $category;
 			}
 		}
@@ -138,7 +138,7 @@ 
 	 */
 	protected function getLevelName($level)
 	{
-		return isset(self::$_levelNames[$level])?self::$_levelNames[$level]:'Unknown';
+		return isset(self::$_levelNames[$level]) ?self::$_levelNames[$level] : 'Unknown';
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	protected function getLevelValue($level)
 	{
-		return isset(self::$_levelValues[$level])?self::$_levelValues[$level]:0;
+		return isset(self::$_levelValues[$level]) ?self::$_levelValues[$level] : 0;
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	protected function formatLogMessage($message, $level, $category, $time)
 	{
-		return @date('M d H:i:s', $time) . ' [' . $this->getLevelName($level) . '] [' . $category . '] ' . $message . "\n";
+		return @date('M d H:i:s', $time).' ['.$this->getLevelName($level).'] ['.$category.'] '.$message."\n";
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	public function collectLogs(TLogger $logger)
 	{
 		$logs = $logger->getLogs($this->getLevels(), $this->getCategories());
-		if(!empty($logs))
+		if (!empty($logs))
 			$this->processLogs($logs);
 	}
 

Braces +15 added lines, -12 removed lines

@@ -90,17 +90,18 @@ 
 	 */
 	public function setLevels($levels)
 	{
-		if(is_int($levels))
-			$this->_levels = $levels;
-		else
+		if(is_int($levels)) {
+					$this->_levels = $levels;
+		} else
 		{
 			$this->_levels = null;
 			$levels = strtolower($levels);
 			foreach(explode(',', $levels) as $level)
 			{
 				$level = trim($level);
-				if(isset(self::$_levelValues[$level]))
-					$this->_levels |= self::$_levelValues[$level];
+				if(isset(self::$_levelValues[$level])) {
+									$this->_levels |= self::$_levelValues[$level];
+				}
 			}
 		}
 	}
@@ -119,15 +120,16 @@ 
 	 */
 	public function setCategories($categories)
 	{
-		if(is_array($categories))
-			$this->_categories = $categories;
-		else
+		if(is_array($categories)) {
+					$this->_categories = $categories;
+		} else
 		{
 			$this->_categories = null;
 			foreach(explode(',', $categories) as $category)
 			{
-				if(($category = trim($category)) !== '')
-					$this->_categories[] = $category;
+				if(($category = trim($category)) !== '') {
+									$this->_categories[] = $category;
+				}
 			}
 		}
 	}
@@ -170,8 +172,9 @@ 
 	public function collectLogs(TLogger $logger)
 	{
 		$logs = $logger->getLogs($this->getLevels(), $this->getCategories());
-		if(!empty($logs))
-			$this->processLogs($logs);
+		if(!empty($logs)) {
+					$this->processLogs($logs);
+		}
 	}
 
 	/**

framework/Util/TFileLogRoute.php

Spacing +15 added lines, -15 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function getLogPath()
 	{
-		if($this->_logPath === null)
+		if ($this->_logPath === null)
 			$this->_logPath = $this->getApplication()->getRuntimePath();
 		return $this->_logPath;
 	}
@@ -67,7 +67,7 @@ 
 	 */
 	public function setLogPath($value)
 	{
-		if(($this->_logPath = Prado::getPathOfNamespace($value)) === null || !is_dir($this->_logPath) || !is_writable($this->_logPath))
+		if (($this->_logPath = Prado::getPathOfNamespace($value)) === null || !is_dir($this->_logPath) || !is_writable($this->_logPath))
 			throw new TConfigurationException('filelogroute_logpath_invalid', $value);
 	}
 
@@ -102,7 +102,7 @@ 
 	public function setMaxFileSize($value)
 	{
 		$this->_maxFileSize = TPropertyValue::ensureInteger($value);
-		if($this->_maxFileSize <= 0)
+		if ($this->_maxFileSize <= 0)
 			throw new TInvalidDataValueException('filelogroute_maxfilesize_invalid');
 	}
 
@@ -120,7 +120,7 @@ 
 	public function setMaxLogFiles($value)
 	{
 		$this->_maxLogFiles = TPropertyValue::ensureInteger($value);
-		if($this->_maxLogFiles < 1)
+		if ($this->_maxLogFiles < 1)
 			throw new TInvalidDataValueException('filelogroute_maxlogfiles_invalid');
 	}
 
@@ -130,10 +130,10 @@ 
 	 */
 	protected function processLogs($logs)
 	{
-		$logFile = $this->getLogPath() . DIRECTORY_SEPARATOR . $this->getLogFile();
-		if(@filesize($logFile) > $this->_maxFileSize * 1024)
+		$logFile = $this->getLogPath().DIRECTORY_SEPARATOR.$this->getLogFile();
+		if (@filesize($logFile) > $this->_maxFileSize * 1024)
 			$this->rotateFiles();
-		foreach($logs as $log)
+		foreach ($logs as $log)
 			error_log($this->formatLogMessage($log[0], $log[1], $log[2], $log[3]), 3, $logFile);
 	}
 
@@ -142,19 +142,19 @@ 
 	 */
 	protected function rotateFiles()
 	{
-		$file = $this->getLogPath() . DIRECTORY_SEPARATOR . $this->getLogFile();
-		for($i = $this->_maxLogFiles;$i > 0;--$i)
+		$file = $this->getLogPath().DIRECTORY_SEPARATOR.$this->getLogFile();
+		for ($i = $this->_maxLogFiles; $i > 0; --$i)
 		{
-			$rotateFile = $file . '.' . $i;
-			if(is_file($rotateFile))
+			$rotateFile = $file.'.'.$i;
+			if (is_file($rotateFile))
 			{
-				if($i === $this->_maxLogFiles)
+				if ($i === $this->_maxLogFiles)
 					unlink($rotateFile);
 				else
-					rename($rotateFile, $file . '.' . ($i + 1));
+					rename($rotateFile, $file.'.'.($i + 1));
 			}
 		}
-		if(is_file($file))
-			rename($file, $file . '.1');
+		if (is_file($file))
+			rename($file, $file.'.1');
 	}
 }
\ No newline at end of file

Braces +26 added lines, -18 removed lines

@@ -56,8 +56,9 @@ 
 	 */
 	public function getLogPath()
 	{
-		if($this->_logPath === null)
-			$this->_logPath = $this->getApplication()->getRuntimePath();
+		if($this->_logPath === null) {
+					$this->_logPath = $this->getApplication()->getRuntimePath();
+		}
 		return $this->_logPath;
 	}
 
@@ -67,8 +68,9 @@ 
 	 */
 	public function setLogPath($value)
 	{
-		if(($this->_logPath = Prado::getPathOfNamespace($value)) === null || !is_dir($this->_logPath) || !is_writable($this->_logPath))
-			throw new TConfigurationException('filelogroute_logpath_invalid', $value);
+		if(($this->_logPath = Prado::getPathOfNamespace($value)) === null || !is_dir($this->_logPath) || !is_writable($this->_logPath)) {
+					throw new TConfigurationException('filelogroute_logpath_invalid', $value);
+		}
 	}
 
 	/**
@@ -102,8 +104,9 @@ 
 	public function setMaxFileSize($value)
 	{
 		$this->_maxFileSize = TPropertyValue::ensureInteger($value);
-		if($this->_maxFileSize <= 0)
-			throw new TInvalidDataValueException('filelogroute_maxfilesize_invalid');
+		if($this->_maxFileSize <= 0) {
+					throw new TInvalidDataValueException('filelogroute_maxfilesize_invalid');
+		}
 	}
 
 	/**
@@ -120,8 +123,9 @@ 
 	public function setMaxLogFiles($value)
 	{
 		$this->_maxLogFiles = TPropertyValue::ensureInteger($value);
-		if($this->_maxLogFiles < 1)
-			throw new TInvalidDataValueException('filelogroute_maxlogfiles_invalid');
+		if($this->_maxLogFiles < 1) {
+					throw new TInvalidDataValueException('filelogroute_maxlogfiles_invalid');
+		}
 	}
 
 	/**
@@ -131,10 +135,12 @@ 
 	protected function processLogs($logs)
 	{
 		$logFile = $this->getLogPath() . DIRECTORY_SEPARATOR . $this->getLogFile();
-		if(@filesize($logFile) > $this->_maxFileSize * 1024)
-			$this->rotateFiles();
-		foreach($logs as $log)
-			error_log($this->formatLogMessage($log[0], $log[1], $log[2], $log[3]), 3, $logFile);
+		if(@filesize($logFile) > $this->_maxFileSize * 1024) {
+					$this->rotateFiles();
+		}
+		foreach($logs as $log) {
+					error_log($this->formatLogMessage($log[0], $log[1], $log[2], $log[3]), 3, $logFile);
+		}
 	}
 
 	/**
@@ -148,13 +154,15 @@ 
 			$rotateFile = $file . '.' . $i;
 			if(is_file($rotateFile))
 			{
-				if($i === $this->_maxLogFiles)
-					unlink($rotateFile);
-				else
-					rename($rotateFile, $file . '.' . ($i + 1));
+				if($i === $this->_maxLogFiles) {
+									unlink($rotateFile);
+				} else {
+									rename($rotateFile, $file . '.' . ($i + 1));
+				}
 			}
 		}
-		if(is_file($file))
-			rename($file, $file . '.1');
+		if(is_file($file)) {
+					rename($file, $file . '.1');
+		}
 	}
 }
\ No newline at end of file