diff --git a/core/includes/common.inc b/core/includes/common.inc index 97b73f4..07f7d54 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -1955,6 +1955,30 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) { } /** + * Retrieves the correct datetime format type for this system. + * + * This value is sometimes required when the format type needs to be determined + * before a date can be created. + * + * @return string + * A string as defined in \DrupalComponent\Datetime\DateTimePlus.php: either + * 'intl' or 'php', depending on whether IntlDateFormatter is available. + */ +function datetime_default_format_type() { + static $drupal_static_fast; + if (!isset($drupal_static_fast)) { + $drupal_static_fast['format_type'] = &drupal_static(__FUNCTION__); + } + $format_type = &$drupal_static_fast['format_type']; + + if (!isset($format_type)) { + $date = new DrupalDateTime(); + $format_type = $date->canUseIntl() ? DrupalDateTime::INTL : DrupalDateTime::PHP; + } + return $format_type; +} + +/** * @} End of "defgroup format". */ diff --git a/core/includes/form.inc b/core/includes/form.inc index 95470f9..0582a44 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -8,6 +8,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Database\Database; use Drupal\Core\Template\Attribute; +use Drupal\Core\Datetime\DrupalDateTime; use Drupal\Core\Utility\Color; /** @@ -1727,8 +1728,8 @@ function form_error(&$element, $message = '') { * - $element['#process']: An array of functions called after user input has * been mapped to the element's #value property. These functions can be used * to dynamically add child elements: for example, for the 'date' element - * type, one of the functions in this array is form_process_date(), which adds - * the individual 'year', 'month', 'day', etc. child elements. These functions + * type, one of the functions in this array is form_process_datetime(), which adds + * the individual 'date', and 'time'. child elements. These functions * can also be used to set additional properties or implement special logic * other than adding child elements: for example, for the 'details' element * type, one of the functions in this array is form_process_details(), which @@ -3030,118 +3031,29 @@ function password_confirm_validate($element, &$element_state) { } /** - * Returns HTML for a date selection form element. + * Returns HTML for an #date form element. * - * @param $variables + * Supports HTML5 types of 'date', 'datetime', 'datetime-local', and 'time'. + * Falls back to a plain textfield. Used as a sub-element by the datetime + * element type. + * + * @param array $variables * An associative array containing: * - element: An associative array containing the properties of the element. * Properties used: #title, #value, #options, #description, #required, - * #attributes. + * #attributes, #id, #name, #type, #min, #max, #step, #value, #size. * * @ingroup themeable */ function theme_date($variables) { $element = $variables['element']; - - $attributes = array(); - if (isset($element['#id'])) { - $attributes['id'] = $element['#id']; - } - if (!empty($element['#attributes']['class'])) { - $attributes['class'] = (array) $element['#attributes']['class']; - } - $attributes['class'][] = 'container-inline'; - - return '' . drupal_render_children($element) . ''; -} - -/** - * Expands a date element into year, month, and day select elements. - */ -function form_process_date($element) { - // Default to current date - if (empty($element['#value'])) { - $element['#value'] = array( - 'day' => format_date(REQUEST_TIME, 'custom', 'j'), - 'month' => format_date(REQUEST_TIME, 'custom', 'n'), - 'year' => format_date(REQUEST_TIME, 'custom', 'Y'), - ); + if (empty($element['attribute']['type'])) { + $element['attribute']['type'] = 'date'; } + element_set_attributes($element, array('id', 'name', 'type', 'min', 'max', 'step', 'value', 'size')); + _form_set_attributes($element, array('form-' . $element['attribute']['type'])); - $element['#tree'] = TRUE; - - // Determine the order of day, month, year in the site's chosen date format. - $format = config('system.date')->get('formats.short.pattern'); - $format = $format['php']; - $sort = array(); - $sort['day'] = max(strpos($format, 'd'), strpos($format, 'j')); - $sort['month'] = max(strpos($format, 'm'), strpos($format, 'M')); - $sort['year'] = strpos($format, 'Y'); - asort($sort); - $order = array_keys($sort); - - // Output multi-selector for date. - foreach ($order as $type) { - switch ($type) { - case 'day': - $options = drupal_map_assoc(range(1, 31)); - $title = t('Day'); - break; - - case 'month': - $options = drupal_map_assoc(range(1, 12), 'map_month'); - $title = t('Month'); - break; - - case 'year': - $options = drupal_map_assoc(range(1900, 2050)); - $title = t('Year'); - break; - } - - $element[$type] = array( - '#type' => 'select', - '#title' => $title, - '#title_display' => 'invisible', - '#value' => $element['#value'][$type], - '#attributes' => $element['#attributes'], - '#options' => $options, - ); - } - - return $element; -} - -/** - * Validates the date type to prevent invalid dates (e.g., February 30, 2006). - */ -function date_validate($element) { - if (!checkdate($element['#value']['month'], $element['#value']['day'], $element['#value']['year'])) { - form_error($element, t('The specified date is invalid.')); - } -} - -/** - * Renders a month name for display. - * - * Callback for drupal_map_assoc() within form_process_date(). - */ -function map_month($month) { - $months = &drupal_static(__FUNCTION__, array( - 1 => 'Jan', - 2 => 'Feb', - 3 => 'Mar', - 4 => 'Apr', - 5 => 'May', - 6 => 'Jun', - 7 => 'Jul', - 8 => 'Aug', - 9 => 'Sep', - 10 => 'Oct', - 11 => 'Nov', - 12 => 'Dec', - )); - return t($months[$month]); + return ''; } /** diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 3483330..8172073 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1564,6 +1564,12 @@ function theme_disable($theme_list) { /** * Preprocess variables for theme_datetime(). + * + * @param array $variables + * An associative array possbily containing: + * - attributes['timestamp']: + * - timestamp: + * - text: */ function template_preprocess_datetime(&$variables) { // Format the 'datetime' attribute based on the timestamp. @@ -1585,6 +1591,7 @@ function template_preprocess_datetime(&$variables) { $variables['html'] = FALSE; } } + $variables['attributes'] = new Attribute($variables['attributes']); } /** diff --git a/core/modules/comment/comment.info b/core/modules/comment/comment.info index 340df76..78394e9 100644 --- a/core/modules/comment/comment.info +++ b/core/modules/comment/comment.info @@ -4,5 +4,6 @@ package = Core version = VERSION core = 8.x dependencies[] = node +dependencies[] = datetime dependencies[] = text configure = admin/content/comment diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/Drupal/comment/CommentFormController.php index ff49681..a5e5f15 100644 --- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php +++ b/core/modules/comment/lib/Drupal/comment/CommentFormController.php @@ -61,7 +61,7 @@ public function form(array $form, array &$form_state, EntityInterface $comment) if ($is_admin) { $author = $comment->name->value; $status = (isset($comment->status->value) ? $comment->status->value : COMMENT_NOT_PUBLISHED); - $date = (!empty($comment->date) ? $comment->date : format_date($comment->created->value, 'custom', 'Y-m-d H:i O')); + $date = (!empty($comment->date) ? $comment->date : new DrupalDateTime($comment->created->value)); } else { if ($user->uid) { @@ -117,10 +117,9 @@ public function form(array $form, array &$form_state, EntityInterface $comment) // Add administrative comment publishing options. $form['author']['date'] = array( - '#type' => 'textfield', + '#type' => 'datetime', '#title' => t('Authored on'), '#default_value' => $date, - '#maxlength' => 25, '#size' => 20, '#access' => $is_admin, ); @@ -212,8 +211,8 @@ public function validate(array $form, array &$form_state) { $account = user_load_by_name($form_state['values']['name']); $form_state['values']['uid'] = $account ? $account->uid : 0; - $date = new DrupalDateTime(!empty($form_state['values']['date']) ? $form_state['values']['date'] : 'now'); - if ($date->hasErrors()) { + $date = $form_state['values']['date']; + if ($date instanceOf DrupalDateTime && $date->hasErrors()) { form_set_error('date', t('You have to specify a valid date.')); } if ($form_state['values']['name'] && !$form_state['values']['is_anonymous'] && !$account) { @@ -244,8 +243,12 @@ public function validate(array $form, array &$form_state) { */ public function buildEntity(array $form, array &$form_state) { $comment = parent::buildEntity($form, $form_state); - $date = new DrupalDateTime(!empty($form_state['values']['date']) ? $form_state['values']['date'] : 'now'); - $comment->created->value = $date->getTimestamp(); + if (!empty($form_state['values']['date']) && $form_state['values']['date'] instanceOf DrupalDateTime) { + $comment->created->value = $form_state['values']['date']->getTimestamp(); + } + else { + $comment->created->value = REQUEST_TIME; + } $comment->changed->value = REQUEST_TIME; return $comment; } diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php index 13817df..faf6ace 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php @@ -7,6 +7,8 @@ namespace Drupal\comment\Tests; +use Drupal\Core\Datetime\DrupalDateTime; + /** * Tests previewing comments. */ @@ -86,13 +88,16 @@ function testCommentEditPreviewSave() { $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $edit = array(); + $date = new DrupalDateTime('2008-03-02 17:23'); $edit['subject'] = $this->randomName(8); $edit['comment_body[' . $langcode . '][0][value]'] = $this->randomName(16); $edit['name'] = $web_user->name; - $edit['date'] = '2008-03-02 17:23 +0300'; - $raw_date = strtotime($edit['date']); + $edit['date[date]'] = $date->format('Y-m-d'); + $edit['date[time]'] = $date->format('H:i:s'); + $raw_date = $date->getTimestamp(); $expected_text_date = format_date($raw_date); - $expected_form_date = format_date($raw_date, 'custom', 'Y-m-d H:i O'); + $expected_form_date = $date->format('Y-m-d'); + $expected_form_time = $date->format('H:i:s'); $comment = $this->postComment($this->node, $edit['subject'], $edit['comment_body[' . $langcode . '][0][value]'], TRUE); $this->drupalPost('comment/' . $comment->id() . '/edit', $edit, t('Preview')); @@ -107,7 +112,8 @@ function testCommentEditPreviewSave() { $this->assertFieldByName('subject', $edit['subject'], 'Subject field displayed.'); $this->assertFieldByName('comment_body[' . $langcode . '][0][value]', $edit['comment_body[' . $langcode . '][0][value]'], 'Comment field displayed.'); $this->assertFieldByName('name', $edit['name'], 'Author field displayed.'); - $this->assertFieldByName('date', $edit['date'], 'Date field displayed.'); + $this->assertFieldByName('date[date]', $edit['date[date]'], 'Date field displayed.'); + $this->assertFieldByName('date[time]', $edit['date[time]'], 'Time field displayed.'); // Check that saving a comment produces a success message. $this->drupalPost('comment/' . $comment->id() . '/edit', $edit, t('Save')); @@ -118,14 +124,16 @@ function testCommentEditPreviewSave() { $this->assertFieldByName('subject', $edit['subject'], 'Subject field displayed.'); $this->assertFieldByName('comment_body[' . $langcode . '][0][value]', $edit['comment_body[' . $langcode . '][0][value]'], 'Comment field displayed.'); $this->assertFieldByName('name', $edit['name'], 'Author field displayed.'); - $this->assertFieldByName('date', $expected_form_date, 'Date field displayed.'); + $this->assertFieldByName('date[date]', $expected_form_date, 'Date field displayed.'); + $this->assertFieldByName('date[time]', $expected_form_time, 'Time field displayed.'); // Submit the form using the displayed values. $displayed = array(); $displayed['subject'] = (string) current($this->xpath("//input[@id='edit-subject']/@value")); $displayed['comment_body[' . $langcode . '][0][value]'] = (string) current($this->xpath("//textarea[@id='edit-comment-body-" . $langcode . "-0-value']")); $displayed['name'] = (string) current($this->xpath("//input[@id='edit-name']/@value")); - $displayed['date'] = (string) current($this->xpath("//input[@id='edit-date']/@value")); + $displayed['date[date]'] = (string) current($this->xpath("//input[@id='edit-date-date']/@value")); + $displayed['date[time]'] = (string) current($this->xpath("//input[@id='edit-date-time']/@value")); $this->drupalPost('comment/' . $comment->id() . '/edit', $displayed, t('Save')); // Check that the saved comment is still correct. diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php index 253136e..e49f2f3 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php @@ -20,7 +20,7 @@ * * @var array */ - public static $modules = array('comment', 'node', 'history', 'field_ui'); + public static $modules = array('comment', 'node', 'history', 'field_ui', 'datetime'); /** * An administrative user with permission to configure comment settings. diff --git a/core/modules/datetime/datetime.info b/core/modules/datetime/datetime.info new file mode 100644 index 0000000..f1bb32c --- /dev/null +++ b/core/modules/datetime/datetime.info @@ -0,0 +1,6 @@ +name = Datetime +description = Defines datetime form elements and a datetime field type. +package = Core +version = VERSION +core = 8.x +dependencies[] = field diff --git a/core/modules/datetime/datetime.install b/core/modules/datetime/datetime.install new file mode 100644 index 0000000..df1ed81 --- /dev/null +++ b/core/modules/datetime/datetime.install @@ -0,0 +1,41 @@ + 'The date value', + 'type' => 'varchar', + 'length' => 20, + 'not null' => FALSE, + ); + $indexes = array( + 'value' => array('value'), + ); + return array('columns' => $db_columns, 'indexes' => $indexes); +} + +/** + * Install the new to D8 Datetime module. + * + * As part of adding this new module to Drupal 8, the Datetime namespace is now + * reserved for this module. This is a possible conflict with a popular contrib + * field DateTime that existed in D7. Hence, any Datetime fields that may have + * existed prior to D8 need to renamed for later upgrade by contrib modules like + * the Date module. + */ +function datetime_install() { + db_update('field_config') + ->fields(array( + 'type' => 'datetime_old', + )) + ->condition('type', 'datetime') + ->execute(); +} diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module new file mode 100644 index 0000000..700b771 --- /dev/null +++ b/core/modules/datetime/datetime.module @@ -0,0 +1,1118 @@ + TRUE, + '#element_validate' => array('datetime_datetime_validate'), + '#process' => array('datetime_datetime_form_process'), + '#theme' => 'datetime_form', + '#theme_wrappers' => array('datetime_wrapper'), + '#date_date_format' => config('system.date')->get('formats.html_date.pattern.' . $format_type), + '#date_date_element' => 'date', + '#date_date_callbacks' => array(), + '#date_time_format' => config('system.date')->get('formats.html_time.pattern.' . $format_type), + '#date_time_element' => 'time', + '#date_time_callbacks' => array(), + '#date_year_range' => '1900:2050', + '#date_increment' => 1, + '#date_timezone' => '', + ); + $types['datelist'] = array( + '#input' => TRUE, + '#element_validate' => array('datetime_datelist_validate'), + '#process' => array('datetime_datelist_form_process'), + '#theme' => 'datelist_form', + '#theme_wrappers' => array('datetime_wrapper'), + '#date_part_order' => array('year', 'month', 'day', 'hour', 'minute'), + '#date_year_range' => '1900:2050', + '#date_increment' => 1, + '#date_date_callbacks' => array(), + '#date_timezone' => '', + ); + return $types; +} + +/** + * Implements hook_theme(). + */ +function datetime_theme() { + return array( + 'datetime_form' => array( + 'render element' => 'element', + ), + 'datelist_form' => array( + 'render element' => 'element', + ), + 'datetime_wrapper' => array( + 'render element' => 'element', + ), + ); +} + +/** + * Implements hook_field_is_empty(). + */ +function datetime_field_is_empty($item, $field) { + if (empty($item['value'])) { + return TRUE; + } + return FALSE; +} + +/** + * Implements hook_field_info(). + */ +function datetime_field_info() { + return array( + 'datetime' => array( + 'label' => 'Date', + 'description' => t('Create and store date values.'), + 'settings' => array( + 'datetime_type' => 'datetime', + ), + 'instance_settings' => array( + 'default_value' => 'now', + ), + 'default_widget' => 'datetime_default', + 'default_formatter' => 'datetime_default', + 'default_token_formatter' => 'datetime_plain', + 'field item class' => '\Drupal\datetime\Type\DateTimeItem', + ), + ); +} + +/** + * Implements hook_field_settings_form(). + */ +function datetime_field_settings_form($field, $instance, $has_data) { + $settings = $field['settings']; + + $form['datetime_type'] = array( + '#type' => 'select', + '#title' => t('Date type'), + '#description' => t('Choose the type of date to create.'), + '#default_value' => $settings['datetime_type'], + '#options' => array( + 'datetime' => t('Date and time'), + 'date' => t('Date only'), + ), + ); + return $form; +} + +/** + * Implements hook_field_instance_settings_form(). + */ +function datetime_field_instance_settings_form($field, $instance) { + $widget = $instance['widget']; + $settings = $instance['settings']; + $widget_settings = $instance['widget']['settings']; + + $form['default_value'] = array( + '#type' => 'select', + '#title' => t('Default date'), + '#description' => t('Set a default value for this date.'), + '#default_value' => $settings['default_value'], + '#options' => array('blank' => t('No default value'), 'now' => t('The current date')), + '#weight' => 1, + ); + + return $form; +} + +/** + * Validation callback for the datetime widget element. + * + * The date has already been validated by the datetime form type validator and + * transformed to an date object. We just need to convert the date back to a the + * storage timezone and format. + * + * @param array $element + * The form element whose value is being validated. + * @param array $form_state + * The current state of the form. + */ +function datetime_datetime_widget_validate(&$element, &$form_state) { + if (!form_get_errors()) { + $input_exists = FALSE; + $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); + if ($input_exists) { + // The date should have been returned to a date object at this point by + // datetime_validate(), which runs before this. + if (!empty($input['value'])) { + $date = $input['value']; + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + + // If this is a date-only field, set it to the default time so the + // timezone conversion can be reversed. + if ($element['value']['#date_time_element'] == 'none') { + datetime_date_default_time($date); + } + // Adjust the date for storage. + $date->setTimezone(new \DateTimezone(DATETIME_STORAGE_TIMEZONE)); + $value = $date->format($element['value']['#date_storage_format']); + form_set_value($element['value'], $value, $form_state); + } + } + } + } +} + +/** + * Validation callback for the datelist widget element. + * + * The date has already been validated by the datetime form type validator and + * transformed to an date object. We just need to convert the date back to a the + * storage timezone and format. + * + * @param array $element + * The form element whose value is being validated. + * @param array $form_state + * The current state of the form. + */ +function datetime_datelist_widget_validate(&$element, &$form_state) { + if (!form_get_errors()) { + $input_exists = FALSE; + $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); + if ($input_exists) { + // The date should have been returned to a date object at this point by + // datetime_validate(), which runs before this. + if (!empty($input['value'])) { + $date = $input['value']; + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + + // If this is a date-only field, set it to the default time so the + // timezone conversion can be reversed. + if (!in_array('hour', $element['value']['#date_part_order'])) { + datetime_date_default_time($date); + } + // Adjust the date for storage. + $date->setTimezone(new \DateTimezone(DATETIME_STORAGE_TIMEZONE)); + $value = $date->format($element['value']['#date_storage_format']); + form_set_value($element['value'], $value, $form_state); + } + } + } + } +} + +/** + * Implements hook_field_load(). + * + * The function generates a Date object for each field early so that it is + * cached in the field cache. This avoids the need to generate the object later. + * The date will be retrieved in UTC, the local timezone adjustment must be made + * in real time, based on the preferences of the site and user. + */ +function datetime_field_load($entity_type, $entities, $field, $instances, $langcode, &$items) { + foreach ($entities as $id => $entity) { + foreach ($items[$id] as $delta => $item) { + $items[$id][$delta]['date'] = NULL; + $value = isset($item['value']) ? $item['value'] : NULL; + if (!empty($value)) { + $storage_format = $field['settings']['datetime_type'] == 'date' ? DATETIME_DATE_STORAGE_FORMAT: DATETIME_DATETIME_STORAGE_FORMAT; + $date = new DrupalDateTime($value, DATETIME_STORAGE_TIMEZONE, $storage_format); + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + $items[$id][$delta]['date'] = $date; + } + } + } + } +} + +/** + * Sets a default value for an empty date field. + * + * Callback for $instance['default_value_function'], as implemented by + * Drupal\datetime\Plugin\field\widget\DateTimeDatepicker. + * + * @param $entity_type + * + * @param $entity + * + * @param array $field + * + * @param array $instance + * + * @param $langcode + * + * + * @return array + * + */ +function datetime_default_value($entity, $field, $instance, $langcode) { + + $value = ''; + $date = ''; + if ($instance['settings']['default_value'] == 'now') { + // A default value should be in the format and timezone used for date + // storage. + $date = new DrupalDateTime('now', DATETIME_STORAGE_TIMEZONE); + $storage_format = $field['settings']['datetime_type'] == 'date' ? DATETIME_DATE_STORAGE_FORMAT: DATETIME_DATETIME_STORAGE_FORMAT; + $value = $date->format($storage_format); + } + + // We only provide a default value for the first item, as do all fields. + // Otherwise, there is no way to clear out unwanted values on multiple value + // fields. + $item = array(); + $item[0]['value'] = $value; + $item[0]['date'] = $date; + + return $item; +} + +/** + * Sets a consistent time on a date without time. + * + * The default time for a date without time can be anything, so long as it is + * consistently applied. If we use noon, dates in most timezones will have the + * same value for in both the local timezone and UTC. + * + * @param $date + * + */ +function datetime_date_default_time($date) { + $date->setTime(12, 0, 0); +} + +/** + * Returns HTML for a HTML5-compatible #datetime form element. + * + * Wrapper around the date element type which creates a date and a time + * component for a date. + * + * @param array $variables + * An associative array containing: + * - element: An associative array containing the properties of the element. + * Properties used: #title, #value, #options, #description, #required, + * #attributes. + * + * @ingroup themeable + * @see form_process_datetime() + */ +function theme_datetime_form($variables) { + + $element = $variables['element']; + + $attributes = array(); + if (isset($element['#id'])) { + $attributes['id'] = $element['#id']; + } + if (!empty($element['#attributes']['class'])) { + $attributes['class'] = (array) $element['#attributes']['class']; + } + $attributes['class'][] = 'container-inline'; + + return '' . drupal_render_children($element) . ''; +} + +/** + * Returns HTML for a date selection form element. + * + * @param array $variables + * An associative array containing: + * - element: An associative array containing the properties of the element. + * Properties used: #title, #value, #options, #description, #required, + * #attributes. + * + * @ingroup themeable + */ +function theme_datelist_form($variables) { + + $element = $variables['element']; + + $attributes = array(); + if (isset($element['#id'])) { + $attributes['id'] = $element['#id']; + } + if (!empty($element['#attributes']['class'])) { + $attributes['class'] = (array) $element['#attributes']['class']; + } + $attributes['class'][] = 'container-inline'; + + return '' . drupal_render_children($element) . ''; +} + +/** + * Returns HTML for a datetime form element. + * + * @ingroup themeable + */ +function theme_datetime_wrapper($variables) { + $element = $variables['element']; + $output = ''; + + // If the element is required, a required marker is appended to the label. + $required = !empty($element['#required']) ? theme('form_required_marker', array('element' => $element)) : ''; + + if (!empty($element['#title'])) { + $output .= '

' . t('!title!required', array('!title' => $element['#title'], '!required' => $required)) . '

'; + } + $output .= $element['#children']; + + return $output; +} + +/** + * Expands a #datetime element type into date and/or time elements. + * + * All form elements are designed to have sane defaults so any or all can be + * omitted. Both the date and time components are configurable so they can be + * output as HTML5 datetime elements or not, as desired. + * + * Examples of possible configurations include: + * HTML5 date and time: + * #date_date_element = 'date'; + * #date_time_element = 'time'; + * HTML5 datetime: + * #date_date_element = 'datetime'; + * #date_time_element = 'none'; + * HTML5 time only: + * #date_date_element = 'none'; + * #date_time_element = 'time' + * Non-HTML5: + * #date_date_element = 'text'; + * #date_time_element = 'text'; + * + * Required settings: + * - #default_value: A DrupalDateTime object, adjusted to the proper local + * timezone. Converting a date stored in the database from UTC to the local + * zone and converting it back to UTC before storing it is not handled here. + * This element accepts a date as the default value, and then converts the + * user input strings back into a new date object on submission. No timezone + * adjustment is performed. + * Optional properties include: + * - #date_date_format: A date format string that describes the format that + * should be displayed to the end user for the date. When using HTML5 + * elements the format MUST use the appropriate HTML5 format for that + * element, no other format will work. See the format_date() function for a + * list of the possible formats and HTML5 standards for the HTML5 + * requirements. Defaults to the right HTML5 format for the chosen element + * if a HTML5 element is used, otherwise defaults to + * config('system.date')->get('formats.html_date.pattern.php'). + * - #date_date_element: The date element. Options are: + * - datetime: Use the HTML5 datetime element type. + * - datetime-local: Use the HTML5 datetime-local element type. + * - date: Use the HTML5 date element type. + * - text: No HTML5 element, use a normal text field. + * - none: Do not display a date element. + * - #date_date_callbacks: Array of optional callbacks for the date element. + * Can be used to add a jQuery datepicker. + * - #date_time_element: The time element. Options are: + * - time: Use a HTML5 time element type. + * - text: No HTML5 element, use a normal text field. + * - none: Do not display a time element. + * - #date_time_format: A date format string that describes the format that + * should be displayed to the end user for the time. When using HTML5 + * elements the format MUST use the appropriate HTML5 format for that + * element, no other format will work. See the format_date() function for + * a list of the possible formats and HTML5 standards for the HTML5 + * requirements. Defaults to the right HTML5 format for the chosen element + * if a HTML5 element is used, otherwise defaults to + * config('system.date')->get('formats.html_time.pattern.php'). + * - #date_time_callbacks: An array of optional callbacks for the time + * element. Can be used to add a jQuery timepicker or an 'All day' checkbox. + * - #date_year_range: A description of the range of years to allow, like + * '1900:2050', '-3:+3' or '2000:+3', where the first value describes the + * earliest year and the second the latest year in the range. A year + * in either position means that specific year. A +/- value describes a + * dynamic value that is that many years earlier or later than the current + * year at the time the form is displayed. Used in jQueryUI datepicker year + * range and HTML5 min/max date settings. Defaults to '1900:2050'. + * - #date_increment: The increment to use for minutes and seconds, i.e. + * '15' would show only :00, :15, :30 and :45. Used for HTML5 step values and + * jQueryUI datepicker settings. Defaults to 1 to show every minute. + * - #date_timezone: The local timezone to use when creating dates. Generally + * this should be left empty and it will be set correctly for the user using + * the form. Useful if the default value is empty to designate a desired + * timezone for dates created in form processing. If a default date is + * provided, this value will be ignored, the timezone in the default date + * takes precedence. Defaults to the value returned by + * drupal_get_user_timezone(). + * + * Example usage: + * @code + * $form = array( + * '#type' => 'datetime', + * '#default_value' => new DrupalDateTime('2000-01-01 00:00:00'), + * '#date_date_element' => 'date', + * '#date_time_element' => 'none', + * '#date_year_range' => '2010:+3', + * ); + * @endcode + * + * @param array $element + * The form element whose value is being processed. + * @param array $form_state + * The current state of the form. + * + * @return array + * The form element whose value has been processed. + */ +function datetime_datetime_form_process($element, &$form_state) { + + // The value callback has populated the #value array. + $date = !empty($element['#value']['object']) ? $element['#value']['object'] : NULL; + + // Set a fallback timezone. + if ($date instanceOf DrupalDateTime) { + $element['#date_timezone'] = $date->getTimezone()->getName(); + } + elseif (!empty($element['#timezone'])) { + $element['#date_timezone'] = $element['#date_timezone']; + } + else { + $element['#date_timezone'] = drupal_get_user_timezone(); + } + + $element['#tree'] = TRUE; + + if ($element['#date_date_element'] != 'none') { + + $date_format = $element['#date_date_element'] != 'none' ? datetime_html5_format('date', $element) : ''; + $date_value = !empty($date) ? $date->format($date_format) : $element['#value']['date']; + + // Creating format examples on every individual date item is messy, and + // placeholders are invalid for HTML5 date and datetime, so an example + // format is appended to the title to appear in tooltips. + $extra_attributes = array( + 'title' => t('Date (i.e. !format)', array('!format' => datetime_format_example($date_format))), + 'type' => $element['#date_date_element'], + ); + + // Adds the HTML5 date attributes. + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + $html5_min = clone($date); + $range = datetime_range_years($element['#date_year_range'], $date); + $html5_min->setDate($range[0], 1, 1)->setTime(0, 0, 0); + $html5_max = clone($date); + $html5_max->setDate($range[1], 12, 31)->setTime(23, 59, 59); + + $extra_attributes += array( + 'min' => $html5_min->format($date_format), + 'max' => $html5_max->format($date_format), + ); + } + + $element['date'] = array( + '#type' => 'date', + '#title' => t('Date'), + '#title_display' => 'invisible', + '#value' => $date_value, + '#attributes' => $element['#attributes'] + $extra_attributes, + '#required' => $element['#required'], + '#size' => max(12, strlen($element['#value']['date'])), + ); + + // Allows custom callbacks to alter the element. + if (!empty($element['#date_date_callbacks'])) { + foreach ($element['#date_date_callbacks'] as $callback) { + if (function_exists($callback)) { + $callback($element, $form_state, $date); + } + } + } + } + + if ($element['#date_time_element'] != 'none') { + + $time_format = $element['#date_time_element'] != 'none' ? datetime_html5_format('time', $element) : ''; + $time_value = !empty($date) ? $date->format($time_format) : $element['#value']['time']; + + // Adds the HTML5 attributes. + $extra_attributes = array( + 'title' =>t('Time (i.e. !format)', array('!format' => datetime_format_example($time_format))), + 'type' => $element['#date_time_element'], + 'step' => $element['#date_increment'], + ); + $element['time'] = array( + '#type' => 'date', + '#title' => t('Time'), + '#title_display' => 'invisible', + '#value' => $time_value, + '#attributes' => $element['#attributes'] + $extra_attributes, + '#required' => $element['#required'], + '#size' => 12, + ); + + // Allows custom callbacks to alter the element. + if (!empty($element['#date_time_callbacks'])) { + foreach ($element['#date_time_callbacks'] as $callback) { + if (function_exists($callback)) { + $callback($element, $form_state, $date); + } + } + } + } + + return $element; +} + +/** + * Value callback for a datetime element. + * + * @param array $element + * The form element whose value is being populated. + * @param array $input + * (optional) The incoming input to populate the form element. If this is + * FALSE, the element's default value should be returned. Defaults to FALSE. + * + * @return array + * The data that will appear in the $element_state['values'] collection for + * this element. Return nothing to use the default. + */ +function form_type_datetime_value($element, $input = FALSE) { + if ($input !== FALSE) { + $date_input = $element['#date_date_element'] != 'none' && !empty($input['date']) ? $input['date'] : ''; + $time_input = $element['#date_time_element'] != 'none' && !empty($input['time']) ? $input['time'] : ''; + $date_format = $element['#date_date_element'] != 'none' ? datetime_html5_format('date', $element) : ''; + $time_format = $element['#date_time_element'] != 'none' ? datetime_html5_format('time', $element) : ''; + $timezone = !empty($element['#date_timezone']) ? $element['#date_timezone'] : NULL; + $date = new DrupalDateTime(trim($date_input . ' ' . $time_input), $timezone, trim($date_format . ' ' . $time_format)); + $input = array( + 'date' => $date_input, + 'time' => $time_input, + 'object' => $date instanceOf DrupalDateTime && !$date->hasErrors() ? $date : NULL, + ); + } + else { + $date = $element['#default_value']; + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + $input = array( + 'date' => $date->format($element['#date_date_format']), + 'time' => $date->format($element['#date_time_format']), + 'object' => $date, + ); + } + else { + $input = array( + 'date' => '', + 'time' => '', + 'object' => NULL, + ); + } + } + return $input; +} + +/** + * Validation callback for a datetime element. + * + * If the date is valid, the date object created from the user input is set in + * the form for use by the caller. The work of compiling the user input back + * into a date object is handled by the value callback, so we can use it here. + * We also have the raw input available for validation testing. + * + * @param array $element + * The form element whose value is being validated. + * @param array $form_state + * The current state of the form. + */ +function datetime_datetime_validate($element, &$form_state) { + + $input_exists = FALSE; + $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); + if ($input_exists) { + + $title = !empty($element['#title']) ? $element['#title'] : ''; + $date_format = $element['#date_date_element'] != 'none' ? datetime_html5_format('date', $element) : ''; + $time_format = $element['#date_time_element'] != 'none' ? datetime_html5_format('time', $element) : ''; + $format = trim($date_format . ' ' . $time_format); + + // If there's empty input and the field is not required, set it to empty. + if (empty($input['date']) && empty($input['time']) && !$element['#required']) { + form_set_value($element, NULL, $form_state); + } + // If there's empty input and the field is required, set an error. A + // reminder of the required format in the message provides a good UX. + elseif (empty($input['date']) && empty($input['time']) && $element['#required']) { + form_error($element, t('The %field date is required. Please enter a date in the format %format.', array('%field' => $title, '%format' => datetime_format_example($format)))); + } + else { + // If the date is valid, set it. + $date = $input['object']; + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + form_set_value($element, $date, $form_state); + } + // If the date is invalid, set an error. A reminder of the required + // format in the message provides a good UX. + else { + form_error($element, t('The %field date is invalid. Please enter a date in the format %format.', array('%field' => $title, '%format' => datetime_format_example($format)))); + } + } + } +} + +/** + * Retrieves the right format for a HTML5 date element. + * + * The format is important because these elements will not work with any other + * format. + * + * @param string $part + * The type of element format to retrieve. + * @param string $element + * The $element to assess. + * + * @return string + * Returns the right format for the type of element, or the original format + * if this is not a HTML5 element. + */ +function datetime_html5_format($part, $element) { + $format_type = datetime_default_format_type(); + switch ($part) { + case 'date': + switch ($element['#date_date_element']) { + case 'date': + return config('system.date')->get('formats.html_date.pattern.' . $format_type); + + case 'datetime': + case 'datetime-local': + return config('system.date')->get('formats.html_datetime.pattern.' . $format_type); + + default: + return $element['#date_date_format']; + } + break; + + case 'time': + switch ($element['#date_time_element']) { + case 'time': + return config('system.date')->get('formats.html_time.pattern.' . $format_type); + + default: + return $element['#date_time_format']; + } + break; + } +} + +/** + * Creates an example for a date format. + * + * This is centralized for a consistent method of creating these examples. + * + * @param string $format + * + * + * @return string + * + */ +function datetime_format_example($format) { + $date = &drupal_static(__FUNCTION__); + if (empty($date)) { + $date = new DrupalDateTime(); + } + return $date->format($format); +} + +/** + * Expands a date element into an array of individual elements. + * + * Required settings: + * - #default_value: A DrupalDateTime object, adjusted to the proper local + * timezone. Converting a date stored in the database from UTC to the local + * zone and converting it back to UTC before storing it is not handled here. + * This element accepts a date as the default value, and then converts the + * user input strings back into a new date object on submission. No timezone + * adjustment is performed. + * Optional properties include: + * - #date_part_order: Array of date parts indicating the parts and order + * that should be used in the selector, optionally including 'ampm' for + * 12 hour time. Default is array('year', 'month', 'day', 'hour', 'minute'). + * - #date_text_parts: Array of date parts that should be presented as + * text fields instead of drop-down selectors. Default is an empty array. + * - #date_date_callbacks: Array of optional callbacks for the date element. + * - #date_year_range: A description of the range of years to allow, like + * '1900:2050', '-3:+3' or '2000:+3', where the first value describes the + * earliest year and the second the latest year in the range. A year + * in either position means that specific year. A +/- value describes a + * dynamic value that is that many years earlier or later than the current + * year at the time the form is displayed. Defaults to '1900:2050'. + * - #date_increment: The increment to use for minutes and seconds, i.e. + * '15' would show only :00, :15, :30 and :45. Defaults to 1 to show every + * minute. + * - #date_timezone: The local timezone to use when creating dates. Generally + * this should be left empty and it will be set correctly for the user using + * the form. Useful if the default value is empty to designate a desired + * timezone for dates created in form processing. If a default date is + * provided, this value will be ignored, the timezone in the default date + * takes precedence. Defaults to the value returned by + * drupal_get_user_timezone(). + * + * Example usage: + * @code + * $form = array( + * '#type' => 'datelist', + * '#default_value' => new DrupalDateTime('2000-01-01 00:00:00'), + * '#date_part_order' => array('month', 'day', 'year', 'hour', 'minute', 'ampm'), + * '#date_text_parts' => array('year'), + * '#date_year_range' => '2010:2020', + * '#date_increment' => 15, + * ); + * @endcode + * + * @param array $element + * The form element whose value is being processed. + * @param array $form_state + * The current state of the form. + */ +function datetime_datelist_form_process($element, &$form_state) { + + // Load translated date part labels from the appropriate calendar plugin. + $date_helper = new DateHelper(); + + // The value callback has populated the #value array. + $date = !empty($element['#value']['object']) ? $element['#value']['object'] : NULL; + + // Set a fallback timezone. + if ($date instanceOf DrupalDateTime) { + $element['#date_timezone'] = $date->getTimezone()->getName(); + } + elseif (!empty($element['#timezone'])) { + $element['#date_timezone'] = $element['#date_timezone']; + } + else { + $element['#date_timezone'] = drupal_get_user_timezone(); + } + + $element['#tree'] = TRUE; + + // Determine the order of the date elements. + $order = !empty($element['#date_part_order']) ? $element['#date_part_order'] : array('year', 'month', 'day'); + $text_parts = !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : array(); + + $has_time = FALSE; + + // Output multi-selector for date. + foreach ($order as $part) { + switch ($part) { + case 'day': + $options = $date_helper->days($element['#required']); + $format = 'j'; + $title = t('Day'); + break; + + case 'month': + $options = $date_helper->monthNamesAbbr($element['#required']); + $format = 'n'; + $title = t('Month'); + break; + + case 'year': + $range = datetime_range_years($element['#date_year_range'], $date); + $options = $date_helper->years($range[0], $range[1], $element['#required']); + $format = 'Y'; + $title = t('Year'); + break; + + case 'hour': + $format = in_array('ampm', $element['#date_part_order']) ? 'g': 'G'; + $options = $date_helper->hours($format, $element['#required']); + $has_time = TRUE; + $title = t('Hour'); + break; + + case 'minute': + $format = 'i'; + $options = $date_helper->minutes($format, $element['#required'], $element['#date_increment']); + $has_time = TRUE; + $title = t('Minute'); + break; + + case 'second': + $format = 's'; + $options = $date_helper->seconds($format, $element['#required'], $element['#date_increment']); + $has_time = TRUE; + $title = t('Second'); + break; + + case 'ampm': + $format = 'a'; + $options = $date_helper->ampm($element['#required']); + $has_time = TRUE; + $title = t('AM/PM'); + } + + $default = !empty($element['#value'][$part]) ? $element['#value'][$part] : ''; + $value = $date instanceOf DrupalDateTime && !$date->hasErrors() ? $date->format($format) : $default; + if (!empty($value) && $part != 'ampm') { + $value = intval($value); + } + + $element['#attributes']['title'] = $title; + $element[$part] = array( + '#type' => in_array($part, $text_parts) ? 'textfield' : 'select', + '#title' => $title, + '#title_display' => 'invisible', + '#value' => $value, + '#attributes' => $element['#attributes'], + '#options' => $options, + '#required' => $element['#required'], + ); + } + + // Allows custom callbacks to alter the element. + if (!empty($element['#date_date_callbacks'])) { + foreach ($element['#date_date_callbacks'] as $callback) { + if (function_exists($callback)) { + $callback($element, $form_state, $date); + } + } + } + + return $element; +} + +/** + * Element value callback for datelist element. + * + * Validates the date type to adjust 12 hour time and prevent invalid dates. If + * the date is valid, the date is set in the form. + * + * @param array $element + * The element being processed. + * @param array|false $input + * + * @param array $form_state + * (optional) The current state of the form. Defaults to an empty array. + * + * @return array + * + */ +function form_type_datelist_value($element, $input = FALSE, &$form_state = array()) { + $parts = $element['#date_part_order']; + $increment = $element['#date_increment']; + + $date = NULL; + if ($input !== FALSE) { + $return = $input; + if (isset($input['ampm'])) { + if ($input['ampm'] == 'pm' && $input['hour'] < 12) { + $input['hour'] += 12; + } + elseif ($input['ampm'] == 'am' && $input['hour'] == 12) { + $input['hour'] -= 12; + } + unset($input['ampm']); + } + $timezone = !empty($element['#date_timezone']) ? $element['#date_timezone'] : NULL; + $date = new DrupalDateTime($input, $timezone); + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + date_increment_round($date, $increment); + } + } + else { + $return = array_fill_keys($parts, ''); + if (!empty($element['#default_value'])) { + $date = $element['#default_value']; + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + date_increment_round($date, $increment); + foreach ($parts as $part) { + switch ($part) { + case 'day': + $format = 'j'; + break; + + case 'month': + $format = 'n'; + break; + + case 'year': + $format = 'Y'; + break; + + case 'hour': + $format = in_array('ampm', $element['#date_part_order']) ? 'g': 'G'; + break; + + case 'minute': + $format = 'i'; + break; + + case 'second': + $format = 's'; + break; + + case 'ampm': + $format = 'a'; + } + $return[$part] = $date->format($format); + } + } + } + } + $return['object'] = $date; + return $return; +} + +/** + * Validation callback for a datelist element. + * + * If the date is valid, the date object created from the user input is set in + * the form for use by the caller. The work of compiling the user input back + * into a date object is handled by the value callback, so we can use it here. + * We also have the raw input available for validation testing. + * + * @param array $element + * The element being processed. + * @param array $form_state + * The current state of the form. + */ +function datetime_datelist_validate($element, &$form_state) { + $input_exists = FALSE; + $input = NestedArray::getValue($form_state['values'], $element['#parents'], $input_exists); + if ($input_exists) { + + $title = !empty($element['#title']) ? $element['#title'] : ''; + + // If there's empty input and the field is not required, set it to empty. + if (empty($input['year']) && empty($input['month']) && empty($input['day']) && !$element['#required']) { + form_set_value($element, NULL, $form_state); + } + // If there's empty input and the field is required, set an error. + elseif (empty($input['year']) && empty($input['month']) && empty($input['day']) && $element['#required']) { + form_error($element, t('The %field date is required.')); + } + else { + // If the input is valid, set it. + $date = $input['object']; + if ($date instanceOf DrupalDateTime && !$date->hasErrors()) { + form_set_value($element, $date, $form_state); + } + // If the input is invalid, set an error. + else { + form_error($element, t('The %field date is invalid.')); + } + } + } +} + +/** + * Rounds minutes and seconds to nearest requested value. + * + * @param $date + * + * @param $increment + * + * + * @return + * + */ +function date_increment_round(&$date, $increment) { + // Round minutes and seconds, if necessary. + if ($date instanceOf DrupalDateTime && $increment > 1) { + $day = intval(date_format($date, 'j')); + $hour = intval(date_format($date, 'H')); + $second = intval(round(intval(date_format($date, 's')) / $increment) * $increment); + $minute = intval(date_format($date, 'i')); + if ($second == 60) { + $minute += 1; + $second = 0; + } + $minute = intval(round($minute / $increment) * $increment); + if ($minute == 60) { + $hour += 1; + $minute = 0; + } + date_time_set($date, $hour, $minute, $second); + if ($hour == 24) { + $day += 1; + $hour = 0; + $year = date_format($date, 'Y'); + $month = date_format($date, 'n'); + date_date_set($date, $year, $month, $day); + } + } + return $date; +} + +/** + * Specifies the start and end year to use as a date range. + * + * Handles a string like -3:+3 or 2001:2010 to describe a dynamic range of + * minimum and maximum years to use in a date selector. + * + * Centers the range around the current year, if any, but expands it far enough + * so it will pick up the year value in the field in case the value in the field + * is outside the initial range. + * + * @param string $string + * A min and max year string like '-3:+1' or '2000:2010' or '2000:+3'. + * @param object $date + * (optional) A date object to test as a default value. Defaults to NULL. + * + * @return array + * A numerically indexed array, containing the minimum and maximum year + * described by this pattern. + */ +function datetime_range_years($string, $date = NULL) { + + $this_year = date_format(new DrupalDateTime(), 'Y'); + list($min_year, $max_year) = explode(':', $string); + + // Valid patterns would be -5:+5, 0:+1, 2008:2010. + $plus_pattern = '@[\+|\-][0-9]{1,4}@'; + $year_pattern = '@^[0-9]{4}@'; + if (!preg_match($year_pattern, $min_year, $matches)) { + if (preg_match($plus_pattern, $min_year, $matches)) { + $min_year = $this_year + $matches[0]; + } + else { + $min_year = $this_year; + } + } + if (!preg_match($year_pattern, $max_year, $matches)) { + if (preg_match($plus_pattern, $max_year, $matches)) { + $max_year = $this_year + $matches[0]; + } + else { + $max_year = $this_year; + } + } + // We expect the $min year to be less than the $max year. Some custom values + // for -99:+99 might not obey that. + if ($min_year > $max_year) { + $temp = $max_year; + $max_year = $min_year; + $min_year = $temp; + } + // If there is a current value, stretch the range to include it. + $value_year = $date instanceOf DrupalDateTime ? $date->format('Y') : ''; + if (!empty($value_year)) { + $min_year = min($value_year, $min_year); + $max_year = max($value_year, $max_year); + } + return array($min_year, $max_year); +} diff --git a/core/modules/datetime/lib/Drupal/datetime/DateHelper.php b/core/modules/datetime/lib/Drupal/datetime/DateHelper.php new file mode 100644 index 0000000..39c770e --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/DateHelper.php @@ -0,0 +1,527 @@ + 'January', + 2 => 'February', + 3 => 'March', + 4 => 'April', + 5 => 'May', + 6 => 'June', + 7 => 'July', + 8 => 'August', + 9 => 'September', + 10 => 'October', + 11 => 'November', + 12 => 'December', + ); + } + + /** + * Constructs an untranslated array of abbreviated month names. + * + * @return array + * An array of month names. + */ + public static function monthNamesAbbrUntranslated() { + // Force the key to use the correct month value, rather than + // starting with zero. + return array( + 1 => 'Jan', + 2 => 'Feb', + 3 => 'Mar', + 4 => 'Apr', + 5 => 'May', + 6 => 'Jun', + 7 => 'Jul', + 8 => 'Aug', + 9 => 'Sep', + 10 => 'Oct', + 11 => 'Nov', + 12 => 'Dec', + ); + } + + /** + * Returns a translated array of month names. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of month names. + */ + public static function monthNames($required = FALSE) { + // Force the key to use the correct month value, rather than + // starting with zero. + $monthnames = array( + 1 => t('January', array(), array('context' => 'Long month name')), + 2 => t('February', array(), array('context' => 'Long month name')), + 3 => t('March', array(), array('context' => 'Long month name')), + 4 => t('April', array(), array('context' => 'Long month name')), + 5 => t('May', array(), array('context' => 'Long month name')), + 6 => t('June', array(), array('context' => 'Long month name')), + 7 => t('July', array(), array('context' => 'Long month name')), + 8 => t('August', array(), array('context' => 'Long month name')), + 9 => t('September', array(), array('context' => 'Long month name')), + 10 => t('October', array(), array('context' => 'Long month name')), + 11 => t('November', array(), array('context' => 'Long month name')), + 12 => t('December', array(), array('context' => 'Long month name')), + ); + $none = array('' => ''); + return !$required ? $none + $monthnames : $monthnames; + } + + /** + * Constructs a translated array of month name abbreviations + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of month abbreviations. + */ + public static function monthNamesAbbr($required = FALSE) { + // Force the key to use the correct month value, rather than + // starting with zero. + $monthnames = array( + 1 => t('Jan'), + 2 => t('Feb'), + 3 => t('Mar'), + 4 => t('Apr'), + 5 => t('May'), + 6 => t('Jun'), + 7 => t('Jul'), + 8 => t('Aug'), + 9 => t('Sep'), + 10 => t('Oct'), + 11 => t('Nov'), + 12 => t('Dec'), + ); + $none = array('' => ''); + return !$required ? $none + $monthnames : $monthnames; + } + + /** + * Constructs an untranslated array of week days. + * + * @return array + * An array of week day names + */ + public static function weekDaysUntranslated() { + return array( + 'Sunday', + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday', + ); + } + + /** + * Returns a translated array of week names. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of week day names + */ + public static function weekDays($required = FALSE) { + $weekdays = array( + t('Sunday'), + t('Monday'), + t('Tuesday'), + t('Wednesday'), + t('Thursday'), + t('Friday'), + t('Saturday'), + ); + $none = array('' => ''); + return !$required ? $none + $weekdays : $weekdays; + } + + /** + * Constructs a translated array of week day abbreviations. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of week day abbreviations + */ + public static function weekDaysAbbr($required = FALSE) { + $weekdays = array( + t('Sun', array(), array('context' => 'Sunday abbreviation')), + t('Mon', array(), array('context' => 'Monday abbreviation')), + t('Tue', array(), array('context' => 'Tuesday abbreviation')), + t('Wed', array(), array('context' => 'Wednesday abbreviation')), + t('Thu', array(), array('context' => 'Thursday abbreviation')), + t('Fri', array(), array('context' => 'Friday abbreviation')), + t('Sat', array(), array('context' => 'Saturday abbreviation')), + ); + $none = array('' => ''); + return !$required ? $none + $weekdays : $weekdays; + } + + /** + * Constructs a translated array of 2-letter week day abbreviations. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of week day 2 letter abbreviations + */ + public static function weekDaysAbbr2($required = FALSE) { + $weekdays = array( + t('Su', array(), array('context' => 'Sunday 2 letter abbreviation')), + t('Mo', array(), array('context' => 'Monday 2 letter abbreviation')), + t('Tu', array(), array('context' => 'Tuesday 2 letter abbreviation')), + t('We', array(), array('context' => 'Wednesday 2 letter abbreviation')), + t('Th', array(), array('context' => 'Thursday 2 letter abbreviation')), + t('Fr', array(), array('context' => 'Friday 2 letter abbreviation')), + t('Sa', array(), array('context' => 'Saturday 2 letter abbreviation')), + ); + $none = array('' => ''); + return !$required ? $none + $weekdays : $weekdays; + } + + /** + * Constructs a translated array of 1-letter week day abbreviations. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of week day 1 letter abbreviations + */ + public static function weekDaysAbbr1($required = FALSE) { + $weekdays = array( + t('S', array(), array('context' => 'Sunday 1 letter abbreviation')), + t('M', array(), array('context' => 'Monday 1 letter abbreviation')), + t('T', array(), array('context' => 'Tuesday 1 letter abbreviation')), + t('W', array(), array('context' => 'Wednesday 1 letter abbreviation')), + t('T', array(), array('context' => 'Thursday 1 letter abbreviation')), + t('F', array(), array('context' => 'Friday 1 letter abbreviation')), + t('S', array(), array('context' => 'Saturday 1 letter abbreviation')), + ); + $none = array('' => ''); + return !$required ? $none + $weekdays : $weekdays; + } + + /** + * Reorders weekdays to match the first day of the week. + * + * @param array $weekdays + * An array of weekdays. + * + * @return array + * An array of weekdays reordered to match the first day of the week. + */ + public static function weekDaysOrdered($weekdays) { + $first_day = config('system.date')->get('first_day'); + if ($first_day > 0) { + for ($i = 1; $i <= $first_day; $i++) { + $last = array_shift($weekdays); + array_push($weekdays, $last); + } + } + return $weekdays; + } + + /** + * Constructs an array of years in a specified range. + * + * @param int $min + * (optional) The minimum year in the array. Defaults to zero. + * @param int $max + * (optional) The maximum year in the array. Defaults to zero. + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of years in the selected range. + */ + public static function years($min = 0, $max = 0, $required = FALSE) { + // Ensure $min and $max are valid values. + if (empty($min)) { + $min = intval(date('Y', REQUEST_TIME) - 3); + } + if (empty($max)) { + $max = intval(date('Y', REQUEST_TIME) + 3); + } + $none = array('' => ''); + $range = drupal_map_assoc(range($min, $max)); + return !$required ? $none + $range : $range; + } + + /** + * Constructs an array of days in a month. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * @param int $month + * (optional) The month in which to find the number of days. Defaults to + * NULL. + * @param int $year + * (optional) The year in which to find the number of days. Defaults to + * NULL. + * + * @return array + * An array of days for the selected month. + */ + public static function days($required = FALSE, $month = NULL, $year = NULL) { + // If we have a month and year, find the right last day of the month. + if (!empty($month) && !empty($year)) { + $date = new DrupalDateTime($year . '-' . $month . '-01 00:00:00', 'UTC'); + $max = $date->format('t'); + } + // If there is no month and year given, default to 31. + if (empty($max)) { + $max = 31; + } + $none = array('' => ''); + $range = drupal_map_assoc(range(1, $max)); + return !$required ? $none + $range : $range; + } + + + /** + * Constructs an array of hours. + * + * @param string $format + * (optional) A date format string that indicates the format to use for the + * hours. Defaults to 'H'. + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of hours in the selected format. + */ + public static function hours($format = 'H', $required = FALSE) { + $hours = array(); + if ($format == 'h' || $format == 'g') { + $min = 1; + $max = 12; + } + else { + $min = 0; + $max = 23; + } + for ($i = $min; $i <= $max; $i++) { + $formatted = ($format == 'H' || $format == 'h') ? DrupalDateTime::datePad($i) : $i; + $hours[$i] = $formatted; + } + $none = array('' => ''); + return !$required ? $none + $hours : $hours; + } + + /** + * Constructs an array of minutes. + * + * @param string $format + * (optional) A date format string that indicates the format to use for the + * minutes. Defaults to 'i'. + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * @param int $increment + * An integer value to increment the values. Defaults to 1. + * + * @return array + * An array of minutes in the selected format. + */ + public static function minutes($format = 'i', $required = FALSE, $increment = 1) { + $minutes = array(); + // Ensure $increment has a value so we don't loop endlessly. + if (empty($increment)) { + $increment = 1; + } + for ($i = 0; $i < 60; $i += $increment) { + $formatted = $format == 'i' ? DrupalDateTime::datePad($i) : $i; + $minutes[$i] = $formatted; + } + $none = array('' => ''); + return !$required ? $none + $minutes : $minutes; + } + + /** + * Constructs an array of seconds. + * + * @param string $format + * (optional) A date format string that indicates the format to use for the + * seconds. Defaults to 's'. + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * @param int $increment + * An integer value to increment the values. Defaults to 1. + * + * @return array + * An array of seconds in the selected format. + */ + public static function seconds($format = 's', $required = FALSE, $increment = 1) { + $seconds = array(); + // Ensure $increment has a value so we don't loop endlessly. + if (empty($increment)) { + $increment = 1; + } + for ($i = 0; $i < 60; $i += $increment) { + $formatted = $format == 's' ? DrupalDateTime::datePad($i) : $i; + $seconds[$i] = $formatted; + } + $none = array('' => ''); + return !$required ? $none + $seconds : $seconds; + } + + /** + * Constructs an array of AM and PM options. + * + * @param bool $required + * (optional) If FALSE, the returned array will include a blank value. + * Defaults to FALSE. + * + * @return array + * An array of AM and PM options. + */ + public static function ampm($required = FALSE) { + $none = array('' => ''); + $ampm = array( + 'am' => t('am', array(), array('context' => 'ampm')), + 'pm' => t('pm', array(), array('context' => 'ampm')), + ); + return !$required ? $none + $ampm : $ampm; + } + + /** + * Identifies the number of days in a month for a date. + * + * @param mixed $date + * (optional) A date object, timestamp, or a date string. + * Defaults to NULL, which means to use the current date. + * + * @return int + * The number of days in the month. + */ + public static function daysInMonth($date = NULL) { + if (!$date instanceOf DrupalDateTime) { + $date = new DrupalDateTime($date); + } + if (!$date->hasErrors()) { + return $date->format('t'); + } + return NULL; + } + + /** + * Identifies the number of days in a year for a date. + * + * @param mixed $date + * (optional) A date object, timestamp, or a date string. + * Defaults to NULL, whcih means to use the current date. + * + * @return int + * The number of days in the year. + */ + public static function daysInYear($date = NULL) { + if (!$date instanceOf DrupalDateTime) { + $date = new DrupalDateTime($date); + } + if (!$date->hasErrors()) { + if ($date->format('L')) { + return 366; + } + else { + return 365; + } + } + return NULL; + } + + /** + * Returns day of week for a given date (0 = Sunday). + * + * @param mixed $date + * (optional) A date object, timestamp, or a date string. + * Defaults to NULL, which means use the current date. + * + * @return int + * The number of the day in the week. + */ + public static function dayOfWeek($date = NULL) { + if (!$date instanceOf DrupalDateTime) { + $date = new DrupalDateTime($date); + } + if (!$date->hasErrors()) { + return $date->format('w'); + } + return NULL; + } + + /** + * Returns translated name of the day of week for a given date. + * + * @param mixed $date + * (optional) A date object, timestamp, or a date string. + * Defaults to NULL, whcih means use the current date. + * @param string $abbr + * (optional) Whether to return the abbreviated name for that day. + * Defaults to TRUE. + * + * @return string + * The name of the day in the week for that date. + */ + public static function dayOfWeekName($date = NULL, $abbr = TRUE) { + if (!$date instanceOf DrupalDateTime) { + $date = new DrupalDateTime($date); + } + $dow = self::dayOfWeek($date); + $days = $abbr ? self::weekDaysAbbr() : self::weekDays(); + return $days[$dow]; + } + +} + diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php new file mode 100644 index 0000000..0718dc3 --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php @@ -0,0 +1,133 @@ + $item) { + + $formatted_date = ''; + $iso_date = ''; + + if (!empty($item['date'])) { + // The date was created and verified during field_load(), so it is safe + // to use without further inspection. + $date = $item['date']; + + // Create the ISO date in Universal Time. + $iso_date = $date->format("Y-m-d\TH:i:s") . 'Z'; + + // The formatted output will be in local time. + $date->setTimeZone(timezone_open(drupal_get_user_timezone())); + if ($this->field['settings']['datetime_type'] == 'date') { + // A date without time will pick up the current time, use the default. + datetime_date_default_time($date); + } + $formatted_date = $this->dateFormat($date); + } + + // Display the date using theme datetime. + // @todo How should RDFa attributes be added to this? + $elements[$delta] = array( + '#theme' => 'datetime', + '#text' => $formatted_date, + '#html' => FALSE, + '#attributes' => array( + 'datetime' => $iso_date, + 'property' => array('dc:date'), + 'datatype' => 'xsd:dateTime', + ), + ); + } + + return $elements; + + } + + /** + * Creates a formatted date value as a string. + * + * @param object $date + * A date object. + * + * @return string + * A formatted date string using the chosen format. + */ + function dateFormat($date) { + $format_type = $this->getSetting('format_type'); + return format_date($date->getTimestamp(), $format_type); + } + + /** + * Implements \Drupal\field\Plugin\Type\Formatter\FormatterInterface::settingsForm(). + */ + public function settingsForm(array $form, array &$form_state) { + + $element = array(); + + $time = new DrupalDateTime(); + $format_types = system_get_date_formats(); + if (!empty($format_types)) { + foreach ($format_types as $type => $type_info) { + $options[$type] = $type_info['name'] . ' (' . format_date($time->format('U'), $type) . ')'; + } + } + + $elements['format_type'] = array( + '#type' => 'select', + '#title' => t('Date format'), + '#description' => t("Choose a format for displaying the date. Be sure to set a format appropriate for the field, i.e. omitting time for a field that only has a date."), + '#options' => $options, + '#default_value' => $this->getSetting('format_type'), + ); + + return $elements; + } + + /** + * Implements \Drupal\field\Plugin\Type\Formatter\FormatterInterface::settingsSummary(). + */ + public function settingsSummary() { + + $date = new DrupalDateTime(); + $output = array(); + $output[] = t('Format: @display', array('@display' => $this->dateFormat($date, FALSE))); + return implode('
', $output); + + } + +} diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php new file mode 100644 index 0000000..caca3af --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php @@ -0,0 +1,59 @@ + $item) { + + $output = ''; + if (!empty($item['date'])) { + // The date was created and verified during field_load(), so it is safe + // to use without further inspection. + $date = $item['date']; + $date->setTimeZone(timezone_open(drupal_get_user_timezone())); + $format = DATETIME_DATETIME_STORAGE_FORMAT; + if ($this->field['settings']['datetime_type'] == 'date') { + // A date without time will pick up the current time, use the default. + datetime_date_default_time($date); + $format = DATETIME_DATE_STORAGE_FORMAT; + } + $output = $date->format($format); + } + $elements[$delta] = array('#markup' => $output); + } + + return $elements; + } + +} diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php new file mode 100644 index 0000000..57f2bfc --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php @@ -0,0 +1,213 @@ +defaultValueFunction(); + parent::__construct($plugin_id, $discovery, $instance, $settings, $weight); + } + + /** + * Returns the callback used to set a date default value. + * + * @return string + * The name of the callback to use when setting a default date value. + */ + public function defaultValueFunction() { + return 'datetime_default_value'; + } + + /** + * Implements \Drupal\field\Plugin\Type\Widget\WidgetInterface::formElement(). + */ + public function formElement(array $items, $delta, array $element, $langcode, array &$form, array &$form_state) { + + $field = $this->field; + $instance = $this->instance; + + $date_order = $this->getSetting('date_order'); + $time_type = $this->getSetting('time_type'); + $increment = $this->getSetting('increment'); + + // We're nesting some sub-elements inside the parent, so we + // need a wrapper. We also need to add another #title attribute + // at the top level for ease in identifying this item in error + // messages. We don't want to display this title because the + // actual title display is handled at a higher level by the Field + // module. + + $element['#theme_wrappers'][] = 'datetime_wrapper'; + $element['#attributes']['class'][] = 'container-inline'; + $element['#element_validate'][] = 'datetime_datelist_widget_validate'; + + // Identify the type of date and time elements to use. + switch ($field['settings']['datetime_type']) { + case 'date': + $storage_format = DATETIME_DATE_STORAGE_FORMAT; + $type_type = 'none'; + break; + + default: + $storage_format = DATETIME_DATETIME_STORAGE_FORMAT; + break; + } + + // Set up the date part order array. + switch ($date_order) { + case 'YMD': + $date_part_order = array('year', 'month', 'day'); + break; + + case 'MDY': + $date_part_order = array('month', 'day', 'year'); + break; + + case 'DMY': + $date_part_order = array('day', 'month', 'year'); + break; + } + switch ($time_type) { + case '24': + $date_part_order = array_merge($date_part_order, array('hour', 'minute')); + break; + + case '12': + $date_part_order = array_merge($date_part_order, array('hour', 'minute', 'ampm')); + break; + + case 'none': + break; + } + + $element['value'] = array( + '#type' => 'datelist', + '#default_value' => NULL, + '#date_increment' => $increment, + '#date_part_order'=> $date_part_order, + '#date_timezone' => drupal_get_user_timezone(), + '#required' => $element['#required'], + ); + + // Set the storage and widget options so the validation can use them. The + // validator will not have access to field or instance settings. + $element['value']['#date_storage_format'] = $storage_format; + + if (!empty($items[$delta]['date'])) { + $date = $items[$delta]['date']; + // The date was created and verified during field_load(), so it is safe to + // use without further inspection. + $date->setTimezone( new \DateTimeZone($element['value']['#date_timezone'])); + if ($field['settings']['datetime_type'] == 'date') { + // A date without time will pick up the current time, use the default + // time. + datetime_date_default_time($date); + } + $element['value']['#default_value'] = $date; + } + return $element; + } + + /** + * + * + * @param array $form + * The form definition as an array. + * @param array $form_state + * The current state of the form as an array. + * + * @return array + * + */ + function settingsForm(array $form, array &$form_state) { + $element = parent::settingsForm($form, $form_state); + + $field = $this->field; + $instance = $this->instance; + + $element['date_order'] = array( + '#type' => 'select', + '#title' => t('Date part order'), + '#default_value' => $this->getSetting('date_order'), + '#options' => array('MDY' => t('Month/Day/Year'), 'DMY' => t('Day/Month/Year'), 'YMD' => t('Year/Month/Day')), + ); + + if ($field['settings']['datetime_type'] == 'datetime') { + $element['time_type'] = array( + '#type' => 'select', + '#title' => t('Time type'), + '#default_value' => $this->getSetting('time_type'), + '#options' => array('24' => t('24 hour time'), '12' => t('12 hour time')), + ); + } + else { + $element['time_type'] = array( + '#type' => 'hidden', + '#value' => 'none', + ); + } + + $element['increment'] = array( + '#type' => 'select', + '#title' => t('Time increments'), + '#default_value' => $this->getSetting('increment'), + '#options' => array( + 1 => t('1 minute'), + 5 => t('5 minute'), + 10 => t('10 minute'), + 15 => t('15 minute'), + 30 => t('30 minute')), + ); + + return $element; + } + +} diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php new file mode 100644 index 0000000..479c613 --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php @@ -0,0 +1,139 @@ +defaultValueFunction(); + parent::__construct($plugin_id, $discovery, $instance, $settings, $weight); + } + + /** + * Return the callback used to set a date default value. + * + * @return string + * The name of the callback to use when setting a default date value. + */ + public function defaultValueFunction() { + return 'datetime_default_value'; + } + + /** + * Implements \Drupal\field\Plugin\Type\Widget\WidgetInterface::formElement(). + * + */ + public function formElement(array $items, $delta, array $element, $langcode, array &$form, array &$form_state) { + + $field = $this->field; + $instance = $this->instance; + $format_type = datetime_default_format_type(); + + // We are nesting some sub-elements inside the parent, so we need a wrapper. + // We also need to add another #title attribute at the top level for ease in + // identifying this item in error messages. We do not want to display this + // title because the actual title display is handled at a higher level by + // the Field module. + + $element['#theme_wrappers'][] = 'datetime_wrapper'; + $element['#attributes']['class'][] = 'container-inline'; + $element['#element_validate'][] = 'datetime_datetime_widget_validate'; + + // Identify the type of date and time elements to use. + switch ($field['settings']['datetime_type']) { + case 'date': + $date_type = 'date'; + $time_type = 'none'; + $date_format = config('system.date')->get('formats.html_date.pattern.' . $format_type); + $time_format = ''; + $element_format = $date_format; + $storage_format = DATETIME_DATE_STORAGE_FORMAT; + break; + + default: + $date_type = 'date'; + $time_type = 'time'; + $date_format = config('system.date')->get('formats.html_date.pattern.' . $format_type); + $time_format = config('system.date')->get('formats.html_time.pattern.' . $format_type); + $element_format = $date_format . ' ' . $time_format; + $storage_format = DATETIME_DATETIME_STORAGE_FORMAT; + break; + } + + $element['value'] = array( + '#type' => 'datetime', + '#default_value' => NULL, + '#date_increment' => 1, + '#date_date_format'=> $date_format, + '#date_date_element' => $date_type, + '#date_date_callbacks' => array(), + '#date_time_format' => $time_format, + '#date_time_element' => $time_type, + '#date_time_callbacks' => array(), + '#date_timezone' => drupal_get_user_timezone(), + '#required' => $element['#required'], + ); + + // Set the storage and widget options so the validation can use them. The + // validator will not have access to field or instance settings. + $element['value']['#date_element_format'] = $element_format; + $element['value']['#date_storage_format'] = $storage_format; + + if (!empty($items[$delta]['date'])) { + $date = $items[$delta]['date']; + // The date was created and verified during field_load(), so it is safe to + // use without further inspection. + $date->setTimezone(new \DateTimeZone($element['value']['#date_timezone'])); + if ($field['settings']['datetime_type'] == 'date') { + // A date without time will pick up the current time, use the default + // time. + datetime_date_default_time($date); + } + $element['value']['#default_value'] = $date; + } + + return $element; + } + +} diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php new file mode 100644 index 0000000..232d019 --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php @@ -0,0 +1,428 @@ + 'Datetime Field', + 'description' => 'Tests datetime field functionality.', + 'group' => 'Datetime', + ); + } + + function setUp() { + parent::setUp(); + + $web_user = $this->drupalCreateUser(array( + 'access field_test content', + 'administer field_test content', + 'administer content types', + )); + $this->drupalLogin($web_user); + + // Create a field with settings to validate. + $this->field = array( + 'field_name' => drupal_strtolower($this->randomName()), + 'type' => 'datetime', + 'settings' => array('datetime_type' => 'date'), + ); + field_create_field($this->field); + $this->instance = array( + 'field_name' => $this->field['field_name'], + 'entity_type' => 'test_entity', + 'bundle' => 'test_bundle', + 'widget' => array( + 'type' => 'datetime_default', + ), + 'settings' => array( + 'default_value' => 'blank', + ), + ); + field_create_instance($this->instance); + + $this->display_options = array( + 'type' => 'datetime_default', + 'label' => 'hidden', + 'settings' => array('format_type' => 'medium'), + ); + entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full') + ->setComponent($this->field['field_name'], $this->display_options) + ->save(); + } + + /** + * Tests date field functionality. + */ + function testDateField() { + + // Display creation form. + $this->drupalGet('test-entity/add/test_bundle'); + $langcode = LANGUAGE_NOT_SPECIFIED; + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][date]", '', 'Date element found.'); + $this->assertNoFieldByName("{$this->field['field_name']}[$langcode][0][value][time]", '', 'Time element not found.'); + + // Submit a valid date and ensure it is accepted. + $value = '2012-12-31 00:00:00'; + $date = new DrupalDateTime($value); + $format_type = $date->canUseIntl() ? DrupalDateTime::INTL : DrupalDateTime::PHP; + $date_format = config('system.date')->get('formats.html_date.pattern.' . $format_type); + $time_format = config('system.date')->get('formats.html_time.pattern.' . $format_type); + + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date->format($date_format), + ); + $this->drupalPost(NULL, $edit, t('Save')); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); + $id = $match[1]; + $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id))); + $this->assertRaw($date->format($date_format)); + $this->assertNoRaw($date->format($time_format)); + + // The expected values will use the default time. + datetime_date_default_time($date); + + // Verify that the date is output according to the formatter settings. + $options = array( + 'format_type' => array('short', 'medium', 'long'), + ); + foreach ($options as $setting => $values) { + foreach ($values as $new_value) { + // Update the entity display settings. + $this->display_options['settings'] = array($setting => $new_value); + $display = entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full') + ->setComponent($this->instance['field_name'], $this->display_options) + ->save(); + + $this->renderTestEntity($id); + switch ($setting) { + case 'format_type': + // Verify that a date is displayed. + $expected = format_date($date->getTimestamp(), $new_value); + $this->renderTestEntity($id); + $this->assertText($expected, format_string('Formatted date field using %value format displayed as %expected.', array('%value' => $new_value, '%expected' => $expected))); + break; + } + } + } + + // Verify that the plain formatter works. + $this->display_options['type'] = 'datetime_plain'; + $display = entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full') + ->setComponent($this->instance['field_name'], $this->display_options) + ->save(); + $expected = $date->format(DATETIME_DATE_STORAGE_FORMAT); + $this->renderTestEntity($id); + $this->assertText($expected, format_string('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected))); + } + + /** + * Tests date and time field. + */ + function testDatetimeField() { + + // Change the field to a datetime field. + $this->field['settings']['datetime_type'] = 'datetime'; + field_update_field($this->field); + + // Display creation form. + $this->drupalGet('test-entity/add/test_bundle'); + $langcode = LANGUAGE_NOT_SPECIFIED; + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][date]", '', 'Date element found.'); + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][time]", '', 'Time element found.'); + + // Submit a valid date and ensure it is accepted. + $value = '2012-12-31 00:00:00'; + $date = new DrupalDateTime($value); + $format_type = $date->canUseIntl() ? DrupalDateTime::INTL : DrupalDateTime::PHP; + $date_format = config('system.date')->get('formats.html_date.pattern.' . $format_type); + $time_format = config('system.date')->get('formats.html_time.pattern.' . $format_type); + + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date->format($date_format), + "{$this->field['field_name']}[$langcode][0][value][time]" => $date->format($time_format), + ); + $this->drupalPost(NULL, $edit, t('Save')); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); + $id = $match[1]; + $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id))); + $this->assertRaw($date->format($date_format)); + $this->assertRaw($date->format($time_format)); + + // Verify that the date is output according to the formatter settings. + $options = array( + 'format_type' => array('short', 'medium', 'long'), + ); + foreach ($options as $setting => $values) { + foreach ($values as $new_value) { + // Update the entity display settings. + $this->display_options['settings'] = array($setting => $new_value); + $display = entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full') + ->setComponent($this->instance['field_name'], $this->display_options) + ->save(); + + $this->renderTestEntity($id); + switch ($setting) { + case 'format_type': + // Verify that a date is displayed. + $expected = format_date($date->getTimestamp(), $new_value); + $this->renderTestEntity($id); + $this->assertText($expected, format_string('Formatted date field using %value format displayed as %expected.', array('%value' => $new_value, '%expected' => $expected))); + break; + } + } + } + + // Verify that the plain formatter works. + $this->display_options['type'] = 'datetime_plain'; + $display = entity_get_display($this->instance['entity_type'], $this->instance['bundle'], 'full') + ->setComponent($this->instance['field_name'], $this->display_options) + ->save(); + $expected = $date->format(DATETIME_DATETIME_STORAGE_FORMAT); + $this->renderTestEntity($id); + $this->assertText($expected, format_string('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected))); + } + + /** + * Tests Date List Widget functionality. + */ + function testDatelistWidget() { + + // Change the field to a datetime field. + $this->field['settings']['datetime_type'] = 'datetime'; + field_update_field($this->field); + + // Change the widget to a datelist widget. + $increment = 1; + $date_order = 'YMD'; + $time_type = '12'; + + $this->instance['widget']['type'] = 'datetime_datelist'; + $this->instance['widget']['settings'] = array( + 'increment' => $increment, + 'date_order' => $date_order, + 'time_type' => $time_type, + ); + field_update_instance($this->instance); + field_cache_clear(); + + // Display creation form. + $this->drupalGet('test-entity/add/test_bundle'); + $field_name = $this->field['field_name']; + $langcode = LANGUAGE_NOT_SPECIFIED; + + $this->assertFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-year\"]", NULL, 'Year element found.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-year", '', 'No year selected.'); + $this->assertFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-month\"]", NULL, 'Month element found.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-month", '', 'No month selected.'); + $this->assertFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-day\"]", NULL, 'Day element found.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-day", '', 'No day selected.'); + $this->assertFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-hour\"]", NULL, 'Hour element found.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-hour", '', 'No hour selected.'); + $this->assertFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-minute\"]", NULL, 'Minute element found.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-minute", '', 'No minute selected.'); + $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-second\"]", NULL, 'Second element not found.'); + $this->assertFieldByXPath("//*[@id=\"edit-$field_name-$langcode-0-value-ampm\"]", NULL, 'AMPM element found.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-ampm", '', 'No ampm selected.'); + + // Submit a valid date and ensure it is accepted. + $date_value = array('year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 5, 'minute' => 15); + $date = new DrupalDateTime($date_value); + + $edit = array(); + // Add the ampm indicator since we are testing 12 hour time. + $date_value['ampm'] = 'am'; + foreach ($date_value as $part => $value) { + $edit["{$this->field['field_name']}[$langcode][0][value][$part]"] = $value; + } + + $this->drupalPost(NULL, $edit, t('Save')); + preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); + $id = $match[1]; + $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id))); + + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-year", '2012', 'Correct year selected.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-month", '12', 'Correct month selected.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-day", '31', 'Correct day selected.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-hour", '5', 'Correct hour selected.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-minute", '15', 'Correct minute selected.'); + $this->assertOptionSelected("edit-$field_name-$langcode-0-value-ampm", 'am', 'Correct ampm selected.'); + } + + /** + * Test default value functionality. + */ + function testDefaultValue() { + + // Change the field to a datetime field. + $this->field['settings']['datetime_type'] = 'datetime'; + field_update_field($this->field); + + // Set the default value to 'now'. + $this->instance['settings']['default_value'] = 'now'; + $this->instance['default_value_function'] = 'datetime_default_value'; + field_update_instance($this->instance); + + // Display creation form. + $date = new DrupalDateTime(); + $date_format = 'Y-m-d'; + $this->drupalGet('test-entity/add/test_bundle'); + $langcode = LANGUAGE_NOT_SPECIFIED; + + // See if current date is set. We cannot test for the precise time because + // it may be a few seconds between the time the comparison date is created + // and the form date, so we just test the date and that the time is not + // empty. + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][date]", $date->format($date_format), 'Date element found.'); + $this->assertNoFieldByName("{$this->field['field_name']}[$langcode][0][value][time]", '', 'Time element found.'); + + // Set the default value to 'blank'. + $this->instance['settings']['default_value'] = 'blank'; + field_update_instance($this->instance); + + // Display creation form. + $date = new DrupalDateTime(); + $this->drupalGet('test-entity/add/test_bundle'); + + // See that no date is set. + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][date]", '', 'Date element found.'); + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][time]", '', 'Time element found.'); + } + + /** + * Test that invalid values are caught and marked as invalid. + */ + function testInvalidField() { + + // Change the field to a datetime field. + $this->field['settings']['datetime_type'] = 'datetime'; + field_update_field($this->field); + + // Display creation form. + $this->drupalGet('test-entity/add/test_bundle'); + $langcode = LANGUAGE_NOT_SPECIFIED; + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][date]", '', 'Date element found.'); + $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value][time]", '', 'Time element found.'); + + // Submit invalid dates and ensure they is not accepted. + $date_value = ''; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => '12:00:00', + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', 'Empty date value has been caught.'); + + $date_value = 'aaaa-12-01'; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => '00:00:00', + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', format_string('Invalid year value %date has been caught.', array('%date' => $date_value))); + + $date_value = '2012-75-01'; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => '00:00:00', + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', format_string('Invalid month value %date has been caught.', array('%date' => $date_value))); + + $date_value = '2012-12-99'; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => '00:00:00', + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', format_string('Invalid day value %date has been caught.', array('%date' => $date_value))); + + $date_value = '2012-12-01'; + $time_value = ''; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => $time_value, + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', 'Empty time value has been caught.'); + + $date_value = '2012-12-01'; + $time_value = '49:00:00'; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => $time_value, + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', format_string('Invalid hour value %time has been caught.', array('%time' => $time_value))); + + $date_value = '2012-12-01'; + $time_value = '12:99:00'; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => $time_value, + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', format_string('Invalid minute value %time has been caught.', array('%time' => $time_value))); + + $date_value = '2012-12-01'; + $time_value = '12:15:99'; + $edit = array( + "{$this->field['field_name']}[$langcode][0][value][date]" => $date_value, + "{$this->field['field_name']}[$langcode][0][value][time]" => $time_value, + ); + $this->drupalPost(NULL, $edit, t('Save')); + $this->assertText('date is invalid', format_string('Invalid second value %time has been caught.', array('%time' => $time_value))); + } + + /** + * Renders a test_entity and sets the output in the internal browser. + * + * @param int $id + * The test_entity ID to render. + * @param string $view_mode + * (optional) The view mode to use for rendering. Defaults to 'full'. + * @param bool $reset + * (optional) Whether to reset the test_entity controller cache. Defaults to + * TRUE to simplify testing. + */ + protected function renderTestEntity($id, $view_mode = 'full', $reset = TRUE) { + if ($reset) { + entity_get_controller('test_entity')->resetCache(array($id)); + } + $entity = field_test_entity_test_load($id); + $display = entity_get_display('test_entity', $entity->bundle(), 'full'); + field_attach_prepare_view('test_entity', array($entity->id() => $entity), array($entity->bundle() => $display), $view_mode); + $entity->content = field_attach_view($entity, $display, $view_mode); + + $output = drupal_render($entity->content); + $this->drupalSetContent($output); + $this->verbose($output); + } + +} diff --git a/core/modules/datetime/lib/Drupal/datetime/Type/DateTimeItem.php b/core/modules/datetime/lib/Drupal/datetime/Type/DateTimeItem.php new file mode 100644 index 0000000..2d14e5a --- /dev/null +++ b/core/modules/datetime/lib/Drupal/datetime/Type/DateTimeItem.php @@ -0,0 +1,39 @@ + 'date', + 'label' => t('Date value'), + ); + } + return self::$propertyDefinitions; + } +} diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/Drupal/edit/EditController.php index 16644ab..e20d48f 100644 --- a/core/modules/edit/lib/Drupal/edit/EditController.php +++ b/core/modules/edit/lib/Drupal/edit/EditController.php @@ -94,7 +94,7 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view if (!empty($form_state['executed'])) { // The form submission took care of saving the updated entity. Return the // updated view of the field. - $entity = $form_state['entity']; + $entity = entity_load($form_state['entity']->entityType(), $form_state['entity']->id(), TRUE); $output = field_view_field($entity, $field_name, $view_mode, $langcode); $response->addCommand(new FieldFormSavedCommand(drupal_render($output))); diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php index d54e30a..02314e8 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php @@ -8,6 +8,7 @@ namespace Drupal\forum\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\Core\Datetime\DrupalDateTime; /** * Provides automated tests for the Forum blocks. @@ -96,17 +97,18 @@ public function testActiveForumTopicsBlock() { $topics = $this->createForumTopics(10); // Comment on the first 5 topics. - $timestamp = time(); + $date = new DrupalDateTime(); $langcode = LANGUAGE_NOT_SPECIFIED; for ($index = 0; $index < 5; $index++) { // Get the node from the topic title. $node = $this->drupalGetNodeByTitle($topics[$index]); + $date->modify('+1 minute'); $comment = entity_create('comment', array( 'nid' => $node->nid, 'node_type' => 'node_type_' . $node->bundle(), 'subject' => $this->randomString(20), 'comment_body' => $this->randomString(256), - 'created' => $timestamp + $index, + 'created' => $date->getTimestamp(), )); comment_save($comment); } @@ -155,12 +157,16 @@ public function testActiveForumTopicsBlock() { */ protected function createForumTopics($count = 5) { $topics = array(); - $timestamp = time() - 24 * 60 * 60; + $date = new DrupalDateTime(); + $date->modify('-24 hours'); for ($index = 0; $index < $count; $index++) { // Generate a random subject/body. $title = $this->randomName(20); $body = $this->randomName(200); + // Forum posts are ordered by timestamp, so force a unique timestamp by + // changing the date. + $date->modify('+1 minute'); $langcode = LANGUAGE_NOT_SPECIFIED; $edit = array( @@ -168,7 +174,8 @@ protected function createForumTopics($count = 5) { "body[$langcode][0][value]" => $body, // Forum posts are ordered by timestamp, so force a unique timestamp by // adding the index. - 'date' => date('c', $timestamp + $index), + 'date[date]' => $date->format('Y-m-d'), + 'date[time]' => $date->format('H:i:s'), ); // Create the forum topic, preselecting the forum ID via a URL parameter. diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php index 8082322..2012239 100644 --- a/core/modules/node/lib/Drupal/node/NodeFormController.php +++ b/core/modules/node/lib/Drupal/node/NodeFormController.php @@ -41,7 +41,7 @@ protected function prepareEntity(EntityInterface $node) { $node->created = REQUEST_TIME; } else { - $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O'); + $node->date = new DrupalDateTime($node->created); // Remove the log message from the original node entity. $node->log = NULL; } @@ -184,12 +184,11 @@ public function form(array $form, array &$form_state, EntityInterface $node) { '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => $user_config->get('anonymous'))), ); - + $format = variable_get('date_format_html_date', 'Y-m-d') . ' ' . variable_get('date_format_html_time', 'H:i:s'); $form['author']['date'] = array( - '#type' => 'textfield', + '#type' => 'datetime', '#title' => t('Authored on'), - '#maxlength' => 25, - '#description' => t('Format: %time. The date format is YYYY-MM-DD and %timezone is the time zone offset from UTC. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? date_format(date_create($node->date), 'Y-m-d H:i:s O') : format_date($node->created, 'custom', 'Y-m-d H:i:s O'), '%timezone' => !empty($node->date) ? date_format(date_create($node->date), 'O') : format_date($node->created, 'custom', 'O'))), + '#description' => t('Format: %format. Leave blank to use the time of form submission.', array('%format' => datetime_format_example($format))), '#default_value' => !empty($node->date) ? $node->date : '', ); @@ -330,8 +329,8 @@ public function validate(array $form, array &$form_state) { } // Validate the "authored on" field. - $date = new DrupalDateTime($node->date); - if ($date->hasErrors()) { + // The date element contains the date object. + if ($node->date instanceOf DrupalDateTime && $node->date->hasErrors()) { form_set_error('date', t('You have to specify a valid date.')); } diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php b/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php index 1bba558..f1ed6aa 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php @@ -19,7 +19,7 @@ * * @var array */ - public static $modules = array('node'); + public static $modules = array('node', 'datetime'); function setUp() { parent::setUp(); diff --git a/core/modules/node/node.info b/core/modules/node/node.info index da33c43..e8413a2 100644 --- a/core/modules/node/node.info +++ b/core/modules/node/node.info @@ -3,4 +3,5 @@ description = Allows content to be submitted to the site and displayed on pages. package = Core version = VERSION core = 8.x +dependencies[] = datetime configure = admin/structure/types diff --git a/core/modules/node/node.install b/core/modules/node/node.install index 12a6945..0e755b5 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -690,7 +690,6 @@ function node_update_8012() { update_module_enable(array('history')); } - /** * Renames global revision permissions to use the word 'all'. */ @@ -707,6 +706,14 @@ function node_update_8013() { } /** + * Enable Datetime module, which is now a required dependency. + */ +function node_update_8014() { + // Enable the datetime module. + update_module_enable(array('datetime')); +} + +/** * @} End of "addtogroup updates-7.x-to-8.x" * The next series of updates should start at 9000. */ diff --git a/core/modules/node/node.module b/core/modules/node/node.module index f2206a0..31ff7c5 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1004,14 +1004,7 @@ function node_submit(Node $node) { $node->revision_uid = $user->uid; } - if (!empty($node->date)) { - $node_created = new DrupalDateTime($node->date); - $node->created = $node_created->getTimestamp(); - } - else { - $node->created = REQUEST_TIME; - } - + $node->created = !empty($node->date) && $node->date instanceOf DrupalDateTime ? $node->date->getTimestamp() : REQUEST_TIME; $node->validated = TRUE; return $node; diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index 138bf34..0c813b2 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -16,6 +16,7 @@ use DOMDocument; use DOMXPath; use SimpleXMLElement; +use Drupal\Core\Datetime\DrupalDateTime; /** * Test case for typical Drupal tests. @@ -1277,7 +1278,6 @@ protected function drupalPost($path, $edit, $submit, array $options = array(), a // handleForm() function, it's not currently a requirement. $submit_matches = TRUE; } - // We post only if we managed to handle every field in edit and the // submit button matches. if (!$edit && ($submit_matches || !isset($submit))) { @@ -1613,6 +1613,10 @@ protected function handleForm(&$post, &$edit, &$upload, $submit, $form) { case 'password': case 'email': case 'search': + case 'date': + case 'time': + case 'datetime': + case 'datetime-local'; $post[$name] = $edit[$name]; unset($edit[$name]); break; diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php index f7bf6fb..07591f5 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php @@ -16,7 +16,7 @@ class FormTest extends WebTestBase { * * @var array */ - public static $modules = array('form_test', 'file'); + public static $modules = array('form_test', 'file', 'datetime'); public static function getInfo() { return array( @@ -518,7 +518,7 @@ function testDisabledElements() { // All the elements should be marked as disabled, including the ones below // the disabled container. - $this->assertEqual(count($disabled_elements), 40, 'The correct elements have the disabled property in the HTML code.'); + $this->assertEqual(count($disabled_elements), 39, 'The correct elements have the disabled property in the HTML code.'); $this->drupalPost(NULL, $edit, t('Submit')); $returned_values['hijacked'] = drupal_json_decode($this->content); @@ -568,7 +568,7 @@ function testDisabledMarkup() { 'textarea' => 'textarea', 'select' => 'select', 'weight' => 'select', - 'date' => 'select', + 'datetime' => 'datetime', ); foreach ($form as $name => $item) { diff --git a/core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php b/core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php index a401183..e7a94f7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php @@ -104,7 +104,7 @@ public function testGetAndSet() { $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.'); // Date type. - $value = new DrupalDateTime(REQUEST_TIME); + $value = new DrupalDateTime(); $typed_data = $this->createTypedData(array('type' => 'date'), $value); $this->assertTrue($typed_data->getValue() === $value, 'Date value was fetched.'); $this->assertEqual($typed_data->validate()->count(), 0); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 223af2e..833bab2 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -489,8 +489,6 @@ function system_element_info() { ); $types['date'] = array( '#input' => TRUE, - '#element_validate' => array('date_validate'), - '#process' => array('form_process_date'), '#theme' => 'date', '#theme_wrappers' => array('form_element'), ); diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module index 8c17e01..165a501 100644 --- a/core/modules/system/tests/modules/form_test/form_test.module +++ b/core/modules/system/tests/modules/form_test/form_test.module @@ -6,6 +6,7 @@ */ use Drupal\form_test\Callbacks; +use Drupal\Core\Datetime\DrupalDateTime; /** * Implements hook_menu(). @@ -1776,23 +1777,6 @@ function _form_test_disabled_elements($form, &$form_state) { '#disabled' => TRUE, ); - // Date. - $form['date'] = array( - '#type' => 'date', - '#title' => 'date', - '#disabled' => TRUE, - '#default_value' => array( - 'day' => 19, - 'month' => 11, - 'year' => 1978, - ), - '#test_hijack_value' => array( - 'day' => 20, - 'month' => 12, - 'year' => 1979, - ), - ); - // The #disabled state should propagate to children. $form['disabled_container'] = array( '#disabled' => TRUE, @@ -1806,6 +1790,19 @@ function _form_test_disabled_elements($form, &$form_state) { ); } + // Date. + $date = new DrupalDateTime('1978-11-01 10:30:00', 'Europe/Berlin'); + $expected = array('date' => '1978-11-01 10:30:00', 'timezone_type' => 3, 'timezone' => 'Europe/Berlin',); + $form['disabled_container']['disabled_container_datetime'] = array( + '#type' => 'datetime', + '#title' => 'datetime', + '#default_value' => $date, + '#expected_value' => $expected, + '#test_hijack_value' => new DrupalDateTime('1978-12-02 11:30:00', 'Europe/Berlin'), + '#date_timezone' => 'Europe/Berlin', + ); + + // Try to hijack the email field with a valid email. $form['disabled_container']['disabled_container_email'] = array( '#type' => 'email', diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php index b9898c6..778b1a0 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php @@ -7,6 +7,8 @@ namespace Drupal\taxonomy\Tests; +use Drupal\Core\Datetime\DrupalDateTime; + /** * Test for legacy node bug. */ @@ -34,14 +36,16 @@ function setUp() { function testTaxonomyLegacyNode() { // Posts an article with a taxonomy term and a date prior to 1970. $langcode = LANGUAGE_NOT_SPECIFIED; + $date = new DrupalDateTime('1969-01-01 00:00:00'); $edit = array(); $edit['title'] = $this->randomName(); - $edit['date'] = '1969-01-01 00:00:00 -0500'; + $edit['date[date]'] = $date->format('Y-m-d'); + $edit['date[time]'] = $date->format('H:i:s'); $edit["body[$langcode][0][value]"] = $this->randomName(); $edit["field_tags[$langcode]"] = $this->randomName(); $this->drupalPost('node/add/article', $edit, t('Save and publish')); // Checks that the node has been saved. $node = $this->drupalGetNodeByTitle($edit['title']); - $this->assertEqual($node->created, strtotime($edit['date']), 'Legacy node was saved with the right date.'); + $this->assertEqual($node->created, $date->getTimestamp(), 'Legacy node was saved with the right date.'); } } diff --git a/core/profiles/standard/standard.info b/core/profiles/standard/standard.info index 2773abe..eb98d8a 100644 --- a/core/profiles/standard/standard.info +++ b/core/profiles/standard/standard.info @@ -11,6 +11,7 @@ dependencies[] = config dependencies[] = comment dependencies[] = contextual dependencies[] = contact +dependencies[] = datetime dependencies[] = custom_block dependencies[] = edit dependencies[] = help