BL compat updates

ColdBox · Jan 22, 2025 · 7286627 · 7286627
1 parent 1c465e8
commit 7286627
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/system/core/util/CFMLEngine.cfc b/system/core/util/CFMLEngine.cfc
@@ -59,14 +59,14 @@ component {
 	 * Verify if this is a lucee server
 	 */
 	boolean function isLucee(){
-		return server.keyExists( "lucee" ) && !server.keyExists( "boxlang" );
+		return !server.keyExists( "boxlang" ) && server.keyExists( "lucee" );
 	}
 
 	/**
 	 * Verify if this is an adobe server
 	 */
 	boolean function isAdobe(){
-		return server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" );
+		return !isBoxlang() && server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" );
 	}
 
 	/**

diff --git a/system/core/util/Util.cfc b/system/core/util/Util.cfc
@@ -11,7 +11,7 @@ component {
 		// Lazy load the helper
 		if ( isNull( variables.engineMappingHelper ) ) {
 			// Detect server
-			if ( listFindNoCase( "Lucee", server.coldfusion.productname ) ) {
+			if ( !server.keyExists( "boxlang" ) && listFindNoCase( "Lucee", server.coldfusion.productname ) ) {
 				variables.engineMappingHelper = new LuceeMappingHelper();
 			} else {
 				variables.engineMappingHelper = new CFMappingHelper();
@@ -63,7 +63,9 @@ component {
 	boolean function inThread(){
 		var engine = "ADOBE";
 
-		if ( server.coldfusion.productname eq "Lucee" ) {
+		if( server.keyExists( "boxlang" ) ){
+			engine = "BOXLANG";
+		} else if ( server.coldfusion.productname eq "Lucee" ) {
 			engine = "LUCEE";
 		}
 
@@ -82,6 +84,7 @@ component {
 				}
 				break;
 			}
+			case "BOXLANG":
 			case "LUCEE": {
 				return isInThread();
 			}
@@ -234,7 +237,7 @@ component {
 		return serializeJSON(
 			arguments.obj,
 			"struct",
-			listFindNoCase( "Lucee", server.coldfusion.productname ) ? "utf-8" : false
+			!server.keyExists( "boxlang" ) && listFindNoCase( "Lucee", server.coldfusion.productname ) ? "utf-8" : false
 		);
 	}
 

diff --git a/test-harness/config/CacheBox.cfc b/test-harness/config/CacheBox.cfc
@@ -43,8 +43,11 @@
 			}
 		};
 
+
 		// Add caches per engine
-		if ( listFindNoCase( "Lucee", server.coldfusion.productname ) ) {
+		if( server.keyExists( "boxlang" ) ){
+			cachebox.caches.cfCache = { provider : "coldbox.system.cache.providers.BoxlangProvider" };
+		} else if ( listFindNoCase( "Lucee", server.coldfusion.productname ) ) {
 			cachebox.caches.luceeCache = { provider : "coldbox.system.cache.providers.LuceeProvider" };
 		} else {
 			cachebox.caches.cfCache = { provider : "coldbox.system.cache.providers.CFColdBoxProvider" };