chagned enum name

core/modules/datetime_range/datetime_range.module

@@ -9,7 +9,7 @@
 use Drupal\Core\Field\FieldTypeCategoryManagerInterface;
 use Drupal\Core\Url;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\datetime_range\DateTimeRangeConstants;
+use Drupal\datetime_range\DateTimeRangeDisplayOptions;
 use Drupal\datetime_range\Plugin\Field\FieldFormatter\DateRangeCustomFormatter;
 use Drupal\datetime_range\Plugin\Field\FieldFormatter\DateRangeDefaultFormatter;
 use Drupal\datetime_range\Plugin\Field\FieldFormatter\DateRangePlainFormatter;
@@ -68,7 +68,7 @@ function datetime_range_entity_view_display_presave(EntityViewDisplayInterface $
 
     if (!isset($component['settings']['from_to'])) {
       // Existing daterange formatters don't have 'from_to'.
-      $component['settings']['from_to'] = DateTimeRangeConstants::BOTH->value;
+      $component['settings']['from_to'] = DateTimeRangeDisplayOptions::BOTH->value;
       $entity_view_display->setComponent($name, $component);
     }
   }

core/modules/datetime_range/src/DateTimeRangeConstants.php → core/modules/datetime_range/src/DateTimeRangeDisplayOptions.php

@@ -5,7 +5,7 @@
 /**
  * Declares constants used in the datetime range module.
  */
-enum DateTimeRangeConstants: string {
+enum DateTimeRangeDisplayOptions: string {
 
   /**
    * Values for the 'from_to' formatter setting.

core/modules/datetime_range/src/DateTimeRangeTrait.php

@@ -16,7 +16,7 @@ trait DateTimeRangeTrait {
    */
   protected static function dateTimeRangeDefaultSettings() {
     return [
-      'from_to' => DateTimeRangeConstants::BOTH->value,
+      'from_to' => DateTimeRangeDisplayOptions::BOTH->value,
       'separator' => '-',
     ];
   }
@@ -73,7 +73,7 @@ protected function dateTimeRangeSettingsForm(array $form, FormStateInterface $fo
       '#default_value' => $this->getSetting('separator'),
       '#states' => [
         'visible' => [
-          'select[name="fields[' . $field_name . '][settings_edit_form][settings][from_to]"]' => ['value' => DateTimeRangeConstants::BOTH->value],
+          'select[name="fields[' . $field_name . '][settings_edit_form][settings][from_to]"]' => ['value' => DateTimeRangeDisplayOptions::BOTH->value],
         ],
       ],
     ];
@@ -93,7 +93,7 @@ protected function dateTimeRangeSettingsSummary() {
       }
     }
 
-    if (($separator = $this->getSetting('separator')) && $this->getSetting('from_to') === DateTimeRangeConstants::BOTH->value) {
+    if (($separator = $this->getSetting('separator')) && $this->getSetting('from_to') === DateTimeRangeDisplayOptions::BOTH->value) {
       $summary[] = $this->t('Separator: %separator', ['%separator' => $separator]);
     }
 
@@ -108,9 +108,9 @@ protected function dateTimeRangeSettingsSummary() {
    */
   protected function getFromToOptions() {
     return [
-      DateTimeRangeConstants::BOTH->value => $this->t('Display both start and end dates'),
-      DateTimeRangeConstants::START_DATE->value => $this->t('Display start date only'),
-      DateTimeRangeConstants::END_DATE->value => $this->t('Display end date only'),
+      DateTimeRangeDisplayOptions::BOTH->value => $this->t('Display both start and end dates'),
+      DateTimeRangeDisplayOptions::START_DATE->value => $this->t('Display start date only'),
+      DateTimeRangeDisplayOptions::END_DATE->value => $this->t('Display end date only'),
     ];
   }
 
@@ -122,8 +122,8 @@ protected function getFromToOptions() {
    */
   protected function startDateIsDisplayed() {
     switch ($this->getSetting('from_to')) {
-      case DateTimeRangeConstants::BOTH->value:
-      case DateTimeRangeConstants::START_DATE->value:
+      case DateTimeRangeDisplayOptions::BOTH->value:
+      case DateTimeRangeDisplayOptions::START_DATE->value:
         return TRUE;
     }
 
@@ -138,8 +138,8 @@ protected function startDateIsDisplayed() {
    */
   protected function endDateIsDisplayed() {
     switch ($this->getSetting('from_to')) {
-      case DateTimeRangeConstants::BOTH->value:
-      case DateTimeRangeConstants::END_DATE->value:
+      case DateTimeRangeDisplayOptions::BOTH->value:
+      case DateTimeRangeDisplayOptions::END_DATE->value:
         return TRUE;
     }
 
@@ -162,13 +162,13 @@ protected function endDateIsDisplayed() {
   protected function renderStartEnd(DrupalDateTime $start_date, string $separator, DrupalDateTime $end_date): array {
     $element = [];
     if ($this->startDateIsDisplayed()) {
-      $element[DateTimeRangeConstants::START_DATE->value] = $this->buildDate($start_date);
+      $element[DateTimeRangeDisplayOptions::START_DATE->value] = $this->buildDate($start_date);
     }
     if ($this->startDateIsDisplayed() && $this->endDateIsDisplayed()) {
       $element['separator'] = ['#plain_text' => ' ' . $separator . ' '];
     }
     if ($this->endDateIsDisplayed()) {
-      $element[DateTimeRangeConstants::END_DATE->value] = $this->buildDate($end_date);
+      $element[DateTimeRangeDisplayOptions::END_DATE->value] = $this->buildDate($end_date);
     }
     return $element;
   }
@@ -189,13 +189,13 @@ protected function renderStartEnd(DrupalDateTime $start_date, string $separator,
   protected function renderStartEndWithIsoAttribute(DrupalDateTime $start_date, string $separator, DrupalDateTime $end_date): array {
     $element = [];
     if ($this->startDateIsDisplayed()) {
-      $element[DateTimeRangeConstants::START_DATE->value] = $this->buildDateWithIsoAttribute($start_date);
+      $element[DateTimeRangeDisplayOptions::START_DATE->value] = $this->buildDateWithIsoAttribute($start_date);
     }
     if ($this->startDateIsDisplayed() && $this->endDateIsDisplayed()) {
       $element['separator'] = ['#plain_text' => ' ' . $separator . ' '];
     }
     if ($this->endDateIsDisplayed()) {
-      $element[DateTimeRangeConstants::END_DATE->value] = $this->buildDateWithIsoAttribute($end_date);
+      $element[DateTimeRangeDisplayOptions::END_DATE->value] = $this->buildDateWithIsoAttribute($end_date);
     }
     return $element;
   }

core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php

@@ -6,7 +6,7 @@
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
-use Drupal\datetime_range\DateTimeRangeConstants;
+use Drupal\datetime_range\DateTimeRangeDisplayOptions;
 use Drupal\Tests\datetime\Functional\DateTestBase;
 use Drupal\datetime_range\Plugin\Field\FieldType\DateRangeItem;
 use Drupal\entity_test\Entity\EntityTest;
@@ -38,7 +38,7 @@ class DateRangeFieldTest extends DateTestBase {
    *
    * @var array
    */
-  protected $defaultSettings = ['timezone_override' => '', 'separator' => '-', 'from_to' => DateTimeRangeConstants::BOTH->value];
+  protected $defaultSettings = ['timezone_override' => '', 'separator' => '-', 'from_to' => DateTimeRangeDisplayOptions::BOTH->value];
 
   /**
    * {@inheritdoc}
@@ -1507,44 +1507,44 @@ public function fromToSettingDataProvider() {
     $datetime_types = [
       DateRangeItem::DATETIME_TYPE_DATE => [
         'daterange_default' => [
-          DateTimeRangeConstants::START_DATE->value => '12/31/2012',
-          DateTimeRangeConstants::END_DATE->value => '06/06/2013',
+          DateTimeRangeDisplayOptions::START_DATE->value => '12/31/2012',
+          DateTimeRangeDisplayOptions::END_DATE->value => '06/06/2013',
         ],
         'daterange_plain' => [
-          DateTimeRangeConstants::START_DATE->value => '2012-12-31',
-          DateTimeRangeConstants::END_DATE->value => '2013-06-06',
+          DateTimeRangeDisplayOptions::START_DATE->value => '2012-12-31',
+          DateTimeRangeDisplayOptions::END_DATE->value => '2013-06-06',
         ],
         'daterange_custom' => [
-          DateTimeRangeConstants::START_DATE->value => '2012-12-31',
-          DateTimeRangeConstants::END_DATE->value => '2013-06-06',
+          DateTimeRangeDisplayOptions::START_DATE->value => '2012-12-31',
+          DateTimeRangeDisplayOptions::END_DATE->value => '2013-06-06',
         ],
       ],
       DateRangeItem::DATETIME_TYPE_DATETIME => [
         'daterange_default' => [
-          DateTimeRangeConstants::START_DATE->value => '12/31/2012 - 00:00',
-          DateTimeRangeConstants::END_DATE->value => '06/06/2013 - 00:00',
+          DateTimeRangeDisplayOptions::START_DATE->value => '12/31/2012 - 00:00',
+          DateTimeRangeDisplayOptions::END_DATE->value => '06/06/2013 - 00:00',
         ],
         'daterange_plain' => [
-          DateTimeRangeConstants::START_DATE->value => '2012-12-31T00:00:00',
-          DateTimeRangeConstants::END_DATE->value => '2013-06-06T00:00:00',
+          DateTimeRangeDisplayOptions::START_DATE->value => '2012-12-31T00:00:00',
+          DateTimeRangeDisplayOptions::END_DATE->value => '2013-06-06T00:00:00',
         ],
         'daterange_custom' => [
-          DateTimeRangeConstants::START_DATE->value => '2012-12-31T00:00:00',
-          DateTimeRangeConstants::END_DATE->value => '2013-06-06T00:00:00',
+          DateTimeRangeDisplayOptions::START_DATE->value => '2012-12-31T00:00:00',
+          DateTimeRangeDisplayOptions::END_DATE->value => '2013-06-06T00:00:00',
         ],
       ],
       DateRangeItem::DATETIME_TYPE_ALLDAY => [
         'daterange_default' => [
-          DateTimeRangeConstants::START_DATE->value => '12/31/2012',
-          DateTimeRangeConstants::END_DATE->value => '06/06/2013',
+          DateTimeRangeDisplayOptions::START_DATE->value => '12/31/2012',
+          DateTimeRangeDisplayOptions::END_DATE->value => '06/06/2013',
         ],
         'daterange_plain' => [
-          DateTimeRangeConstants::START_DATE->value => '2012-12-31',
-          DateTimeRangeConstants::END_DATE->value => '2013-06-06',
+          DateTimeRangeDisplayOptions::START_DATE->value => '2012-12-31',
+          DateTimeRangeDisplayOptions::END_DATE->value => '2013-06-06',
         ],
         'daterange_custom' => [
-          DateTimeRangeConstants::START_DATE->value => '2012-12-31',
-          DateTimeRangeConstants::END_DATE->value => '2013-06-06',
+          DateTimeRangeDisplayOptions::START_DATE->value => '2012-12-31',
+          DateTimeRangeDisplayOptions::END_DATE->value => '2013-06-06',
         ],
       ],
     ];
@@ -1556,9 +1556,9 @@ public function fromToSettingDataProvider() {
         // Both start and end date.
         $return[$datetime_type . '-' . $field_formatter_type . '-both'] = [
           'expected' => [
-            $dates[DateTimeRangeConstants::START_DATE->value] => TRUE,
+            $dates[DateTimeRangeDisplayOptions::START_DATE->value] => TRUE,
             $separator => TRUE,
-            $dates[DateTimeRangeConstants::END_DATE->value] => TRUE,
+            $dates[DateTimeRangeDisplayOptions::END_DATE->value] => TRUE,
           ],
           'datetime_type' => $datetime_type,
           'field_formatter_type' => $field_formatter_type,
@@ -1567,25 +1567,25 @@ public function fromToSettingDataProvider() {
         // Only start date.
         $return[$datetime_type . '-' . $field_formatter_type . '-start_date'] = [
           'expected' => [
-            $dates[DateTimeRangeConstants::START_DATE->value] => TRUE,
+            $dates[DateTimeRangeDisplayOptions::START_DATE->value] => TRUE,
             $separator => FALSE,
-            $dates[DateTimeRangeConstants::END_DATE->value] => FALSE,
+            $dates[DateTimeRangeDisplayOptions::END_DATE->value] => FALSE,
           ],
           'datetime_type' => $datetime_type,
           'field_formatter_type' => $field_formatter_type,
-          ['from_to' => DateTimeRangeConstants::START_DATE->value],
+          ['from_to' => DateTimeRangeDisplayOptions::START_DATE->value],
         ];
 
         // Only end date.
         $return[$datetime_type . '-' . $field_formatter_type . '-end_date'] = [
           'expected' => [
-            $dates[DateTimeRangeConstants::START_DATE->value] => FALSE,
+            $dates[DateTimeRangeDisplayOptions::START_DATE->value] => FALSE,
             $separator => FALSE,
-            $dates[DateTimeRangeConstants::END_DATE->value] => TRUE,
+            $dates[DateTimeRangeDisplayOptions::END_DATE->value] => TRUE,
           ],
           'datetime_type' => $datetime_type,
           'field_formatter_type' => $field_formatter_type,
-          ['from_to' => DateTimeRangeConstants::END_DATE->value],
+          ['from_to' => DateTimeRangeDisplayOptions::END_DATE->value],
         ];
       }
     }

core/modules/datetime_range/tests/src/FunctionalJavascript/DateRangeFieldTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\datetime_range\FunctionalJavascript;
 
-use Drupal\datetime_range\DateTimeRangeConstants;
+use Drupal\datetime_range\DateTimeRangeDisplayOptions;
 use Drupal\datetime_range\Plugin\Field\FieldType\DateRangeItem;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -82,13 +82,13 @@ public function testFromToSeparatorState() {
 
     // Assert that date separator field is visible if 'from_to' is set to
     // BOTH.
-    $this->assertSession()->fieldValueEquals($from_to_locator, DateTimeRangeConstants::BOTH->value);
+    $this->assertSession()->fieldValueEquals($from_to_locator, DateTimeRangeDisplayOptions::BOTH->value);
     $this->assertTrue($separator->isVisible());
     // Assert that the date separator is not visible if 'from_to' is set to
     // START_DATE or END_DATE.
-    $page->selectFieldOption($from_to_locator, DateTimeRangeConstants::START_DATE->value);
+    $page->selectFieldOption($from_to_locator, DateTimeRangeDisplayOptions::START_DATE->value);
     $this->assertFalse($separator->isVisible());
-    $page->selectFieldOption($from_to_locator, DateTimeRangeConstants::END_DATE->value);
+    $page->selectFieldOption($from_to_locator, DateTimeRangeDisplayOptions::END_DATE->value);
     $this->assertFalse($separator->isVisible());
   }