Merge b959478 into 1e34504

zendframework · Jun 16, 2017 · f93da20 · f93da20
2 parents 1e34504 + b959478
commit f93da20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/Element/DateTime.php b/src/Element/DateTime.php
@@ -226,7 +226,7 @@ public function getInputSpecification()
     private function valueIsValidDateTimeFormat($value)
     {
         return PhpDateTime::createFromFormat(
-            static::DATETIME_FORMAT,
+            $this->format,
             $value
         ) instanceof DateTimeInterface;
     }

diff --git a/src/Element/Month.php b/src/Element/Month.php
@@ -27,6 +27,13 @@ class Month extends DateTime
         'type' => 'month',
     ];
 
+    /**
+     * A valid format string accepted by date()
+     *
+     * @var string
+     */
+    protected $format = self::DATETIME_FORMAT;
+
     /**
      * Retrieves a Date Validator configured for a Month Input type
      *

diff --git a/test/Element/DateTest.php b/test/Element/DateTest.php
@@ -128,14 +128,14 @@ public function testCorrectFormatPassedToDateValidator()
             'min'       => '2012-01-01',
             'max'       => '2012-12-31',
         ]);
-        $element->setFormat('d-m-Y');
+        $element->setFormat('Y-m-d');
 
         $inputSpec = $element->getInputSpecification();
         foreach ($inputSpec['validators'] as $validator) {
             switch (get_class($validator)) {
                 case 'Zend\Validator\DateStep':
                 case 'Zend\Validator\Date':
-                    $this->assertEquals('d-m-Y', $validator->getFormat());
+                    $this->assertEquals('Y-m-d', $validator->getFormat());
                     break;
             }
         }