Unit tests updated to reflect changes.

 Throws an InvalidArgumentException when one attempts to create a DateTime element with a string that does not conform to the expected \DateTime format.
 Week updated because one cannot construct a \DateTime from 'Y-\WW' format

Author: jackdpeterson

src/Element/DateTime.php

@@ -12,6 +12,7 @@
 use DateInterval;
 use DateTime as PhpDateTime;
 use Zend\Form\Element;
+use Zend\Form\Exception\InvalidArgumentException;
 use Zend\InputFilter\InputProviderInterface;
 use Zend\Validator\Date as DateValidator;
 use Zend\Validator\DateStep as DateStepValidator;
@@ -53,7 +54,6 @@ class DateTime extends Element implements InputProviderInterface
     public function setOptions($options)
     {
         parent::setOptions($options);
-
         if (isset($this->options['format'])) {
             $this->setFormat($this->options['format']);
         }
@@ -81,6 +81,7 @@ public function getValue($returnFormattedValue = true)
             return $value;
         }
         $format = $this->getFormat();
+
         return $value->format($format);
     }
 
@@ -92,7 +93,8 @@ public function getValue($returnFormattedValue = true)
      */
     public function setFormat($format)
     {
-        $this->format = (string) $format;
+        $this->format = (string)$format;
+
         return $this;
     }
 
@@ -120,32 +122,78 @@ protected function getValidators()
         $validators = [];
         $validators[] = $this->getDateValidator();
 
-        if (isset($this->attributes['min'])) {
-            $validators[] = new GreaterThanValidator([
-                'min'       => $this->attributes['min'],
-                'inclusive' => true,
-            ]);
+        if (isset($this->attributes['min']) &&
+            \DateTime::createFromFormat(
+                $this->format,
+                $this->attributes['min']
+            ) instanceof \DateTimeInterface
+        ) {
+            $validators[] = new GreaterThanValidator(
+                [
+                    'min' => $this->attributes['min'],
+                    'inclusive' => true,
+                ]
+            );
+        } elseif (isset($this->attributes['min']) &&
+            ! \DateTime::createFromFormat(
+                $this->format,
+                $this->attributes['min']
+            ) instanceof \DateTimeInterface
+        ) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    '%1$s expects "min" to conform to %2$s; received "%3$s"',
+                    __METHOD__,
+                    $this->format,
+                    $this->attributes['min']
+                )
+            );
         }
-        if (isset($this->attributes['max'])) {
-            $validators[] = new LessThanValidator([
-                'max'       => $this->attributes['max'],
+
+        if (isset($this->attributes['max']) &&
+            \DateTime::createFromFormat(
+                $this->format,
+                $this->attributes['max']
+            ) instanceof \DateTimeInterface
+        ) {
+            $validators[] = new LessThanValidator(
+                [
+                'max' => $this->attributes['max'],
                 'inclusive' => true,
-            ]);
+                ]
+            );
+        } elseif (isset($this->attributes['max']) &&
+            ! \DateTime::createFromFormat(
+                $this->format,
+                $this->attributes['max']
+            ) instanceof \DateTimeInterface
+        ) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    '%1$s expects "max" to conform to %2$s; received "%3$s"',
+                    __METHOD__,
+                    $this->format,
+                    $this->attributes['max']
+                )
+            );
         }
+
+
         if (! isset($this->attributes['step'])
             || 'any' !== $this->attributes['step']
         ) {
             $validators[] = $this->getStepValidator();
         }
 
         $this->validators = $validators;
+
         return $this->validators;
     }
 
     /**
      * Retrieves a Date Validator configured for a DateTime Input type
      *
-     * @return DateTime
+     * @return DateValidator
      */
     protected function getDateValidator()
     {
@@ -155,22 +203,23 @@ protected function getDateValidator()
     /**
      * Retrieves a DateStep Validator configured for a DateTime Input type
      *
-     * @return DateTime
+     * @return DateStepValidator
      */
     protected function getStepValidator()
     {
-        $format    = $this->getFormat();
+        $format = $this->getFormat();
         $stepValue = (isset($this->attributes['step']))
-                   ? $this->attributes['step'] : 1; // Minutes
-
+            ? $this->attributes['step'] : 1; // Minutes
         $baseValue = (isset($this->attributes['min']))
-                   ? $this->attributes['min'] : date($format, 0);
+            ? $this->attributes['min'] : date($format, 0);
 
-        return new DateStepValidator([
-            'format'    => $format,
+        return new DateStepValidator(
+            [
+            'format' => $format,
             'baseValue' => $baseValue,
-            'step'      => new DateInterval("PT{$stepValue}M"),
-        ]);
+            'step' => new DateInterval("PT{$stepValue}M"),
+            ]
+        );
     }
 
     /**

src/Element/Week.php

@@ -11,6 +11,8 @@
 
 use Zend\Validator\DateStep as DateStepValidator;
 use Zend\Validator\Regex as RegexValidator;
+use Zend\Validator\GreaterThan as GreaterThanValidator;
+use Zend\Validator\LessThan as LessThanValidator;
 
 class Week extends DateTime
 {
@@ -52,4 +54,36 @@ protected function getStepValidator()
             'step'      => new \DateInterval("P{$stepValue}W"),
         ]);
     }
+
+    /**
+     * @see https://bugs.php.net/bug.php?id=74511
+     * @return array
+     */
+    protected function getValidators()
+    {
+        if ($this->validators) {
+            return $this->validators;
+        }
+        $validators = [];
+        $validators[] = $this->getDateValidator();
+        if (isset($this->attributes['min'])) {
+            $validators[] = new GreaterThanValidator([
+                'min'       => $this->attributes['min'],
+                'inclusive' => true,
+            ]);
+        }
+        if (isset($this->attributes['max'])) {
+            $validators[] = new LessThanValidator([
+                'max'       => $this->attributes['max'],
+                'inclusive' => true,
+            ]);
+        }
+        if (! isset($this->attributes['step'])
+            || 'any' !== $this->attributes['step']
+        ) {
+            $validators[] = $this->getStepValidator();
+        }
+        $this->validators = $validators;
+        return $this->validators;
+    }
 }

test/Element/DateTest.php

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

test/Element/DateTimeLocalTest.php

@@ -19,8 +19,8 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
         $element = new DateTimeLocalElement('foo');
         $element->setAttributes([
             'inclusive' => true,
-            'min'       => '2000-01-01T00:00Z',
-            'max'       => '2001-01-01T00:00Z',
+            'min'       => '2000-01-01T00:00',
+            'max'       => '2001-01-01T00:00',
             'step'      => '1',
         ]);
 
@@ -40,11 +40,11 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
             switch ($class) {
                 case 'Zend\Validator\GreaterThan':
                     $this->assertTrue($validator->getInclusive());
-                    $this->assertEquals('2000-01-01T00:00Z', $validator->getMin());
+                    $this->assertEquals('2000-01-01T00:00', $validator->getMin());
                     break;
                 case 'Zend\Validator\LessThan':
                     $this->assertTrue($validator->getInclusive());
-                    $this->assertEquals('2001-01-01T00:00Z', $validator->getMax());
+                    $this->assertEquals('2001-01-01T00:00', $validator->getMax());
                     break;
                 case 'Zend\Validator\DateStep':
                     $dateInterval = new \DateInterval('PT1M');

test/Element/MonthTest.php

@@ -24,6 +24,8 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
             'step'      => '1',
         ]);
 
+        $element->setFormat('Y-m');
+
         $inputSpec = $element->getInputSpecification();
         $this->assertArrayHasKey('validators', $inputSpec);
         $this->assertInternalType('array', $inputSpec['validators']);

test/Element/WeekTest.php

@@ -14,6 +14,7 @@
 
 class WeekTest extends TestCase
 {
+
     public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttributes()
     {
         $element = new WeekElement('foo');
@@ -24,6 +25,8 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
             'step'      => '1',
         ]);
 
+        $element->setFormat('Y-\WW');
+
         $inputSpec = $element->getInputSpecification();
         $this->assertArrayHasKey('validators', $inputSpec);
         $this->assertInternalType('array', $inputSpec['validators']);