Drupal 9 compatibility fixes

Author: Sergey-Orlov

composer.json

@@ -23,9 +23,10 @@
   ],
   "license": "GPL-2.0+",
   "require": {
-    "drupal/core": "^8.8.4",
+    "drupal/core": "^8.8.4 || ^9",
+    "drupal/courier": "^2.0@alpha",
     "drupal/dynamic_entity_reference": "^1.0",
-    "drupal/unlimited_number": "^1.0@beta"
+    "drupal/unlimited_number": "^2.0"
   },
   "suggest": {
     "drupal/token": " Improves token UI on message template forms.",

rng.info.yml

@@ -4,7 +4,6 @@ description: 'Provides the ability to create and manage events and registrations
 package: RNG
 core_version_requirement: ^8.8.4 || ^9.0
 dependencies:
-  - drupal:system (>=8.1)
   - courier:courier
   - dynamic_entity_reference:dynamic_entity_reference
-  - unlimited_number:unlimited_number (>=8.x-1.0-beta2)
+  - unlimited_number:unlimited_number

rng.services.yml

@@ -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/Entity/EventTypeRule.php

@@ -15,6 +15,19 @@
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "id"
+ *   },
+ *   config_export = {
+ *     "entity_type",
+ *     "bundle",
+ *     "machine_name",
+ *     "trigger",
+ *     "conditions",
+ *     "actions",
+ *     "client",
+ *     "format",
+ *     "pager_settings",
+ *     "api_key_settings",
+ *     "parameters",
  *   }
  * )
  */

src/Entity/RegistrantType.php

@@ -36,6 +36,12 @@
  *     "edit-form" = "/admin/structure/rng/registrant_types/manage/{registrant_type}",
  *     "admin-form" = "/admin/structure/rng/registrant_types/manage/{registrant_type}",
  *     "collection" = "/admin/structure/rng/registrant_types"
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *     "description",
+ *     "label_pattern",
  *   }
  * )
  */

src/Entity/RegistrationType.php

@@ -31,6 +31,11 @@
  *     "canonical" = "/admin/structure/rng/registration_types/manage/{registration_type}",
  *     "edit-form" = "/admin/structure/rng/registration_types/manage/{registration_type}",
  *     "delete-form" = "/admin/structure/rng/registration_types/manage/{registration_type}/delete",
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *     "description",
  *   }
  * )
  */

src/Entity/RngEventType.php

@@ -37,6 +37,23 @@
  *     "delete-form" = "/admin/structure/rng/event_types/manage/{rng_event_type}/delete",
  *     "event-access-defaults" = "/admin/structure/rng/event_types/manage/{rng_event_type}/access_defaults",
  *     "field-mapping" = "/admin/structure/rng/event_types/manage/{rng_event_type}/field_mapping",
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "entity_type",
+ *     "bundle",
+ *     "mirror_operation_to_event_manage",
+ *     "custom_rules",
+ *     "default_registrant",
+ *     "allow_anon_registrants",
+ *     "auto_sync_registrants",
+ *     "auto_attach_users",
+ *     "registrant_email_field",
+ *     "event_start_date_field",
+ *     "event_end_date_field",
+ *     "people_types",
+ *     "default_messages",
+ *     "fields",
  *   }
  * )
  */

src/EventMeta.php

@@ -380,7 +380,7 @@ public function getDefaultRules($trigger = NULL) {
 
     /** @var \Drupal\rng\Entity\EventTypeRuleInterface[] $default_rules */
     $default_rules = $this
-      ->entityManager
+      ->entityTypeManager
       ->getStorage('rng_event_type_rule')
       ->loadByProperties([
         'entity_type' => $this->getEvent()->getEntityTypeId(),

src/Form/MessageActionForm.php

@@ -59,7 +59,7 @@ public function __construct(ActionManager $action_manager, EntityTypeManagerInte
   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')
     );
   }

src/Form/RegistrationTypeForm.php

@@ -4,31 +4,35 @@
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Link;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Form controller for registration types.
  */
 class RegistrationTypeForm extends EntityForm {
   /**
-   * @var \Drupal\Core\Entity\Query\QueryFactory
+   * An instance of the entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityQueryFactory;
+  protected $entityTypeManager;
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(QueryFactory $query_factory) {
-    $this->entityQueryFactory = $query_factory;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('entity.query'));
+    return new static(
+      $container->get('entity_type.manager')
+    );
   }
 
   /**
@@ -80,7 +84,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    * 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->entityTypeManager->getStorage('registration_type')->getQuery();
     return (bool) $query->condition('id', $entity_id)->execute();
   }
 

src/Lists/EventTypeListBuilder.php

@@ -40,8 +40,8 @@ public function __construct(EntityTypeInterface $entity_type, EntityStorageInter
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
-      $container->get('entity.manager'),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager'),
       $container->get('current_user')
     );
   }

src/Lists/GroupListBuilder.php

@@ -48,7 +48,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityStorageInter
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('rng.event_manager')
     );
   }

src/Lists/RegistrationListBuilder.php

@@ -54,7 +54,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityStorageInter
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('rng.event_manager')
     );
   }

src/Lists/RuleListBuilder.php

@@ -58,7 +58,7 @@ public function __construct(EntityTypeInterface $entity_type, EntityStorageInter
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('rng.event_manager'),
       $container->get('redirect.destination')
     );

src/Plugin/Derivative/LocalActions.php

@@ -53,7 +53,7 @@ public function __construct(EntityTypeManagerInterface $entity_manager, RoutePro
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
     return new static(
-      $container->get('entity.manager'),
+      $container->get('entity_type.manager'),
       $container->get('router.route_provider'),
       $container->get('rng.event_manager')
     );