Merge branch 'development'

Author: lmajano

.travis.yml

@@ -8,7 +8,7 @@ notifications:
 env:
   global:
     # TARGET RELEASE VERSION: BUMP AS NEEDED
-    - COLDBOX_VERSION=5.6.1
+    - COLDBOX_VERSION=5.6.2
   matrix:
     - ENGINE=lucee@4.5 ANT_TARGET=build.all
     - ENGINE=lucee@5 ANT_TARGET=run-tests

system/Bootstrap.cfc

@@ -652,6 +652,9 @@ component serializable="false" accessors="true"{
 	* Process Stack trace for errors
 	*/
 	private function processStackTrace( str ){
+		// Not using encodeForHTML() as it is too destructive and ruins whitespace chars and other stuff
+		arguments.str = HTMLEditFormat( arguments.str );
+		
 		var aMatches = REMatchNoCase( "\(([^\)]+)\)", arguments.str );
 		for( var aString in aMatches ){
 			arguments.str = replacenocase( arguments.str, aString, "<span class='highlight'>#aString#</span>", "all" );

system/cache/policies/AbstractEvictionPolicy.cfc

@@ -76,7 +76,7 @@ component serializable=false implements="coldbox.system.cache.policies.IEviction
 			var md = indexer.getObjectMetadata( item );
 
 			// Evict if not already marked for eviction or an eternal object.
-			if( md.timeout gt 0 AND NOT md.isExpired ){
+			if( md.timeout GT 0 AND NOT md.isExpired ){
 
 				// Evict The Object
 				variables.cacheProvider.clear( item );

system/cache/providers/CFProvider.cfc

@@ -213,9 +213,10 @@ component
      */
     struct function getStoreMetadataReport(){
 		return getKeys()
-			.map( function( item ){
-				return getCachedObjectMetadata( item );
-			});
+			.reduce( function( item, result ){
+				result[ item ] = getCachedObjectMetadata( item );
+				return result;
+			}, {} );
 	}
 
 	/**
@@ -538,14 +539,7 @@ component
 	 **/
 	 private function validateConfiguration(){
 		 // Add in settings not discovered
-		structAppend( variables.configuration, variables.DEFAULTS );
-		// Validate configuration values, if they don't exist, then default them to DEFAULTS
-		for( var key in variables.DEFAULTS ){
-			if( NOT len( variables.configuration[ key ] ) ){
-				variables.configuration[ key ] = variables.DEFAULTS[ key ];
-			}
-		}
-
+		structAppend( variables.configuration, variables.DEFAULTS, false );
 		return this;
 	}
 

system/cache/providers/LuceeProvider.cfc

@@ -112,9 +112,10 @@ component
      */
     struct function getStoreMetadataReport(){
 		return getKeys()
-			.map( function( item ){
-				return getCachedObjectMetadata( item );
-			});
+			.reduce( function( item, result ){
+				result[ item ] = getCachedObjectMetadata( item );
+				return result;
+			}, {} );
 	}
 
 	/**
@@ -421,14 +422,7 @@ component
 	 **/
 	 private function validateConfiguration(){
 		 // Add in settings not discovered
-		structAppend( variables.configuration, variables.DEFAULTS );
-		// Validate configuration values, if they don't exist, then default them to DEFAULTS
-		for( var key in variables.DEFAULTS ){
-			if( NOT len( variables.configuration[ key ] ) ){
-				variables.configuration[ key ] = variables.DEFAULTS[ key ];
-			}
-		}
-
+		structAppend( variables.configuration, variables.DEFAULTS, false );
 		return this;
 	}
 

system/cache/providers/lucee-lib/LuceeStats.cfc

@@ -71,7 +71,7 @@ component implements="coldbox.system.cache.util.IStats" accessors="true"{
 	/**
 	 * Get the total cache's hits
 	 */
-	numeric function getHits();
+	numeric function getHits() {
 		var props = cacheGetProperties( getCacheProvider().getConfiguration().cacheName );
 		if( arrayLen( props ) and structKeyExists( props[ 1 ], "hit_count" ) ){
 			return props[ 1 ].hit_count;

system/cache/report/monitor.cfm

@@ -11,7 +11,7 @@ Description :
 	
 ATTRIBUTES:
 - cacheBox : An instance reference to the cacheBox factory to report on
-- baseURL (optional='default') : An optional baseURL that will be used to post to this monitor on. Default is cgi.script_name
+- baseURL (optional='default') : An optional baseURL that will be used to post to this monitor on. Default is CGI.SCRIPT_NAME
 - skin (optional='default') : The skin to render the report in, it uses 'default' skin by default.
 ----------------------------------------------------------------------->
 
@@ -26,7 +26,7 @@ ATTRIBUTES:
 <!--- CacheBox Factory --->
 <cfparam name="attributes.cacheFactory" 	type="any" default="">
 <!--- BaseURL --->	
-<cfparam name="attributes.baseURL" 			type="string" default="#cgi.script_name#">
+<cfparam name="attributes.baseURL" 			type="string" default="#CGI.SCRIPT_NAME#">
 <!--- Skin To Use --->
 <cfparam name="attributes.skin"				type="string" default="default">
 <!--- Enable Monitor --->

system/cache/util/EventURLFacade.cfc

@@ -36,7 +36,7 @@ component accessors="true"{
 			// Get the original incoming context hash
 			"incomingHash" 	= incomingHash,
 			// Multi-Host support
-			"cgihost" 		= cgi.http_host
+			"cgihost" 		= CGI.HTTP_HOST
 		};
 
 		// Incorporate Routed Structs
@@ -65,7 +65,7 @@ component accessors="true"{
 			// Get the original incoming context hash according to incoming arguments
 			"incomingHash" 	= hash( virtualRC.toString() ),
 			// Multi-Host support
-			"cgihost" 		= cgi.http_host
+			"cgihost" 		= CGI.HTTP_HOST
 		};
 
 		// return hash from cache key struct