Merge branch 'development'

Author: lmajano

.cflintrc

@@ -1,13 +1,10 @@
 {
     "rule": [],
     "includes": [
-		{ "code": "AVOID_USING_STRUCTNEW" },
-        { "code": "AVOID_USING_ARRAYNEW" },
         { "code": "AVOID_USING_CFINCLUDE_TAG" },
 		{ "code": "AVOID_USING_CFABORT_TAG" },
 		{ "code": "AVOID_USING_CFEXECUTE_TAG" },
 		{ "code": "AVOID_USING_DEBUG_ATTR" },
-		{ "code": "AVOID_USING_CREATEOBJECT" },
 		{ "code": "AVOID_USING_ABORT" },
 		{ "code": "AVOID_USING_ISDATE" },
 		{ "code": "AVOID_USING_ISDEBUGMODE" },
@@ -41,7 +38,6 @@
 		{ "code": "FUNCTION_HINT_MISSING" },
 		{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
         { "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
-		{ "code": "GLOBAL_VAR" },
         { "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
 		{ "code": "MISSING_VAR" },
 		{ "code" : "METHOD_INVALID_NAME" },
@@ -57,8 +53,7 @@
 		{ "code": "SCOPE_ALLCAPS_NAME" },
 		{ "code": "VAR_ALLCAPS_NAME" },
 		{ "code": "VAR_INVALID_NAME" },
-		{ "code": "VAR_TOO_WORDY" },
-		{ "code": "VAR_IS_TEMPORARY" }
+		{ "code": "VAR_TOO_WORDY" }
     ],
     "inheritParent": false,
     "parameters": {

.travis.yml

@@ -7,7 +7,7 @@ notifications:
 
 env:
   global:
-    - COLDBOX_VERSION=5.1.2
+    - COLDBOX_VERSION=5.2.0
   matrix:
     - ENGINE=lucee@4.5 ANT_TARGET=build.all
     - ENGINE=lucee@5 ANT_TARGET=run-tests

build/build.xml

@@ -11,8 +11,8 @@
 	<!-- UPDATE ON EACH VERSION CYCLE -->
 	<property name="groupID"				value="ortussolutions" />
 
-	<property name="coldbox.version" 		value="5.1.2" />
-	<property name="coldbox.stableversion" 	value="5.1.1" />
+	<property name="coldbox.version" 		value="5.2.0" />
+	<property name="coldbox.stableversion" 	value="5.1.2" />
 
 	<property name="coldbox.slug"	 		value="coldbox"/>
 	<property name="cachebox.slug"	 		value="cachebox"/>

system/core/util/Util.cfc

@@ -26,7 +26,10 @@ Description :
 		<cfargument name="in" type="array" required="true" hint="The array to convert"/>
 		<cfscript>
 			return arguments.in.reduce( function( result, item, index ){
-				var target = result ?: structNew();
+				var target = {};
+				if( !isNull( result ) ){
+					target = result;
+				}
 				target[ index ] = item;
 				return target;
 			} );

system/logging/LogBox.cfc

@@ -11,7 +11,7 @@
 */
 component accessors="true"{
 
-	
+
 	/**
 	* The LogBox unique ID
 	*/
@@ -21,12 +21,12 @@ component accessors="true"{
 	* The LogBox operating version
 	*/
 	property name="version";
-	
+
 	/**
 	* The appender registration map
 	*/
 	property name="appenderRegistry" type="struct";
-	
+
 	/**
 	* The Logger registration map
 	*/
@@ -67,7 +67,7 @@ component accessors="true"{
 		variables.categoryAppenders = "";
 		// Version
 		variables.version           = "@build.version@+@build.number@";
-		
+
 		// Link incoming ColdBox argument
 		variables.coldbox = arguments.coldbox;
 
@@ -79,7 +79,7 @@ component accessors="true"{
 
 	/**
 	 * Configure logbox for operation. You can also re-configure LogBox programmatically. Basically we register all appenders here and all categories
-	 * 
+	 *
 	 * @config The LogBoxConfig object to use to configure this instance of LogBox: coldbox.system.logging.config.LogBoxConfig
 	 * @config.doc_generic coldbox.system.logging.config.LogBoxConfig
 	 */
@@ -109,7 +109,7 @@ component accessors="true"{
 				levelMax = rootConfig.levelMax,
 				appenders = getAppendersMap( rootConfig.appenders )
 			};
-			
+
 			//Save in Registry
 			variables.loggerRegistry = {
 				"ROOT" = new coldbox.system.logging.Logger( argumentCollection=args )
@@ -119,7 +119,7 @@ component accessors="true"{
 
 	/**
 	 * Get the root logger object
-	 * 
+	 *
 	 * @return coldbox.system.logging.Logger
 	 */
 	function getRootLogger(){
@@ -128,16 +128,16 @@ component accessors="true"{
 
 	/**
 	 * Get a logger object configured with a category name and appenders. If not configured, then it reverts to the root logger defined for this instance of LogBox
-	 * 
+	 *
 	 * @category The category name to use in this logger or pass in the target object will log from and we will inspect the object and use its metadata name
-	 * 
+	 *
 	 * @return coldbox.system.logging.Logger
 	 */
 	function getLogger( required category ){
 		var root = getRootLogger();
 
 		// is category object?
-		if( isObject( arguments.category ) ){ 
+		if( isObject( arguments.category ) ){
 			arguments.category = getMetadata( arguments.category ).name;
 		}
 
@@ -202,7 +202,7 @@ component accessors="true"{
 
 	/**
 	 * Register a new appender object in the appender registry.
-	 * 
+	 *
 	 * @name A unique name for the appender to register. Only unique names can be registered per variables.
 	 * @class The appender's class to register. We will create, init it and register it for you.
 	 * @properties The structure of properties to configure this appender with.
@@ -222,9 +222,9 @@ component accessors="true"{
 		if( !structKeyExists( variables.appenderRegistry, arguments.name ) ){
 
 			lock name="#variables.logboxID#.registerappender.#name#" type="exclusive" timeout="15" throwOnTimeout="true"{
-				
+
 				if( !structKeyExists( variables.appenderRegistry, arguments.name ) ){
-					
+
 					// Create appender and linking
 					var oAppender = new "#arguments.class#"( argumentCollection=arguments );
 					oAppender.setColdBox( variables.coldbox );
@@ -247,7 +247,7 @@ component accessors="true"{
 
 	/**
 	 * Get a parent logger according to category convention inheritance.  If not found, it returns the root logger.
-	 * 
+	 *
 	 * @category The category name to investigate for parents
 	 */
 	private function locateCategoryParentLogger( required category ){
@@ -278,20 +278,24 @@ component accessors="true"{
 
 	/**
 	 * Get a map of appenders by list. Usually called to get a category of appenders
-	 * 
+	 *
 	 * @appenders The list of appenders to get
 	 */
 	struct function getAppendersMap( required appenders ){
 		var results = arguments.appenders
 			.listToArray()
 			.reduce( function( result, item, index ){
-				var target = result ?: structNew();
+				var target = {};
+				if( !isNull( arguments.result ) ){
+					target = result;
+				}
 				target[ item ] = variables.appenderRegistry[ item ];
 				return target;
 			} );
-		return results ?: structnew();
+
+		return ( isNull( results ) ? structNew() : results );
 	}
-	
+
 	/**
 	 * Get Utility Object
 	 */

system/modules/HTMLHelper/models/HTMLHelper.cfc

@@ -118,11 +118,11 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 				// Load Asset
 				if( findNoCase( ".js", item ) ){
 					sb.append(
-						'<script src="#jsPath##item#" #asyncStr##deferStr#></script>'
+						'<script src="#jsPath##encodeForHTMLAttribute( item )#" #asyncStr##deferStr#></script>'
 					);
 				} else {
 					sb.append(
-						'<link href="#cssPath##item#" type="text/css" rel="stylesheet" />'
+						'<link href="#cssPath##encodeForHTMLAttribute( item )#" type="text/css" rel="stylesheet" />'
 					);
 				}
 
@@ -619,15 +619,15 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 		// Add single source
 		if( arrayLen(arguments.src) eq 1){
 			arguments.src[1] = prepareBaseLink(arguments.noBaseURL, arguments.src[1]);
-			video.append(' src="#arguments.src[1]#" />');
+			video.append(' src="#encodeForHTMLAttribute( arguments.src[ 1 ] )#" />');
 			return video.toString();
 		}
 
 		// create source tags
 		video.append(">");
 		for(x=1; x lte arrayLen(arguments.src); x++){
 			arguments.src[ x ] = prepareBaseLink(arguments.noBaseURL, arguments.src[ x ]);
-			video.append('<source src="#arguments.src[ x ]#"/>');
+			video.append('<source src="#encodeForHTMLAttribute( arguments.src[ x ] )#"/>');
 		}
 		video.append("</video>");
 
@@ -684,15 +684,15 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 		// Add single source
 		if( arrayLen(arguments.src) eq 1){
 			arguments.src[1] = prepareBaseLink(arguments.noBaseURL, arguments.src[1]);
-			audio.append(' src="#arguments.src[1]#" />');
+			audio.append(' src="#encodeForHTMLAttribute( arguments.src[1] )#" />');
 			return audio.toString();
 		}
 
 		// create source tags
 		audio.append(">");
 		for(x=1; x lte arrayLen(arguments.src); x++){
 			arguments.src[ x ] = prepareBaseLink(arguments.noBaseURL, arguments.src[ x ]);
-			audio.append('<source src="#arguments.src[ x ]#"/>');
+			audio.append('<source src="#encodeForHTMLAttribute( arguments.src[ x ] )#"/>');
 		}
 		audio.append("</audio>");
 
@@ -964,7 +964,7 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 
 		// create textarea
 		buffer.append("<textarea");
-		flattenAttributes(arguments,"value,label,wrapper,labelWrapper,groupWrapper,labelAttrs,labelClass,bind,bindProperty,inputInsideLabel",buffer).append(">#arguments.value#</textarea>");
+		flattenAttributes(arguments,"value,label,wrapper,labelWrapper,groupWrapper,labelAttrs,labelClass,bind,bindProperty,inputInsideLabel",buffer).append(">#encodeForHTML( arguments.value )#</textarea>");
 
 		//wrapper?
 		wrapTag(buffer,arguments.wrapper,1);
@@ -2348,7 +2348,10 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 		var key			= "";
 
 		// Metadata
-		var firstMetadata 	= getMetadata( arguments.data[ 1 ] ?: {} );
+		var firstMetadata = {};
+		if( !isNull( arguments.data[ 1 ] ) ){
+			firstMetadata = getMetadata( arguments.data[ 1 ] );
+		}
 		// All properties
 		var properties 		= structKeyExists( firstMetadata, "properties" ) ? firstMetadata.properties : [];
 		// Filtered properties
@@ -2398,7 +2401,9 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 		required buffer
 	){
 		// Guess columns from first struct found
-		var columns	= structKeyArray( data[ 1 ] ?: {} )
+		var thisData = ( isNull( data[ 1 ] ) ? structNew() : data[ 1 ] );
+
+		var columns	= structKeyArray( thisData )
 			.filter( function( item ){
 				return ( passIncludeExclude( item, includes, excludes ) );
 			} );

system/remote/RemotingUtil.cfc

@@ -1,55 +1,45 @@
-<!-----------------------------------------------------------------------
-********************************************************************************
-Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
-www.ortussolutions.com
-********************************************************************************
+/**
+* Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
+* www.ortussolutions.com
+* ---
+* @author Luis Majano <lmajano@ortussolutions.com>
+* Remoting Utility
+*/
+component{
 
-Author     :	Luis Majano
-Description :
-A cool remoting utililty component
------------------------------------------------------------------------>
-<cfcomponent output="false" hint="A cool remoting utililty component" >
-	
-	<!--- 
+	/*
 	Based on original function by Elliot Sprehn, found here
 	http://livedocs.adobe.com/coldfusion/7/htmldocs/wwhelp/wwhimpl/common/html/wwhelp.htm?context=ColdFusion_Documentation&file=00000271.htm
 	by Chris Blackwell
-	--->
-	<cffunction name="clearHeaderBuffer" output="false" access="public" returntype="void" hint="Clear the CFHTMLHead buffer">
-		<cfset var my = structnew() />
-	
-		<cfswitch expression="#trim(server.coldfusion.productname)#">
-	
-			<cfcase value="ColdFusion Server">
-				<cfset my.out = getPageContext().getOut() />
-	
-				<!--- It's necessary to iterate over this until we get to a coldfusion.runtime.NeoJspWriter --->
-				<cfloop condition="getMetaData(my.out).getName() is 'coldfusion.runtime.NeoBodyContent'">
-					<cfset my.out = my.out.getEnclosingWriter() />
-				</cfloop>
-	
-				<cfset my.method = my.out.getClass().getDeclaredMethod("initHeaderBuffer", arrayNew(1)) />
-				<cfset my.method.setAccessible(true) />
-				<cfset my.method.invoke(my.out, arrayNew(1)) />
-	
-			</cfcase>
-	
-	
-			<cfcase value="Lucee">
-	
-				<cfset my.out = getPageContext().getOut() />
-	
-				<cfloop condition="getMetaData(my.out).getName() is 'lucee.runtime.writer.BodyContentImpl'">
-					<cfset my.out = my.out.getEnclosingWriter() />
-				</cfloop>
-	
-				<cfset my.headData = my.out.getClass().getDeclaredField("headData") />
-				<cfset my.headData.setAccessible(true) />
-				<cfset my.headData.set(my.out, createObject("java", "java.lang.String").init("")) />
-	
-			</cfcase>
-	
-		</cfswitch>	
-	</cffunction>
+	*/
 
-</cfcomponent>
+	/**
+	 * Clear the CFHTMLHead buffer
+	 */
+	void function clearHeaderBuffer(){
+		var my = {};
+
+		switch ( trim( server.coldfusion.productname ) ) {
+			case  "ColdFusion Server" :
+				my.out = getPageContext().getOut();
+				//  It's necessary to iterate over this until we get to a coldfusion.runtime.NeoJspWriter
+				while( condition="getMetaData( my.out ).getName() == 'coldfusion.runtime.NeoBodyContent'" ) {
+					my.out = my.out.getEnclosingWriter();
+				}
+				my.method = my.out.getClass().getDeclaredMethod( "initHeaderBuffer", [] );
+				my.method.setAccessible( true );
+				my.method.invoke( my.out, [] );
+				break;
+			case  "Lucee" :
+				my.out = getPageContext().getOut();
+				while ( condition="getMetaData( my.out ).getName() == 'lucee.runtime.writer.BodyContentImpl'" ) {
+					my.out = my.out.getEnclosingWriter();
+				}
+				my.headData = my.out.getClass().getDeclaredField( "headData" );
+				my.headData.setAccessible( true );
+				my.headData.set( my.out, createObject( "java", "java.lang.String" ).init( "" ) );
+				break;
+		}
+	}
+
+}