drupal_container() is deprecated, and all calls in the config module need to be replaced with Drupal::service(), except for where the module_handler service is requested, which needs to be replaced with Drupal::moduleHandler() (see #1957154)

CommentFileSizeAuthor
#14 config-replace_drupal_container-2003576-14.patch1.55 KBjeroent
#12 config-replace_drupal_container-2003576-12.patch1.55 KBjeroent
#9 config-replace_drupal_container-2003576-9.patch1.55 KBjeroent
#5 replace-drupal_container-2003576-5.patch1.55 KBalexander.ilivanov
#1 2003576-1.patch1.55 KBebeyrent

Comments

ebeyrent’s picture

ebeyrent commented
Status: Active » Needs review
StatusFileSize
new 2003576-1.patch1.55 KB
ebeyrent’s picture

ebeyrent commented
Component: comment.module » config.module
dawehner’s picture

dawehner
Primary language German
commented 
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.phpundefined
@@ -110,7 +110,7 @@ function testConfigLocaleUserOverride() {
+    $config_factory = \Drupal::service('config.factory');

This could be just $this->container->get('config.factory')

Status: Needs review » Needs work

The last submitted patch, 2003576-1.patch, failed testing.

alexander.ilivanov’s picture

alexander.ilivanov commented
Assigned: ebeyrent » alexander.ilivanov
Status: Needs work » Needs review
Issue tags: +CodeSprintUA
StatusFileSize
new replace-drupal_container-2003576-5.patch1.55 KB

drupal_container() replaced
Patch attached.

tstoeckler’s picture

tstoeckler
he/him
Primary language German
Location Essen, Germany
commented
Status: Needs review » Reviewed & tested by the community

Looks good.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, replace-drupal_container-2003576-5.patch, failed testing.

dawehner’s picture

dawehner
Primary language German
commented 
+++ b/core/modules/config/config.admin.incundefined
@@ -113,8 +113,8 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa
+  $target_storage = Drupal::service('config.storage.staging');

This should use the $source_storage.

jeroent’s picture

jeroent
Primary language Dutch
Location 🇧🇪
commented
Status: Needs work » Needs review
StatusFileSize
new config-replace_drupal_container-2003576-9.patch1.55 KB

replaced drupal_container with Drupal::service.

Status: Needs review » Needs work

The last submitted patch, config-replace_drupal_container-2003576-9.patch, failed testing.

ddrozdik’s picture

ddrozdik commented 
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php
@@ -110,7 +110,7 @@ function testConfigLocaleUserOverride() {
       'preferred_langcode' => 'de',
     ));
 
-    $config_factory = drupal_container()->get('config.factory');
+    $config_factory = Drupal::service('config.factory');

Please use \Drupal::service('config.factory'); in clases.

jeroent’s picture

jeroent
Primary language Dutch
Location 🇧🇪
commented
Status: Needs work » Needs review
StatusFileSize
new config-replace_drupal_container-2003576-12.patch1.55 KB

Made changes as suggested by DmitryDrozdik.

ebeyrent’s picture

ebeyrent commented 
+++ b/core/modules/config/config.admin.inc
@@ -113,8 +113,8 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa
+  $source_storage = \Drupal::service('config.storage.staging');

Need to remove the backslash when in module code.

Should be:

Drupal::service('config.storage.staging');
Drupal::service('config.storage');

jeroent’s picture

jeroent
Primary language Dutch
Location 🇧🇪
commented
Assigned: alexander.ilivanov » Unassigned
StatusFileSize
new config-replace_drupal_container-2003576-14.patch1.55 KB

made changes as suggested by ebeyrent.

ebeyrent’s picture

ebeyrent commented
Status: Needs review » Reviewed & tested by the community

RTBC

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Fixed

Committed and pushed to 8.x. Thanks!

ddrozdik’s picture

ddrozdik commented
Status: Fixed » Closed (fixed)