acf compat since member functions differ between lucee

Author: lmajano

.travis.yml

@@ -10,6 +10,7 @@ env:
     - MODULE_ID=cbdebugger
   matrix:
     - ENGINE=lucee@5
+    - ENGINE=adobe@2016
     - ENGINE=adobe@2018
 
 branches:

models/DebuggerService.cfc

@@ -460,7 +460,7 @@ component
 		var callstack   = callStackGet();
 		var targetIndex = callstack
 			.map( function( item, index, array ){
-				// Do we have template matches or simple tests?
+				// Do we have template matches or simple function equality?
 				if ( !isNull( templateMatch ) ) {
 					if (
 						arguments.item.function == targetMethod && findNoCase(
@@ -480,8 +480,9 @@ component
 				return !isNull( arguments.item );
 			} );
 
+		// Only return if we have matches, else default return struct
 		if ( targetIndex.len() ) {
-			var results       = callStack[ targetIndex.last() + 1 ];
+			var results       = callStack[ targetIndex[ arrayLen( targetIndex ) ] + 1 ];
 			results[ "line" ] = results.lineNumber;
 			return results;
 		}

readme.md

@@ -36,7 +36,7 @@ Apache License, Version 2.0.
 ## System Requirements
 
 - Lucee 5+
-- ColdFusion 2018+
+- ColdFusion 2016+
 - ColdBox 6+
 
 # Instructions

test-harness/[email protected]

@@ -0,0 +1,19 @@
+{
+    "name":"cbdebugger-adobe@2016",
+    "app":{
+        "serverHomeDirectory":".engine/adobe2016",
+        "cfengine":"adobe@2016"
+    },
+    "web":{
+        "http":{
+            "port":"60299"
+        },
+        "rewrites":{
+            "enable":"true"
+        },
+        "aliases":{
+            "/moduleroot/cbdebugger":"../"
+        }
+    },
+    "openBrowser":"false"
+}

views/main/panels/cbormPanel.cfm

@@ -271,7 +271,9 @@
 						#args.profiler.cborm.totalQueries#
 					</td>
 				</tr>
-				<cfloop array="#args.profiler.cborm.sessionStats.keyArray().sort( "textnocase" )#" item="thisItem" >
+				<cfset stats = args.profiler.cborm.sessionStats.keyArray()>
+				<cfset stats.sort( "textnocase" )>
+				<cfloop array="#stats#" item="thisItem" >
 					<tr>
 						<th width="200" align="right">
 							#thisItem# :

views/main/panels/coldboxPanel.cfm

@@ -1,3 +1,6 @@
+<!--- Sort keys --->
+<cfset coldboxKeys = args.profiler.coldbox.keyArray()>
+<cfset coldboxKeys.sort( "textnocase" )>
 <cfoutput>
 <!--- Title --->
 <div class="cbd-titles" onClick="cbdToggle( 'cbd-coldboxData' )">
@@ -13,7 +16,7 @@
 	id="cbd-coldboxData"
 >
 	<table border="0" align="center" cellpadding="0" cellspacing="1" class="cbd-tables">
-		<cfloop array="#args.profiler.coldbox.keyArray().sort( "textnocase" )#" item="thisItem" >
+		<cfloop array="#coldboxKeys#" item="thisItem" >
 			<tr>
 				<th width="200" align="right">
 					#thisItem# :

views/main/panels/collectionPanel.cfm

@@ -1,10 +1,12 @@
+<cfset collectionKeys = args.collection.keyArray()>
+<cfset collectionKeys.sort( "textnocase" )>
 <cfoutput>
 <!--- Public Collection --->
 <table border="0" cellpadding="0" cellspacing="1" class="cbd-tables" width="100%">
 	<tr>
 		<th colspan="2">#args.collectionType# Collection</th>
 	</tr>
-	<cfloop array="#args.collection.keyArray().sort( "textnocase" )#" index="thisKey">
+	<cfloop array="#collectionKeys#" index="thisKey">
 		<!--- Identify Value or null --->
 		<cfif !isNull( args.collection[ thisKey ] )>
 			<cfset thisValue = args.collection[ thisKey ]>

views/main/panels/exceptionPanel.cfm

@@ -1,5 +1,7 @@
-<cfoutput>
 <cfset exceptionBean = new coldbox.system.web.context.ExceptionBean()>
+<cfset exceptionKeys = args.profiler.exception.keyArray()>
+<cfset exceptionKeys.sort( "textnocase" )>
+<cfoutput>
 	<!--- Title --->
 	<div class="cbd-titles" onClick="cbdToggle( 'cbd-exceptionData' )">
 		&nbsp;
@@ -11,7 +13,7 @@
 
 	<div class="cbd-contentView" id="cbd-exceptionData">
 		<table border="0" align="center" cellpadding="0" cellspacing="1" class="cbd-tables">
-			<cfloop array="#args.profiler.exception.keyArray().sort( "textnocase" )#" item="thisItem" >
+			<cfloop array="#exceptionKeys#" item="thisItem" >
 				<cfif !isSimpleValue( args.profiler.exception[ thisItem ] ) OR len( args.profiler.exception[ thisItem ] )>
 					<tr>
 						<th width="100" align="right">

views/main/panels/httpRequestPanel.cfm

@@ -83,9 +83,11 @@
 		</cfif>
 	</table>
 
+	<cfset headerKeys = args.profiler.requestData.headers.keyArray()>
+	<cfset headerKeys.sort( "textnocase" )>
 	<h2>Headers</h2>
 	<table border="0" align="center" cellpadding="0" cellspacing="1" class="cbd-tables">
-		<cfloop array="#args.profiler.requestData.headers.keyArray().sort( "textnocase" )#" item="thisHeader" >
+		<cfloop array="#headerKeys#" item="thisHeader" >
 			<tr>
 				<th width="175" align="right">
 					#thisHeader#
@@ -102,18 +104,21 @@
 										Cookie Value
 									</th>
 								</tr>
-								<cfloop array="#args.profiler.requestData.headers.cookie.listToArray( ";" ).sort( "textNoCase" )#" index="thisHeader">
+								<!--- Sort Cookies --->
+								<cfset cookieKeys = args.profiler.requestData.headers.cookie.listToArray( ";" )>
+								<cfset cookieKeys.sort( "textnocase" )>
+								<cfloop array="#cookieKeys#" index="thisCookie">
 									<tr>
 										<td class="cbd-cellBreak">
 											<em class="textBlue">
-												#getToken( thisHeader, 1, "=" )#
+												#getToken( thisCookie, 1, "=" )#
 											</em>
 										</td>
 										<td class="cbd-cellBreak">
-											<cfif !isBoolean( getToken( thisHeader, 2, "=" ) ) && isJSON( getToken( thisHeader, 2, "=" ) )>
-												#getInstance( '@JSONPrettyPrint' ).formatJSON( getToken( thisHeader, 2, "=" ) )#
+											<cfif !isBoolean( getToken( thisCookie, 2, "=" ) ) && isJSON( getToken( thisCookie, 2, "=" ) )>
+												#getInstance( '@JSONPrettyPrint' ).formatJSON( getToken( thisCookie, 2, "=" ) )#
 											<cfelse>
-												#getToken( thisHeader, 2, "=" )#
+												#getToken( thisCookie, 2, "=" )#
 											</cfif>
 										</td>
 									</tr>