Commit 22859f81 authored by catch's avatar catch
Browse files

Issue #3264061 by andypost: Remove deprecated functions from image module

parent 39a076cf

core/modules/image/src/Controller/ImageStyleDownloadController.php

+1 −6
Original line number Diff line number Diff line
@@ -63,16 +63,11 @@ class ImageStyleDownloadController extends FileDownloadController { 
   * @param \Drupal\Core\File\FileSystemInterface $file_system

   *   The system service.

   */

  public function __construct(LockBackendInterface $lock, ImageFactory $image_factory, StreamWrapperManagerInterface $stream_wrapper_manager, FileSystemInterface $file_system = NULL) {

  public function __construct(LockBackendInterface $lock, ImageFactory $image_factory, StreamWrapperManagerInterface $stream_wrapper_manager, FileSystemInterface $file_system) {

    parent::__construct($stream_wrapper_manager);

    $this->lock = $lock;

    $this->imageFactory = $image_factory;

    $this->logger = $this->getLogger('image');



    if (!isset($file_system)) {

      @trigger_error('Not defining the $file_system argument to ' . __METHOD__ . ' is deprecated in drupal:9.1.0 and will throw an error in drupal:10.0.0.', E_USER_DEPRECATED);

      $file_system = \Drupal::service('file_system');

    }

    $this->fileSystem = $file_system;

  }

core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php

+1 −5
Original line number Diff line number Diff line
@@ -75,14 +75,10 @@ class ImageFormatter extends ImageFormatterBase { 
   * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator

   *   The file URL generator.

   */

  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityStorageInterface $image_style_storage, FileUrlGeneratorInterface $file_url_generator = NULL) {

  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityStorageInterface $image_style_storage, FileUrlGeneratorInterface $file_url_generator) {

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

    $this->currentUser = $current_user;

    $this->imageStyleStorage = $image_style_storage;

    if (!$file_url_generator) {

      @trigger_error('Calling ImageFormatter::__construct() without the $file_url_generator argument is deprecated in drupal:9.3.0 and the $file_url_generator argument will be required in drupal:10.0.0. See https://www.drupal.org/node/2940031', E_USER_DEPRECATED);

      $file_url_generator = \Drupal::service('file_url_generator');

    }

    $this->fileUrlGenerator = $file_url_generator;

  }