Commit 30c0bdf9 authored by Andrey Postnikov's avatar Andrey Postnikov Committed by Youri
Browse files

Issue #3157334 by Suresh Prabhu Parkala, andypost, norwegian.blue: Fixed Drupal 9 deprecations.

parent d8f9f966

rng.services.yml

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ services: 
      - { name: access_check, applies_to: _event_rule_reset }

  access_check.rng.event_registrations_allowed:

    class: Drupal\rng\Access\RegistrationAddAccessCheck

    arguments: ['@entity.manager']

    arguments: ['@entity_type.manager']

    tags:

      - { name: access_check, applies_to: _registration_add_access }

  rng.paramconverter.entity_type_rule_component:

src/Access/RegistrationAddAccessCheck.php

+7 −7
Original line number Diff line number Diff line
@@ -16,20 +16,20 @@ use Drupal\rng\Entity\RegistrationTypeInterface; 
class RegistrationAddAccessCheck implements AccessInterface {



  /**

   * The entity manager.

   * The entity type manager.

   *

   * @var \Drupal\Core\Entity\EntityTypeManagerInterface

   */

  protected $entityManager;

  protected $entityTypeManager;



  /**

   * Constructs a EventRegistrationAllowedCheck object.

   *

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager

   *   The entity manager.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager

   *   The entity type manager.

   */

  public function __construct(EntityTypeManagerInterface $entity_manager) {

    $this->entityManager = $entity_manager;

  public function __construct(EntityTypeManagerInterface $entity_type_manager) {

    $this->entityTypeManager = $entity_type_manager;

  }



  /**
@@ -38,7 +38,7 @@ class RegistrationAddAccessCheck implements AccessInterface { 
  public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account, RegistrationTypeInterface $registration_type = NULL) {

    if ($event = $route->getDefault('event')) {

      $context = ['event' => $route_match->getParameter($event)];

      $access_control_handler = $this->entityManager->getAccessControlHandler('registration');

      $access_control_handler = $this->entityTypeManager->getAccessControlHandler('registration');

      if ($registration_type) {

        return $access_control_handler->createAccess($registration_type->id(), $account, $context, TRUE);

      }

src/Form/MessageActionForm.php

+8 −8
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ class MessageActionForm extends FormBase { 
  protected $actionPlugin;



  /**

   * The entity manager.

   * The entity type manager.

   *

   * @var \Drupal\Core\Entity\EntityTypeManagerInterface

   */

  protected $entityManager;

  protected $entityTypeManager;



  /**

   * The RNG event manager.
@@ -42,14 +42,14 @@ class MessageActionForm extends FormBase { 
   *

   * @param \Drupal\Core\Action\ActionManager $action_manager

   *   The action manager.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager

   *   The entity manager.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager

   *   The entity type manager.

   * @param \Drupal\rng\EventManagerInterface $event_manager

   *   The RNG event manager.

   */

  public function __construct(ActionManager $action_manager, EntityTypeManagerInterface $entity_manager, EventManagerInterface $event_manager) {

  public function __construct(ActionManager $action_manager, EntityTypeManagerInterface $entity_type_manager, EventManagerInterface $event_manager) {

    $this->actionPlugin = $action_manager->createInstance('rng_courier_message');

    $this->entityManager = $entity_manager;

    $this->entityTypeManager = $entity_type_manager;

    $this->eventManager = $event_manager;

  }
@@ -59,7 +59,7 @@ class MessageActionForm extends FormBase { 
  public static function create(ContainerInterface $container) {

    return new static(

      $container->get('plugin.manager.action'),

      $container->get('entity.manager'),

      $container->get('entity_type.manager'),

      $container->get('rng.event_manager')

    );

  }
@@ -124,7 +124,7 @@ class MessageActionForm extends FormBase { 
    }



    $event = $form_state->get('event');

    $context = $this->entityManager->getStorage('courier_context')

    $context = $this->entityTypeManager->getStorage('courier_context')

      ->load('rng_registration_' . $event->getEntityTypeId());

    if (!$context) {

      throw new \Exception(sprintf('No context available for %s', $event->getEntityTypeId()));

src/Form/RegistrationTypeForm.php

+9 −11
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ namespace Drupal\rng\Form; 


use Drupal\Core\Entity\EntityForm;

use Drupal\Core\Form\FormStateInterface;

use Drupal\Core\Entity\Query\QueryFactory;

use Drupal\Core\Link;

use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -12,23 +11,22 @@ use Symfony\Component\DependencyInjection\ContainerInterface; 
 * Form controller for registration types.

 */

class RegistrationTypeForm extends EntityForm {

  /**

   * @var \Drupal\Core\Entity\Query\QueryFactory

   */

  protected $entityQueryFactory;



  /**

   * {@inheritdoc}

   * The registration type storage.

   *

   * @var \Drupal\Core\Entity\EntityStorageInterface

   */

  public function __construct(QueryFactory $query_factory) {

    $this->entityQueryFactory = $query_factory;

  }

  protected $registrationTypeStorage;



  /**

   * {@inheritdoc}

   */

  public static function create(ContainerInterface $container) {

    return new static($container->get('entity.query'));

    $instance = new static();

    $instance->registrationTypeStorage = $container->get('entity_type.manager')

      ->getStorage('registration_type');

    return $instance;

  }



  /**
@@ -80,7 +78,7 @@ class RegistrationTypeForm extends EntityForm { 
   * Callback for `id` form element in RegistrationTypeForm->buildForm.

   */

  public function exists($entity_id, array $element, FormStateInterface $form_state) {

    $query = $this->entityQueryFactory->get('registration_type');

    $query = $this->registrationTypeStorage->getQuery();

    return (bool) $query->condition('id', $entity_id)->execute();

  }

src/Lists/EventTypeListBuilder.php

+12 −25
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ namespace Drupal\rng\Lists; 


use Drupal\Core\Config\Entity\ConfigEntityListBuilder;

use Drupal\Core\Entity\EntityTypeInterface;

use Drupal\Core\Entity\EntityStorageInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Session\AccountInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Drupal\Core\Entity\EntityInterface;

use Drupal\Core\Url;
@@ -17,33 +14,23 @@ use Drupal\Core\Url; 
class EventTypeListBuilder extends ConfigEntityListBuilder {



  /**

   * Constructs a new EntityListBuilder object.

   * The entity type manager.

   *

   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type

   *   The entity type definition.

   * @param \Drupal\Core\Entity\EntityStorageInterface $storage

   *   The entity storage class.

   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager

   *   The entity manager.

   * @param \Drupal\Core\Session\AccountInterface $current_user

   *   The current user.

   * @var \Drupal\Core\Entity\EntityTypeManagerInterface

   */

  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, EntityTypeManagerInterface $entity_manager, AccountInterface $current_user) {

    parent::__construct($entity_type, $storage);

    $this->entityManager = $entity_manager;

    $this->currentUser = $current_user;

  }

  protected $entityTypeManager;



  /**

   * {@inheritdoc}

   */

  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {

    return new static(

    $entity_type_manager = $container->get('entity_type.manager');

    $instance = new static(

      $entity_type,

      $container->get('entity.manager')->getStorage($entity_type->id()),

      $container->get('entity.manager'),

      $container->get('current_user')

      $entity_type_manager->getStorage($entity_type->id())

    );

    $instance->entityTypeManager = $entity_type_manager;

    return $instance;

  }



  /**
@@ -54,7 +41,7 @@ class EventTypeListBuilder extends ConfigEntityListBuilder { 
    $operations = parent::getDefaultOperations($entity);



    if ($this->moduleHandler->moduleExists('field_ui')) {

      $entity_type = \Drupal::entityTypeManager()

      $entity_type = $this->entityTypeManager

        ->getDefinition($entity->getEventEntityTypeId());



      if ($entity_type->get('field_ui_base_route')) {
@@ -87,13 +74,13 @@ class EventTypeListBuilder extends ConfigEntityListBuilder { 
  public function buildRow(EntityInterface $entity) {

    /** @var \Drupal\rng\Entity\EventTypeInterface $entity **/



    $entity_type = $this->entityManager

    $entity_type = $this->entityTypeManager

      ->getDefinition($entity->getEventEntityTypeId());

    $t_args = ['@entity_type' => $entity_type->getLabel()];

    $bundle_entity_type = $entity_type->getBundleEntityType();

    if ($bundle_entity_type && $bundle_entity_type !== 'bundle') {

      $bundle = $this->entityManager

        ->getStorage($entity_type->getBundleEntityType())

      $bundle = $this->entityTypeManager

        ->getStorage($bundle_entity_type)

        ->load($entity->getEventBundle());

      $t_args['@bundle'] = $bundle->label();

      $row['machine_name'] = $this->t('@entity_type: @bundle', $t_args);