Merge pull request #602 from kbrodej/hotfix/Drupal-class-avoid-#547

Added dependency injection for EntityTypeManager instead \Drupal calls
Gizra · Feb 7, 2020 · b0349d6 · b0349d6
2 parents 94e67d7 + da52bba
commit b0349d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/phpcs-ruleset.xml.dist b/phpcs-ruleset.xml.dist
@@ -28,8 +28,6 @@
         <exclude name="DrupalPractice.InfoFiles.NamespacedDependency.NonNamespaced" />
         <!-- https://github.com/Gizra/og/issues/546 -->
         <exclude name="DrupalPractice.Objects.GlobalClass.GlobalClass" />
-        <!-- https://github.com/Gizra/og/issues/547 -->
-        <exclude name="DrupalPractice.Objects.GlobalDrupal.GlobalDrupal" />
         <!-- https://github.com/Gizra/og/issues/543 -->
         <exclude name="DrupalPractice.Objects.GlobalFunction.GlobalFunction" />
     </rule>

diff --git a/src/GroupTypeManager.php b/src/GroupTypeManager.php
@@ -131,6 +131,13 @@ class GroupTypeManager implements GroupTypeManagerInterface {
    */
   protected $groupAudienceHelper;
 
+  /**
+   * The Entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * Constructs a GroupTypeManager object.
    *
@@ -155,6 +162,7 @@ class GroupTypeManager implements GroupTypeManagerInterface {
    */
   public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EventDispatcherInterface $event_dispatcher, CacheBackendInterface $cache, PermissionManagerInterface $permission_manager, OgRoleManagerInterface $og_role_manager, RouteBuilderInterface $route_builder, OgGroupAudienceHelperInterface $group_audience_helper) {
     $this->configFactory = $config_factory;
+    $this->entityTypeManager = $entity_type_manager;
     $this->entityTypeBundleInfo = $entity_type_bundle_info;
     $this->eventDispatcher = $event_dispatcher;
     $this->cache = $cache;
@@ -377,7 +385,7 @@ protected function populateGroupRelationMap(): void {
 
     $this->groupRelationMap = [];
 
-    $user_bundles = \Drupal::entityTypeManager()->getDefinition('user')->getKey('bundle') ?: ['user'];
+    $user_bundles = $this->entityTypeManager->getDefinition('user')->getKey('bundle') ?: ['user'];
 
     foreach ($this->entityTypeBundleInfo->getAllBundleInfo() as $group_content_entity_type_id => $bundles) {
       foreach ($bundles as $group_content_bundle_id => $bundle_info) {