Replace drupal_container() with Drupal::service() in the user module

Will be done today during Code Sprint UA

drupal_container() replaced
Patch attached.

+++ b/core/modules/user/user.moduleundefined
@@ -1288,7 +1288,7 @@ function user_login_name_validate($form, &$form_state) {
-  $flood = Drupal::service('flood');
+  $flood = \Drupal::service('flood');

\ is not necessary if it's not in a class, same for other cases.

Instead of Drupal::service('flood'), you can use Drupal::flood()

You are right.

Each test have own container so use it

+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.phpundefined
@@ -71,7 +71,7 @@ function testUserCancelUid1() {
-      'pass' => drupal_container()->get('password')->hash(trim($password)),
+      'pass' => \Drupal::service('password')->hash(trim($password)),

+++ b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.phpundefined
@@ -107,7 +107,7 @@ function testPasswordRehashOnLogin() {
-    $password_hasher = drupal_container()->get('password');
+    $password_hasher = \Drupal::service('password');

use $this->container->get('needed service')->operation

Fixed for Test
Patch added.

+++ b/core/modules/user/user.moduleundefined
@@ -1310,7 +1310,7 @@ function user_login_authenticate_validate($form, &$form_state) {
-        $identifier = $account->uid . '-' . Drupal::request()->getClientIP();
+        $identifier = $account->uid . '-' . \Drupal::request()->getClientIP();

PLease do not change this

fixed.

Let's see what bot say

Awesome

+++ b/core/modules/user/user.moduleundefined
@@ -1288,7 +1288,7 @@ function user_login_name_validate($form, &$form_state) {
-  $flood = Drupal::service('flood');
+  $flood = Drupal::flood();

@@ -1336,7 +1336,7 @@ function user_login_authenticate_validate($form, &$form_state) {
-  $flood = Drupal::service('flood');
+  $flood = Drupal::flood();

This 2 hunks was lost

Added fixes for Drupal::service('flood'); lost in #19

#22: 2001044-replace-drupal_container-user-module_22.patch queued for re-testing.

#22: 2001044-replace-drupal_container-user-module_22.patch queued for re-testing.

Needs reroll

I re-roll the patch using the re-roll guidelines and with @jlbellido's teach. I remove user_login_authenticate_validate() and user_login_final_validate() functions of user.module because these functions no longer exist and are deleted before the last patch was uploaded.

Thanks to @jlbellido for teach me how goes the re-rolling and @alexpott for guide me.

+++ b/core/modules/user/user.moduleundefined
@@ -1095,8 +1095,80 @@ function user_menu_title() {
  */
+<<<<<<< HEAD
 function user_page_title(UserInterface $account = NULL) {
   return $account ? $account->getUsername() : '';
+=======
+function user_page_title($account) {
+  return is_object($account) ? user_format_name($account) : '';
+}

Hey @aitiba... this is part of the conflict information. Before you upload patches it's great to manually test them first. You can do this by enabling the simpletest module and running the user tests. And a manual inspection of the patch file before uploading can reveal this. Basically you should be able to review the patch file and think yep that all makes sense.

As I did the re-roll yesterday to help on irc I will upload my version so you can contrast and compare the patches... and perhaps try the reroll process again to see if you can come up with the same patch.

Also we can now inject the user.data service properly into the views UserData plugin and not just pull it from the Drupal static. The code that does this is...

   /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('user.data'));
+  }
+
+  /**
+   * Constructs a UserData object.
+   */
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, UserDataInterface $user_data) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->userData = $user_data;
+  }
+
+  /**
    * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::init().
    */
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
-
-    $this->userData = drupal_container()->get('user.data');
   }

Needs reroll

  /**
   * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::init().
   */
  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
    parent::init($view, $display, $options);
  }

This method does nothing except call its parent now, so can't it just be removed?

#34: 2001044-replace-drupal_container-user.patch queued for re-testing.

Thanks!

Committed and pushed to 8.x. Thanks!