COLDBOX-715 #resolve

Elvis operator inconsistencies on Adobe Engines

Author: lmajano

.cflintrc

@@ -1,8 +1,6 @@
 {
     "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" },
@@ -57,8 +55,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": {

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

@@ -2348,7 +2348,10 @@ component extends="coldbox.system.FrameworkSupertype" accessors=true singleton{
 		var key			= "";
 
 		// Metadata
-		var firstMetadata 	= getMetadata( arguments.data[ 1 ] ?: structNew() );
+		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 ] ?: structNew() )
+		var thisData = ( isNull( data[ 1 ] ) ? structNew() : data[ 1 ] );
+
+		var columns	= structKeyArray( thisData )
 			.filter( function( item ){
 				return ( passIncludeExclude( item, includes, excludes ) );
 			} );

system/web/context/RequestContext.cfc

@@ -666,17 +666,17 @@ component serializable=false accessors="true"{
 	* Are we in SSL or not? This method looks at cgi.server_port_secure for indication
 	*/
 	boolean function isSSL(){
-		if( isBoolean( cgi.server_port_secure ) AND cgi.server_port_secure ){ 
-			return true; 
+		if( isBoolean( cgi.server_port_secure ) AND cgi.server_port_secure ){
+			return true;
 		}
 		// Add typical proxy headers for SSL
-		if( getHTTPHeader( "x-forwarded-proto", "http" ) eq "https" ){ 
-			return true; 
+		if( getHTTPHeader( "x-forwarded-proto", "http" ) eq "https" ){
+			return true;
 		}
-		if( getHTTPHeader( "x-scheme", "http" ) eq "https" ){ 
-			return true; 
+		if( getHTTPHeader( "x-scheme", "http" ) eq "https" ){
+			return true;
 		}
-		// cgi.https 
+		// cgi.https
 		if( cgi.keyExists( "https" ) and cgi.https eq "on" ){
 			return true;
 		}
@@ -1009,8 +1009,11 @@ component serializable=false accessors="true"{
 		if( arrayLen( foundRoute ) ){
 			var args = {
 				to 	= entryPoint & foundRoute[ 1 ].pattern,
-				ssl = arguments.ssl ?: javaCast( "null", "" )
+				ssl = javaCast( "null", "" )
 			};
+			if( !isNull( arguments.ssl ) ){
+				args.ssl = arguments.ssl;
+			}
 
 			// Process Params
 			arguments.params.each( function( key, value ){
@@ -1446,7 +1449,7 @@ component serializable=false accessors="true"{
 
 	/**
 	 * Set an HTTP Response Header
-	 * 
+	 *
 	 * @statusCode the status code
 	 * @statusText the status text
 	 * @name The header name
@@ -1471,10 +1474,10 @@ component serializable=false accessors="true"{
 			getPageContext().getResponse().addHeader( javaCast( "string", arguments.name ), javaCast( "string", arguments.value ) );
 			variables.responseHeaders[ arguments.name ] = arguments.value;
 		} else {
-			throw( 
+			throw(
 				message = "Invalid header arguments",
 				detail 	= "Pass in either a statusCode or name argument",
-				type 	= "RequestContext.InvalidHTTPHeaderParameters" 
+				type 	= "RequestContext.InvalidHTTPHeaderParameters"
 			);
 		}
 

system/web/routing/Router.cfc

@@ -1069,7 +1069,7 @@ component accessors="true" extends="coldbox.system.FrameworkSupertype" threadsaf
 				args = {
 					pattern = arguments.pattern,
 					event   = arguments.target,
-					verbs   = variables.thisRoute.verbs ?: "",
+					verbs   = ( variables.thisRoute.keyExists( "verbs" ) ? variables.thisRoute.verbs : "" ),
 					name 	= arguments.name
 				};
 			}
@@ -1078,8 +1078,8 @@ component accessors="true" extends="coldbox.system.FrameworkSupertype" threadsaf
 				args = {
 					pattern  = arguments.pattern,
 					response = arguments.target,
-					verbs    = variables.thisRoute.verbs ?: "",
-					name 	= arguments.name
+					verbs 	 = ( variables.thisRoute.keyExists( "verbs" ) ? variables.thisRoute.verbs : "" ),
+					name 	 = arguments.name
 				};
 			}
 

system/web/services/RoutingService.cfc

@@ -244,9 +244,15 @@ component extends="coldbox.system.web.services.BaseService" accessors="true"{
 		// Process Redirects
 		if( routeResults.route.redirect.len() ){
 			if( routeResults.route.redirect.findNoCase( "http" ) ){
-				controller.relocate( URL=routeResults.route.redirect, statusCode=routeResults.route.statusCode ?: 301 );
+				controller.relocate(
+					URL        = routeResults.route.redirect,
+					statusCode = ( routeResults.route.keyExists( "statusCode" ) ? routeResults.route.statusCode : 301 )
+				);
 			} else {
-				controller.relocate( event=routeResults.route.redirect, statusCode=routeResults.route.statusCode ?: 301 );
+				controller.relocate(
+					event      = routeResults.route.redirect,
+					statusCode = ( routeResults.route.keyExists( "statusCode" ) ? routeResults.route.statusCode : 301 )
+				);
 			}
 			return;
 		}