pradosoft / prado

framework/Caching/TMemCache.php

Spacing +33 added lines, -33 removed lines

@@ -92,7 +92,7 @@ 
 	/**
 	 * @var boolean if the module is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var Memcache the Memcache instance
 	 */
@@ -100,23 +100,23 @@ 
 	/**
 	 * @var string host name of the memcache server
 	 */
-	private $_host = 'localhost';
+	private $_host='localhost';
 	/**
 	 * @var integer the port number of the memcache server
 	 */
-	private $_port = 11211;
+	private $_port=11211;
 
-	private $_timeout = 360;
+	private $_timeout=360;
 
 	/**
 	 * @var integer Controls the minimum value length before attempting to compress automatically.
 	 */
-	private $_threshold = 0;
+	private $_threshold=0;
 
 	/**
 	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
 	 */
-	private $_minSavings = 0.0;
+	private $_minSavings=0.0;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -124,12 +124,12 @@ 
 	 * If false {@link http://pecl.php.net/package/memcache memcache}. will be used.
 	 * Defaults to false.
 	 */
-	private $_useMemcached = false;
+	private $_useMemcached=false;
 	
 	/**
 	 * @var array list of servers available
 	 */
-	private $_servers = [];
+	private $_servers=[];
 
 	/**
 	 * Destructor.
@@ -137,7 +137,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_cache !== null && !$this->_useMemcached)
+		if($this->_cache!==null && !$this->_useMemcached)
 			$this->_cache->close();
 	}
 
@@ -157,27 +157,27 @@ 
 		if(!extension_loaded('memcached') && $this->_useMemcached)
 			throw new TConfigurationException('memcached_extension_required');
 		
-		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
+		$this->_cache=$this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
 		{
 			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'],
-					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
+				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;
+		$this->_initialized=true;
 		parent::init($config);
 	}
 
@@ -192,29 +192,29 @@ 
 		{
 			foreach($xml->getElementsByTagName('server') as $serverConfig)
 			{
-				$properties = $serverConfig->getAttributes();
-				if(($host = $properties->remove('Host')) === null)
+				$properties=$serverConfig->getAttributes();
+				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))
 					throw new TConfigurationException('memcache_serverport_invalid');
-				$server = ['Host' => $host,'Port' => $port,'Weight' => 1,'Timeout' => 1800,'RetryInterval' => 15,'Persistent' => true];
-				$checks = [
+				$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)
 				{
-					$value = $properties->remove($property);
-					if($value !== null && is_numeric($value))
-						$server[$property] = $value;
-					elseif($value !== null)
+					$value=$properties->remove($property);
+					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;
+				$server['Persistent']=TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
 			}
 		}
 	}
@@ -236,7 +236,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_host_unchangeable');
 		else
-			$this->_host = $value;
+			$this->_host=$value;
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_port_unchangeable');
 		else
-			$this->_port = TPropertyValue::ensureInteger($value);
+			$this->_port=TPropertyValue::ensureInteger($value);
 	}
 	
 	/**
@@ -276,7 +276,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_host_unchangeable');
 		else
-			$this->_useMemcached = $value;
+			$this->_useMemcached=$value;
 	}
 	
 	/**
@@ -296,7 +296,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_threshold_unchangeable');
 		else
-			$this->_threshold = TPropertyValue::ensureInteger($value);
+			$this->_threshold=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('memcache_min_savings_unchangeable');
 		else
-			$this->_minSavings = TPropertyValue::ensureFloat($value);
+			$this->_minSavings=TPropertyValue::ensureFloat($value);
 	}
 
 	/**

framework/Caching/TApplicationStateCacheDependency.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
 	 */
 	public function getHasChanged()
 	{
-		return Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		return Prado::getApplication()->getMode()!==TApplicationMode::Performance;
 	}
 }
\ No newline at end of file

framework/Caching/TChainedCacheDependency.php

Spacing +3 added lines, -3 removed lines

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

framework/Caching/TXCache.php

Spacing +4 added lines, -4 removed lines

@@ -56,8 +56,8 @@ 
 		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))
 			throw new TConfigurationException('xcache_extension_not_enabled');
@@ -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;

framework/Caching/TGlobalStateCacheDependency.php

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
 	 */
 	public function setStateName($value)
 	{
-		$this->_stateName = $value;
-		$this->_stateValue = Prado::getApplication()->getGlobalState($value);
+		$this->_stateName=$value;
+		$this->_stateValue=Prado::getApplication()->getGlobalState($value);
 	}
 
 	/**
@@ -64,6 +64,6 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->_stateValue !== Prado::getApplication()->getGlobalState($this->_stateName);
+		return $this->_stateValue!==Prado::getApplication()->getGlobalState($this->_stateName);
 	}
 }
\ No newline at end of file

framework/Caching/TEtcdCache.php

Spacing +19 added lines, -19 removed lines

@@ -59,17 +59,17 @@ 
   /**
    * @var string the etcd host
    */
-  protected $_host = 'localhost';
+  protected $_host='localhost';
   
   /**
    * @var integer the etcd port
    */
-  protected $_port = 2379;
+  protected $_port=2379;
   
   /**
    * @var string the directory to store values in
    */
-  protected $_dir = 'pradocache';
+  protected $_dir='pradocache';
 
    /**
     * Initializes this module.
@@ -79,7 +79,7 @@ 
     */
 	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);
 	}
   
@@ -96,7 +96,7 @@ 
 	 * @param string $value the etcd host
 	 */
 	public function setHost($value) {
-	$this->_host = TPropertyValue::ensureString($value);
+	$this->_host=TPropertyValue::ensureString($value);
 	}
 	
   /**
@@ -112,7 +112,7 @@ 
 	 * @param integer $value the etcd port
 	 */
 	public function setPort($value) {
-	$this->_port = TPropertyValue::ensureInteger($value);
+	$this->_port=TPropertyValue::ensureInteger($value);
 	}
 	 
   /**
@@ -128,7 +128,7 @@ 
 	 * @param string $value the directory to store values in
 	 */
 	public function setDir($value) {
-	$this->_dir = TPropertyValue::ensureString($value);
+	$this->_dir=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -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);
 	}
 
@@ -154,9 +154,9 @@ 
 	 */
 	protected function setValue($key, $value, $expire)
 	{
-	$value = ['value' => serialize($value)];
-	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+	$value=['value' => serialize($value)];
+	if($expire > 0) $value['ttl']=$expire;
+		$result=$this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -171,9 +171,9 @@ 
 	 */
 	protected function addValue($key, $value, $expire)
 	{
-	$value = ['value' => serialize($value), 'prevExist' => 'false'];
-	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+	$value=['value' => serialize($value), 'prevExist' => 'false'];
+	if($expire > 0) $value['ttl']=$expire;
+		$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');
 	}
   
   /**
@@ -208,15 +208,15 @@ 
    * @param array the additional post data to send with the request
    * @return \stdClass the response from the etcd instance
    */
-  protected function request($method, $key, $value = []) {
-	$curl = curl_init("http://{$this->_host}:{$this->_port}/v2/keys/{$key}");
+  protected function request($method, $key, $value=[]) {
+	$curl=curl_init("http://{$this->_host}:{$this->_port}/v2/keys/{$key}");
 	curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
 	curl_setopt($curl, CURLOPT_HEADER, false);
 	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
 	curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/x-www-form-urlencoded']);
 	curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($value));
-	$response = curl_exec($curl);
+	$response=curl_exec($curl);
 	curl_close($curl);
 	return json_decode($response);
   }

framework/Caching/TDirectoryCacheDependency.php

Spacing +16 added lines, -16 removed lines

@@ -35,8 +35,8 @@ 
  */
 class TDirectoryCacheDependency extends TCacheDependency
 {
-	private $_recursiveCheck = true;
-	private $_recursiveLevel = -1;
+	private $_recursiveCheck=true;
+	private $_recursiveLevel=-1;
 	private $_timestamps;
 	private $_directory;
 
@@ -63,10 +63,10 @@ 
 	 */
 	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);
+		$this->_directory=$path;
+		$this->_timestamps=$this->generateTimestamps($path);
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function setRecursiveCheck($value)
 	{
-		$this->_recursiveCheck = TPropertyValue::ensureBoolean($value);
+		$this->_recursiveCheck=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setRecursiveLevel($value)
 	{
-		$this->_recursiveLevel = TPropertyValue::ensureInteger($value);
+		$this->_recursiveLevel=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->generateTimestamps($this->_directory) != $this->_timestamps;
+		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
 	}
 
 	/**
@@ -152,23 +152,23 @@ 
 	 * @param int level of the recursion
 	 * @return array list of file modification time indexed by the file path
 	 */
-	protected function generateTimestamps($directory, $level = 0)
+	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)
+		$timestamps=[];
+		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))
 			{
 				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
+					$timestamps=array_merge($this->generateTimestamps($path, $level + 1));
 			}
 			elseif($this->validateFile($path))
-				$timestamps[$path] = filemtime($path);
+				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;

framework/Caching/TCache.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 abstract class TCache extends \Prado\TModule implements ICache, \ArrayAccess
 {
 	private $_prefix;
-	private $_primary = true;
+	private $_primary=true;
 
 	/**
 	 * Initializes the cache module.
@@ -61,11 +61,11 @@ 
 	 */
 	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)
+			if($this->getApplication()->getCache()===null)
 				$this->getApplication()->setCache($this);
 			else
 				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
@@ -88,7 +88,7 @@ 
 	 */
 	public function setPrimaryCache($value)
 	{
-		$this->_primary = TPropertyValue::ensureBoolean($value);
+		$this->_primary=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setKeyPrefix($value)
 	{
-		$this->_prefix = $value;
+		$this->_prefix=$value;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	protected function generateUniqueKey($key)
 	{
-		return md5($this->_prefix . $key);
+		return md5($this->_prefix.$key);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function get($id)
 	{
-		if(($data = $this->getValue($this->generateUniqueKey($id))) !== false)
+		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
 		{
 			if(!is_array($data))
 				return false;
@@ -146,13 +146,13 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id, $value, $expire = 0, $dependency = null)
+	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);
 		}
 	}
@@ -166,11 +166,11 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id, $value, $expire = 0, $dependency = null)
+	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);
 	}
 
@@ -250,7 +250,7 @@ 
 	 */
 	public function offsetExists($id)
 	{
-		return $this->get($id) !== false;
+		return $this->get($id)!==false;
 	}
 
 	/**

framework/TService.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 	/**
 	 * @var boolean whether the service is enabled
 	 */
-	private $_enabled = true;
+	private $_enabled=true;
 
 	/**
 	 * Initializes the service and attaches {@link run} to the RunService event of application.
@@ -54,7 +54,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled = TPropertyValue::ensureBoolean($value);
+		$this->_enabled=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**