Verified Commit fb90a180 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3375816 by anpel, rpayanm: Rename $val in... 

Issue #3375816 by anpel, rpayanm: Rename $val in Drupalfield_uiFormFieldStorageAddForm::buildForm to something more descriptive
parent 6f321593

core/modules/field_ui/src/Form/FieldStorageAddForm.php

+7 −7
Original line number Diff line number Diff line
@@ -180,16 +180,16 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t 
      ],

    ];

    $field_type_options_radios = [];

    foreach ($field_type_options as $field_option => $val) {

    foreach ($field_type_options as $id => $field_type) {

      /** @var  \Drupal\Core\Field\FieldTypeCategoryInterface $category_info */

      $category_info = $this->fieldTypeCategoryManager->createInstance($val['category'], $val);

      $category_info = $this->fieldTypeCategoryManager->createInstance($field_type['category'], $field_type);

      $display_as_group = !($category_info instanceof FallbackFieldTypeCategory);

      $cleaned_class_name = Html::getClass($val['unique_identifier']);

      $field_type_options_radios[$field_option] = [

      $cleaned_class_name = Html::getClass($field_type['unique_identifier']);

      $field_type_options_radios[$id] = [

        '#type' => 'container',

        '#attributes' => [

          'class' => ['field-option', 'js-click-to-select'],

          'checked' => $this->getRequest()->request->get('new_storage_type') !== NULL && $this->getRequest()->request->get('new_storage_type') == ($display_as_group ? $val['category'] : $val['unique_identifier']),

          'checked' => $this->getRequest()->request->get('new_storage_type') !== NULL && $this->getRequest()->request->get('new_storage_type') == ($display_as_group ? $field_type['category'] : $field_type['unique_identifier']),

        ],

        '#weight' => $category_info->getWeight(),

        'thumb' => [
@@ -201,7 +201,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t 
            '#type' => 'container',

            '#attributes' => [

              'class' => ['field-option__icon', $display_as_group ?

                "field-icon-$val[category]" : "field-icon-$cleaned_class_name",

                "field-icon-$field_type[category]" : "field-icon-$cleaned_class_name",

              ],

            ],

          ],
@@ -219,7 +219,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t 
          '#theme_wrappers' => ['form_element__new_storage_type'],

          // If it is a category, set return value as the category label,

          // otherwise, set it as the field type id.

          '#return_value' => $display_as_group ? $val['category'] : $val['unique_identifier'],

          '#return_value' => $display_as_group ? $field_type['category'] : $field_type['unique_identifier'],

          '#attributes' => [

            'class' => ['field-option-radio'],

          ],