fix(Relationships): Fix naming collision with newEntity function an…

…d variable name.
coldbox-modules · May 31, 2024 · 81aedbb · 81aedbb
1 parent ba3a2f4
commit 81aedbb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/models/Relationships/BelongsTo.cfc b/models/Relationships/BelongsTo.cfc
@@ -219,14 +219,14 @@ component
 	 */
 	public array function initRelation( required array entities, required string relation ) {
 		arguments.entities.each( function( entity ) {
-			var newEntity = newDefaultEntity();
+			var defaultEntity = newDefaultEntity();
 			if ( structKeyExists( arguments.entity, "isQuickEntity" ) ) {
 				arguments.entity.assignRelationship(
 					relation,
-					isNull( newEntity ) ? javacast( "null", "" ) : newEntity
+					isNull( defaultEntity ) ? javacast( "null", "" ) : defaultEntity
 				);
 			} else {
-				arguments.entity[ relation ] = isNull( newEntity ) ? {} : newEntity.getMemento();
+				arguments.entity[ relation ] = isNull( defaultEntity ) ? {} : defaultEntity.getMemento();
 			}
 		} );
 		return arguments.entities;

diff --git a/models/Relationships/BelongsToThrough.cfc b/models/Relationships/BelongsToThrough.cfc
@@ -262,14 +262,14 @@ component extends="quick.models.Relationships.BaseRelationship" {
 	 */
 	public array function initRelation( required array entities, required string relation ) {
 		return arguments.entities.map( function( entity ) {
-			var newEntity = newDefaultEntity();
+			var defaultEntity = newDefaultEntity();
 			if ( structKeyExists( arguments.entity, "isQuickEntity" ) ) {
 				arguments.entity.assignRelationship(
 					relation,
-					isNull( newEntity ) ? javacast( "null", "" ) : newEntity
+					isNull( defaultEntity ) ? javacast( "null", "" ) : defaultEntity
 				);
 			} else {
-				arguments.entity[ relation ] = isNull( newEntity ) ? {} : newEntity.getMemento();
+				arguments.entity[ relation ] = isNull( defaultEntity ) ? {} : defaultEntity.getMemento();
 			}
 			return arguments.entity;
 		} );

diff --git a/models/Relationships/HasOne.cfc b/models/Relationships/HasOne.cfc
@@ -57,14 +57,14 @@ component extends="quick.models.Relationships.HasOneOrMany" {
 	 */
 	public array function initRelation( required array entities, required string relation ) {
 		return arguments.entities.map( function( entity ) {
-			var newEntity = newDefaultEntity();
+			var defaultEntity = newDefaultEntity();
 			if ( structKeyExists( arguments.entity, "isQuickEntity" ) ) {
 				arguments.entity.assignRelationship(
 					relation,
-					isNull( newEntity ) ? javacast( "null", "" ) : newEntity
+					isNull( defaultEntity ) ? javacast( "null", "" ) : defaultEntity
 				);
 			} else {
-				arguments.entity[ relation ] = isNull( newEntity ) ? {} : newEntity.getMemento();
+				arguments.entity[ relation ] = isNull( defaultEntity ) ? {} : defaultEntity.getMemento();
 			}
 			return arguments.entity;
 		} );

diff --git a/models/Relationships/HasOneThrough.cfc b/models/Relationships/HasOneThrough.cfc
@@ -53,14 +53,14 @@ component extends="quick.models.Relationships.HasOneOrManyThrough" {
 	 */
 	public array function initRelation( required array entities, required string relation ) {
 		return arguments.entities.map( function( entity ) {
-			var newEntity = newDefaultEntity();
+			var defaultEntity = newDefaultEntity();
 			if ( structKeyExists( arguments.entity, "isQuickEntity" ) ) {
 				arguments.entity.assignRelationship(
 					relation,
-					isNull( newEntity ) ? javacast( "null", "" ) : newEntity
+					isNull( defaultEntity ) ? javacast( "null", "" ) : defaultEntity
 				);
 			} else {
-				arguments.entity[ relation ] = isNull( newEntity ) ? {} : newEntity.getMemento();
+				arguments.entity[ relation ] = isNull( defaultEntity ) ? {} : defaultEntity.getMemento();
 			}
 			return arguments.entity;
 		} );