* Adobe 2016 Dropped

Author: lmajano

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ]
+        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2

ModuleConfig.cfc

@@ -7,7 +7,7 @@ component {
 
 	// Module Properties
 	this.title              = "ColdBox Debugger";
-	this.author             = "Curt Gratz - Ortus Solutions";
+	this.author             = "Ortus Solutions";
 	this.version            = "@build.version@[email protected]@";
 	this.webURL             = "https://www.ortussolutions.com";
 	this.description        = "The ColdBox Debugger Module";
@@ -262,10 +262,7 @@ component {
 
 			/******************** ACFSQL COLLECTOR ************************************/
 
-			// Do not load on lucee or ACF 2016
-			if (
-				variables.settings.acfSql.enabled && !server.keyExists( "lucee" ) && server.coldfusion.productVersion.listFirst() gt "2016"
-			) {
+			if ( variables.settings.acfSql.enabled && !server.keyExists( "lucee" ) ) {
 				interceptorService.registerInterceptor(
 					interceptorClass = "#moduleMapping#.interceptors.ACFSqlCollector",
 					interceptorName  = "ACFSqlCollector@cbdebugger"

box.json

@@ -60,15 +60,12 @@
         "install:2021":"run-script cfpm:install zip,debugger,orm,mysql,postgresql,sqlserver,feed,chart",
         "install:dependencies":"install && cd test-harness && install",
         "start:lucee":"server start [email protected]",
-        "start:2016":"server start [email protected]",
         "start:2018":"server start [email protected]",
         "start:2021":"server start [email protected]",
         "stop:lucee":"server stop name=cbdebugger-lucee@5",
-        "stop:2016":"server stop name=cbdebugger-adobe@2016",
         "stop:2018":"server stop name=cbdebugger-adobe@2018",
         "stop:2021":"server stop name=cbdebugger-adobe@2021",
         "logs:lucee":"server log name=cbdebugger-lucee@5 --follow",
-        "logs:2016":"server log name=cbdebugger-adobe@2016 --follow",
         "logs:2018":"server log name=cbdebugger-adobe@2018 --follow",
         "logs:2021":"server log name=cbdebugger-adobe@2021 --follow"
     },

build/.travis.yml

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

changelog.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
-## [3.5.0] => 2022-SEP
+## [4.0.0] => 2022-SEP
 
 ### Added
 
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Tracers are now streamlined and stored alongside the request profilers
 * Small UI fixes on request profiler HTTP methods
 * WireBox collecting is now done by the WireBox collector not the Request Collector.
+* Adobe 2016 Dropped
 
 ----
 

interceptors/RequestCollector.cfc

@@ -93,7 +93,7 @@ component extends="coldbox.system.Interceptor" {
 			// Don't render in ajax calls
 			!arguments.event.isAjax() AND
 			// Only show on HTML content types
-			findNoCase( "html", getPageContextResponse().getContentType() ) AND
+			findNoCase( "html", variables.debuggerService.getPageContextResponse().getContentType() ) AND
 			// We don't have any render data OR the render data is HTML
 			(
 				structIsEmpty( arguments.event.getRenderData() ) || arguments.event.getRenderData().contentType == "text/html"
@@ -259,19 +259,6 @@ component extends="coldbox.system.Interceptor" {
 		}
 	}
 
-	/**
-	 * Helper method to deal with ACF2016's overload of the page context response, come on Adobe, get your act together!
-	 **/
-	private function getPageContextResponse(){
-		var response = getPageContext().getResponse();
-		try {
-			response.getStatus();
-			return response;
-		} catch ( any e ) {
-			return response.getResponse();
-		}
-	}
-
 	/**
 	 * Execute Debugger Commands
 	 */

models/DebuggerService.cfc

@@ -499,20 +499,12 @@ component
 	}
 
 	/**
-	 * Helper method to deal with ACF2016's overload of the page context response, come on Adobe, get your act together!
+	 * Helper method to deal with ACF's overload of the page context response, come on Adobe, get your act together!
 	 */
 	function getPageContextResponse(){
-		if ( server.keyExists( "lucee" ) ) {
-			return getPageContext().getResponse();
-		}
-		if ( server.coldfusion.productVersion.listFirst() eq 2016 ) {
-			return getPageContext()
-				.getResponse()
-				.getResponse()
-				.getResponse();
-		} else {
-			return getPageContext().getResponse().getResponse();
-		}
+		return server.keyExists( "lucee" ) ? getPageContext().getResponse() : getPageContext()
+			.getResponse()
+			.getResponse();
 	}
 
 	/**