Merge branch 'development'

Author: lmajano

.cfformat.json

@@ -16,7 +16,7 @@
 	"function_call.padding": true,
 	"function_call.multiline.leading_comma.padding": true,
 	"function_call.casing.builtin": "cfdocs",
-	"function_call.casing.userdefined": "",
+	"function_call.casing.userdefined": "camel",
 	"function_call.multiline.element_count": 4,
 	"function_call.multiline.leading_comma": false,
 	"function_call.multiline.min_length": 40,

.travis.yml

@@ -10,7 +10,6 @@ env:
     - MODULE_ID=cbvalidation
   matrix:
     - ENGINE=lucee@5
-    - ENGINE=adobe@11
     - ENGINE=adobe@2016
     - ENGINE=adobe@2018
 

box.json

@@ -1,7 +1,7 @@
 {
     "name":"ColdBox Validation",
     "author":"Ortus Solutions <[email protected]>",
-    "version":"1.5.2",
+    "version":"2.0.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
     "slug":"cbvalidation",
     "type":"modules",
@@ -31,6 +31,9 @@
         ".git*"
     ],
     "scripts":{
-        "toMaster":"recipe build/toMaster.boxr"
+		"toMaster":"recipe build/toMaster.boxr",
+		"format":"cfformat run models/**/*.cfc,ModuleConfig.cfc,tests/specs/**/*.cfc,*.cfc --overwrite",
+		"format:check":"cfformat run models/**/*.cfc,ModuleConfig.cfc,tests/specs/**/*.cfc,*.cfc --check",
+		"lint":"cflint models/**.cfc --text --html --json --!exitOnError --suppress"
     }
 }

changelog.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## 2.0.0
+
+### Features
+
+* No more manual discovery of validators, automated registration and lookup process, cleaned lots of code on this one!
+* New Validator: `Accepted` - The field under validation must be yes, on, 1, or true. This is useful for validating "Terms of Service" acceptance.
+* New Validator: `Alpha` - Only allows alphabetic characters
+* New Validator: `RequiredUnless` with validation data: `anotherField:value,...`  -  The field under validation must be present and not empty unless the `anotherfield` field is equal to the passed `value`.
+* New Validator: `RequiredIf` with validation data: `anotherField:value,...`  -  The field under validation must be present and not empty if the `anotherfield` field is equal to the passed `value`.
+* Accelerated validation by removing type checks. ACF chokes on interface checks
+
+### Improvements
+
+* Consistency on all validators to ignore null or empty values except the `Required` validator
+* Formatting consistencies
+* Improve error messages to describe better validation
+* Get away from `evaluate()` instead use `invoke()`
+
+### Compat & Bugs
+
+* `Bugs` : Fixed lots of wrong type exceptions
+* `Compat` : Remove ACF11 support
+
+`requiredUnless=role,test
+---
+
 ## 1.5.2
 
 * `bug` : Added `float` to the type validator which was missing

models/GenericObject.cfc

@@ -1,19 +1,18 @@
 /**
- * *******************************************************************************
- * Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
+ * Copyright since 2020 by Ortus Solutions, Corp
  * www.ortussolutions.com
- * *******************************************************************************
+ * ---
  * Great for when you want to validate a form that is not represented by an object.
  * A generic object that can simulate an object getters from a collection structure.
  */
-component{
+component {
 
 	/**
 	 * Constructor
 	 *
 	 * @memento The struct to represent
 	 */
-	GenericObject function init( struct memento=structNew() ){
+	GenericObject function init( struct memento = structNew() ){
 		variables.collection = arguments.memento;
 		return this;
 	}
@@ -32,12 +31,13 @@ component{
 	 * @missingMethodArguments
 	 */
 	any function onMissingMethod( required string missingMethodName, required struct missingMethodArguments ){
-		var key = replacenocase( arguments.missingMethodName, "get", "" );
+		var key = replaceNoCase( arguments.missingMethodName, "get", "" );
 
-		if( structKeyExists( variables.collection, key ) ){
+		if ( structKeyExists( variables.collection, key ) ) {
 			return variables.collection[ key ];
 		}
 
 		// Return null
 	}
-}
+
+}

models/IValidationManager.cfc

@@ -1,13 +1,12 @@
 /**
- * *******************************************************************************
- * Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
+ * Copyright since 2020 by Ortus Solutions, Corp
  * www.ortussolutions.com
- * *******************************************************************************
+ * ---
  * The ColdBox validation manager interface, all inspired by awesome Hyrule Validation Framework by Dan Vega
  */
 import cbvalidation.models.*;
 import cbvalidation.models.result.*;
-interface{
+interface {
 
 	/**
 	 * Validate an object
@@ -19,15 +18,15 @@ interface{
 	 * @excludeFieldsAn optional list of fields to exclude from the validation.
 	 * @includeFieldsAn optional list of fields to include in the validation.
 	 *
-	 * @result ValidationResult object
+	 * @return IValidationResult
 	 */
-	IValidationResult function validate(
+	any function validate(
 		required any target,
 		string fields,
 		any constraints,
-		string locale="",
-		string excludeFields="",
-		string includeFields=""
+		string locale        = "",
+		string excludeFields = "",
+		string includeFields = ""
 	);
 
 	/**
@@ -48,14 +47,19 @@ interface{
 	 * Set the shared constraints into the validation manager, usually these are described in the ColdBox configuraiton file
 	 *
 	 * @constraintsFilter by name or not
+	 *
+	 * @return IValidationManager
 	 */
-	IValidationManager function setSharedConstraints( struct constraints );
+	any function setSharedConstraints( struct constraints );
 
 	/**
 	 * Store a shared constraint
 	 *
 	 * @nameFilter by name or not
 	 * @constraintThe constraint to store.
+	 *
+	 * @return IValidationManager
 	 */
-	IValidationManager function addSharedConstraint( required string name, required struct constraint );
-}
+	any function addSharedConstraint( required string name, required struct constraint );
+
+}