Issue #3129298 by suzymasri, Manuel Garcia: Drupal 9 Readiness

src/WebformEncryptSubmissionStorage.php

@@ -5,7 +5,7 @@ namespace Drupal\webform_encrypt;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Session\AccountProxyInterface;
@@ -37,8 +37,8 @@ class WebformEncryptSubmissionStorage extends WebformSubmissionStorage {
    *   The entity type definition.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   The cache backend to be used.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
@@ -50,8 +50,8 @@ class WebformEncryptSubmissionStorage extends WebformSubmissionStorage {
    * @param \Drupal\encrypt\EncryptServiceInterface $encryptService
    *   The encryption Service.
    */
-  public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, AccountProxyInterface $current_user, WebformAccessRulesManagerInterface $access_rules_manager, EncryptServiceInterface $encryptService) {
-    parent::__construct($entity_type, $database, $entity_manager, $cache, $language_manager, $current_user, $access_rules_manager);
+  public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityTypeManagerInterface $entity_type_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, AccountProxyInterface $current_user, WebformAccessRulesManagerInterface $access_rules_manager, EncryptServiceInterface $encryptService) {
+    parent::__construct($entity_type, $database, $entity_type_manager, $cache, $language_manager, $current_user, $access_rules_manager);
 
     $this->encryptionService = $encryptService;
   }

webform_encrypt.info.yml

@@ -2,7 +2,7 @@ name: 'Webform Encrypt'
 type: module
 description: 'Provides encryption for webform components.'
 package: 'Webform'
-core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - webform:webform
   - encrypt:encrypt