Verified Commit 7689c819 authored by Dave Long's avatar Dave Long
Browse files

Issue #3406460 by quietone, smustgrave: Fix spelling of array keys in tests

(cherry picked from commit 3eb02577)
parent f33f0a17
Loading
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -233,9 +233,7 @@ downcasting
doxygen
dragtable
drillable
drivernumber
drivertest
drivertext
dropbutton
dropbuttons
drupaldevdays
@@ -530,10 +528,8 @@ nojs
nolink
nomask
nonconfigurable
nonoptional
noquotes
nosniff
nostart
notexisting
notnull
notsimpletest
@@ -767,7 +763,6 @@ subchild
subclassing
subcompile
subcondition
subcontainer
subdir
subelements
subform
@@ -995,7 +990,6 @@ xmlhttp
xmlhttprequest
xpsdocument
xtmpl
xxgroup
yamls
yarhar
yarr
@@ -1003,7 +997,6 @@ yearless
yokotsoko
yottabyte
yottabytes
yygroup
zartan
zettabyte
zettabytes
@@ -1012,4 +1005,3 @@ zoneinfo
zoomin
zoomout
zxvf
zzgroup
+4 −4
Original line number Diff line number Diff line
@@ -227,20 +227,20 @@ function ajax_forms_test_advanced_commands_add_css_legacy_callback($form, FormSt
}

/**
 * Ajax form callback: Selects the 'drivertext' element of the validation form.
 * Ajax form callback: Selects the 'driver_text' element of the validation form.
 */
function ajax_forms_test_validation_form_callback($form, FormStateInterface $form_state) {
  \Drupal::messenger()->addStatus("ajax_forms_test_validation_form_callback invoked");
  \Drupal::messenger()->addStatus(t("Callback: drivertext=%drivertext, spare_required_field=%spare_required_field", ['%drivertext' => $form_state->getValue('drivertext'), '%spare_required_field' => $form_state->getValue('spare_required_field')]));
  \Drupal::messenger()->addStatus(t("Callback: driver_text=%driver_text, spare_required_field=%spare_required_field", ['%driver_text' => $form_state->getValue('driver_text'), '%spare_required_field' => $form_state->getValue('spare_required_field')]));
  return ['#markup' => '<div id="message_area">ajax_forms_test_validation_form_callback at ' . date('c') . '</div>'];
}

/**
 * Ajax form callback: Selects the 'drivernumber' element of the validation form.
 * Ajax form callback: Selects the 'driver_number' element of the validation form.
 */
function ajax_forms_test_validation_number_form_callback($form, FormStateInterface $form_state) {
  \Drupal::messenger()->addStatus("ajax_forms_test_validation_number_form_callback invoked");
  \Drupal::messenger()->addStatus(t("Callback: drivernumber=%drivernumber, spare_required_field=%spare_required_field", ['%drivernumber' => $form_state->getValue('drivernumber'), '%spare_required_field' => $form_state->getValue('spare_required_field')]));
  \Drupal::messenger()->addStatus(t("Callback: driver_number=%driver_number, spare_required_field=%spare_required_field", ['%driver_number' => $form_state->getValue('driver_number'), '%spare_required_field' => $form_state->getValue('spare_required_field')]));
  return ['#markup' => '<div id="message_area_number">ajax_forms_test_validation_number_form_callback at ' . date('c') . '</div>'];
}

+4 −4
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ public function getFormId() {
   * {@inheritdoc}
   */
  public function buildForm(array $form, FormStateInterface $form_state) {
    $form['drivertext'] = [
    $form['driver_text'] = [
      '#title' => $this->t('AJAX-enabled textfield.'),
      '#description' => $this->t("When this one AJAX-triggers and the spare required field is empty, you should not get an error."),
      '#type' => 'textfield',
      '#default_value' => $form_state->getValue('drivertext', ''),
      '#default_value' => $form_state->getValue('driver_text', ''),
      '#ajax' => [
        'callback' => 'ajax_forms_test_validation_form_callback',
        'wrapper' => 'message_area',
@@ -36,11 +36,11 @@ public function buildForm(array $form, FormStateInterface $form_state) {
      '#suffix' => '<div id="message_area"></div>',
    ];

    $form['drivernumber'] = [
    $form['driver_number'] = [
      '#title' => $this->t('AJAX-enabled number field.'),
      '#description' => $this->t("When this one AJAX-triggers and the spare required field is empty, you should not get an error."),
      '#type' => 'number',
      '#default_value' => $form_state->getValue('drivernumber', ''),
      '#default_value' => $form_state->getValue('driver_number', ''),
      '#ajax' => [
        'callback' => 'ajax_forms_test_validation_number_form_callback',
        'wrapper' => 'message_area_number',
+5 −5
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
      '#attributes' => ['class' => ['empty_optional']],
      '#optional' => TRUE,
    ];
    $form['empty_nonoptional'] = [
    $form['empty_non_optional'] = [
      '#type' => 'container',
      '#attributes' => ['class' => ['empty_nonoptional']],
      '#attributes' => ['class' => ['empty_non_optional']],
      '#optional' => FALSE,
    ];

@@ -43,12 +43,12 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    ];
    $form['nonempty_optional']['child_1'] = [];

    $form['nonempty_nonoptional'] = [
    $form['nonempty_non_optional'] = [
      '#type' => 'container',
      '#attributes' => ['class' => ['nonempty_nonoptional']],
      '#attributes' => ['class' => ['nonempty_non_optional']],
      '#optional' => FALSE,
    ];
    $form['nonempty_nonoptional']['child_2'] = [];
    $form['nonempty_non_optional']['child_2'] = [];

    return $form;
  }
+11 −11
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    // option groups sorted, some left alone, and at least one with #sort_start
    // set to a non-default value.
    $sortable_options = $this->makeSortableOptions('sso');
    $sortable_options['sso_zzgroup']['#sort_options'] = TRUE;
    $sortable_options['sso_xxgroup']['#sort_options'] = TRUE;
    $sortable_options['sso_xxgroup']['#sort_start'] = 1;
    $sortable_options['sso_zz_group']['#sort_options'] = TRUE;
    $sortable_options['sso_xx_group']['#sort_options'] = TRUE;
    $sortable_options['sso_xx_group']['#sort_start'] = 1;
    // Do not use a sort start on this one.
    $form['sorted'] = [
      '#type' => 'select',
@@ -149,7 +149,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    // Add a select to test sorting with a -NONE- option included,
    // and #sort_start set.
    $sortable_none_options = $this->makeSortableOptions('sno');
    $sortable_none_options['sno_zzgroup']['#sort_options'] = TRUE;
    $sortable_none_options['sno_zz_group']['#sort_options'] = TRUE;
    $form['sorted_none'] = [
      '#type' => 'select',
      '#options' => $sortable_none_options,
@@ -160,11 +160,11 @@ public function buildForm(array $form, FormStateInterface $form_state) {

    // Add a select to test sorting with a -NONE- option included,
    // and #sort_start not set.
    $sortable_none_nostart_options = $this->makeSortableOptions('snn');
    $sortable_none_nostart_options['snn_zzgroup']['#sort_options'] = TRUE;
    $form['sorted_none_nostart'] = [
    $sortable_none_no_start_options = $this->makeSortableOptions('snn');
    $sortable_none_no_start_options['snn_zz_group']['#sort_options'] = TRUE;
    $form['sorted_none_no_start'] = [
      '#type' => 'select',
      '#options' => $sortable_none_nostart_options,
      '#options' => $sortable_none_no_start_options,
      '#sort_options' => TRUE,
      '#empty_value' => 'snn_empty',
    ];
@@ -189,17 +189,17 @@ protected function makeSortableOptions($prefix) {
      // that labels are cast to strings before sorting.
      $prefix . '_first_element' => new TranslatableMarkup('first element'),
      $prefix . '_second' => new TranslatableMarkup('second element'),
      $prefix . '_zzgroup' => [
      $prefix . '_zz_group' => [
        $prefix . '_gc' => new TranslatableMarkup('group c'),
        $prefix . '_ga' => new TranslatableMarkup('group a'),
        $prefix . '_gb' => 'group b',
      ],
      $prefix . '_yygroup' => [
      $prefix . '_yy_group' => [
        $prefix . '_ge' => new TranslatableMarkup('group e'),
        $prefix . '_gd' => new TranslatableMarkup('group d'),
        $prefix . '_gf' => new TranslatableMarkup('group f'),
      ],
      $prefix . '_xxgroup' => [
      $prefix . '_xx_group' => [
        $prefix . '_gz' => new TranslatableMarkup('group z'),
        $prefix . '_gi' => new TranslatableMarkup('group i'),
        $prefix . '_gh' => new TranslatableMarkup('group h'),
Loading