diff --git a/entity_browser.views.inc b/entity_browser.views.inc index a026adc..c5a6d12 100644 --- a/entity_browser.views.inc +++ b/entity_browser.views.inc @@ -9,7 +9,7 @@ * Implements hook_views_data_alter(). */ function entity_browser_views_data_alter(&$data) { - $entity_manager = \Drupal::entityManager(); + $entity_manager = \Drupal::entityTypeManager(); foreach ($entity_manager->getDefinitions() as $entity_type_name => $entity_type) { if (!empty($data[$entity_type->getBaseTable()])) { $entity_keys = $entity_type->get('entity_keys'); diff --git a/modules/entity_form/entity_browser_entity_form.module b/modules/entity_form/entity_browser_entity_form.module index 41894b0..d4a6638 100644 --- a/modules/entity_form/entity_browser_entity_form.module +++ b/modules/entity_form/entity_browser_entity_form.module @@ -8,7 +8,7 @@ use \Drupal\Component\Utility\NestedArray; * Implements hook_inline_entity_form_reference_form_alter(). */ function entity_browser_entity_form_inline_entity_form_reference_form_alter(&$reference_form, \Drupal\Core\Form\FormStateInterface &$form_state) { - $entity_manager = \Drupal::entityManager(); + $entity_manager = \Drupal::entityTypeManager(); \Drupal::service('event_dispatcher') ->addListener( Events::REGISTER_JS_CALLBACKS, @@ -86,11 +86,11 @@ function entity_browser_entity_form_reference_form_validate(&$reference_form, Fo $instance = $form_state->get(['inline_entity_form', $ief_id, 'instance']); $target_type = $instance->getFieldStorageDefinition()->getSetting('target_type'); /** @var \Drupal\inline_entity_form\InlineEntityFormHandlerInterface $handler */ - $handler = \Drupal::entityManager()->getHandler($target_type, 'inline_form'); + $handler = \Drupal::entityTypeManager()->getHandler($target_type, 'inline_form'); $labels = $handler->labels(); $form_values = NestedArray::getValue($form_state->getValues(), $reference_form['#parents']); - $attach_entities = \Drupal::entityManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id'])); + $attach_entities = \Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id'])); // Check to see if entity is already referenced by current IEF widget if (!empty($attach_entities)) { @@ -126,7 +126,7 @@ function entity_browser_entity_form_reference_form_submit($reference_form, FormS $entity_type = $reference_form['#entity_type']; $form_values = NestedArray::getValue($form_state->getValues(), $reference_form['#parents']); - $attach_entities = \Drupal::entityManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id'])); + $attach_entities = \Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id'])); // Determine the correct weight of the new element. $weight = 0; diff --git a/src/Controllers/EntityBrowserController.php b/src/Controllers/EntityBrowserController.php index a3f546b..2bb8fe2 100644 --- a/src/Controllers/EntityBrowserController.php +++ b/src/Controllers/EntityBrowserController.php @@ -30,7 +30,7 @@ class EntityBrowserController extends ControllerBase { */ public function entityBrowserEdit(EntityInterface $entity) { // Build the entity edit form. - $form_object = $this->entityManager()->getFormObject($entity->getEntityTypeId(), 'edit'); + $form_object = $this->entityTypeManager()->getFormObject($entity->getEntityTypeId(), 'edit'); $form_object->setEntity($entity); $form_state = (new FormState()) ->setFormObject($form_object) diff --git a/src/EntityBrowserInterface.php b/src/EntityBrowserInterface.php index 70623f8..1b07bf0 100644 --- a/src/EntityBrowserInterface.php +++ b/src/EntityBrowserInterface.php @@ -8,7 +8,6 @@ namespace Drupal\entity_browser; use Drupal\Core\Config\Entity\ConfigEntityInterface; -use Drupal\Core\Form\FormStateInterface; /** * Provides an interface defining an entity browser entity. diff --git a/src/Plugin/EntityBrowser/Display/Modal.php b/src/Plugin/EntityBrowser/Display/Modal.php index 75ec8f8..d731db6 100644 --- a/src/Plugin/EntityBrowser/Display/Modal.php +++ b/src/Plugin/EntityBrowser/Display/Modal.php @@ -12,7 +12,6 @@ use Drupal\Core\Ajax\OpenModalDialogCommand; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Url; -use Drupal\entity_browser\DisplayAjaxInterface; use Drupal\entity_browser\DisplayBase; use Drupal\entity_browser\DisplayRouterInterface; use Drupal\entity_browser\Events\Events; @@ -21,7 +20,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Drupal\Core\Path\CurrentPathStack; use Drupal\Core\Ajax\AjaxResponse; -use Drupal\Core\Ajax\CloseDialogCommand; use Drupal\entity_browser\Ajax\SelectEntitiesCommand; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; diff --git a/src/Plugin/EntityBrowser/FieldWidgetDisplay/ImageThumbnail.php b/src/Plugin/EntityBrowser/FieldWidgetDisplay/ImageThumbnail.php index 33058f7..7e3124d 100644 --- a/src/Plugin/EntityBrowser/FieldWidgetDisplay/ImageThumbnail.php +++ b/src/Plugin/EntityBrowser/FieldWidgetDisplay/ImageThumbnail.php @@ -80,7 +80,7 @@ class ImageThumbnail extends FieldWidgetDisplayBase implements ContainerFactoryP */ public function settingsForm(array $form, FormStateInterface $form_state) { $options = []; - foreach ($this->entityManager->getStorage('image_style')->loadMultiple() as $id => $image_style) { + foreach (\Drupal::entityTypeManager()->getStorage('image_style')->loadMultiple() as $id => $image_style) { $options[$id] = $image_style->label(); } diff --git a/src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php b/src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php index a35d7a5..d0cff7f 100644 --- a/src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php +++ b/src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php @@ -64,7 +64,7 @@ class RenderedEntity extends FieldWidgetDisplayBase implements ContainerFactoryP * {@inheritdoc} */ public function view(EntityInterface $entity) { - return $this->entityManager->getViewBuilder($this->configuration['entity_type'])->view($entity, $this->configuration['view_mode']); + return \Drupal::entityTypeManager()->getViewBuilder($this->configuration['entity_type'])->view($entity, $this->configuration['view_mode']); } /** diff --git a/src/Plugin/EntityBrowser/Widget/Upload.php b/src/Plugin/EntityBrowser/Widget/Upload.php index e34ae9e..a744789 100644 --- a/src/Plugin/EntityBrowser/Widget/Upload.php +++ b/src/Plugin/EntityBrowser/Widget/Upload.php @@ -93,7 +93,7 @@ class Upload extends WidgetBase { $files = []; foreach ($form_state->getValue(['upload'], []) as $fid) { /** @var \Drupal\file\FileInterface $file */ - $file = $this->entityManager->getStorage('file')->load($fid); + $file = \Drupal::entityTypeManager()->getStorage('file')->load($fid); $file->setPermanent(); $file->save(); $files[] = $file; diff --git a/src/Plugin/EntityBrowser/Widget/View.php b/src/Plugin/EntityBrowser/Widget/View.php index 76052a4..a87db1a 100644 --- a/src/Plugin/EntityBrowser/Widget/View.php +++ b/src/Plugin/EntityBrowser/Widget/View.php @@ -203,7 +203,7 @@ class View extends WidgetBase implements ContainerFactoryPluginInterface { $entities = []; $ids = $form_state->get('view_widget_rows'); foreach ($selected_rows as $row) { - $entities[] = $this->entityManager->getStorage($ids[$row]['type'])->load($ids[$row]['id']); + $entities[] = \Drupal::entityTypeManager()->getStorage($ids[$row]['type'])->load($ids[$row]['id']); } $this->selectEntities($entities, $form_state); diff --git a/src/Plugin/Field/FieldWidget/EntityReference.php b/src/Plugin/Field/FieldWidget/EntityReference.php index c88924f..bcf555d 100644 --- a/src/Plugin/Field/FieldWidget/EntityReference.php +++ b/src/Plugin/Field/FieldWidget/EntityReference.php @@ -17,8 +17,6 @@ use Drupal\Core\Field\WidgetBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Url; -use Drupal\entity_browser\Events\Events; -use Drupal\entity_browser\Events\RegisterJSCallbacks; use Drupal\entity_browser\FieldWidgetDisplayManager; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -115,7 +113,7 @@ class EntityReference extends WidgetBase implements ContainerFactoryPluginInterf $browsers = []; /** @var \Drupal\entity_browser\EntityBrowserInterface $browser */ - foreach ($this->entityManager->getStorage('entity_browser')->loadMultiple() as $browser) { + foreach (\Drupal::entityTypeManager()->getStorage('entity_browser')->loadMultiple() as $browser) { $browsers[$browser->id()] = $browser->label(); } @@ -205,7 +203,7 @@ class EntityReference extends WidgetBase implements ContainerFactoryPluginInterf return [t('No entity browser selected.')]; } else { - $browser = $this->entityManager->getStorage('entity_browser') + $browser = \Drupal::entityTypeManager()->getStorage('entity_browser') ->load($entity_browser_id); $summary[] = t('Entity browser: @browser', ['@browser' => $browser->label()]); } @@ -223,7 +221,7 @@ class EntityReference extends WidgetBase implements ContainerFactoryPluginInterf */ function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $entity_type = $this->fieldDefinition->getFieldStorageDefinition()->getSetting('target_type'); - $entity_storage = $this->entityManager->getStorage($entity_type); + $entity_storage = \Drupal::entityTypeManager()->getStorage($entity_type); $field_widget_display = $this->fieldDisplayManager->createInstance( $this->getSetting('field_widget_display'), $this->getSetting('field_widget_display_settings') + ['entity_type' => $this->fieldDefinition->getFieldStorageDefinition()->getSetting('target_type')] @@ -281,7 +279,7 @@ class EntityReference extends WidgetBase implements ContainerFactoryPluginInterf $hidden_id = Html::getUniqueId('edit-' . $this->fieldDefinition->getName() . '-target-id'); $details_id = Html::getUniqueId('edit-' . $this->fieldDefinition->getName()); /** @var \Drupal\entity_browser\EntityBrowserInterface $entity_browser */ - $entity_browser = $this->entityManager->getStorage('entity_browser')->load($this->getSetting('entity_browser')); + $entity_browser = \Drupal::entityTypeManager()->getStorage('entity_browser')->load($this->getSetting('entity_browser')); $element += [ '#id' => $details_id, diff --git a/src/Plugin/views/display/EntityBrowser.php b/src/Plugin/views/display/EntityBrowser.php index c6f271b..8d4e9df 100644 --- a/src/Plugin/views/display/EntityBrowser.php +++ b/src/Plugin/views/display/EntityBrowser.php @@ -7,7 +7,6 @@ namespace Drupal\entity_browser\Plugin\views\display; -use Drupal\Core\DependencyInjection\DependencySerializationTrait; use Drupal\views\Plugin\views\display\DisplayPluginBase; /** diff --git a/src/WidgetSelectorBase.php b/src/WidgetSelectorBase.php index aef1971..4f8f95d 100644 --- a/src/WidgetSelectorBase.php +++ b/src/WidgetSelectorBase.php @@ -9,7 +9,6 @@ namespace Drupal\entity_browser; use Drupal\Core\Plugin\PluginBase; use Drupal\Core\Form\FormStateInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * Base class for widget selector plugins. diff --git a/src/WidgetSelectorInterface.php b/src/WidgetSelectorInterface.php index 9fc7a24..9ef6798 100644 --- a/src/WidgetSelectorInterface.php +++ b/src/WidgetSelectorInterface.php @@ -7,7 +7,6 @@ namespace Drupal\entity_browser; -use Drupal\Component\Plugin\LazyPluginCollection; use Drupal\Component\Plugin\PluginInspectionInterface; use Drupal\Core\Form\FormStateInterface;