Allow range constraint for ezinteger and ezfloat to have only one of …

…min/max
netgen · Aug 19, 2015 · 707a150 · 707a150
1 parent 7fbeed1
commit 707a150
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/Form/FieldTypeHandler/Float.php b/Form/FieldTypeHandler/Float.php
@@ -26,14 +26,25 @@ protected function buildFieldForm(
 
         if ( !empty( $fieldDefinition->getValidatorConfiguration()['FloatValueValidator'] ) )
         {
+            $rangeConstraints = array();
+
             $min = $fieldDefinition->getValidatorConfiguration()['FloatValueValidator']['minFloatValue'];
             $max = $fieldDefinition->getValidatorConfiguration()['FloatValueValidator']['maxFloatValue'];
-            $options['constraints'][] = new Assert\Range(
-                array(
-                    'min' => $min,
-                    'max' => $max,
-                )
-            );
+
+            if ( $min !== false )
+            {
+                $rangeConstraints['min'] = $min;
+            }
+
+            if ( $max !== false )
+            {
+                $rangeConstraints['max'] = $max;
+            }
+
+            if ( !empty( $rangeConstraints ) )
+            {
+                $options['constraints'][] = new Assert\Range( $rangeConstraints );
+            }
         }
 
         if ( !empty( $fieldDefinition->defaultValue ) )

diff --git a/Form/FieldTypeHandler/Integer.php b/Form/FieldTypeHandler/Integer.php
@@ -31,14 +31,25 @@ protected function buildFieldForm(
 
         if ( !empty( $fieldDefinition->getValidatorConfiguration()['IntegerValueValidator'] ) )
         {
+            $rangeConstraints = array();
+
             $min = $fieldDefinition->getValidatorConfiguration()['IntegerValueValidator']['minIntegerValue'];
             $max = $fieldDefinition->getValidatorConfiguration()['IntegerValueValidator']['maxIntegerValue'];
-            $options['constraints'][] = new Assert\Range(
-                array(
-                    'min' => $min,
-                    'max' => $max,
-                )
-            );
+
+            if ( $min !== false )
+            {
+                $rangeConstraints['min'] = $min;
+            }
+
+            if ( $max !== false )
+            {
+                $rangeConstraints['max'] = $max;
+            }
+
+            if ( !empty( $rangeConstraints ) )
+            {
+                $options['constraints'][] = new Assert\Range( $rangeConstraints );
+            }
         }
 
         $formBuilder->add( $fieldDefinition->identifier, 'integer', $options );