Drupal 9 (#58)

* merge upstream (#3) * drupal 9 support * coding styles
Islandora · Nov 16, 2020 · ebb2726 · ebb2726
1 parent 27fd236
commit ebb2726
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     }
   ],
   "require": {
-    "drupal/geolocation": "^3.0",
-    "drupal/token": "^1.3"
+    "drupal/geolocation": "^3.2",
+    "drupal/token": "^1.7"
   },
   "require-dev": {
     "phpunit/phpunit": "^6",

diff --git a/controlled_access_terms.info.yml b/controlled_access_terms.info.yml
@@ -2,6 +2,7 @@ name: 'Controlled Access Terms'
 type: module
 description: 'Provides topic, geographic, person, family, and corporate body entites as well as an authorities link field.'
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: 'Controlled Access Terms'
 
 dependencies:

diff --git a/controlled_access_terms.module b/controlled_access_terms.module
@@ -156,7 +156,7 @@ function controlled_access_terms_update_8002() {
         $entity_form_display->set("content.$field_name.type", 'edtf_default');
 
         // Update the field setting.
-        if (!$fields = \Drupal::entityManager()->getStorage('field_config')->loadByProperties(['field_name' => $field_name])) {
+        if (!$fields = \Drupal::service('entity_type.manager')->getStorage('field_config')->loadByProperties(['field_name' => $field_name])) {
           continue;
         }
         else {
@@ -171,7 +171,7 @@ function controlled_access_terms_update_8002() {
         }
 
         // Update the field storage setting.
-        if (!$field_storage_configs = \Drupal::entityManager()->getStorage('field_storage_config')->loadByProperties(['field_name' => $field_name])) {
+        if (!$field_storage_configs = \Drupal::service('entity_type.manager')->getStorage('field_storage_config')->loadByProperties(['field_name' => $field_name])) {
           continue;
         }
         else {

diff --git a/modules/controlled_access_terms_defaults/controlled_access_terms_defaults.info.yml b/modules/controlled_access_terms_defaults/controlled_access_terms_defaults.info.yml
@@ -2,6 +2,7 @@ name: 'Controlled Access Terms Defaults'
 description: 'Install content types for geographic location, corporate body, family, person and subject along with default form configuration and RDF mapping.'
 type: module
 core: 8.x
+core_version_requirement: ^8 || ^9
 dependencies:
   - content_translation
   - controlled_access_terms