Apply cfformat changes

Author: lmajano

models/validators/RequiredIfValidator.cfc

@@ -37,8 +37,8 @@ component
 		any validationData,
 		struct rules
 	){
-		var isRequired = true;
-        var errorMetadata = {};
+		var isRequired    = true;
+		var errorMetadata = {};
 
 		// If you passed in simple data, simply check that the target field has a value
 		if ( isSimpleValue( arguments.validationData ) && len( arguments.validationData ) ) {
@@ -61,22 +61,19 @@ component
 				.reduce( function( result, key, value ){
 					return ( arguments.value && arguments.result );
 				}, true );
-        // If passed a UDF/closure
-        } else if ( 
-            isCustomFunction( arguments.validationData ) || 
-            isClosure( arguments.validationData )
-        ) {
-            
-            // Validate against the UDF/closure
-            var isRequired = arguments.validationData(
-                isNull( arguments.targetValue ) ? javacast( "null", "" ) : arguments.targetValue,
-                arguments.target,
-                errorMetadata
-            );
-
-        } else {
-            
-            validationResult.addError(
+			// If passed a UDF/closure
+		} else if (
+			isCustomFunction( arguments.validationData ) ||
+			isClosure( arguments.validationData )
+		) {
+			// Validate against the UDF/closure
+			var isRequired = arguments.validationData(
+				isNull( arguments.targetValue ) ? javacast( "null", "" ) : arguments.targetValue,
+				arguments.target,
+				errorMetadata
+			);
+		} else {
+			validationResult.addError(
 				validationResult.newError(
 					message        = "The target for RequiredIf must be a simple field name or a struct of field to target value pairs.",
 					field          = arguments.field,
@@ -109,9 +106,9 @@ component
 			validationData : arguments.validationData
 		};
 
-		validationResult.addError( 
-            validationResult.newError( argumentCollection = args ).setErrorMetadata( errorMetadata ) 
-        );
+		validationResult.addError(
+			validationResult.newError( argumentCollection = args ).setErrorMetadata( errorMetadata )
+		);
 		return false;
 	}
 

test-harness/tests/specs/validators/RequiredIfValidatorTest.cfc

@@ -106,78 +106,47 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 
 				expect( model.validate( result, mock, "testField", "", "name" ) ).toBeFalse();
 
-				expect(
-                    model.validate(
-                        result,
-                        mock,
-                        "testField",
-                        "",
-                        "missing"
-                    )
-				).toBeTrue();
+				expect( model.validate( result, mock, "testField", "", "missing" ) ).toBeTrue();
 			} );
-            it( "can accept a closure as validationData", function(){
+			it( "can accept a closure as validationData", function(){
 				var mock = createStub()
 					.$( "getName", "luis" )
 					.$( "getRole", "admin" )
 					.$( "getMissing", javacast( "null", "" ) );
 				var result = createMock( "cbvalidation.models.result.ValidationResult" ).init();
 
-				expect( 
-                    model.validate( 
-                        result, 
-                        mock, 
-                        "testField", 
-                        "", 
-                        isRequired1 
-                    ) ).toBeFalse();
+				expect( model.validate( result, mock, "testField", "", isRequired1 ) ).toBeFalse();
 
-				expect(
-                    model.validate(
-                        result,
-                        mock,
-                        "testField",
-                        "",
-                        isRequired2
-                    )
-				).toBeTrue();
+				expect( model.validate( result, mock, "testField", "", isRequired2 ) ).toBeTrue();
 			} );
-            it( "can use custom error metadata", function(){
+			it( "can use custom error metadata", function(){
 				var mock = createStub()
 					.$( "getName", "luis" )
 					.$( "getRole", "admin" )
 					.$( "getMissing", javacast( "null", "" ) );
 				var result = createMock( "cbvalidation.models.result.ValidationResult" ).init();
 
-				expect( 
-                    model.validate( 
-                        result, 
-                        mock, 
-                        "testField", 
-                        "", 
-                        isRequired3 
-                    ) ).toBeFalse();
+				expect( model.validate( result, mock, "testField", "", isRequired3 ) ).toBeFalse();
 
-                var errorMetadata = result.getErrors()[ 1 ].getErrorMetadata();
+				var errorMetadata = result.getErrors()[ 1 ].getErrorMetadata();
 
-                expect( errorMetaData ).toHaveKey( "customMessage" );
-                expect( errorMetaData.customMessage ).toBe( "This is custom data" );
-                
+				expect( errorMetaData ).toHaveKey( "customMessage" );
+				expect( errorMetaData.customMessage ).toBe( "This is custom data" );
 			} );
 		} );
 	}
 
-    private function isRequired1( value, target, errorMetadata ){
+	private function isRequired1( value, target, errorMetadata ){
 		return true;
 	}
 
-    private function isRequired2( value, target, errorMetadata ){
+	private function isRequired2( value, target, errorMetadata ){
 		return false;
 	}
 
-    private function isRequired3( value, target, errorMetadata ){
+	private function isRequired3( value, target, errorMetadata ){
 		arguments.errorMetadata[ "customMessage" ] = "This is custom data";
-        return true;
+		return true;
 	}
 
 }