Merge branch 'development'

coldbox-modules · Nov 16, 2022 · d1f413f · d1f413f
2 parents 217ea6f + 22cbd1e
commit d1f413f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 25 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"ColdBox ORM Extensions",
-    "version":"4.2.0",
+    "version":"4.3.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cborm/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions <[email protected]",
     "homepage":"https://github.com/coldbox-modules/cborm",

diff --git a/changelog.md b/changelog.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
+## [v4.3.0] => 2022-NOV-16
+
+### Changed
+
+* Updated `processState()` to `announce()` to stay compliant
+
+----
+
 ## [v4.2.0] => 2022-NOV-16
 
 ### Changed

diff --git a/models/BaseORMService.cfc b/models/BaseORMService.cfc
@@ -420,7 +420,7 @@ component accessors="true" {
 		if ( getEventHandling() ) {
 			getORMEventHandler()
 				.getEventManager()
-				.processState(
+				.announce(
 					"beforeOrmExecuteQuery",
 					{
 						"query"   : arguments.query,
@@ -443,7 +443,7 @@ component accessors="true" {
 		if ( getEventHandling() ) {
 			getORMEventHandler()
 				.getEventManager()
-				.processState(
+				.announce(
 					"afterOrmExecuteQuery",
 					{
 						"query"   : arguments.query,

diff --git a/models/criterion/BaseBuilder.cfc b/models/criterion/BaseBuilder.cfc
@@ -162,7 +162,7 @@ component accessors="true" {
 
 		// process interception
 		if ( ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Order", "criteriaBuilder" : this }
 			);
@@ -209,7 +209,7 @@ component accessors="true" {
 
 		// announce
 		if ( ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Alias", "criteriaBuilder" : this }
 			);
@@ -242,7 +242,7 @@ component accessors="true" {
 				nativeCriteria = nativeCriteria.createCriteria( arguments.associationName, arguments.joinType );
 				// announce
 				if ( ORMService.getEventHandling() ) {
-					variables.eventManager.processState(
+					variables.eventManager.announce(
 						"onCriteriaBuilderAddition",
 						{
 							"type"            : "New Criteria w/Join Type",
@@ -281,7 +281,7 @@ component accessors="true" {
 			}
 		}
 		if ( ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "New Criteria", "criteriaBuilder" : this }
 			);
@@ -351,7 +351,7 @@ component accessors="true" {
 
 		// announce
 		if ( ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Projection", "criteriaBuilder" : this }
 			);
@@ -482,7 +482,7 @@ component accessors="true" {
 
 		// announce
 		if ( ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Projection", "criteriaBuilder" : this }
 			);
@@ -716,7 +716,7 @@ component accessors="true" {
 
 			// announce
 			if ( ORMService.getEventHandling() ) {
-				variables.eventManager.processState(
+				variables.eventManager.announce(
 					"onCriteriaBuilderAddition",
 					{ "type" : "Projection", "criteriaBuilder" : this }
 				);

diff --git a/models/criterion/CriteriaBuilder.cfc b/models/criterion/CriteriaBuilder.cfc
@@ -143,15 +143,15 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState( "beforeCriteriaBuilderList", { "criteriaBuilder" : this } );
+			variables.eventManager.announce( "beforeCriteriaBuilderList", { "criteriaBuilder" : this } );
 		}
 
 		// Get listing
 		var results = variables.nativeCriteria.list() ?: [];
 
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"afterCriteriaBuilderList",
 				{ "criteriaBuilder" : this, "results" : results }
 			);
@@ -176,7 +176,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 	/**
 	 * pass off arguments to higher-level restriction builder, and handle the results
 	 *
-	 * @missingMethodName     
+	 * @missingMethodName
 	 * @missingMethodArguments
 	 */
 	any function onMissingMethod( required string missingMethodName, required struct missingMethodArguments ){
@@ -194,7 +194,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Restriction", "criteriaBuilder" : this }
 			);
@@ -220,7 +220,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Subquery", "criteriaBuilder" : this }
 			);
@@ -284,7 +284,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 		if ( getSqlHelper().canLogLimitOffset() ) {
 			// process interception
 			if ( variables.ORMService.getEventHandling() ) {
-				variables.eventManager.processState(
+				variables.eventManager.announce(
 					"onCriteriaBuilderAddition",
 					{ "type" : "Offset", "criteriaBuilder" : this }
 				);
@@ -303,7 +303,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 		if ( getSqlHelper().canLogLimitOffset() ) {
 			// process interception
 			if ( variables.ORMService.getEventHandling() ) {
-				variables.eventManager.processState(
+				variables.eventManager.announce(
 					"onCriteriaBuilderAddition",
 					{ "type" : "Max", "criteriaBuilder" : this }
 				);
@@ -372,7 +372,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 	any function get( properties = "" ){
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState( "beforeCriteriaBuilderGet", { "criteriaBuilder" : this } );
+			variables.eventManager.announce( "beforeCriteriaBuilderGet", { "criteriaBuilder" : this } );
 		}
 
 		// Do we have any properties to add?
@@ -385,7 +385,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 
 		// process interception
 		if ( !isNull( result ) && variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"afterCriteriaBuilderGet",
 				{ "criteriaBuilder" : this, "result" : result }
 			);
@@ -404,7 +404,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 	numeric function count( propertyName = "" ){
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState( "beforeCriteriaBuilderCount", { "criteriaBuilder" : this } );
+			variables.eventManager.announce( "beforeCriteriaBuilderCount", { "criteriaBuilder" : this } );
 		}
 
 		// else project on the local criterias
@@ -416,7 +416,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"onCriteriaBuilderAddition",
 				{ "type" : "Count", "criteriaBuilder" : this }
 			);
@@ -429,7 +429,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 
 		// process interception
 		if ( variables.ORMService.getEventHandling() ) {
-			variables.eventManager.processState(
+			variables.eventManager.announce(
 				"afterCriteriaBuilderCount",
 				{ "criteriaBuilder" : this, "results" : results }
 			);

diff --git a/models/criterion/DetachedCriteriaBuilder.cfc b/models/criterion/DetachedCriteriaBuilder.cfc
@@ -51,7 +51,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 	/**
 	 * pass off arguments to higher-level restriction builder, and handle the results
 	 *
-	 * @missingMethodName     
+	 * @missingMethodName
 	 * @missingMethodArguments
 	 */
 	any function onMissingMethod( required string missingMethodName, required struct missingMethodArguments ){
@@ -76,7 +76,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 			default:
 				nativeCriteria.add( r );
 				// process interception
-				variables.eventManager.processState(
+				variables.eventManager.announce(
 					"onCriteriaBuilderAddition",
 					{
 						"type"            : "Subquery Restriction",
@@ -182,7 +182,7 @@ component accessors="true" extends="cborm.models.criterion.BaseBuilder" {
 		if ( getSqlHelper().canLogLimitOffset() ) {
 			// process interception
 			if ( variables.ormService.getEventHandling() ) {
-				variables.eventManager.processState(
+				variables.eventManager.announce(
 					"onCriteriaBuilderAddition",
 					{ "type" : "Max", "criteriaBuilder" : this }
 				);