Merge branch 'hotfix/2717' into develop

Forward port zendframework/zendframework#2717

src/DateStep.php

@@ -21,18 +21,14 @@
  * @category   Zend
  * @package    Zend_Validate
  */
-class DateStep extends AbstractValidator
+class DateStep extends Date
 {
-    const INVALID      = 'dateStepInvalid';
-    const INVALID_DATE = 'dateStepInvalidDate';
     const NOT_STEP     = 'dateStepNotStep';
 
     /**
      * @var array
      */
     protected $messageTemplates = array(
-        self::INVALID      => "Invalid type given. String, integer, array or DateTime expected",
-        self::INVALID_DATE => "The input does not appear to be a valid date",
         self::NOT_STEP     => "The input is not a valid step"
     );
 
@@ -155,28 +151,6 @@ public function getStep()
         return $this->step;
     }
 
-    /**
-     * Returns the format option
-     *
-     * @return string
-     */
-    public function getFormat()
-    {
-        return $this->format;
-    }
-
-    /**
-     * Sets the format option
-     *
-     * @param  string $format
-     * @return DateStep
-     */
-    public function setFormat($format)
-    {
-        $this->format = $format;
-        return $this;
-    }
-
     /**
      * Returns the timezone option
      *
@@ -241,13 +215,7 @@ protected function convertToDateTime($param)
      */
     public function isValid($value)
     {
-        if (!is_string($value)
-            && !is_int($value)
-            && !($value instanceof DateTime)
-        ) {
-            $this->error(self::INVALID);
-            return false;
-        }
+        parent::isValid($value);
 
         $this->setValue($value);
 
@@ -258,7 +226,6 @@ public function isValid($value)
         try {
             $valueDate = $this->convertToDateTime($value);
         } catch (Exception\InvalidArgumentException $ex) {
-            $this->error(self::INVALID_DATE);
             return false;
         }
 

test/DateStepTest.php

@@ -110,4 +110,15 @@ public function testEqualsMessageTemplates()
         $this->assertObjectHasAttribute('messageTemplates', $validator);
         $this->assertAttributeEquals($validator->getOption('messageTemplates'), 'messageTemplates', $validator);
     }
+
+    public function testStepError()
+    {
+        $validator = new Validator\DateStep(array(
+            'format'       => 'Y-m-d',
+            'baseValue'    => '2012-01-23',
+            'step' => new DateInterval("P10D"),
+        ));
+
+        $this->assertFalse($validator->isValid('2012-13-13'));
+    }
 }