Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / datetime / src / Plugin / Validation / Constraint / DateTimeFormatConstraintValidator.php

diff --git a/web/core/modules/datetime/src/Plugin/Validation/Constraint/DateTimeFormatConstraintValidator.php b/web/core/modules/datetime/src/Plugin/Validation/Constraint/DateTimeFormatConstraintValidator.php
index a027a82f098491661522a29d197a15be53777437..4b2ad5d7095cf16b09610bbbb0a9d29857a4bebe 100644 (file)
--- a/web/core/modules/datetime/src/Plugin/Validation/Constraint/DateTimeFormatConstraintValidator.php
+++ b/web/core/modules/datetime/src/Plugin/Validation/Constraint/DateTimeFormatConstraintValidator.php
@@ -4,6 +4,7 @@ namespace Drupal\datetime\Plugin\Validation\Constraint;
 
 use Drupal\Component\Datetime\DateTimePlus;
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
@@ -24,10 +25,10 @@ class DateTimeFormatConstraintValidator extends ConstraintValidator {
       }
       else {
         $datetime_type = $item->getFieldDefinition()->getSetting('datetime_type');
-        $format = $datetime_type === DateTimeItem::DATETIME_TYPE_DATE ? DATETIME_DATE_STORAGE_FORMAT : DATETIME_DATETIME_STORAGE_FORMAT;
+        $format = $datetime_type === DateTimeItem::DATETIME_TYPE_DATE ? DateTimeItemInterface::DATE_STORAGE_FORMAT : DateTimeItemInterface::DATETIME_STORAGE_FORMAT;
         $date = NULL;
         try {
-          $date = DateTimePlus::createFromFormat($format, $value, new \DateTimeZone(DATETIME_STORAGE_TIMEZONE));
+          $date = DateTimePlus::createFromFormat($format, $value, new \DateTimeZone(DateTimeItemInterface::STORAGE_TIMEZONE));
         }
         catch (\InvalidArgumentException $e) {
           $this->context->addViolation($constraint->badFormat, [