Merge branch 'feature/172' into develop

Close #172
Fixes #170
Fixes #168

Author: weierophinney

CHANGELOG.md

@@ -29,6 +29,12 @@ All notable changes to this project will be documented in this file, in reverse
   binding values in a fieldset will correctly identify the elements in the
   provided data.
 
+- [#172](https://github.com/zendframework/zend-form/pull/172) fixes the
+  `DateTime` element such that it no longer attempts to use its
+  `DATETIME_FORMAT` constant, but, rather, the value of the `$format` property,
+  when representing the element; this change allows developers to override the
+  format, which was the original intention.
+
 ## 2.10.3 - TBD
 
 ### Added

src/Element/DateTime.php

@@ -135,7 +135,7 @@ protected function getValidators()
             throw new InvalidArgumentException(sprintf(
                 '%1$s expects "min" to conform to %2$s; received "%3$s"',
                 __METHOD__,
-                static::DATETIME_FORMAT,
+                $this->format,
                 $this->attributes['min']
             ));
         }
@@ -153,7 +153,7 @@ protected function getValidators()
             throw new InvalidArgumentException(sprintf(
                 '%1$s expects "max" to conform to %2$s; received "%3$s"',
                 __METHOD__,
-                static::DATETIME_FORMAT,
+                $this->format,
                 $this->attributes['max']
             ));
         }
@@ -226,7 +226,7 @@ public function getInputSpecification()
     private function valueIsValidDateTimeFormat($value)
     {
         return PhpDateTime::createFromFormat(
-            static::DATETIME_FORMAT,
+            $this->format,
             $value
         ) instanceof DateTimeInterface;
     }

src/Element/Month.php

@@ -18,6 +18,13 @@ class Month extends DateTime
 
     const DATETIME_FORMAT = 'Y-m';
 
+    /**
+     * A valid format string accepted by date()
+     *
+     * @var string
+     */
+    protected $format = self::DATETIME_FORMAT;
+
     /**
      * Seed attributes
      *

test/Element/DateTest.php

@@ -125,8 +125,8 @@ public function testCorrectFormatPassedToDateValidator()
     {
         $element = new DateElement('foo');
         $element->setAttributes([
-            'min'       => '2012-01-01',
-            'max'       => '2012-12-31',
+            'min'       => '01-01-2012',
+            'max'       => '31-12-2012',
         ]);
         $element->setFormat('d-m-Y');