symfony · SoboLAN · May 4, 2015 · dosten · May 4, 2015 · dosten
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+* deprecated `Date` and `Time` constraints
+* deprecated `DateValidator` and `TimeValidator` validators
+* deprecated `PATTERN` constant in `DateTimeValidator`
+* added new optional `format` option to `DateTime` constraint
+
 2.7.0
 -----
 

diff --git a/src/Symfony/Component/Validator/Constraints/Date.php b/src/Symfony/Component/Validator/Constraints/Date.php
@@ -20,6 +20,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @api
+ * 
+ * @deprecated since version 2.8, to be removed in 3.0. Use {@link DateTime} instead.
  */
 class Date extends Constraint
 {

diff --git a/src/Symfony/Component/Validator/Constraints/DateTime.php b/src/Symfony/Component/Validator/Constraints/DateTime.php
@@ -18,6 +18,7 @@
  * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Radu Murzea <radu.murzea@gmail.com>
  *
  * @api
  */
@@ -34,4 +35,5 @@ class DateTime extends Constraint
     );
 
     public $message = 'This value is not a valid datetime.';
+    public $format = 'Y-m-d H:i:s';
 }
diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -17,11 +17,15 @@
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Radu Murzea <radu.murzea@gmail.com>
  *
  * @api
  */
 class DateTimeValidator extends DateValidator
 {
+    /**
+     * @deprecated since version 2.8, to be removed in 3.0.
+     */
     const PATTERN = '/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/';
 
     /**
@@ -43,48 +47,79 @@ public function validate($value, Constraint $constraint)
 
         $value = (string) $value;
 
-        if (!preg_match(static::PATTERN, $value, $matches)) {
+        $dateTimeObject = \DateTime::createFromFormat($constraint->format, $value);
+        $errors = \DateTime::getLastErrors();
+
+        //the value was successfully parsed
+        if ($errors['error_count'] + $errors['warning_count'] <= 0) {
+            return;
+        }
+
+        //see the function's phpdoc for details
+        $errorCode = $this->getViolationCode($errors, 'errors');
+
+        if (! is_null($errorCode)) {
             if ($this->context instanceof ExecutionContextInterface) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_FORMAT_ERROR)
+                    ->setCode($errorCode)
                     ->addViolation();
             } else {
                 $this->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_FORMAT_ERROR)
+                    ->setCode($errorCode)
                     ->addViolation();
             }
 
             return;
         }
 
-        if (!DateValidator::checkDate($matches[1], $matches[2], $matches[3])) {
+        //see the function's phpdoc for details
+        $warningCode = $this->getViolationCode($errors, 'warnings');
+
+        if (! is_null($warningCode)) {
             if ($this->context instanceof ExecutionContextInterface) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_DATE_ERROR)
+                    ->setCode($warningCode)
                     ->addViolation();
             } else {
                 $this->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_DATE_ERROR)
+                    ->setCode($warningCode)
                     ->addViolation();
             }
+
+            return;
         }
+    }
+
+    /**
+     * PHP's DateTime stores the errors and warning at unpredictable indexes,
+     * so it's a bit trickier to retrieve them (we have to use array_values + array_shift).
+     * 
+     * Also, based on the error/warning message string, we can guess if it was
+     * a date problem, time problem or format/general problem.
+     * 
+     * @param array $errors result from calling \DateTime::getLastErrors()
+     * @param string $key the key under which to search for errors/warnings
+     * @return mixed an integer representing the error code or NULL if everything was ok
+     */
+    private function getViolationCode($errors, $key)
+    {
+        if (isset($errors[$key]) && count($errors[$key]) > 0) {
+            $allErrors = array_values($errors[$key]);
+            $firstError = array_shift($allErrors);
 
-        if (!TimeValidator::checkTime($matches[4], $matches[5], $matches[6])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_TIME_ERROR)
-                    ->addViolation();
+            if (strpos($firstError, 'date') !== false) {
+                return DateTime::INVALID_DATE_ERROR;
+            } elseif (strpos($firstError, 'time') !== false) {
+                return DateTime::INVALID_TIME_ERROR;
             } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_TIME_ERROR)
-                    ->addViolation();
+                return DateTime::INVALID_FORMAT_ERROR;
             }
+        } else {
+            return;
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/DateValidator.php b/src/Symfony/Component/Validator/Constraints/DateValidator.php
@@ -20,6 +20,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @api
+ * 
+ * @deprecated since version 2.8, to be removed in 3.0. Use {@link DateTimeValidator} instead.
  */
 class DateValidator extends ConstraintValidator
 {

diff --git a/src/Symfony/Component/Validator/Constraints/Time.php b/src/Symfony/Component/Validator/Constraints/Time.php
@@ -20,6 +20,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @api
+ * 
+ * @deprecated since version 2.8, to be removed in 3.0. Use {@link DateTime} instead.
  */
 class Time extends Constraint
 {

diff --git a/src/Symfony/Component/Validator/Constraints/TimeValidator.php b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
@@ -20,6 +20,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @api
+ * 
+ * @deprecated since version 2.8, to be removed in 3.0. Use {@link DateTimeValidator} instead.
  */
 class TimeValidator extends ConstraintValidator
 {

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
@@ -98,6 +98,8 @@ public function getInvalidDateTimes()
             array('foobar', DateTime::INVALID_FORMAT_ERROR),
             array('2010-01-01', DateTime::INVALID_FORMAT_ERROR),
             array('00:00:00', DateTime::INVALID_FORMAT_ERROR),
+            array('2010-0101 01:02:03', DateTime::INVALID_FORMAT_ERROR),
+            array('2010-01-01X01:02:03', DateTime::INVALID_FORMAT_ERROR),
             array('2010-01-01 00:00', DateTime::INVALID_FORMAT_ERROR),
             array('2010-13-01 00:00:00', DateTime::INVALID_DATE_ERROR),
             array('2010-04-32 00:00:00', DateTime::INVALID_DATE_ERROR),
@@ -107,4 +109,27 @@ public function getInvalidDateTimes()
             array('2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR),
         );
     }
+
+    /**
+     * @dataProvider getCustomDateTimes
+     */
+    public function testCustomFormatDateTime($format, $dateTime)
+    {
+        $constraint = new DateTime(array(
+            'format' => $format,
+        ));
+
+        $this->validator->validate($dateTime, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    public function getCustomDateTimes()
+    {
+        return array(
+            array('d-m-Y', '15-07-2015'),
+            array('m-Y-d i:H', '11-2013-29 47:19'),
+            array('Y F d', '2002 March 17'),
+        );
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
@@ -15,6 +15,9 @@
 use Symfony\Component\Validator\Constraints\DateValidator;
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @deprecated since version 2.8, to be removed in 3.0.
+ */
 class DateValidatorTest extends AbstractConstraintValidatorTest
 {
     protected function getApiVersion()

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
@@ -15,6 +15,9 @@
 use Symfony\Component\Validator\Constraints\TimeValidator;
 use Symfony\Component\Validator\Validation;
 
+/**
+ * @deprecated since version 2.8, to be removed in 3.0.
+ */
 class TimeValidatorTest extends AbstractConstraintValidatorTest
 {
     protected function getApiVersion()
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ @@
      * @author Bernhard Schussek <bschussek@gmail.com>
      *
      * @api
+     *
+     * @deprecated since version 2.8, to be removed in 3.0. Use {@link DateTime} instead.
      */
     class Date extends Constraint
     {
@@ Expand Down @@