drupal-media / entity_browser

src/Plugin/EntityBrowser/SelectionDisplay/View.php

Spacing +2 added lines, -2 removed lines

@@ -84,14 +84,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' => '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/EntityBrowser/Display/IFrame.php

Spacing +4 added lines, -4 removed lines

@@ -148,7 +148,7 @@ 
             'entity_browser' => [
               'iframe' => [
                 $uuid => [
-                  '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'],
@@ -182,7 +182,7 @@ 
   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' => [
@@ -190,7 +190,7 @@ 
           'drupalSettings' => [
             'entity_browser' => [
               'iframe' => [
-                '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'),
@@ -208,7 +208,7 @@ 
    * {@inheritdoc}
    */
   public function path() {
-    return '/entity-browser/iframe/' . $this->configuration['entity_browser_id'];
+    return '/entity-browser/iframe/'.$this->configuration['entity_browser_id'];
   }
 
   /**

modules/entity_form/src/Plugin/EntityBrowser/Widget/EntityForm.php

Spacing +7 added lines, -7 removed lines

@@ -96,7 +96,7 @@ 
    * {@inheritdoc}
    */
   public function getForm(array &$original_form, FormStateInterface $form_state, array $aditional_widget_parameters) {
-    if (empty($this->configuration['entity_type']) || empty($this->configuration['bundle'])  || empty($this->configuration['form_mode'])) {
+    if (empty($this->configuration['entity_type']) || empty($this->configuration['bundle']) || empty($this->configuration['form_mode'])) {
       return ['#markup' => t('The settings for this widget (Entity type, Bundle or Form mode) are not configured correctly.')];
     }
 
@@ -137,7 +137,7 @@ 
     $definitions = $this->entityTypeManager->getDefinitions();
     $entity_types = array_combine(
       array_keys($definitions),
-      array_map(function (EntityTypeInterface $item) {
+      array_map(function(EntityTypeInterface $item) {
         return $item->getLabel();
       }, $definitions)
     );
@@ -155,7 +155,7 @@ 
     $bundles = [];
     if ($entity_type) {
       $definitions = $this->entityTypeBundleInfo->getBundleInfo($entity_type);
-      $bundles = array_map(function ($item) {
+      $bundles = array_map(function($item) {
         return $item['label'];
       }, $definitions);
     }
@@ -168,7 +168,7 @@ 
         '#options' => $bundles,
         '#default_value' => $bundle,
       ],
-      '#attributes' => ['id' => 'bundle-wrapper-' . $this->uuid()],
+      '#attributes' => ['id' => 'bundle-wrapper-'.$this->uuid()],
     ];
 
     $form['form_mode'] = [
@@ -179,7 +179,7 @@ 
         '#default_value' => $form_mode,
         '#options' => $this->entityDisplayRepository->getFormModeOptions($entity_type),
       ],
-      '#attributes' => ['id' => 'form-mode-wrapper-' . $this->uuid()],
+      '#attributes' => ['id' => 'form-mode-wrapper-'.$this->uuid()],
     ];
 
     return $form;
@@ -204,8 +204,8 @@ 
    */
   public function updateFormElements($form, FormStateInterface $form_state) {
     $response = new AjaxResponse();
-    $response->addCommand(new ReplaceCommand('#bundle-wrapper-' . $this->uuid(), $this->updateBundle($form, $form_state)));
-    $response->addCommand(new ReplaceCommand('#form-mode-wrapper-' . $this->uuid(), $this->updateFormMode($form, $form_state)));
+    $response->addCommand(new ReplaceCommand('#bundle-wrapper-'.$this->uuid(), $this->updateBundle($form, $form_state)));
+    $response->addCommand(new ReplaceCommand('#form-mode-wrapper-'.$this->uuid(), $this->updateFormMode($form, $form_state)));
     return $response;
   }
 

src/Plugin/Field/FieldWidget/EntityReferenceBrowserWidget.php

Braces +3 added lines, -6 removed lines

@@ -216,12 +216,10 @@ 
 
     if (empty($entity_browser_id)) {
       return [t('No entity browser selected.')];
-    }
-    else {
+    } else {
       if ($browser = $this->entityManager->getStorage('entity_browser')->load($entity_browser_id)) {
         $summary[] = t('Entity browser: @browser', ['@browser' => $browser->label()]);
-      }
-      else {
+      } else {
         drupal_set_message(t('Missing entity browser!'), 'error');
         return [t('Missing entity browser!')];
       }
@@ -421,8 +419,7 @@ 
     // 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);
     }
 

Spacing +12 added lines, -12 removed lines

@@ -146,7 +146,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' => t('Entity display plugin'),
       '#type' => 'select',
@@ -180,7 +180,7 @@ 
       '#type' => 'fieldset',
       '#title' => t('Entity display plugin configuration'),
       '#tree' => TRUE,
-      '#prefix' => '<div id="' . $id . '">',
+      '#prefix' => '<div id="'.$id.'">',
       '#suffix' => '</div>',
     ];
 
@@ -278,7 +278,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();
   }
 
   /**
@@ -315,7 +315,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']);
       }
 
@@ -351,8 +351,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,
@@ -367,7 +367,7 @@ 
         // We need to repeat ID here as it is otherwise skipped when rendering.
         '#attributes' => ['id' => $hidden_id],
         '#default_value' => array_map(
-          function (EntityInterface $item) { return $item->getEntityTypeId() . ':' . $item->id(); },
+          function(EntityInterface $item) { return $item->getEntityTypeId().':'.$item->id(); },
           $entities
         ),
         // #ajax is officially not supported for hidden elements but if we
@@ -409,7 +409,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;
   }
 
@@ -512,7 +512,7 @@ 
       '#theme_wrappers' => ['container'],
       '#attributes' => ['class' => ['entities-list']],
       'items' => array_map(
-        function (ContentEntityInterface $entity) use ($field_widget_display, $details_id, $field_parents) {
+        function(ContentEntityInterface $entity) use ($field_widget_display, $details_id, $field_parents) {
           $display = $field_widget_display->view($entity);
           if (is_string($display)) {
             $display = ['#markup' => $display];
@@ -521,7 +521,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(),
             ],
             'display' => $display,
             'remove_button' => [
@@ -532,9 +532,9 @@ 
                 'wrapper' => $details_id,
               ],
               '#submit' => [[get_class($this), 'removeItemSubmit']],
-              '#name' => $this->fieldDefinition->getName() . '_remove_' . $entity->id(),
+              '#name' => $this->fieldDefinition->getName().'_remove_'.$entity->id(),
               '#limit_validation_errors' => [array_merge($field_parents, [$this->fieldDefinition->getName()])],
-              '#attributes' => ['data-entity-id' => $entity->getEntityTypeId() . ':' . $entity->id()],
+              '#attributes' => ['data-entity-id' => $entity->getEntityTypeId().':'.$entity->id()],
               '#access' => (bool) $this->getSetting('field_widget_remove'),
             ],
             'edit_button' => [

src/Plugin/Field/FieldWidget/FileBrowserWidget.php

Braces +6 added lines, -12 removed lines

@@ -177,8 +177,7 @@ 
 
     if (empty($entity_browser_id)) {
       return [$this->t('No entity browser selected.')];
-    }
-    else {
+    } else {
       $browser = $this->entityTypeManager->getStorage('entity_browser')
         ->load($entity_browser_id);
       $summary[] = $this->t('Entity browser: @browser', ['@browser' => $browser->label()]);
@@ -194,8 +193,7 @@ 
       // their styles in code.
       if (isset($image_styles[$image_style_setting])) {
         $preview_image_style = $this->t('Preview image style: @style', ['@style' => $image_styles[$image_style_setting]]);
-      }
-      else {
+      } else {
         $preview_image_style = $this->t('No preview image');
       }
     }
@@ -263,8 +261,7 @@ 
         if ($image->isValid()) {
           $width = $image->getWidth();
           $height = $image->getHeight();
-        }
-        else {
+        } else {
           $width = $height = NULL;
         }
 
@@ -276,8 +273,7 @@ 
           '#style_name' => $widget_settings['preview_image_style'],
           '#uri' => $uri,
         ];
-      }
-      else {
+      } else {
         $display = $this->entityTypeManager->getViewBuilder('file')->view($entity, $view_mode);
       }
 
@@ -292,8 +288,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;
           }
@@ -453,8 +448,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 +6 added lines, -6 removed lines

@@ -227,7 +227,7 @@ 
 
     $delta = 0;
 
-    $order_class = $field_machine_name . '-delta-order';
+    $order_class = $field_machine_name.'-delta-order';
 
     $current = [
       '#type' => 'table',
@@ -304,7 +304,7 @@ 
       $current[$entity_id] = [
         '#attributes' => [
           'class' => ['draggable'],
-          'data-entity-id' => $entity->getEntityTypeId() . ':' . $entity_id,
+          'data-entity-id' => $entity->getEntityTypeId().':'.$entity_id,
         ],
         'display' => $display,
         'filename' => ['#markup' => $entity->label()],
@@ -361,9 +361,9 @@ 
             'wrapper' => $details_id,
           ],
           '#submit' => [[get_class($this), 'removeItemSubmit']],
-          '#name' => $field_machine_name . '_remove_' . $entity_id,
+          '#name' => $field_machine_name.'_remove_'.$entity_id,
           '#limit_validation_errors' => [array_merge($field_parents, [$field_machine_name, 'target_id'])],
-          '#attributes' => ['data-entity-id' => $entity->getEntityTypeId() . ':' . $entity_id],
+          '#attributes' => ['data-entity-id' => $entity->getEntityTypeId().':'.$entity_id],
           '#access' => (bool) $widget_settings['field_widget_remove'],
         ],
         '_weight' => [
@@ -417,7 +417,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');
     });
 
@@ -477,7 +477,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;
   }
 

src/Element/EntityBrowserElement.php

Spacing +5 added lines, -5 removed lines

@@ -63,8 +63,8 @@ 
     }
 
     $default_value = implode(' ', array_map(
-      function (EntityInterface $item) {
-        return $item->getEntityTypeId() . ':' . $item->id();
+      function(EntityInterface $item) {
+        return $item->getEntityTypeId().':'.$item->id();
       },
       $element['#default_value']
     ));
@@ -85,7 +85,7 @@ 
       ['validators' => $validators, 'selected_entities' => $element['#default_value']]
     );
 
-    $hidden_id = Html::getUniqueId($element['#id'] . '-target');
+    $hidden_id = Html::getUniqueId($element['#id'].'-target');
     $element['entity_ids'] = [
       '#type' => 'hidden',
       '#id' => $hidden_id,
@@ -97,7 +97,7 @@ 
     $element['#attached']['drupalSettings']['entity_browser'] = [
       $entity_browser->getDisplay()->getUuid() => [
         'cardinality' => $element['#cardinality'],
-        'selector' => '#' . $hidden_id,
+        'selector' => '#'.$hidden_id,
       ],
     ];
 
@@ -137,7 +137,7 @@ 
     }
 
     return array_map(
-      function ($item) {
+      function($item) {
         list($entity_type, $entity_id) = explode(':', $item);
         return \Drupal::entityTypeManager()->getStorage($entity_type)->load($entity_id);
       },

Braces +1 added lines, -2 removed lines

@@ -116,8 +116,7 @@
 
     if (!$this->isSelectionCompleted($form_state)) {
       $form_state->setRebuild();
-    }
-    else {
+    } else {
       $entity_browser->getDisplay()->selectionCompleted($this->getSelectedEntities($form_state));
     }
   }

src/Tests/FormElementTest.php

Spacing +5 added lines, -5 removed lines

@@ -51,22 +51,22 @@
     $this->assertFieldByXPath("//input[@type='hidden' and @id='edit-fancy-entity-browser-target']", '', "Entity browser's hidden element found.");
 
     $edit = [
-      'fancy_entity_browser[entity_ids]' => $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id() . ' ' . $this->nodes[1]->getEntityTypeId() . ':' . $this->nodes[1]->id(),
+      'fancy_entity_browser[entity_ids]' => $this->nodes[0]->getEntityTypeId().':'.$this->nodes[0]->id().' '.$this->nodes[1]->getEntityTypeId().':'.$this->nodes[1]->id(),
     ];
     $this->drupalPostForm(NULL, $edit, 'Submit');
-    $expected = 'Selected entities: ' . $this->nodes[0]->label() . ', ' . $this->nodes[1]->label();
+    $expected = 'Selected entities: '.$this->nodes[0]->label().', '.$this->nodes[1]->label();
     $this->assertText($expected, 'Selected entities detected.');
 
-    $default_entity = $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id();
+    $default_entity = $this->nodes[0]->getEntityTypeId().':'.$this->nodes[0]->id();
     $this->drupalGet('/test-element', ['query' => ['default_entity' => $default_entity]]);
     $this->assertLink('Select entities', 0, 'Trigger link found.');
     $this->assertFieldByXPath("//input[@type='hidden' and @id='edit-fancy-entity-browser-target']", $default_entity, "Entity browser's hidden element found.");
 
     $edit = [
-      'fancy_entity_browser[entity_ids]' => $this->nodes[1]->getEntityTypeId() . ':' . $this->nodes[1]->id() . ' ' . $this->nodes[0]->getEntityTypeId() . ':' . $this->nodes[0]->id(),
+      'fancy_entity_browser[entity_ids]' => $this->nodes[1]->getEntityTypeId().':'.$this->nodes[1]->id().' '.$this->nodes[0]->getEntityTypeId().':'.$this->nodes[0]->id(),
     ];
     $this->drupalPostForm(NULL, $edit, 'Submit');
-    $expected = 'Selected entities: ' . $this->nodes[1]->label() . ', ' . $this->nodes[0]->label();
+    $expected = 'Selected entities: '.$this->nodes[1]->label().', '.$this->nodes[0]->label();
     $this->assertText($expected, 'Selected entities detected.');
   }
 

src/WidgetBase.php

Doc Comments +1 added lines, -1 removed lines

@@ -276,7 +276,7 @@
   /**
    * Run widget validators.
    *
-   * @param array $entities
+   * @param \Drupal\Core\Entity\EntityInterface[] $entities
    *   Array of entity ids to validate.
    * @param array $validators
    *   Array of widget validator ids.

src/Tests/ConfigUITest.php

Spacing +10 added lines, -10 removed lines

@@ -139,9 +139,9 @@ 
     $xpath = new \DOMXPath($dom);
     foreach ($commands as $command) {
       if ($command['command'] == 'insert' && $command['method'] == 'replaceWith') {
-        $wrapperNode = $xpath->query('//*[@id="' . ltrim($command['selector'], '#') . '"]')->item(0);
+        $wrapperNode = $xpath->query('//*[@id="'.ltrim($command['selector'], '#').'"]')->item(0);
         $newDom = new \DOMDocument();
-        @$newDom->loadHTML('<div>' . $command['data'] . '</div>');
+        @$newDom->loadHTML('<div>'.$command['data'].'</div>');
         $newNode = @$dom->importNode($newDom->documentElement->firstChild->firstChild, TRUE);
         $wrapperNode->parentNode->replaceChild($newNode, $wrapperNode);
         $content = $dom->saveHTML();
@@ -232,14 +232,14 @@ 
     $this->assertUrl('/admin/config/content/entity_browser/test_entity_browser/selection_display', ['query' => ['js' => 'nojs']]);
 
     $this->drupalPostForm(NULL, [], 'Next');
-    $this->assertFieldById('edit-table-' . $first_uuid . '-label', 'upload', 'Correct value for widget label found.');
-    $this->assertFieldById('edit-table-' . $first_uuid . '-form-upload-location', 'public://', 'Correct value for upload location found.');
-    $this->assertFieldByXPath("//input[@data-drupal-selector='edit-table-" . $first_uuid . "-form-submit-text']", 'Select files', 'Correct value for submit text found.');
-    $this->assertFieldById('edit-table-' . $second_uuid . '-label', 'entity_form', 'Correct value for widget label found.');
-    $this->assertOptionSelectedWithDrupalSelector('edit-table-' . $second_uuid . '-form-entity-type', 'user', 'Correct value for entity type found.');
-    $this->assertOptionSelectedWithDrupalSelector('edit-table-' . $second_uuid . '-form-bundle-select', 'user', 'Correct value for bundle found.');
-    $this->assertOptionSelectedWithDrupalSelector('edit-table-' . $second_uuid . '-form-form-mode-form-select', 'register', 'Correct value for form modes found.');
-    $this->assertFieldByXPath("//input[@data-drupal-selector='edit-table-" . $second_uuid . "-form-submit-text']", 'But some are more equal than others', 'Correct value for submit text found.');
+    $this->assertFieldById('edit-table-'.$first_uuid.'-label', 'upload', 'Correct value for widget label found.');
+    $this->assertFieldById('edit-table-'.$first_uuid.'-form-upload-location', 'public://', 'Correct value for upload location found.');
+    $this->assertFieldByXPath("//input[@data-drupal-selector='edit-table-".$first_uuid."-form-submit-text']", 'Select files', 'Correct value for submit text found.');
+    $this->assertFieldById('edit-table-'.$second_uuid.'-label', 'entity_form', 'Correct value for widget label found.');
+    $this->assertOptionSelectedWithDrupalSelector('edit-table-'.$second_uuid.'-form-entity-type', 'user', 'Correct value for entity type found.');
+    $this->assertOptionSelectedWithDrupalSelector('edit-table-'.$second_uuid.'-form-bundle-select', 'user', 'Correct value for bundle found.');
+    $this->assertOptionSelectedWithDrupalSelector('edit-table-'.$second_uuid.'-form-form-mode-form-select', 'register', 'Correct value for form modes found.');
+    $this->assertFieldByXPath("//input[@data-drupal-selector='edit-table-".$second_uuid."-form-submit-text']", 'But some are more equal than others', 'Correct value for submit text found.');
 
     $this->drupalPostForm(NULL, [], 'Finish');