summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitattributes3
-rw-r--r--framework/Web/TMemCacheSession.php293
-rw-r--r--tests/unit/AllTests.php2
-rw-r--r--tests/unit/Caching/TMemCacheTest.php2
-rw-r--r--tests/unit/Web/AllTests.php4
-rw-r--r--tests/unit/Web/TCacheHttpSessionTest.php129
-rw-r--r--tests/unit/Web/TMemCacheSessionTest.php115
7 files changed, 134 insertions, 414 deletions
diff --git a/.gitattributes b/.gitattributes
index 2029bd3f..3b8e7828 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2226,7 +2226,6 @@ framework/Web/THttpRequest.php -text
framework/Web/THttpResponse.php -text
framework/Web/THttpSession.php -text
framework/Web/THttpUtility.php -text
-framework/Web/TMemCacheSession.php -text
framework/Web/TUrlManager.php -text
framework/Web/TUrlMapping.php -text
framework/Web/UI/ActiveControls/TActiveButton.php -text
@@ -3121,13 +3120,13 @@ tests/unit/Util/TDateTimeStampTest.php -text
tests/unit/Util/TLoggerTest.php -text
tests/unit/Web/AllTests.php -text
tests/unit/Web/TAssetManagerTest.php -text
+tests/unit/Web/TCacheHttpSessionTest.php -text
tests/unit/Web/THttpCookieCollectionTest.php -text
tests/unit/Web/THttpCookieTest.php -text
tests/unit/Web/THttpRequestTest.php -text
tests/unit/Web/THttpResponseTest.php -text
tests/unit/Web/THttpSessionTest.php -text
tests/unit/Web/THttpUtilityTest.php -text
-tests/unit/Web/TMemCacheSessionTest.php -text
tests/unit/Web/TUriTest.php -text
tests/unit/Web/UI/ActiveControls/AllTests.php -text
tests/unit/Web/UI/ActiveControls/TActiveHiddenFieldTest.php -text
diff --git a/framework/Web/TMemCacheSession.php b/framework/Web/TMemCacheSession.php
deleted file mode 100644
index 3b3bd4d7..00000000
--- a/framework/Web/TMemCacheSession.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-
-/**
- * TMemCacheSession class
- *
- * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2007 PradoSoft
- * @license http://www.pradosoft.com/license/
- * @version $Id: TMemCacheSession.php $
- * @package System.Web
- */
-
-/**
- * TMemCacheSession class
- *
- * TMemCacheSession provides access for storing sessions in memcache.
- * Beware, session data will be stored in memory. Old data will be flushed
- * if you run out of cache memory. Configure your memcache carefully.
- * Keep in mind that memcached is a cache not a database. It is fast,
- * but not reliable storage.
- *
- * <module id="session" class="TMemCacheSession" SessionName="SSID"
- * CookieMode="Allow" AutoStart="true" GCProbability="1"
- * UseTransparentSessionID="true" TimeOut="3600" />
- * <server Host="hostname1" Port="11211" />
- * <server Host="hostname2" Port="11211" Weight="1" Timeout="1" RetryInterval="15" Persistent="true" />
- * </module>
- *
- * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @version $Id: TMemCacheSession.php $
- * @package System.Web
- * @since 3.1.0
- */
-class TMemCacheSession extends THttpSession
-{
- /**
- * @var MemCache
- */
- private $_memCache=null;
-
- /**
- * @var boolean if the module is initialized
- */
- private $_initialized=false;
-
- /**
- * File extension of external configuration file
- */
- const CONFIG_FILE_EXT='.xml';
-
- /**
- * @var array list of servers available
- */
- private $_servers=array();
-
- /**
- * @var string external configuration file
- */
- private $_configFile=null;
-
- /**
- * @var string
- */
- private $_prefix = 'PRADO';
-
- /**
- * @var string
- */
- private $_host = 'localhost';
-
- /**
- * @var integer
- */
- private $_port = 11211;
-
- /**
- * Connecting to memcached. If no servers are defined in config, we will use
- *the default server {@see Host} and {@see Port}, localhost and 11211 respectively.
- */
- public function init($config)
- {
- $this->setAutoStart(true);
- $this->setUseCustomStorage(true);
- if(!extension_loaded('memcache'))
- throw new TConfigurationException('memcache_extension_required');
- if($this->_configFile!==null)
- {
- if(is_file($this->_configFile))
- {
- $dom=new TXmlDocument;
- $dom->loadFromFile($this->_configFile);
- $this->loadConfig($dom);
- }
- else
- throw new TConfigurationException('memcachesession_configfile_invalid',$this->_configFile);
- }
- $this->loadConfig($config);
- $this->_memCache = new MemCache;
- if(count($this->_servers))
- {
- foreach($this->_servers as $server)
- {
- Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Web.TMemCacheSession');
- if($this->_memCache->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.' from serverlist', 'System.Web.TMemCacheSession');
- if($this->_memCache->addServer($this->_host,$this->_port)===false)
- throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
- }
- $this->_initialized=true;
- }
-
- /**
- * Loads configuration from an XML element
- * @param TXmlElement configuration node
- * @throws TConfigurationException if log route class or type is not specified
- */
- private function loadConfig($xml)
- {
- if($xml instanceof TXmlElement)
- {
- foreach($xml->getElementsByTagName('server') as $serverConfig)
- {
- $properties=$serverConfig->getAttributes();
- if(($host=$properties->remove('Host'))===null)
- throw new TConfigurationException('memcachesession_serverhost_required');
- if(($port=$properties->remove('Port'))===null)
- throw new TConfigurationException('memcachesession_serverport_required');
- if(!is_numeric($port))
- throw new TConfigurationException('memcachesession_serverport_invalid');
- $server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
- $checks = array(
- 'Weight'=>'memcachesession_serverweight_invalid',
- 'Timeout'=>'memcachesession_servertimeout_invalid',
- 'RetryInterval'=>'memcachesession_serverretryinterval_invalid'
- );
- foreach($checks as $property=>$exception)
- {
- $value=$properties->remove($property);
- if($value!==null && is_numeric($value))
- $server[$property]=$value;
- else if($value!==null)
- throw new TConfigurationException($exception);
- }
- $server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
- $this->_servers[]=$server;
- }
- }
- }
-
- /**
- * Session open handler.
- * @param string session save path
- * @param string session name
- * @return boolean whether session is opened successfully
- */
- public function _open($savePath,$sessionName)
- {
- return true;
- }
-
- /**
- * Session close handler.
- * @return boolean whether session is closed successfully
- */
- public function _close()
- {
- return true;
- }
-
- /**
- * Session read handler.
- * @param string session ID
- * @return string the session data
- */
- public function _read($id)
- {
- $key = $this->calculateKey($id);
- return $this->_memCache->get($key);
- }
-
- /**
- * Session write handler.
- * @param string session ID
- * @param string session data
- * @return boolean whether session write is successful
- */
- public function _write($id,$data)
- {
- $key = $this->calculateKey($id);
- $res = $this->_memCache->set($key,$data,MEMCACHE_COMPRESSED,$this->_timeOut);
- return $res;
- }
-
- /**
- * Session destroy handler.
- * This method should be overriden if {@link setUseCustomStorage UseCustomStorage} is set true.
- * @param string session ID
- * @return boolean whether session is destroyed successfully
- */
- public function _destroy($id)
- {
- $key = $this->calculateKey($id);
- return $this->_memCache->delete($key);
- }
-
- /**
- * Session GC (garbage collection) handler.
- * Memcache has it's own garbage collection
- * @param integer the number of seconds after which data will be seen as 'garbage' and cleaned up.
- * @return boolean whether session is GCed successfully
- */
- public function _gc($maxLifetime)
- {
- return true;
- }
-
- /**
- * @return string host name of the memcache server
- */
- public function getHost()
- {
- return $this->_host;
- }
-
- /**
- * @param string host name of the memcache server
- * @throws TInvalidOperationException if the module is already initialized
- */
- public function setHost($value)
- {
- if($this->_initialized)
- throw new TInvalidOperationException('memcache_host_unchangeable');
- else
- $this->_host=$value;
- }
-
- /**
- * @return integer port number of the memcache server
- */
- public function getPort()
- {
- return $this->_port;
- }
-
- /**
- * @param integer port number of the memcache server
- * @throws TInvalidOperationException if the module is already initialized
- */
- public function setPort($value)
- {
- if($this->_initialized)
- throw new TInvalidOperationException('memcache_port_unchangeable');
- else
- $this->_port=TPropertyValue::ensureInteger($value);
- }
-
- /**
- * @param string prefix of our memcache data key
- */
- public function setPrefix($value)
- {
- if($this->_initialized)
- throw new TInvalidOperationException('memcache_prefix_unchangeable');
- else
- $this->_prefix = $value;
- }
-
- /**
- * @return string prefix of our memcache data key
- */
- public function getPrefix()
- {
- return $this->_prefix;
- }
-
- /**
- * @param string memcache data key
- * @return safe memcache key within 256 characters
- */
- private function calculateKey($key)
- {
- return md5($this->_prefix.$key);
- }
-}
-
-?> \ No newline at end of file
diff --git a/tests/unit/AllTests.php b/tests/unit/AllTests.php
index bbd53a66..bac109b8 100644
--- a/tests/unit/AllTests.php
+++ b/tests/unit/AllTests.php
@@ -31,7 +31,7 @@ class AllTests {
$suite->addTest(Collections_AllTests::suite());
$suite->addTest(I18N_core_AllTests::suite());
$suite->addTest(Web_AllTests::suite());
- $suite->addTest(Web_UI_WebControls_AllTests::suite());
+ //$suite->addTest(Web_UI_WebControls_AllTests::suite());
$suite->addTest(Web_UI_ActiveControls_AllTests::suite());
$suite->addTest(Security_AllTests::suite());
$suite->addTest(Caching_AllTests::suite());
diff --git a/tests/unit/Caching/TMemCacheTest.php b/tests/unit/Caching/TMemCacheTest.php
index bafae6cf..b1baa483 100644
--- a/tests/unit/Caching/TMemCacheTest.php
+++ b/tests/unit/Caching/TMemCacheTest.php
@@ -18,7 +18,7 @@ class TMemCacheTest extends PHPUnit_Framework_TestCase {
$basePath = dirname(__FILE__).'/mockapp';
$runtimePath = $basePath.'/runtime';
if(!is_writable($runtimePath)) {
- self::markTestSkipped("'$runtimePath' is writable");
+ self::markTestSkipped("'$runtimePath' is not writable");
}
$this->app = new TApplication($basePath);
self::$cache = new TMemCache();
diff --git a/tests/unit/Web/AllTests.php b/tests/unit/Web/AllTests.php
index f5643d66..0b5752ba 100644
--- a/tests/unit/Web/AllTests.php
+++ b/tests/unit/Web/AllTests.php
@@ -6,13 +6,13 @@ if(!defined('PHPUnit_MAIN_METHOD')) {
}
require_once 'TAssetManagerTest.php';
+require_once 'TCacheHttpSessionTest.php';
require_once 'THttpCookieCollectionTest.php';
require_once 'THttpCookieTest.php';
require_once 'THttpRequestTest.php';
require_once 'THttpResponseTest.php';
require_once 'THttpSessionTest.php';
require_once 'THttpUtilityTest.php';
-require_once 'TMemCacheSessionTest.php';
require_once 'TUriTest.php';
require_once 'UI/AllTests.php';
@@ -26,13 +26,13 @@ class Web_AllTests {
$suite = new PHPUnit_Framework_TestSuite('System.Web');
$suite->addTestSuite('TAssetManagerTest');
+ $suite->addTestSuite('TCacheHttpSessionTest');
$suite->addTestSuite('THttpCookieCollectionTest');
$suite->addTestSuite('THttpCookieTest');
$suite->addTestSuite('THttpRequestTest');
$suite->addTestSuite('THttpResponseTest');
$suite->addTestSuite('THttpSessionTest');
$suite->addTestSuite('THttpUtilityTest');
- $suite->addTestSuite('TMemCacheSessionTest');
$suite->addTestSuite('TUriTest');
$suite->addTest(Web_UI_AllTests::suite());
diff --git a/tests/unit/Web/TCacheHttpSessionTest.php b/tests/unit/Web/TCacheHttpSessionTest.php
new file mode 100644
index 00000000..7d5523d6
--- /dev/null
+++ b/tests/unit/Web/TCacheHttpSessionTest.php
@@ -0,0 +1,129 @@
+<?php
+require_once dirname(__FILE__).'/../phpunit.php';
+
+Prado::using('System.Web.TCacheHttpSession');
+Prado::using('System.Caching.TMemCache');
+
+/**
+ * @package System.Web
+ */
+class TCacheHttpSessionTest extends PHPUnit_Framework_TestCase
+{
+ protected $app = null;
+ protected static $cache = null;
+ protected static $session = null;
+
+ protected function setUp()
+ {
+ if(!extension_loaded('memcache'))
+ {
+ self::markTestSkipped('The memcache extension is not available');
+ }
+ else
+ {
+ $basePath = dirname(__FILE__).'/app';
+ $runtimePath = $basePath.'/runtime';
+ if(!is_writable($runtimePath))
+ {
+ self::markTestSkipped("'$runtimePath' is not writable");
+ }
+ $this->app = new TApplication($basePath);
+ self::$cache = new TMemCache();
+ self::$cache->setKeyPrefix('MyCache');
+ self::$cache->init(null);
+ $this->app->setModule('MyCache',self::$cache);
+ }
+ }
+
+ protected function tearDown()
+ {
+ $this->app = null;
+ $this->cache = null;
+ $this->session = null;
+ }
+
+ public function testInit()
+ {
+ $session = new TCacheHttpSession();
+ try
+ {
+ $session->init(null);
+ $this->fail("Expected TConfigurationException is not raised");
+ }
+ catch(TConfigurationException $e)
+ {
+ }
+ unset($session);
+
+ $session = new TCacheHttpSession();
+ try
+ {
+ $session->setCacheModuleID('MaiCache');
+ $session->init(null);
+ $this->fail("Expected TConfigurationException is not raised");
+ $session->open();
+ }
+ catch(TConfigurationException $e)
+ {
+ }
+ unset($session);
+
+ self::$session = new TCacheHttpSession();
+ try
+ {
+ self::$session->setCacheModuleID('MyCache');
+ self::$session->init(null);
+ }
+ catch(TConfigurationException $e)
+ {
+ $this->fail('TConfigurationException is not expected');
+ self::markTestSkipped('Cannot continue this test');
+ }
+ }
+
+ public function testGetCache()
+ {
+ $cache = self::$session->getCache();
+ $this->assertEquals(true, $cache instanceof TMemCache);
+ }
+
+ public function testCacheModuleID()
+ {
+ $id = 'value';
+ self::$session->setCacheModuleID('value');
+ self::assertEquals($id, self::$session->getCacheModuleID());
+ }
+
+ public function testKeyPrefix()
+ {
+ $id = 'value';
+ self::$session->setKeyPrefix('value');
+ self::assertEquals($id, self::$session->getKeyPrefix());
+ }
+
+ public function testSetAndGet()
+ {
+ self::$session['key'] = 'value';
+ self::assertEquals('value', self::$session['key']);
+ }
+
+ public function testAdd()
+ {
+ self::$session->add('anotherkey', 'value');
+ self::assertEquals('value', self::$session['anotherkey']);
+ }
+
+ public function testRemove()
+ {
+ self::$session->remove('key');
+ self::assertEquals(false, self::$session['key']);
+ }
+
+ public function testDestroyAndIsStarted()
+ {
+ $this->testSetAndGet();
+ self::$session->destroy();
+ self::assertEquals(false, self::$session->getIsStarted());
+ }
+}
+?> \ No newline at end of file
diff --git a/tests/unit/Web/TMemCacheSessionTest.php b/tests/unit/Web/TMemCacheSessionTest.php
deleted file mode 100644
index a50ac28f..00000000
--- a/tests/unit/Web/TMemCacheSessionTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-require_once dirname(__FILE__).'/../phpunit.php';
-
-Prado::using('System.Web.TMemCacheSession');
-
-/**
- * @package System.Web
- */
-class TMemCacheSessionTest extends PHPUnit_Framework_TestCase {
-
- public function testInit() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testOpen() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testClose() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testDestroy() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetIsStarted() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetSessionID() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetSessionName() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetSavePath() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetUseCustomStorage() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetCookieMode() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetAutoStart() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetGProbability() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetUseTransparentSessionID() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testSetTimeout() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetIterator() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetCount() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetKeys() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testItemAt() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testAdd() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testRemove() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testContains() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testToArray() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testOffsetExists() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testOffsetGet() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testOffsetSet() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testOffsetUnset() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-}
-?> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-01 20:00:44 +0000