Merge pull request #5551. Fix #5549 in develop

zendframework · Feb 20, 2014 · f85d27d · f85d27d
2 parents 70b6470 + 230b0a2
commit f85d27d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/library/Zend/Form/Element/Number.php b/library/Zend/Form/Element/Number.php
@@ -49,7 +49,7 @@ protected function getValidators()
         ));
 
         $inclusive = true;
-        if (!empty($this->attributes['inclusive'])) {
+        if (isset($this->attributes['inclusive'])) {
             $inclusive = $this->attributes['inclusive'];
         }
 

diff --git a/tests/ZendTest/Form/Element/NumberTest.php b/tests/ZendTest/Form/Element/NumberTest.php
@@ -89,4 +89,37 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
             }
         }
     }
+
+    public function testFalseInclusiveValidatorBasedOnAttributes()
+    {
+        $element = new NumberElement();
+        $element->setAttributes(array(
+            'inclusive' => false,
+            'min'       => 5,
+        ));
+
+        $inputSpec = $element->getInputSpecification();
+        foreach($inputSpec['validators'] as $validator) {
+            if (get_class($validator) == 'Zend\Validator\GreaterThan') {
+                $this->assertFalse($validator->getInclusive());
+                break;
+            }
+        }
+    }
+
+    public function testDefaultInclusiveTrueatValidatorWhenInclusiveIsNotSetOnAttributes()
+    {
+        $element = new NumberElement();
+        $element->setAttributes(array(
+            'min'       => 5,
+        ));
+
+        $inputSpec = $element->getInputSpecification();
+        foreach($inputSpec['validators'] as $validator) {
+            if (get_class($validator) == 'Zend\Validator\GreaterThan') {
+                $this->assertTrue($validator->getInclusive());
+                break;
+            }
+        }
+    }
 }