Merge pull request #2 from uiowa/remove_circular_dependency_injection

Remove problematic dependency injection
uiowa · Aug 18, 2022 · 0f9fb39 · 0f9fb39
2 parents d93f30f + 548d4d7
commit 0f9fb39
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/src/ConfigOverride/SamlauthOverride.php b/src/ConfigOverride/SamlauthOverride.php
@@ -5,25 +5,11 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Samlauth configuration overrides.
  */
 class SamlauthOverride implements ConfigFactoryOverrideInterface {
-  /**
-   * The entity_type.manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager) {
-    $this->entityTypeManager = $entityTypeManager;
-  }
 
   /**
    * {@inheritdoc}
@@ -34,7 +20,7 @@ public function loadOverrides($names) {
     // Allow all roles to be linkable.
     if (in_array('samlauth.authentication', $names)) {
 
-      $roles = $this->entityTypeManager->getStorage('user_role')->loadMultiple();
+      $roles = \Drupal::service('entity_type.manager')->getStorage('user_role')->loadMultiple();
       $allowed = [];
 
       /** @var \Drupal\user\Entity\Role $role */

diff --git a/tests/build/composer.json b/tests/build/composer.json
@@ -18,7 +18,7 @@
         "symfony/phpunit-bridge": "^5.2",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "drupal/coder": "^8.3",
-        "mglaman/drupal-check": "^1.1",
+        "mglaman/drupal-check": "~1.3.1",
         "oomphinc/composer-installers-extender": "^2.0",
         "phpspec/prophecy-phpunit": "^2.0"
     },
@@ -50,5 +50,13 @@
             "Drupal\\uiowa_auth\\": "docroot/modules/custom/uiowa_auth/src/",
             "Drupal\\Tests\\uiowa_auth\\": "docroot/modules/custom/uiowa_auth/tests/"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "drupal/core-composer-scaffold": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "oomphinc/composer-installers-extender": true
+        }
     }
 }
diff --git a/uiowa_auth.services.yml b/uiowa_auth.services.yml
@@ -21,6 +21,5 @@ services:
       - { name: event_subscriber }
   uiowa_auth.samlauth_override:
     class: Drupal\uiowa_auth\ConfigOverride\SamlauthOverride
-    arguments: [ '@entity_type.manager' ]
     tags:
       - { name: config.factory.override }