Update autowiring to ensure currentGroupService exists during install…

…ation
goalgorilla · Nov 26, 2024 · 6da5d3b · 6da5d3b
1 parent e62b1d6
commit 6da5d3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/modules/social_features/social_group/social_group.services.yml b/modules/social_features/social_group/social_group.services.yml
@@ -51,6 +51,5 @@ services:
       - { name: cache.context }
 
   Drupal\social_group\CurrentGroupService:
-    class: Drupal\social_group\CurrentGroupService
+    social_group.current_group_service: '@Drupal\social_group\CurrentGroupService'
     autowire: true
-    social_group.current_group: '@Drupal\social_group\CurrentGroupService'
diff --git a/modules/social_features/social_post/social_post.info.yml b/modules/social_features/social_post/social_post.info.yml
@@ -5,13 +5,14 @@ core_version_requirement: ^9 || ^10
 dependencies:
   - drupal:block
   - drupal:comment
-  - social:dropdown
   - drupal:field
-  - group:group
   - drupal:options
-  - social:social_comment
   - drupal:text
   - drupal:user
   - drupal:views
+  - group:group
   - social:activity_creator
+  - social:dropdown
+  - social:social_comment
+  - social:social_group
 package: Social
diff --git a/modules/social_features/social_post/src/Plugin/Block/PostBlock.php b/modules/social_features/social_post/src/Plugin/Block/PostBlock.php
@@ -154,7 +154,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $container->get('form_builder'),
       $container->get('module_handler'),
       $container->get('current_route_match'),
-      $container->get('social_group.current_group'),
+      $container->get(CurrentGroupService::class),
     );
   }
 

diff --git a/social.info.yml b/social.info.yml
@@ -18,9 +18,9 @@ dependencies:
   - color:color
   - improved_theme_settings:improved_theme_settings
   # Open Social
+  - social:social_group
   - social:social_activity
   - social:social_core
-  - social:social_group
   - social:social_swiftmail
   - social:social_user