drupal-media / entity_browser

src/Plugin/EntityBrowser/SelectionDisplay/View.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
     // can't do much about it.
     $selected_entities = $form_state->get(['entity_browser', 'selected_entities']);
     if (!empty($selected_entities)) {
-      $ids = array_map(function (EntityInterface $item) {
+      $ids = array_map(function(EntityInterface $item) {
         return $item->id();
       }, $selected_entities);
       $storage['selection_display_view']->setArguments([implode(',', $ids)]);
@@ -86,14 +86,14 @@ 
     $views = Views::getAllViews();
     foreach ($views as $view_id => $view) {
       foreach ($view->get('display') as $display_id => $display) {
-        $options[$view_id . '.' . $display_id] = $this->t('@view : @display', array('@view' => $view->label(), '@display' => $display['display_title']));
+        $options[$view_id.'.'.$display_id] = $this->t('@view : @display', array('@view' => $view->label(), '@display' => $display['display_title']));
       }
     }
 
     $form['view'] = [
       '#type' => 'select',
       '#title' => $this->t('View : View display'),
-      '#default_value' => $this->configuration['view'] . '.' . $this->configuration['view_display'],
+      '#default_value' => $this->configuration['view'].'.'.$this->configuration['view_display'],
       '#options' => $options,
       '#required' => TRUE,
       '#description' => $this->t('View display to use for displaying currently selected items. Do note that to get something usefull out of this display, its first contextual filter should be a filter on the primary identifier field of your entity type (e.g., Node ID, Media ID).'),

src/Plugin/Field/FieldWidget/EntityReferenceBrowserWidget.php

Braces +4 added lines, -8 removed lines

@@ -453,8 +453,7 @@ 
     // and use this information to return correct part of the form.
     if (!empty($trigger['#ajax']['event']) && $trigger['#ajax']['event'] == 'entity_browser_value_updated') {
       $parents = array_slice($trigger['#array_parents'], 0, -1);
-    }
-    elseif ($trigger['#type'] == 'submit' && strpos($trigger['#name'], '_remove_')) {
+    } elseif ($trigger['#type'] == 'submit' && strpos($trigger['#name'], '_remove_')) {
       $parents = array_slice($trigger['#array_parents'], 0, -static::$deleteDepth);
     }
 
@@ -621,12 +620,10 @@ 
     $entity_browser_id = $this->getSetting('entity_browser');
     if (empty($entity_browser_id)) {
       return [$this->t('No entity browser selected.')];
-    }
-    else {
+    } else {
       if ($browser = $this->entityTypeManager->getStorage('entity_browser')->load($entity_browser_id)) {
         $summary[] = $this->t('Entity browser: @browser', ['@browser' => $browser->label()]);
-      }
-      else {
+      } else {
         drupal_set_message($this->t('Missing entity browser!'), 'error');
         return [$this->t('Missing entity browser!')];
       }
@@ -636,8 +633,7 @@ 
     $selection_mode_options = EntityBrowserElement::getSelectionModeOptions();
     if (isset($selection_mode_options[$selection_mode])) {
       $summary[] = $this->t('Selection mode: @selection_mode', ['@selection_mode' => $selection_mode_options[$selection_mode]]);
-    }
-    else {
+    } else {
       $summary[] = $this->t('Undefined selection mode.');
     }
 

Spacing +15 added lines, -15 removed lines

@@ -158,7 +158,7 @@ 
       }
     }
 
-    $id = Html::getUniqueId('field-' . $this->fieldDefinition->getName() . '-display-settings-wrapper');
+    $id = Html::getUniqueId('field-'.$this->fieldDefinition->getName().'-display-settings-wrapper');
     $element['field_widget_display'] = [
       '#title' => $this->t('Entity display plugin'),
       '#type' => 'select',
@@ -208,7 +208,7 @@ 
       '#type' => 'fieldset',
       '#title' => $this->t('Entity display plugin configuration'),
       '#tree' => TRUE,
-      '#prefix' => '<div id="' . $id . '">',
+      '#prefix' => '<div id="'.$id.'">',
       '#suffix' => '</div>',
     ];
 
@@ -291,7 +291,7 @@ 
    *   A key for form state storage.
    */
   protected function getFormStateKey(FieldItemListInterface $items) {
-    return $items->getEntity()->uuid() . ':' . $items->getFieldDefinition()->getName();
+    return $items->getEntity()->uuid().':'.$items->getFieldDefinition()->getName();
   }
 
   /**
@@ -303,7 +303,7 @@ 
 
     // Get correct ordered list of entity IDs.
     $ids = array_map(
-      function (EntityInterface $entity) {
+      function(EntityInterface $entity) {
         return $entity->id();
       },
       $entities
@@ -317,8 +317,8 @@ 
     // might result in unpredictable results.
     $form_state->set(['entity_browser_widget', $this->getFormStateKey($items)], $ids);
 
-    $hidden_id = Html::getUniqueId('edit-' . $this->fieldDefinition->getName() . '-target-id');
-    $details_id = Html::getUniqueId('edit-' . $this->fieldDefinition->getName());
+    $hidden_id = Html::getUniqueId('edit-'.$this->fieldDefinition->getName().'-target-id');
+    $details_id = Html::getUniqueId('edit-'.$this->fieldDefinition->getName());
 
     $element += [
       '#id' => $details_id,
@@ -333,8 +333,8 @@ 
         // We need to repeat ID here as it is otherwise skipped when rendering.
         '#attributes' => ['id' => $hidden_id],
         '#default_value' => implode(' ', array_map(
-            function (EntityInterface $item) {
-              return $item->getEntityTypeId() . ':' . $item->id();
+            function(EntityInterface $item) {
+              return $item->getEntityTypeId().':'.$item->id();
             },
             $entities
         )),
@@ -383,7 +383,7 @@ 
    */
   public static function processEntityBrowser(&$element, FormStateInterface $form_state, &$complete_form) {
     $uuid = key($element['#attached']['drupalSettings']['entity_browser']);
-    $element['#attached']['drupalSettings']['entity_browser'][$uuid]['selector'] = '#' . $element['#custom_hidden_id'];
+    $element['#attached']['drupalSettings']['entity_browser'][$uuid]['selector'] = '#'.$element['#custom_hidden_id'];
     return $element;
   }
 
@@ -488,7 +488,7 @@ 
       '#theme_wrappers' => ['container'],
       '#attributes' => ['class' => ['entities-list']],
       'items' => array_map(
-        function (ContentEntityInterface $entity, $row_id) use ($field_widget_display, $details_id, $field_parents) {
+        function(ContentEntityInterface $entity, $row_id) use ($field_widget_display, $details_id, $field_parents) {
           $display = $field_widget_display->view($entity);
           $edit_button_access = $this->getSetting('field_widget_edit');
           if ($entity->getEntityTypeId() == 'file') {
@@ -504,7 +504,7 @@ 
             '#theme_wrappers' => ['container'],
             '#attributes' => [
               'class' => ['item-container', Html::getClass($field_widget_display->getPluginId())],
-              'data-entity-id' => $entity->getEntityTypeId() . ':' . $entity->id(),
+              'data-entity-id' => $entity->getEntityTypeId().':'.$entity->id(),
               'data-row-id' => $row_id,
             ],
             'display' => $display,
@@ -516,10 +516,10 @@ 
                 'wrapper' => $details_id,
               ],
               '#submit' => [[get_class($this), 'removeItemSubmit']],
-              '#name' => $this->fieldDefinition->getName() . '_remove_' . $entity->id() . '_' . $row_id . '_' . md5(json_encode($field_parents)),
+              '#name' => $this->fieldDefinition->getName().'_remove_'.$entity->id().'_'.$row_id.'_'.md5(json_encode($field_parents)),
               '#limit_validation_errors' => [array_merge($field_parents, [$this->fieldDefinition->getName()])],
               '#attributes' => [
-                'data-entity-id' => $entity->getEntityTypeId() . ':' . $entity->id(),
+                'data-entity-id' => $entity->getEntityTypeId().':'.$entity->id(),
                 'data-row-id' => $row_id,
               ],
               '#access' => (bool) $this->getSetting('field_widget_remove'),
@@ -657,7 +657,7 @@ 
       }
       // Submit was triggered by one of the "Remove" buttons. We need to walk
       // few levels up to read value of "target_id" element.
-      elseif ($trigger['#type'] == 'submit' && strpos($trigger['#name'], $this->fieldDefinition->getName() . '_remove_') === 0) {
+      elseif ($trigger['#type'] == 'submit' && strpos($trigger['#name'], $this->fieldDefinition->getName().'_remove_') === 0) {
         $parents = array_merge(array_slice($trigger['#parents'], 0, -static::$deleteDepth), ['target_id']);
       }
 
@@ -714,7 +714,7 @@ 
     // If an entity browser is being used in this widget, add it as a config
     // dependency.
     if ($browser_name = $this->getSetting('entity_browser')) {
-      $dependencies['config'][] = 'entity_browser.browser.' . $browser_name;
+      $dependencies['config'][] = 'entity_browser.browser.'.$browser_name;
     }
 
     return $dependencies;

src/Plugin/Field/FieldWidget/FileBrowserWidget.php

Braces +3 added lines, -6 removed lines

@@ -175,8 +175,7 @@ 
     // their styles in code.
     elseif ($this->fieldDefinition->getType() == 'image' && $image_style = ImageStyle::load($image_style_setting)) {
       $preview_image_style = $this->t('Preview image style: @style', ['@style' => $image_style->label()]);
-    }
-    else {
+    } else {
       $preview_image_style = $this->t('No preview image');
     }
     array_unshift($summary, $preview_image_style);
@@ -260,8 +259,7 @@ 
           if ($field_type == 'file') {
             $description = $item->description;
             $display_field = $item->display;
-          }
-          elseif ($field_type == 'image') {
+          } elseif ($field_type == 'image') {
             $alt = $item->alt;
             $title = $item->title;
             $width = $item->width;
@@ -455,8 +453,7 @@ 
       $extensions = isset($settings['file_extensions']) ? $settings['file_extensions'] : implode(' ', $supported_extensions);
       $extensions = array_intersect(explode(' ', $extensions), $supported_extensions);
       $validators['file_validate_extensions'] = [implode(' ', $extensions)];
-    }
-    elseif (!empty($settings['file_extensions'])) {
+    } elseif (!empty($settings['file_extensions'])) {
       $validators['file_validate_extensions'] = [$settings['file_extensions']];
     }
 

Spacing +7 added lines, -7 removed lines

@@ -216,7 +216,7 @@ 
 
     $delta = 0;
 
-    $order_class = $field_machine_name . '-delta-order';
+    $order_class = $field_machine_name.'-delta-order';
 
     $current = [
       '#type' => 'table',
@@ -283,7 +283,7 @@ 
       $current[$entity_id] = [
         '#attributes' => [
           'class' => ['draggable'],
-          'data-entity-id' => $entity->getEntityTypeId() . ':' . $entity_id,
+          'data-entity-id' => $entity->getEntityTypeId().':'.$entity_id,
           'data-row-id' => $delta,
         ],
       ];
@@ -355,7 +355,7 @@ 
             'options' => ['query' => ['details_id' => $details_id]],
           ],
           '#attributes' => [
-            'data-entity-id' => $entity->getEntityTypeId() . ':' . $entity->id(),
+            'data-entity-id' => $entity->getEntityTypeId().':'.$entity->id(),
             'data-row-id' => $delta,
           ],
           '#access' => $can_edit,
@@ -368,10 +368,10 @@ 
             'wrapper' => $details_id,
           ],
           '#submit' => [[get_class($this), 'removeItemSubmit']],
-          '#name' => $field_machine_name . '_remove_' . $entity_id . '_' . md5(json_encode($field_parents)),
+          '#name' => $field_machine_name.'_remove_'.$entity_id.'_'.md5(json_encode($field_parents)),
           '#limit_validation_errors' => [array_merge($field_parents, [$field_machine_name, 'target_id'])],
           '#attributes' => [
-            'data-entity-id' => $entity->getEntityTypeId() . ':' . $entity->id(),
+            'data-entity-id' => $entity->getEntityTypeId().':'.$entity->id(),
             'data-row-id' => $delta,
           ],
           '#access' => (bool) $widget_settings['field_widget_remove'],
@@ -429,7 +429,7 @@ 
     }
 
     // Return ourself as the structure doesn't match the default.
-    usort($return, function ($a, $b) {
+    usort($return, function($a, $b) {
       return SortArray::sortByKeyInt($a, $b, '_weight');
     });
 
@@ -489,7 +489,7 @@ 
     $data['validators']['file'] = ['validators' => $this->getFileValidators()];
     // Provide context for widgets to enhance their configuration. Currently
     // we only know that "upload_location" is used.
-    $data['widget_context']['upload_location'] = $settings['uri_scheme'] . '://' . $settings['file_directory'];
+    $data['widget_context']['upload_location'] = $settings['uri_scheme'].'://'.$settings['file_directory'];
     return $data;
   }
 

modules/entity_form/entity_browser_entity_form.module

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 /**
  * Implements hook_inline_entity_form_reference_form_alter().
  */
-function entity_browser_entity_form_inline_entity_form_reference_form_alter(&$reference_form, FormStateInterface &$form_state) {
+function entity_browser_entity_form_inline_entity_form_reference_form_alter(&$reference_form, FormStateInterface&$form_state) {
   /** @var \Drupal\field\FieldConfigInterface $instance */
   $instance = $form_state->get([
     'inline_entity_form',
@@ -27,7 +27,7 @@ 
   ]);
 
   /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
-  $entity_form_id = $instance->getTargetEntityTypeId() . '.' . $instance->getTargetBundle() . '.default';
+  $entity_form_id = $instance->getTargetEntityTypeId().'.'.$instance->getTargetBundle().'.default';
   // TODO - 'default' might become configurable or something else in the future.
   // See https://www.drupal.org/node/2510274
   $form_display = \Drupal::entityTypeManager()->getStorage('entity_form_display')->load($entity_form_id);
@@ -47,7 +47,7 @@ 
   ]));
 
   $cardinality = FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED;
-  if($instance->getFieldStorageDefinition()->get('cardinality') !== $cardinality) {
+  if ($instance->getFieldStorageDefinition()->get('cardinality') !== $cardinality) {
     $cardinality = $instance->getFieldStorageDefinition()->get('cardinality') - $count_existing_selection;
   }
 
@@ -119,7 +119,7 @@ 
   $ief_id = $reference_form['#ief_id'];
   $form_values = NestedArray::getValue($form_state->getValues(), $reference_form['#parents']);
   $attach_entities = EntityBrowserElement::processEntityIds($form_values['entity_browser']['entity_ids']);
-  $entities =& $form_state->get(['inline_entity_form', $ief_id, 'entities']);
+  $entities = & $form_state->get(['inline_entity_form', $ief_id, 'entities']);
 
   // Determine the correct weight of the new element.
   $weight = 0;

Braces +1 added lines, -2 removed lines

@@ -165,8 +165,7 @@
         '#empty_value' => '_none',
         '#default_value' => $plugin->getThirdPartySetting('entity_browser_entity_form', 'entity_browser_id'),
       ];
-    }
-    else {
+    } else {
       $element['message'] = [
         '#markup' => t('There are no entity browsers available. You can create one <a href="@url">here</a>.', ['@url' => Url::fromRoute('entity.entity_browser.collection')->toString()]),
       ];

src/Form/GeneralInfoConfig.php

Spacing +9 added lines, -9 removed lines

@@ -90,9 +90,9 @@ 
     $entity_browser = $cached_values['entity_browser'];
 
     if (empty($entity_browser->id())) {
-      $help_text = '<div class="clearfix eb-help-text"><h2>' . $this->t('Entity Browser creation instructions') . '</h2>';
-      $help_text .= '<p>' . $this->t('This is a multi-step form. In this first step you need to define the main characteristics of the Entity Browser (in other words, which plugins will be used for each functionality). In the following steps of this wizard, each individual plugin can be configured, when necessary.') . '</p>';
-      $help_text .= '<p>' . $this->t('You can find more detailed information about creating and configuring Entity Browsers at the <a href="@guide_href" target="_blank">official documentation</a>.', ['@guide_href' => 'https://drupal-media.gitbooks.io/drupal8-guide/content/modules/entity_browser/intro.html']) . '</p>';
+      $help_text = '<div class="clearfix eb-help-text"><h2>'.$this->t('Entity Browser creation instructions').'</h2>';
+      $help_text .= '<p>'.$this->t('This is a multi-step form. In this first step you need to define the main characteristics of the Entity Browser (in other words, which plugins will be used for each functionality). In the following steps of this wizard, each individual plugin can be configured, when necessary.').'</p>';
+      $help_text .= '<p>'.$this->t('You can find more detailed information about creating and configuring Entity Browsers at the <a href="@guide_href" target="_blank">official documentation</a>.', ['@guide_href' => 'https://drupal-media.gitbooks.io/drupal8-guide/content/modules/entity_browser/intro.html']).'</p>';
       $help_text .= '</div>';
       $form['help_text'] = [
         '#markup' => $help_text,
@@ -100,10 +100,10 @@ 
     }
 
     $displays = [];
-    $display_description = $this->t('Choose here how the browser(s) should be presented to the end user. The available plugins are:') . '<ul>';
+    $display_description = $this->t('Choose here how the browser(s) should be presented to the end user. The available plugins are:').'<ul>';
     foreach ($this->displayManager->getDefinitions() as $plugin_id => $plugin_definition) {
       $displays[$plugin_id] = $plugin_definition['label'];
-      $display_description .= '<li><b>' . $plugin_definition['label'] . ':</b> ' . $plugin_definition['description'] . '</li>';
+      $display_description .= '<li><b>'.$plugin_definition['label'].':</b> '.$plugin_definition['description'].'</li>';
     }
     $display_description .= '</ul>';
     $form['display'] = [
@@ -116,10 +116,10 @@ 
     ];
 
     $widget_selectors = [];
-    $widget_description = $this->t('In the last step of the entity browser configuration you can decide how the widgets will be available to the editor. The available plugins are:') . '<ul>';
+    $widget_description = $this->t('In the last step of the entity browser configuration you can decide how the widgets will be available to the editor. The available plugins are:').'<ul>';
     foreach ($this->widgetSelectorManager->getDefinitions() as $plugin_id => $plugin_definition) {
       $widget_selectors[$plugin_id] = $plugin_definition['label'];
-      $widget_description .= '<li><b>' . $plugin_definition['label'] . ':</b> ' . $plugin_definition['description'] . '</li>';
+      $widget_description .= '<li><b>'.$plugin_definition['label'].':</b> '.$plugin_definition['description'].'</li>';
     }
     $widget_description .= '</ul>';
     $form['widget_selector'] = [
@@ -132,10 +132,10 @@ 
     ];
 
     $selection_display = [];
-    $selection_description = $this->t('You can optionally allow a "work-in-progress selection zone" to be available to the editor, while still navigating, browsing and selecting the entities. The available plugins are:') . '<ul>';
+    $selection_description = $this->t('You can optionally allow a "work-in-progress selection zone" to be available to the editor, while still navigating, browsing and selecting the entities. The available plugins are:').'<ul>';
     foreach ($this->selectionDisplayManager->getDefinitions() as $plugin_id => $plugin_definition) {
       $selection_display[$plugin_id] = $plugin_definition['label'];
-      $selection_description .= '<li><b>' . $plugin_definition['label'] . ':</b> ' . $plugin_definition['description'] . '</li>';
+      $selection_description .= '<li><b>'.$plugin_definition['label'].':</b> '.$plugin_definition['description'].'</li>';
     }
     $selection_description .= '</ul>';
     $form['selection_display'] = [

src/Form/WidgetsConfig.php

Spacing +4 added lines, -4 removed lines

@@ -53,10 +53,10 @@ 
     $entity_browser = $form_state->getTemporaryValue('wizard')['entity_browser'];
 
     $widgets = [];
-    $description = $this->t('The available plugins are:') . '<ul>';
+    $description = $this->t('The available plugins are:').'<ul>';
     foreach ($this->widgetManager->getDefinitions() as $plugin_id => $plugin_definition) {
       $widgets[$plugin_id] = $plugin_definition['label'];
-      $description .= '<li><b>' . $plugin_definition['label'] . ':</b> ' . $plugin_definition['description'] . '</li>';
+      $description .= '<li><b>'.$plugin_definition['label'].':</b> '.$plugin_definition['description'].'</li>';
     }
     $description .= '</ul>';
     $default_widgets = [];
@@ -67,7 +67,7 @@ 
     $form['widget'] = [
       '#type' => 'select',
       '#title' => $this->t('Add widget plugin'),
-      '#options' => ['_none_' => '- ' . $this->t('Select a widget to add it') . ' -'] + $widgets,
+      '#options' => ['_none_' => '- '.$this->t('Select a widget to add it').' -'] + $widgets,
       '#description' => $description,
       '#ajax' => [
         'callback' => [get_class($this), 'tableUpdatedAjaxCallback'],
@@ -121,7 +121,7 @@ 
       $row['remove'] = [
         '#type' => 'submit',
         '#value' => $this->t('Delete'),
-        '#name' => 'remove' . $uuid,
+        '#name' => 'remove'.$uuid,
         '#ajax' => [
           'callback' => [get_class($this), 'tableUpdatedAjaxCallback'],
           'wrapper' => 'widgets',

src/Plugin/EntityBrowser/Display/IFrame.php

Spacing +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
             'entity_browser' => [
               'iframe' => [
                 $this->getUuid() => [
-                  'src' => Url::fromRoute('entity_browser.' . $this->configuration['entity_browser_id'], [], $data['query_parameters'])
+                  'src' => Url::fromRoute('entity_browser.'.$this->configuration['entity_browser_id'], [], $data['query_parameters'])
                     ->toString(),
                   'width' => $this->configuration['width'],
                   'height' => $this->configuration['height'],
@@ -185,15 +185,15 @@ 
   public function propagateSelection(FilterResponseEvent $event) {
     $render = [
       'labels' => [
-        '#markup' => 'Labels: ' . implode(', ', array_map(function (EntityInterface $item) {
+        '#markup' => 'Labels: '.implode(', ', array_map(function(EntityInterface $item) {
           return $item->label();
         }, $this->entities)),
         '#attached' => [
-          'library' => ['entity_browser/'. $this->pluginDefinition['id'] . '_selection'],
+          'library' => ['entity_browser/'.$this->pluginDefinition['id'].'_selection'],
           'drupalSettings' => [
             'entity_browser' => [
               $this->pluginDefinition['id'] => [
-                'entities' => array_map(function (EntityInterface $item) {
+                'entities' => array_map(function(EntityInterface $item) {
                   return [$item->id(), $item->uuid(), $item->getEntityTypeId()];
                 }, $this->entities),
                 'uuid' => $this->request->query->get('uuid'),
@@ -211,7 +211,7 @@ 
    * {@inheritdoc}
    */
   public function path() {
-    return '/entity-browser/' . $this->pluginDefinition['id'] . '/' . $this->configuration['entity_browser_id'];
+    return '/entity-browser/'.$this->pluginDefinition['id'].'/'.$this->configuration['entity_browser_id'];
   }
 
   /**

src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
    */
   public function calculateDependencies() {
     $dependencies = parent::calculateDependencies();
-    if ($view_mode = $this->entityTypeManager->getStorage('entity_view_mode')->load($this->configuration['entity_type'] . '.' . $this->configuration['view_mode'])) {
+    if ($view_mode = $this->entityTypeManager->getStorage('entity_view_mode')->load($this->configuration['entity_type'].'.'.$this->configuration['view_mode'])) {
       $dependencies[$view_mode->getConfigDependencyKey()][] = $view_mode->getConfigDependencyName();
     }
     return $dependencies;

src/Plugin/EntityBrowser/SelectionDisplay/MultiStepDisplay.php

Spacing +6 added lines, -6 removed lines

@@ -113,7 +113,7 @@ 
         $display = ['#markup' => $display];
       }
 
-      $form['selected']['items_' . $entity->id() . '_' . $id] = [
+      $form['selected']['items_'.$entity->id().'_'.$id] = [
         '#theme_wrappers' => ['container'],
         '#attributes' => [
           'class' => ['item-container'],
@@ -124,11 +124,11 @@ 
           '#type' => 'submit',
           '#value' => $this->t('Remove'),
           '#submit' => [[get_class($this), 'removeItemSubmit']],
-          '#name' => 'remove_' . $entity->id() . '_' . $id,
+          '#name' => 'remove_'.$entity->id().'_'.$id,
           '#attributes' => [
             'class' => ['entity-browser-remove-selected-entity'],
             'data-row-id' => $id,
-            'data-remove-entity' => 'items_' . $entity->id(),
+            'data-remove-entity' => 'items_'.$entity->id(),
           ],
         ],
         'weight' => [
@@ -290,10 +290,10 @@ 
         foreach ($entity_ids as $entity_pair_info) {
           $last_entity_id = $selected_entities[$selected_entity_keys[$key_index]]->id();
 
-          $html = $renderer->render($form['selection_display']['selected']['items_' . $last_entity_id . '_' . $selected_entity_keys[$key_index]]);
+          $html = $renderer->render($form['selection_display']['selected']['items_'.$last_entity_id.'_'.$selected_entity_keys[$key_index]]);
 
           $ajax->addCommand(
-            new ReplaceCommand('div[id="' . $entity_pair_info['proxy_id'] . '"]', static::trimSingleHtmlTag($html))
+            new ReplaceCommand('div[id="'.$entity_pair_info['proxy_id'].'"]', static::trimSingleHtmlTag($html))
           );
 
           $key_index++;
@@ -367,7 +367,7 @@ 
     // Remove weight of entity being removed.
     $form_state->unsetValue([
       'selected',
-      $triggering_element['#attributes']['data-remove-entity'] . '_' . $triggering_element['#attributes']['data-row-id'],
+      $triggering_element['#attributes']['data-remove-entity'].'_'.$triggering_element['#attributes']['data-row-id'],
     ]);
 
     // Remove entity itself.