Fix rule validator

K-Phoen · Oct 19, 2015 · f5a1c2b · f5a1c2b
1 parent 9e1f556
commit f5a1c2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Tests/Validator/Constraints/RuleValidatorTest.php b/Tests/Validator/Constraints/RuleValidatorTest.php
@@ -55,7 +55,7 @@ public function validRulesProvider()
 
         $checkVariablesConstraint = new ValidRule([
             'allowed_operators' => null, // all
-            'allowed_variables' => ['foo', 'bar']
+            'allowed_variables' => ['foo', 'bar', 'readingTime']
         ]);
 
         return [
@@ -66,6 +66,7 @@ public function validRulesProvider()
             ['foo = 42 AND bar = foo', $checkOperatorsConstraint],
 
             ['foo = 42', $checkVariablesConstraint],
+            ['readingTime <= 42', $checkVariablesConstraint],
             ['foo = 42 AND bar = foo', $checkOperatorsConstraint],
         ];
     }

diff --git a/Validator/Constraints/RuleValidator.php b/Validator/Constraints/RuleValidator.php
@@ -42,7 +42,7 @@ private function validateOperators(Rule $model, Constraint $constraint)
         }
 
         $operators = array_map(function(AST\Operator $element) {
-            return $element->getName();
+            return strtolower($element->getName());
         }, $model->getOperators());
 
         foreach ($operators as $operator) {
@@ -67,7 +67,7 @@ private function validateVariableAccesses(Rule $model, Constraint $constraint)
                 $flattenedDimensions[] = $dimension[1];
             }
 
-            return implode('.', $flattenedDimensions);
+            return strtolower(implode('.', $flattenedDimensions));
         }, $model->getAccesses());
 
         foreach ($accesses as $access) {