Merge pull request #32 from wernerkrauss/UseDataValue

use ->dataValue() instead of ->Value() for better comparison, fixes #30
sheadawson · Mar 6, 2015 · 8628217 · 8628217
2 parents 1c3223b + 49a97d5
commit 8628217
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/code/ValidationLogicCriterion.php b/code/ValidationLogicCriterion.php
@@ -84,7 +84,7 @@ public function phpOperator(){
 	 * @return string
 	 **/
 	public function toPHP(){
-		$value1 = '$fields->dataFieldByName(\'' . $this->master . '\')->Value()';
+		$value1 = '$fields->dataFieldByName(\'' . $this->master . '\')->dataValue()';
 		$value2 = $this->value;
 
 		if($operator = $this->phpOperator()){

diff --git a/code/ZenValidatorConstraint.php b/code/ZenValidatorConstraint.php
@@ -748,7 +748,7 @@ public function removeParsley() {
 	}
 
 	function validate($value) {
-		return $this->getTargetField()->Value() == $value;
+		return $this->getTargetField()->dataValue() == $value;
 	}
 
 	function getDefaultMessage() {
@@ -815,16 +815,16 @@ function validate($value) {
 		switch ($this->type) {
 			//Validates that the value is greater than another field's one
 			case self::GREATER:
-				return $value > $this->getTargetField()->Value();
+				return $value > $this->getTargetField()->dataValue();
 			//Validates that the value is greater than or equal to another field's one
 			case self::GREATER_OR_EQUAL:
-				return $value >= $this->getTargetField()->Value();
+				return $value >= $this->getTargetField()->dataValue();
 			//Validates that the value is less than another field's one
 			case self::LESS:
-				return $value < $this->getTargetField()->Value();
+				return $value < $this->getTargetField()->dataValue();
 			//Validates that the value is less than or equal to another field's one
 			case self::LESS_OR_EQUAL:
-				return $value <= $this->getTargetField()->Value();
+				return $value <= $this->getTargetField()->dataValue();
 			default:
 				throw new Exception('Invalid type : ' . $this->type);
 		}