diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php index a9d742b..8f648a6 100644 --- a/core/modules/comment/src/CommentForm.php +++ b/core/modules/comment/src/CommentForm.php @@ -137,27 +137,29 @@ public function form(array $form, FormStateInterface $form_state) { } // Add the author name field depending on the current user. - $form['author']['name'] = array( + $form['author']['uid'] = array( '#type' => 'textfield', '#title' => $this->t('Your name'), - '#default_value' => $author, + '#default_value' => user_load_by_name($author), '#required' => ($this->currentUser->isAnonymous() && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT), '#maxlength' => 60, '#size' => 30, ); if ($is_admin) { - $form['author']['name']['#title'] = $this->t('Authored by'); - $form['author']['name']['#description'] = $this->t('Leave blank for %anonymous.', array('%anonymous' => $this->config('user.settings')->get('anonymous'))); - $form['author']['name']['#autocomplete_route_name'] = 'user.autocomplete'; + $form['author']['uid']['#type'] = 'entity_autocomplete'; + $form['author']['uid']['#target_type'] = 'user'; + $form['author']['uid']['#selection_settings'] = ['include_anonymous' => FALSE]; + $form['author']['uid']['#title'] = $this->t('Authored by'); + $form['author']['uid']['#description'] = $this->t('Leave blank for %anonymous.', array('%anonymous' => $this->config('user.settings')->get('anonymous'))); } elseif ($this->currentUser->isAuthenticated()) { - $form['author']['name']['#type'] = 'item'; - $form['author']['name']['#value'] = $form['author']['name']['#default_value']; - $form['author']['name']['#theme'] = 'username'; - $form['author']['name']['#account'] = $this->currentUser; + $form['author']['uid']['#type'] = 'item'; + $form['author']['uid']['#value'] = $form['author']['uid']['#default_value']; + $form['author']['uid']['#theme'] = 'username'; + $form['author']['uid']['#account'] = $this->currentUser; } elseif($this->currentUser->isAnonymous()) { - $form['author']['name']['#attributes']['data-drupal-default-value'] = $this->config('user.settings')->get('anonymous'); + $form['author']['uid']['#attributes']['data-drupal-default-value'] = $this->config('user.settings')->get('anonymous'); } // Add author email and homepage fields depending on the current user. @@ -248,20 +250,15 @@ public function buildEntity(array $form, FormStateInterface $form_state) { else { $comment->setCreatedTime(REQUEST_TIME); } - $author_name = $form_state->getValue('name'); + $author_uid = $form_state->getValue('uid'); if (!$this->currentUser->isAnonymous()) { - // Assign the owner based on the given user name - none means anonymous. - $accounts = $this->entityManager->getStorage('user') - ->loadByProperties(array('name' => $author_name)); - $account = reset($accounts); - $uid = $account ? $account->id() : 0; - $comment->setOwnerId($uid); + $comment->setOwnerId($author_uid ? : 0); } // If the comment was posted by an anonymous user and no author name was // required, use "Anonymous" by default. - if ($comment->getOwnerId() === 0 && (!isset($author_name) || $author_name === '')) { + if ($comment->getOwnerId() === 0 && (!isset($author_uid) || $author_uid === '')) { $comment->setAuthorName($this->config('user.settings')->get('anonymous')); } @@ -296,10 +293,6 @@ public function validate(array $form, FormStateInterface $form_state) { foreach ($violations as $violation) { $form_state->setErrorByName('date', $violation->getMessage()); } - $violations = $comment->name->validate(); - foreach ($violations as $violation) { - $form_state->setErrorByName('name', $violation->getMessage()); - } } /** diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php index a475332..3a9857f 100644 --- a/core/modules/content_translation/src/ContentTranslationHandler.php +++ b/core/modules/content_translation/src/ContentTranslationHandler.php @@ -390,20 +390,21 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En } // Default to the anonymous user. - $name = ''; + $uid = 0; if ($new_translation) { - $name = \Drupal::currentUser()->getUsername(); + $uid = \Drupal::currentUser()->getAccount()->id(); } elseif (($account = $metadata->getAuthor()) && $account->id()) { - $name = $account->getUsername(); + $uid = $account->id(); } - $form['content_translation']['name'] = array( - '#type' => 'textfield', + $form['content_translation']['uid'] = array( + '#type' => 'entity_autocomplete', '#title' => t('Authored by'), + '#target_type' => 'user', + '#default_value' => User::load($uid), + // Validation is done by static::entityFormValidate(). + '#validate_reference' => FALSE, '#maxlength' => 60, - '#autocomplete_route_name' => 'user.autocomplete', - '#default_value' => $name, - '#description' => t('Leave blank for %anonymous.', array('%anonymous' => \Drupal::config('user.settings')->get('anonymous'))), ); $date = $new_translation ? REQUEST_TIME : $metadata->getCreatedTime(); @@ -530,12 +531,8 @@ public function entityFormEntityBuild($entity_type, EntityInterface $entity, arr $form_langcode = $form_object->getFormLangcode($form_state); $values = &$form_state->getValue('content_translation', array()); - if ($values['name'] == \Drupal::config('user.settings')->get('anonymous')) { - $values['name'] = ''; - } - $metadata = $this->manager->getTranslationMetadata($entity); - $metadata->setAuthor(!empty($values['name']) && ($account = user_load_by_name($values['name'])) ? $account : User::load(0)); + $metadata->setAuthor(!empty($values['uid']) ? User::load($values['uid']) : User::load(0)); $metadata->setPublished(!empty($values['status'])); $metadata->setCreatedTime(!empty($values['created']) ? strtotime($values['created']) : REQUEST_TIME); $metadata->setChangedTime(REQUEST_TIME); @@ -560,8 +557,8 @@ function entityFormValidate($form, FormStateInterface $form_state) { if (!$form_state->isValueEmpty('content_translation')) { $translation = $form_state->getValue('content_translation'); // Validate the "authored by" field. - if (!empty($translation['name']) && !($account = user_load_by_name($translation['name']))) { - $form_state->setErrorByName('content_translation][name', t('The translation authoring username %name does not exist.', array('%name' => $translation['name']))); + if (!empty($translation['uid']) && !($account = User::load($translation['uid']))) { + $form_state->setErrorByName('content_translation][uid', t('The translation authoring username %name does not exist.', array('%name' => $account->getUsername()))); } // Validate the "authored on" field. if (!empty($translation['created']) && strtotime($translation['created']) === FALSE) { diff --git a/core/modules/node/src/Plugin/Action/AssignOwnerNode.php b/core/modules/node/src/Plugin/Action/AssignOwnerNode.php index 0d1cc38..cd88339 100644 --- a/core/modules/node/src/Plugin/Action/AssignOwnerNode.php +++ b/core/modules/node/src/Plugin/Action/AssignOwnerNode.php @@ -12,6 +12,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\user\Entity\User; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -63,8 +64,8 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ public function execute($entity = NULL) { - $entity->uid = $this->configuration['owner_uid']; - $entity->save(); + /** @var \Drupal\node\NodeInterface $entity */ + $entity->setOwnerId($this->configuration['owner_uid'])->save(); } /** @@ -82,32 +83,33 @@ public function defaultConfiguration() { public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $description = t('The username of the user to which you would like to assign ownership.'); $count = $this->connection->query("SELECT COUNT(*) FROM {users}")->fetchField(); - $owner_name = ''; - if (is_numeric($this->configuration['owner_uid'])) { - $owner_name = $this->connection->query("SELECT name FROM {users_field_data} WHERE uid = :uid AND default_langcode = 1", array(':uid' => $this->configuration['owner_uid']))->fetchField(); - } // Use dropdown for fewer than 200 users; textbox for more than that. if (intval($count) < 200) { $options = array(); $result = $this->connection->query("SELECT uid, name FROM {users_field_data} WHERE uid > 0 AND default_langcode = 1 ORDER BY name"); foreach ($result as $data) { - $options[$data->name] = $data->name; + $options[$data->uid] = $data->name; } - $form['owner_name'] = array( + $form['owner_uid'] = array( '#type' => 'select', '#title' => t('Username'), - '#default_value' => $owner_name, + '#default_value' => $this->configuration['owner_uid'], '#options' => $options, '#description' => $description, ); } else { - $form['owner_name'] = array( - '#type' => 'textfield', + $form['owner_uid'] = array( + '#type' => 'entity_autocomplete', '#title' => t('Username'), - '#default_value' => $owner_name, - '#autocomplete_route_name' => 'user.autocomplete', + '#target_type' => 'user', + '#selection_setttings' => array( + 'include_anonymous' => FALSE, + ), + '#default_value' => User::load($this->configuration['owner_uid']), + // Validation is done in static::validateConfigurationForm(). + '#validate_reference' => FALSE, '#size' => '6', '#maxlength' => '60', '#description' => $description, @@ -120,9 +122,9 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta * {@inheritdoc} */ public function validateConfigurationForm(array &$form, FormStateInterface $form_state) { - $exists = (bool) $this->connection->queryRange('SELECT 1 FROM {users_field_data} WHERE name = :name AND default_langcode = 1', 0, 1, array(':name' => $form_state->getValue('owner_name')))->fetchField(); + $exists = (bool) $this->connection->queryRange('SELECT 1 FROM {users_field_data} WHERE name = :name AND default_langcode = 1', 0, 1, array(':name' => $form_state->getValue('owner_uid')))->fetchField(); if (!$exists) { - $form_state->setErrorByName('owner_name', t('Enter a valid username.')); + $form_state->setErrorByName('owner_uid', t('Enter a valid username.')); } } @@ -130,7 +132,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form * {@inheritdoc} */ public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { - $this->configuration['owner_uid'] = $this->connection->query('SELECT uid from {users_field_data} WHERE name = :name AND default_langcode = 1', array(':name' => $form_state->getValue('owner_name')))->fetchField(); + $this->configuration['owner_uid'] = $form_state->getValue('owner_uid'); } /** @@ -139,7 +141,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) { /** @var \Drupal\node\NodeInterface $object */ $result = $object->access('update', $account, TRUE) - ->andIf($object->uid->access('edit', $account, TRUE)); + ->andIf($object->getOwner()->access('edit', $account, TRUE)); return $return_as_object ? $result : $result->isAllowed(); } diff --git a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php index 788f35a..d8f609a 100644 --- a/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php +++ b/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php @@ -71,12 +71,11 @@ public function onRequest(GetResponseEvent $event) { */ public function onView(GetResponseEvent $event) { $current_route = $this->currentRouteMatch->getRouteName(); - $user_autcomplete_route = array( - 'user.autocomplete', - 'user.autocomplete_anonymous', + $entity_autcomplete_route = array( + 'system.entity_autocomplete', ); - if (in_array($current_route, $user_autcomplete_route)) { + if (in_array($current_route, $entity_autcomplete_route)) { if ($this->container->initialized('theme.registry')) { throw new \Exception('registry initialized'); } diff --git a/core/modules/user/src/Controller/UserAutocompleteController.php b/core/modules/user/src/Controller/UserAutocompleteController.php deleted file mode 100644 index aca4e44..0000000 --- a/core/modules/user/src/Controller/UserAutocompleteController.php +++ /dev/null @@ -1,82 +0,0 @@ -userAutocomplete = $user_autocomplete; - } - - /** - * {@inheritdoc} - */ - public static function create(ContainerInterface $container) { - return new static( - $container->get('user.autocomplete') - ); - } - - /** - * Returns response for the user autocompletion. - * - * @param \Symfony\Component\HttpFoundation\Request $request - * The current request object containing the search string. - * @param bool $include_anonymous - * (optional) TRUE if the name used to indicate anonymous users (e.g. - * "Anonymous") should be autocompleted. Defaults to FALSE. - * - * @return \Symfony\Component\HttpFoundation\JsonResponse - * A JSON response containing the autocomplete suggestions for existing users. - * - * @see \Drupal\user\UserAutocomplete::getMatches() - */ - public function autocompleteUser(Request $request, $include_anonymous = FALSE) { - $matches = $this->userAutocomplete->getMatches($request->query->get('q'), $include_anonymous); - - return new JsonResponse($matches); - } - - /** - * Returns response for the user autocompletion with the anonymous user. - * - * @param \Symfony\Component\HttpFoundation\Request $request - * The current request object containing the search string. - * - * @return \Symfony\Component\HttpFoundation\JsonResponse - * A JSON response containing the autocomplete suggestions for existing users. - * - * @see \Drupal\user\UserAutocomplete::autocompleteUser() - */ - public function autocompleteUserAnonymous(Request $request) { - return $this->autocompleteUser($request, TRUE); - } - -} diff --git a/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php b/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php index 8d2e701..c20a3fb 100644 --- a/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php +++ b/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php @@ -86,6 +86,13 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta 'filter' => array( 'type' => '_none', ), + 'include_anonymous' => TRUE, + ); + + $form['include_anonymous'] = array( + '#type' => 'checkbox', + '#title' => $this->t('Include the anonymous user.'), + '#default_value' => $selection_handler_settings['include_anonymous'], ); // Add user specific filter options. @@ -156,6 +163,11 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') * {@inheritdoc} */ public function entityQueryAlter(SelectInterface $query) { + // Bail out early if we do not need to match the Anonymous user. + if (empty($this->configuration['handler_settings']['include_anonymous'])) { + return; + } + if ($this->currentUser->hasPermission('administer users')) { // In addition, if the user is administrator, we need to make sure to // match the anonymous user, that doesn't actually have a name in the diff --git a/core/modules/user/src/Plugin/views/filter/Name.php b/core/modules/user/src/Plugin/views/filter/Name.php index 76e642a..30793d5 100644 --- a/core/modules/user/src/Plugin/views/filter/Name.php +++ b/core/modules/user/src/Plugin/views/filter/Name.php @@ -8,7 +8,9 @@ namespace Drupal\user\Plugin\views\filter; use Drupal\Component\Utility\Tags; +use Drupal\Core\Entity\Element\EntityAutocomplete; use Drupal\Core\Form\FormStateInterface; +use Drupal\user\Entity\User; use Drupal\views\Plugin\views\filter\InOperator; /** @@ -23,27 +25,16 @@ class Name extends InOperator { protected $alwaysMultiple = TRUE; protected function valueForm(&$form, FormStateInterface $form_state) { - $values = array(); - if ($this->value) { - $result = entity_load_multiple_by_properties('user', array('uid' => $this->value)); - foreach ($result as $account) { - if ($account->id()) { - $values[] = $account->getUsername(); - } - else { - $values[] = 'Anonymous'; // Intentionally NOT translated. - } - } - } - - sort($values); - $default_value = implode(', ', $values); + $users = $this->value ? User::loadMultiple(sort($this->value)) : array(); + $default_value = EntityAutocomplete::getEntityLabels($users); $form['value'] = array( - '#type' => 'textfield', + '#type' => 'entity_autocomplete', '#title' => $this->t('Usernames'), '#description' => $this->t('Enter a comma separated list of user names.'), + '#target_type' => 'user', + '#tags' => TRUE, '#default_value' => $default_value, - '#autocomplete_route_name' => 'user.autocomplete_anonymous', + '#process_default_value' => FALSE, ); $user_input = $form_state->getUserInput(); @@ -54,10 +45,11 @@ protected function valueForm(&$form, FormStateInterface $form_state) { } protected function valueValidate($form, FormStateInterface $form_state) { - $values = Tags::explode($form_state->getValue(array('options', 'value'))); - if ($uids = $this->validate_user_strings($form['value'], $form_state, $values)) { - $form_state->setValue(array('options', 'value'), $uids); + $uids = array(); + foreach ($form_state->getValue(array('options', 'value')) as $value) { + $uids[] = $value['target_id']; } + $form_state->setValue(array('options', 'value'), $uids); } public function acceptExposedInput($input) { @@ -90,13 +82,11 @@ public function validateExposed(&$form, FormStateInterface $form_state) { $input = $this->options['group_info']['group_items'][$input]['value']; } - $values = Tags::explode($input); - + $uids = FALSE; if (!$this->options['is_grouped'] || ($this->options['is_grouped'] && ($input != 'All'))) { - $uids = $this->validate_user_strings($form[$identifier], $form_state, $values); - } - else { - $uids = FALSE; + foreach ($form_state->getValue($identifier) as $value) { + $uids[] = $value['target_id']; + } } if ($uids) { @@ -104,43 +94,6 @@ public function validateExposed(&$form, FormStateInterface $form_state) { } } - /** - * Validate the user string. Since this can come from either the form - * or the exposed filter, this is abstracted out a bit so it can - * handle the multiple input sources. - */ - function validate_user_strings(&$form, FormStateInterface $form_state, $values) { - $uids = array(); - $placeholders = array(); - $args = array(); - foreach ($values as $value) { - if (strtolower($value) == 'anonymous') { - $uids[] = 0; - } - else { - $missing[strtolower($value)] = TRUE; - $args[] = $value; - $placeholders[] = "'%s'"; - } - } - - if (!$args) { - return $uids; - } - - $result = entity_load_multiple_by_properties('user', array('name' => $args)); - foreach ($result as $account) { - unset($missing[strtolower($account->getUsername())]); - $uids[] = $account->id(); - } - - if ($missing) { - $form_state->setError($form, $this->formatPlural(count($missing), 'Unable to find user: @users', 'Unable to find users: @users', array('@users' => implode(', ', array_keys($missing))))); - } - - return $uids; - } - protected function valueSubmit($form, FormStateInterface $form_state) { // prevent array filter from removing our anonymous user. } diff --git a/core/modules/user/src/UserAutocomplete.php b/core/modules/user/src/UserAutocomplete.php deleted file mode 100644 index d32c166..0000000 --- a/core/modules/user/src/UserAutocomplete.php +++ /dev/null @@ -1,94 +0,0 @@ -configFactory = $config_factory; - $this->entityQuery = $entity_query; - $this->entityManager = $entity_manager; - } - - /** - * Get matches for the autocompletion of user names. - * - * @param string $string - * The string to match for usernames. - * - * @param bool $include_anonymous - * (optional) TRUE if the name used to indicate anonymous users (e.g. - * "Anonymous") should be autocompleted. Defaults to FALSE. - * - * @return array - * An array containing the matching usernames. - */ - public function getMatches($string, $include_anonymous = FALSE) { - $matches = array(); - if ($string) { - if ($include_anonymous) { - $anonymous_name = $this->configFactory->get('user.settings')->get('anonymous'); - // Allow autocompletion for the anonymous user. - if (stripos($anonymous_name, $string) !== FALSE) { - $matches[] = array('value' => $anonymous_name, 'label' => String::checkPlain($anonymous_name)); - } - } - $uids = $this->entityQuery->get('user') - ->condition('name', $string, 'STARTS_WITH') - ->range(0, 10) - ->execute(); - - $controller = $this->entityManager->getStorage('user'); - foreach ($controller->loadMultiple($uids) as $account) { - $matches[] = array('value' => $account->getUsername(), 'label' => String::checkPlain($account->getUsername())); - } - } - - return $matches; - } - -} diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index 4f6a263..d30770f 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -13,20 +13,6 @@ user.logout: requirements: _user_is_logged_in: 'TRUE' -user.autocomplete: - path: '/user/autocomplete' - defaults: - _controller: '\Drupal\user\Controller\UserAutocompleteController::autocompleteUser' - requirements: - _permission: 'access user profiles' - -user.autocomplete_anonymous: - path: '/user/autocomplete/anonymous' - defaults: - _controller: '\Drupal\user\Controller\UserAutocompleteController::autocompleteUserAnonymous' - requirements: - _permission: 'access user profiles' - user.admin_index: path: '/admin/config/people' defaults: diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml index 8a4f4f0..83c5028 100644 --- a/core/modules/user/user.services.yml +++ b/core/modules/user/user.services.yml @@ -34,9 +34,6 @@ services: arguments: ['@database'] tags: - { name: backend_overridable } - user.autocomplete: - class: Drupal\user\UserAutocomplete - arguments: ['@config.factory', '@entity.manager', '@entity.query'] user_maintenance_mode_subscriber: class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber arguments: ['@maintenance_mode', '@current_user']