Unverified Commit bbf10637 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3111865 by ravi.shankar, Hardik_Patel_12, longwave: Remove all... 

Issue #3111865 by ravi.shankar, Hardik_Patel_12, longwave: Remove all @deprecated code from media_library module
parent a98801db

core/modules/media_library/src/Form/AddFormBase.php

+1 −5
Changes for core/modules/media_library/src/Form/AddFormBase.php: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -72,14 +72,10 @@ abstract class AddFormBase extends FormBase implements BaseFormIdInterface, Trus 
   * @param \Drupal\media_library\OpenerResolverInterface $opener_resolver

   *   The opener resolver.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, MediaLibraryUiBuilder $library_ui_builder, OpenerResolverInterface $opener_resolver = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, MediaLibraryUiBuilder $library_ui_builder, OpenerResolverInterface $opener_resolver) {

    $this->entityTypeManager = $entity_type_manager;

    $this->libraryUiBuilder = $library_ui_builder;

    $this->viewBuilder = $this->entityTypeManager->getViewBuilder('media');

    if (!$opener_resolver) {

      @trigger_error('The media_library.opener_resolver service must be passed to AddFormBase::__construct(), it is required before Drupal 9.0.0.', E_USER_DEPRECATED);

      $opener_resolver = \Drupal::service('media_library.opener_resolver');

    }

    $this->openerResolver = $opener_resolver;

  }

core/modules/media_library/src/Form/FileUploadForm.php

+1 −5
Changes for core/modules/media_library/src/Form/FileUploadForm.php: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -77,15 +77,11 @@ class FileUploadForm extends AddFormBase { 
   * @param \Drupal\file\FileUsage\FileUsageInterface $file_usage

   *   The file usage service.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, MediaLibraryUiBuilder $library_ui_builder, ElementInfoManagerInterface $element_info, RendererInterface $renderer, FileSystemInterface $file_system, OpenerResolverInterface $opener_resolver = NULL, FileUsageInterface $file_usage = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, MediaLibraryUiBuilder $library_ui_builder, ElementInfoManagerInterface $element_info, RendererInterface $renderer, FileSystemInterface $file_system, OpenerResolverInterface $opener_resolver, FileUsageInterface $file_usage) {

    parent::__construct($entity_type_manager, $library_ui_builder, $opener_resolver);

    $this->elementInfo = $element_info;

    $this->renderer = $renderer;

    $this->fileSystem = $file_system;

    if (!$file_usage) {

      @trigger_error('Calling FileUploadForm::__construct() without the `file.usage` service is deprecated in drupal:8.8.0 and is removed in drupal:9.0.0. Pass the `file.usage` service to the constructor. See https://www.drupal.org/node/3075165', E_USER_DEPRECATED);

      $file_usage = \Drupal::service('file.usage');

    }

    $this->fileUsage = $file_usage;

  }

core/modules/media_library/src/MediaLibraryUiBuilder.php

+1 −5
Changes for core/modules/media_library/src/MediaLibraryUiBuilder.php: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -73,15 +73,11 @@ class MediaLibraryUiBuilder { 
   * @param \Drupal\media_library\OpenerResolverInterface $opener_resolver

   *   The opener resolver.

   */

  public function __construct(EntityTypeManagerInterface $entity_type_manager, RequestStack $request_stack, ViewExecutableFactory $views_executable_factory, FormBuilderInterface $form_builder, OpenerResolverInterface $opener_resolver = NULL) {

  public function __construct(EntityTypeManagerInterface $entity_type_manager, RequestStack $request_stack, ViewExecutableFactory $views_executable_factory, FormBuilderInterface $form_builder, OpenerResolverInterface $opener_resolver) {

    $this->entityTypeManager = $entity_type_manager;

    $this->request = $request_stack->getCurrentRequest();

    $this->viewsExecutableFactory = $views_executable_factory;

    $this->formBuilder = $form_builder;

    if (!$opener_resolver) {

      @trigger_error('The media_library.opener_resolver service must be passed to ' . __METHOD__ . ' and will be required before Drupal 9.0.0.', E_USER_DEPRECATED);

      $opener_resolver = \Drupal::service('media_library.opener_resolver');

    }

    $this->openerResolver = $opener_resolver;

  }

core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php

+1 −9
Changes for core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php: 1 added line, 9 removed lines.
Original line number Diff line number Diff line
@@ -86,18 +86,10 @@ class MediaLibraryWidget extends WidgetBase implements ContainerFactoryPluginInt 
   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler

   *   The module handler.

   */

  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, EntityTypeManagerInterface $entity_type_manager, AccountInterface $current_user = NULL, ModuleHandlerInterface $module_handler = NULL) {

  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, EntityTypeManagerInterface $entity_type_manager, AccountInterface $current_user, ModuleHandlerInterface $module_handler) {

    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings);

    $this->entityTypeManager = $entity_type_manager;

    if (!$current_user) {

      @trigger_error('The current_user service must be passed to MediaLibraryWidget::__construct(), it is required before Drupal 9.0.0.', E_USER_DEPRECATED);

      $current_user = \Drupal::currentUser();

    }

    $this->currentUser = $current_user;

    if (!$module_handler) {

      @trigger_error('The module_handler service must be passed to MediaLibraryWidget::__construct(), it is required before Drupal 9.0.0.', E_USER_DEPRECATED);

      $module_handler = \Drupal::moduleHandler();

    }

    $this->moduleHandler = $module_handler;

  }