Adding methods to UserInterface/AccountInterface

Yai for this.

+++ b/core/lib/Drupal/Core/Session/AccountInterface.phpundefined
@@ -55,4 +55,44 @@ public function getSecureSessionId();
+   * @param $default
+   *   Optional default language code to return if the account
+   *   has no valid language.

missing @param type (string)

+++ b/core/lib/Drupal/Core/Session/AccountInterface.phpundefined
@@ -55,4 +55,44 @@ public function getSecureSessionId();
+  public function getPreferredLangcode($type = NULL, $default = NULL);

Let's add two methods for this and get rid of that $type argument.

+++ b/core/lib/Drupal/Core/Session/UserSession.phpundefined
@@ -66,6 +66,27 @@ class UserSession implements AccountInterface {
+  /**
+   * The preferred language code of the account.
+   *
+   * @var string
+   */
+  protected $preferred_admin_langcode;

The preferred admin language code.

+++ b/core/lib/Drupal/Core/Session/UserSession.phpundefined
@@ -112,4 +133,45 @@ public function getSessionId() {
+  function getPreferredLangcode($type = NULL, $default = NULL) {
+    $language_list = language_list();
+    if (isset($type)) {
+      $preferred_langcode = $this->{'preferred_' . $type . '_langcode'};
+    }
+    else {
+      $preferred_langcode = $this->preferred_langcode;
+    }
+    if (!empty($preferred_langcode) && isset($language_list[$preferred_langcode])) {
+      return $language_list[$preferred_langcode]->langcode;
+    }
+    else {
+      return $default ? $default : language_default()->langcode;
+    }

Yeah... Umh, let's really go with two separate methods (one for admin, one for non-admin). :)

+++ b/core/modules/user/lib/Drupal/user/UserInterface.phpundefined
@@ -50,4 +50,163 @@ public function addRole($rid);
+   * @return int
+   *   Timestamp of the creation date.
+   *

Empty line.

+++ b/core/modules/user/user.moduleundefined
@@ -2197,31 +2191,18 @@ function theme_user_signature($variables) {
+function user_preferred_langcode(AccountInterface $account, $type = NULL, $default = NULL) {
+  return $account->getPreferredLangcode($type, $default);
 }

Okay, I see where this is coming from now. Still. It's weird. Let's change that.

Yeah in core, we have two preferred langcodes, admin and regular. And there are 3 languages assignable to an account in total. There is also the entity language, which is the third. The UI does not expose all 3. If you install Drupal by default, it will only expose the language if language module is enabled. Then the language selector will set the entity language and the preferred language at once. The admin preferred language is only exposed if some language type has it configured (and the user is an admin). It is only used in that case also. So these are all built in properties/behaviours and not extensible as such. So we can have specific methods for them theoretically :)

Cool. Much cleaner now.

+++ b/core/modules/user/lib/Drupal/user/UserInterface.phpundefined
@@ -50,4 +50,146 @@ public function addRole($rid);
+  public function activate();
...
+  public function block();

Can we make these return $this? I like it when methods for which a return value makes no sense are chainable.

Great. RTBC if green.

Cool. Back to RTBC.

+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.phpundefined
@@ -124,7 +124,7 @@ public function validateArgument($argument) {
+        $name = $GLOBALS['user']->getUserName() ?: config('user.settings')->get('anonymous');

@@ -174,7 +171,7 @@ public function processSummaryArguments(&$args) {
+        $args[$uids_arg_keys[$uid]] = $account->label();

How are label() and getUserName() different?

+++ b/core/modules/user/lib/Drupal/user/UserBCDecorator.phpundefined
@@ -15,6 +15,12 @@
   /**
+   *
+   * @var \Drupal\user\UserInterface

Missing the rest of the doc.

Based on #19

Yes, discussed this with berdir a few minutes ago and I think it is fine with in-lining that code. Best part about it: Removing user_format_name().

Sounds good!

I disagree with having getName/getTitle for each one. Having label() across all entity types is a feature.
I certainly don't want to have to have getNid() getTid() getCid() and go back to remembering which is which.

I'm okay with the inlining, but I still don't want two methods to do the exact same thing. We've worked hard to remove that weird overlap in Views. (Display handlers, anyone?)

Agree with #23. It's fine to have a label() method, but it should pass through to a method that's more descriptive.

The getNid() getTid() getCid() example doesn't really work, because you'd just call id(). Those are exposing implementation details, not domain knowledge.

I agree with @msonnabaum here...

Great, RTBC if it comes back green.

back to rtbc

This issue was RTBC and passing tests on July 1, the beginning of API freeze.

(tag did not stick. trying again.)

Committed 5a85a56 and pushed to 8.x. Thanks!

I think we need to update the existing change notice and we need to announce the removal of user_preferred_langcode()

+++ b/core/lib/Drupal/Core/Session/AccountInterface.php
@@ -55,4 +55,63 @@ public function getSecureSessionId();
+
+  /**
+   * Returns the preferred language code of the account.
+   *
+   * @param string $default
+   *   (optional) Default language code to return if the account
+   *   has no valid language, defaults to the site default language.
+   *
+   * @return string
+   *   The language code that is preferred by the account.
+   */
+  public function getPreferredLangcode($default = NULL);

+++ b/core/modules/language/language.module
@@ -463,8 +463,9 @@ function language_get_default_langcode($entity_type, $bundle) {
+      $language_code = $user->getPreferredLangcode();
+      if (!empty($language_code)) {
+        $default_value = $language_code;
       }

+++ b/core/modules/language/language.negotiation.inc
@@ -196,8 +196,12 @@ function language_from_user($languages) {
+    $langcode = $user->getPreferredLangcode();
+    $default_langcode = language_default()->id;
+    if (!empty($langcode) && $langcode != $default_langcode && isset($languages[$langcode])) {
+      return $langcode;

@@ -221,9 +225,13 @@ function language_from_user_admin(array $languages, Request $request = NULL) {
+    $langcode = $user->getPreferredAdminLangcode();
+    $default_langcode = language_default()->id;
+    if (!empty($langcode) && $langcode != $default_langcode && isset($languages[$langcode]) && path_is_admin($request_path)) {
+      return $langcode;

Pretty sure this doesn't work as intended, as getPreferred(Admin)Langcode() never returns NULL. Instead it has $default support built-in.

Setting to "needs review" for that.

Oops, thought this was "fixed". That was pointless.

Follow up issue: #2112679: getUsername() should return the username getDisplayName() for the formatted user name