Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

7 files changed, 12 insertions, 34 deletions

diff --git a/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php b/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
index ae6aa200..d2e3d014 100644
--- a/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
+++ b/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
@@ -4,19 +4,17 @@
  *
  * @author Berczi Gabor <gabor.berczi@devworx.hu>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TFastSqlMapApplicationCache.php 2996 2011-06-20 15:24:57Z ctrlaltca@gmail.com $
  * @package System.Data.SqlMap
  */
 
 /**
  * TFastSqlMapApplicationCache class file
- *  
+ *
  * Fast SqlMap result cache class with minimal-concurrency get/set and atomic flush operations
- *  
+ *
  * @author Berczi Gabor <gabor.berczi@devworx.hu>
- * @version $Id: TFastSqlMapApplicationCache.php 2996 2011-06-20 15:24:57Z ctrlaltca@gmail.com $
  * @package System.Data.SqlMap
  * @since 3.2
  */
@@ -30,12 +28,12 @@ class TFastSqlMapApplicationCache implements ICache
 	{
 		$this->_cacheModel = $cacheModel;
 	}
-	
+
 	protected function getBaseKeyKeyName()
 	{
 		return 'SqlMapCacheBaseKey::'.$this->_cacheModel->getId();
 	}
-	
+
 	protected function getBaseKey()
 	{
 		$cache = $this->getCache();
@@ -48,7 +46,7 @@ class TFastSqlMapApplicationCache implements ICache
 		}
 		return $basekey;
 	}
-	
+
 	protected function getCacheKey($key)
 	{
 		return $this->getBaseKey().'###'.$key;
@@ -63,7 +61,7 @@ class TFastSqlMapApplicationCache implements ICache
 	{
 		$this->getCache()->delete($this->getBaseKeyKeyName());
 	}
-	
+
 	public function get($key)
 	{
 		$result = $this->getCache()->get($this->getCacheKey($key));
diff --git a/framework/Data/SqlMap/DataMapper/TLazyLoadList.php b/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
index c512ef92..d50c1b84 100644
--- a/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
+++ b/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TLazyLoadList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  */
 
@@ -14,7 +13,6 @@
  * TLazyLoadList executes mapped statements when the proxy collection is first accessed.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TLazyLoadList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -107,7 +105,6 @@ class TLazyLoadList
  * particular object and relays the call to handler object.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TLazyLoadList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
diff --git a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
index 20a853c4..c19b77ab 100644
--- a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
+++ b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPropertyAccess.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  */
 
@@ -37,7 +36,6 @@
  * </code>
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TPropertyAccess.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
index 15e148fe..aa853b6c 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSqlMapCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  */
 
@@ -16,7 +15,6 @@
  * a least-recently-used cache implementation.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TSqlMapCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -89,7 +87,6 @@ abstract class TSqlMapCache implements ICache
  * object that was first added when the cache is full.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TSqlMapCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -126,7 +123,6 @@ class TSqlMapFifoCache extends TSqlMapCache
  * object that was accessed last when the cache is full.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TSqlMapCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -168,7 +164,6 @@ class TSqlMapLruCache extends TSqlMapCache
  * caching SqlMap results.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapException.php b/framework/Data/SqlMap/DataMapper/TSqlMapException.php
index d308768f..bce03a5c 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapException.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapException.php
@@ -4,7 +4,6 @@
  * TSqlMapException is the base exception class for all SqlMap exceptions.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapException.php 3187 2012-07-12 11:21:01Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -63,7 +62,6 @@ class TSqlMapException extends TException
  * TSqlMapConfigurationException, raised during configuration file parsing.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapException.php 3187 2012-07-12 11:21:01Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -76,7 +74,6 @@ class TSqlMapConfigurationException extends TSqlMapException
  * TSqlMapUndefinedException, raised when mapped statemented are undefined.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapException.php 3187 2012-07-12 11:21:01Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -89,7 +86,6 @@ class TSqlMapUndefinedException extends TSqlMapException
  * TSqlMapDuplicateException, raised when a duplicate mapped statement is found.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapException.php 3187 2012-07-12 11:21:01Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -101,7 +97,6 @@ class TSqlMapDuplicateException extends TSqlMapException
  * TInvalidPropertyException, raised when setting or getting an invalid property.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapException.php 3187 2012-07-12 11:21:01Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
index f3d67d47..d789471d 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSqlMapPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  */
 
@@ -23,7 +22,6 @@ Prado::using('System.Collections.TPagedList');
  * The paged list does not need to know about the total number of records.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TSqlMapPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
index 9d743b82..18b8ef99 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSqlMapTypeHandlerRegistry.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  */
 
@@ -15,7 +14,6 @@
  * to PHP types and vice versa.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapTypeHandlerRegistry.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */
@@ -121,7 +119,6 @@ class TSqlMapTypeHandlerRegistry
  * booleans using "Y" and "N" instead of the more typical 0/1.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
- * @version $Id: TSqlMapTypeHandlerRegistry.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Data.SqlMap
  * @since 3.1
  */