From cd560535c784bd064d9a5b25a6eeac1d991eb9fb Mon Sep 17 00:00:00 2001
From: owenbush <ojb@ukhhf.co.uk>
Date: Mon, 11 May 2020 18:03:11 -0600
Subject: [PATCH] Replace all deprecated calls to entity.manager getStorage

---
 .../src/RegistrantListBuilder.php                             | 4 ++--
 src/EventInstanceListBuilder.php                              | 2 +-
 src/EventSeriesListBuilder.php                                | 2 +-
 src/Form/EventInstanceRevisionDeleteForm.php                  | 3 +--
 src/Form/EventInstanceRevisionRevertForm.php                  | 2 +-
 src/Form/EventInstanceRevisionRevertTranslationForm.php       | 2 +-
 src/Form/EventSeriesRevisionDeleteForm.php                    | 3 +--
 src/Form/EventSeriesRevisionRevertForm.php                    | 2 +-
 src/Form/EventSeriesRevisionRevertTranslationForm.php         | 2 +-
 9 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/recurring_events_registration/src/RegistrantListBuilder.php b/modules/recurring_events_registration/src/RegistrantListBuilder.php
index 5d0fdb4..7fc6fb0 100644
--- a/modules/recurring_events_registration/src/RegistrantListBuilder.php
+++ b/modules/recurring_events_registration/src/RegistrantListBuilder.php
@@ -47,7 +47,7 @@ class RegistrantListBuilder extends EntityListBuilder {
   protected $entityFieldManager;
 
   /**
-   * Constructs a new EventInstanceListBuilder object.
+   * Constructs a new RegistrantListBuilder object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
@@ -79,7 +79,7 @@ class RegistrantListBuilder extends EntityListBuilder {
   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('config.factory'),
       $container->get('request_stack'),
       $container->get('recurring_events_registration.creation_service'),
diff --git a/src/EventInstanceListBuilder.php b/src/EventInstanceListBuilder.php
index 8d75f8f..599a2d4 100644
--- a/src/EventInstanceListBuilder.php
+++ b/src/EventInstanceListBuilder.php
@@ -67,7 +67,7 @@ class EventInstanceListBuilder extends EntityListBuilder {
   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('date.formatter'),
       $container->get('language_manager'),
       $container->get('config.factory')
diff --git a/src/EventSeriesListBuilder.php b/src/EventSeriesListBuilder.php
index 38ed5f3..fc59888 100644
--- a/src/EventSeriesListBuilder.php
+++ b/src/EventSeriesListBuilder.php
@@ -67,7 +67,7 @@ class EventSeriesListBuilder extends EntityListBuilder {
   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('date.formatter'),
       $container->get('language_manager'),
       $container->get('config.factory')
diff --git a/src/Form/EventInstanceRevisionDeleteForm.php b/src/Form/EventInstanceRevisionDeleteForm.php
index 4fcb048..4fd1d6b 100644
--- a/src/Form/EventInstanceRevisionDeleteForm.php
+++ b/src/Form/EventInstanceRevisionDeleteForm.php
@@ -79,9 +79,8 @@ class EventInstanceRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    $entity_manager = $container->get('entity.manager');
     return new static(
-      $entity_manager->getStorage('eventinstance'),
+      $container->get('entity_type.manager')->getStorage('eventinstance'),
       $container->get('database'),
       $container->get('date.formatter'),
       $container->get('messenger')
diff --git a/src/Form/EventInstanceRevisionRevertForm.php b/src/Form/EventInstanceRevisionRevertForm.php
index 53a65df..4256b30 100644
--- a/src/Form/EventInstanceRevisionRevertForm.php
+++ b/src/Form/EventInstanceRevisionRevertForm.php
@@ -70,7 +70,7 @@ class EventInstanceRevisionRevertForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventinstance'),
+      $container->get('entity_type.manager')->getStorage('eventinstance'),
       $container->get('date.formatter'),
       $container->get('messenger')
     );
diff --git a/src/Form/EventInstanceRevisionRevertTranslationForm.php b/src/Form/EventInstanceRevisionRevertTranslationForm.php
index 10f02f6..63b9e26 100644
--- a/src/Form/EventInstanceRevisionRevertTranslationForm.php
+++ b/src/Form/EventInstanceRevisionRevertTranslationForm.php
@@ -53,7 +53,7 @@ class EventInstanceRevisionRevertTranslationForm extends EventInstanceRevisionRe
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventinstance'),
+      $container->get('entity_type.manager')->getStorage('eventinstance'),
       $container->get('date.formatter'),
       $container->get('language_manager')
     );
diff --git a/src/Form/EventSeriesRevisionDeleteForm.php b/src/Form/EventSeriesRevisionDeleteForm.php
index ed515e5..666ef40 100644
--- a/src/Form/EventSeriesRevisionDeleteForm.php
+++ b/src/Form/EventSeriesRevisionDeleteForm.php
@@ -79,9 +79,8 @@ class EventSeriesRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    $entity_manager = $container->get('entity.manager');
     return new static(
-      $entity_manager->getStorage('eventseries'),
+      $container->get('entity_type.manager')->getStorage('eventseries'),
       $container->get('database'),
       $container->get('date.formatter'),
       $container->get('messenger')
diff --git a/src/Form/EventSeriesRevisionRevertForm.php b/src/Form/EventSeriesRevisionRevertForm.php
index 5c2412c..ca6dd1f 100644
--- a/src/Form/EventSeriesRevisionRevertForm.php
+++ b/src/Form/EventSeriesRevisionRevertForm.php
@@ -70,7 +70,7 @@ class EventSeriesRevisionRevertForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventseries'),
+      $container->get('entity_type.manager')->getStorage('eventseries'),
       $container->get('date.formatter'),
       $container->get('messenger')
     );
diff --git a/src/Form/EventSeriesRevisionRevertTranslationForm.php b/src/Form/EventSeriesRevisionRevertTranslationForm.php
index 448b3c6..e784638 100644
--- a/src/Form/EventSeriesRevisionRevertTranslationForm.php
+++ b/src/Form/EventSeriesRevisionRevertTranslationForm.php
@@ -61,7 +61,7 @@ class EventSeriesRevisionRevertTranslationForm extends EventSeriesRevisionRevert
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventseries'),
+      $container->get('entity_type.manager')->getStorage('eventseries'),
       $container->get('date.formatter'),
       $container->get('language_manager'),
       $container->get('datetime.time')
-- 
GitLab