Commit dcc51c80 authored by catch's avatar catch
Browse files

Issue #3261248 by paulocs, andregp, andypost, longwave, quietone: Remove... 

Issue #3261248 by paulocs, andregp, andypost, longwave, quietone: Remove deprecated user.module functions
parent 099ba9fc

core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php

+1 −5
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface { 
   * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher

   *   The event dispatcher.

   */

  public function __construct(MaintenanceModeInterface $maintenance_mode, ConfigFactoryInterface $config_factory, TranslationInterface $translation, UrlGeneratorInterface $url_generator, AccountInterface $account, BareHtmlPageRendererInterface $bare_html_page_renderer, MessengerInterface $messenger, EventDispatcherInterface $event_dispatcher = NULL) {

  public function __construct(MaintenanceModeInterface $maintenance_mode, ConfigFactoryInterface $config_factory, TranslationInterface $translation, UrlGeneratorInterface $url_generator, AccountInterface $account, BareHtmlPageRendererInterface $bare_html_page_renderer, MessengerInterface $messenger, EventDispatcherInterface $event_dispatcher) {

    $this->maintenanceMode = $maintenance_mode;

    $this->config = $config_factory;

    $this->stringTranslation = $translation;
@@ -102,10 +102,6 @@ public function __construct(MaintenanceModeInterface $maintenance_mode, ConfigFa 
    $this->account = $account;

    $this->bareHtmlPageRenderer = $bare_html_page_renderer;

    $this->messenger = $messenger;

    if (!$event_dispatcher) {

      @trigger_error('Calling MaintenanceModeSubscriber::__construct() without the $event_dispatcher argument is deprecated in drupal:9.4.0 and the $event_dispatcher argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3255799', E_USER_DEPRECATED);

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

    }

    $this->eventDispatcher = $event_dispatcher;

  }

core/lib/Drupal/Core/Site/MaintenanceMode.php

+1 −5
Original line number Diff line number Diff line
@@ -35,12 +35,8 @@ class MaintenanceMode implements MaintenanceModeInterface { 
   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory

   *   The config factory.

   */

  public function __construct(StateInterface $state, ConfigFactoryInterface $config_factory = NULL) {

  public function __construct(StateInterface $state, ConfigFactoryInterface $config_factory) {

    $this->state = $state;

    if (!$config_factory) {

      @trigger_error('Calling MaintenanceMode::__construct() without the $config_factory argument is deprecated in drupal:9.4.0 and the $config_factory argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3255815', E_USER_DEPRECATED);

      $config_factory = \Drupal::service('config.factory');

    }

    $this->config = $config_factory;

  }

core/modules/user/src/Authentication/Provider/Cookie.php

+2 −6
Original line number Diff line number Diff line
@@ -53,17 +53,13 @@ class Cookie implements AuthenticationProviderInterface, EventSubscriberInterfac 
   *   The session configuration.

   * @param \Drupal\Core\Database\Connection $connection

   *   The database connection.

   * @param \Drupal\Core\Messenger\MessengerInterface|null $messenger

   * @param \Drupal\Core\Messenger\MessengerInterface $messenger

   *   The messenger.

   */

  public function __construct(SessionConfigurationInterface $session_configuration, Connection $connection, MessengerInterface $messenger = NULL) {

  public function __construct(SessionConfigurationInterface $session_configuration, Connection $connection, MessengerInterface $messenger) {

    $this->sessionConfiguration = $session_configuration;

    $this->connection = $connection;

    $this->messenger = $messenger;

    if ($this->messenger === NULL) {

      @trigger_error('The MessengerInterface must be passed to ' . __NAMESPACE__ . '\Cookie::__construct(). It was added in drupal:9.2.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);

      $this->messenger = \Drupal::messenger();

    }

  }



  /**

core/modules/user/src/Controller/UserAuthenticationController.php

+1 −5
Original line number Diff line number Diff line
@@ -114,11 +114,7 @@ class UserAuthenticationController extends ControllerBase implements ContainerIn 
   * @param \Psr\Log\LoggerInterface $logger

   *   A logger instance.

   */

  public function __construct($user_flood_control, UserStorageInterface $user_storage, CsrfTokenGenerator $csrf_token, UserAuthInterface $user_auth, RouteProviderInterface $route_provider, Serializer $serializer, array $serializer_formats, LoggerInterface $logger) {

    if (!$user_flood_control instanceof UserFloodControlInterface) {

      @trigger_error('Passing the flood service to ' . __METHOD__ . ' is deprecated in drupal:9.1.0 and is replaced by user.flood_control in drupal:10.0.0. See https://www.drupal.org/node/3067148', E_USER_DEPRECATED);

      $user_flood_control = \Drupal::service('user.flood_control');

    }

  public function __construct(UserFloodControlInterface $user_flood_control, UserStorageInterface $user_storage, CsrfTokenGenerator $csrf_token, UserAuthInterface $user_auth, RouteProviderInterface $route_provider, Serializer $serializer, array $serializer_formats, LoggerInterface $logger) {

    $this->userFloodControl = $user_flood_control;

    $this->userStorage = $user_storage;

    $this->csrfToken = $csrf_token;

core/modules/user/src/Entity/Role.php

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public function calculateDependencies() { 
    $valid_permissions = array_intersect($this->permissions, array_keys($permission_definitions));

    $invalid_permissions = array_diff($this->permissions, $valid_permissions);

    if (!empty($invalid_permissions) && !$this->get('skip_missing_permission_deprecation')) {

      @trigger_error('Adding non-existent permissions to a role is deprecated in drupal:9.3.0 and triggers a runtime exception before drupal:10.0.0. The incorrect permissions are "' . implode('", "', $invalid_permissions) . '". Permissions should be defined in a permissions.yml file or a permission callback. See https://www.drupal.org/node/3193348', E_USER_DEPRECATED);

      throw new \RuntimeException('Adding non-existent permissions to a role is not allowed. The incorrect permissions are "' . implode('", "', $invalid_permissions) . '".');

    }

    foreach ($valid_permissions as $permission) {

      // Depend on the module that is providing this permissions.