Merge branch 'form-validators' of https://github.com/bakura10/zf2 int…

…o hotfix/form-validator-cleanup

src/DateStep.php

@@ -62,7 +62,7 @@ class DateStep extends AbstractValidator
      *
      * @var DateInterval
      */
-    protected $stepInterval;
+    protected $step;
 
     /**
      * Format to use for parsing date strings
@@ -92,7 +92,7 @@ public function __construct($options = array())
             $options = func_get_args();
             $temp['baseValue'] = array_shift($options);
             if (!empty($options)) {
-                $temp['stepInterval'] = array_shift($options);
+                $temp['step'] = array_shift($options);
             }
             if (!empty($options)) {
                 $temp['format'] = array_shift($options);
@@ -107,10 +107,10 @@ public function __construct($options = array())
         if (isset($options['baseValue'])) {
             $this->setBaseValue($options['baseValue']);
         }
-        if (isset($options['stepInterval'])) {
-            $this->setStepInterval($options['stepInterval']);
+        if (isset($options['step'])) {
+            $this->setStep($options['step']);
         } else {
-            $this->setStepInterval(new DateInterval('P1D'));
+            $this->setStep(new DateInterval('P1D'));
         }
         if (array_key_exists('format', $options)) {
             $this->setFormat($options['format']);
@@ -149,12 +149,12 @@ public function getBaseValue()
     /**
      * Sets the step date interval
      *
-     * @param  DateInterval $stepValue
+     * @param  DateInterval $step
      * @return DateStep
      */
-    public function setStepInterval(DateInterval $stepInterval)
+    public function setStep(DateInterval $step)
     {
-        $this->stepInterval = $stepInterval;
+        $this->step = $step;
         return $this;
     }
 
@@ -163,9 +163,9 @@ public function setStepInterval(DateInterval $stepInterval)
      *
      * @return DateInterval
      */
-    public function getStepInterval()
+    public function getStep()
     {
-        return $this->stepInterval;
+        return $this->step;
     }
 
     /**
@@ -265,7 +265,7 @@ public function isValid($value)
         $this->setValue($value);
 
         $baseDate     = $this->convertToDateTime($this->getBaseValue());
-        $stepInterval = $this->getStepInterval();
+        $step = $this->getStep();
 
         // Parse the date
         try {
@@ -282,7 +282,7 @@ public function isValid($value)
 
         // Optimization for simple intervals.
         // Handle intervals of just one date or time unit.
-        $intervalParts = explode('|', $stepInterval->format('%y|%m|%d|%h|%i|%s'));
+        $intervalParts = explode('|', $step->format('%y|%m|%d|%h|%i|%s'));
         $partCounts    = array_count_values($intervalParts);
         if (5 === $partCounts["0"]) {
             // Find the unit with the non-zero interval
@@ -398,14 +398,14 @@ public function isValid($value)
         // or until the value is exceeded.
         if ($baseDate < $valueDate) {
             while ($baseDate < $valueDate) {
-                $baseDate->add($stepInterval);
+                $baseDate->add($step);
                 if ($baseDate == $valueDate) {
                     return true;
                 }
             }
         } else {
             while ($baseDate > $valueDate) {
-                $baseDate->sub($stepInterval);
+                $baseDate->sub($step);
                 if ($baseDate == $valueDate) {
                     return true;
                 }

test/DateStepTest.php

@@ -107,7 +107,7 @@ public function testDateStepValidation($interval, $format, $baseValue, $value, $
         $validator = new Validator\DateStep(array(
             'format'       => $format,
             'baseValue'    => $baseValue,
-            'stepInterval' => new DateInterval($interval),
+            'step' => new DateInterval($interval),
         ));
 
         $this->assertEquals($isValid, $validator->isValid($value));