Merge branch 'development' of github.com:coldbox-modules/cbmailservices into development

Author: michaelborn

.github/workflows/release.yml

@@ -148,7 +148,7 @@ jobs:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.MODULE_ID }}
           path: .tmp

.github/workflows/tests.yml

@@ -84,7 +84,7 @@ jobs:
           curl http://127.0.0.1:60299
 
       # Startup Fake SMTP
-      - uses: isbang/compose-action@v1.0.0
+      - uses: hoverkraft-tech/compose-action@v2
         with:
           compose-file: './test-harness/tests/resources/docker-compose.yml'
 

models/Mail.cfc

@@ -17,6 +17,8 @@ component accessors="true" {
 	// DI
 	property name="wirebox" inject="wirebox";
 
+	property name="renderer" inject="coldbox:renderer";
+
 	/**
 	 * The config struct representing the mail payload which is sent to the configured protocol in the mail service
 	 */
@@ -457,25 +459,21 @@ component accessors="true" {
 
 		// Do we have a layout?
 		if ( !isNull( arguments.layout ) && len( arguments.layout ) ) {
-			variables.config.body = variables.wirebox
-				.getInstance( "Renderer@coldbox" )
-				.layout(
-					layout    : arguments.layout,
-					module    : arguments.layoutModule,
-					view      : arguments.view,
-					args      : arguments.args,
-					viewModule: arguments.module
-				);
+			variables.config.body = variables.renderer.layout(
+				layout    : arguments.layout,
+				module    : arguments.layoutModule,
+				view      : arguments.view,
+				args      : arguments.args,
+				viewModule: arguments.module
+			);
 		}
 		// Else, plain view rendering
 		else {
-			variables.config.body = variables.wirebox
-				.getInstance( "Renderer@coldbox" )
-				.view(
-					view  : arguments.view,
-					args  : arguments.args,
-					module: arguments.module
-				);
+			variables.config.body = variables.renderer.view(
+				view  : arguments.view,
+				args  : arguments.args,
+				module: arguments.module
+			);
 		}
 
 		return this;