Merge branch 'hotfix/zf2-572' into develop

Forward port #2387
zendframework · Sep 19, 2012 · 15fa021 · 15fa021
2 parents c198073 + 1ade32b
commit 15fa021
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/library/Zend/Validator/Step.php b/library/Zend/Validator/Step.php
@@ -127,11 +127,26 @@ public function isValid($value)
 
         $this->setValue($value);
 
-        if (fmod($value - $this->baseValue, $this->step) !== 0.0) {
+        if ($this->fmod($value - $this->baseValue, $this->step) !== 0.0) {
             $this->error(self::NOT_STEP);
             return false;
         }
 
         return true;
     }
+
+    /**
+     * replaces the internal fmod function which give wrong results on many cases
+     *
+     * @param float $x
+     * @param float $y
+     * @return float
+     */
+    protected function fmod($x, $y)
+    {
+        if ($y == 0.0) {
+            return 1.0;
+        }
+        return $x - $y * floor($x / $y);
+    }
 }
diff --git a/tests/ZendTest/Validator/StepTest.php b/tests/ZendTest/Validator/StepTest.php
@@ -96,6 +96,7 @@ public function testDecimalStep()
             array(0.1, false),
             array(2.1, true),
             array(3.1, false),
+            array(10.5, true),
             array('2.1', true),
             array('1.1', false),
             array(1.11, false),