diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index bae9d9e70f0a9532ba2df7a872310bd17eb4e718..f7ab2d7e67a14163fcf325574314901cf802c70f 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1550,7 +1550,7 @@ function watchdog($type, $message, array $variables = NULL, $severity = WATCHDOG
$in_error_state = TRUE;
// The user object may not exist in all conditions, so 0 is substituted if needed.
- $user_uid = isset($user->uid) ? $user->uid : 0;
+ $user_uid = isset($user) ? $user->id() : 0;
// Prepare the fields to be logged
$log_entry = array(
@@ -1898,7 +1898,7 @@ function drupal_get_user_timezone() {
global $user;
$config = config('system.timezone');
- if ($user && $config->get('user.configurable') && $user->uid && $user->timezone) {
+ if ($user && $config->get('user.configurable') && $user->id() && $user->timezone) {
return $user->timezone;
}
else {
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 4829751c3662453d9512b4c1a546d4fecc0bdfd6..dfd20fabe120f14bb6d6597235c808b1e6dc6329 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3069,7 +3069,7 @@ function drupal_get_token($value = '') {
*/
function drupal_valid_token($token, $value = '', $skip_anonymous = FALSE) {
global $user;
- return (($skip_anonymous && $user->uid == 0) || ($token == drupal_get_token($value)));
+ return (($skip_anonymous && $user->id() == 0) || ($token == drupal_get_token($value)));
}
/**
@@ -4163,7 +4163,7 @@ function drupal_render_cid_parts($granularity = NULL) {
$cid_parts[] = 'r.' . implode(',', $user->roles);
}
elseif ($granularity & DRUPAL_CACHE_PER_USER) {
- $cid_parts[] = "u.$user->uid";
+ $cid_parts[] = 'u.' . $user->id();
}
if ($granularity & DRUPAL_CACHE_PER_PAGE) {
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 58644ffd4cd227e985ac3e143d20499b440829da..1af50ccd776c34e8e1bce8c453ce8e8a22781f4f 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -1123,7 +1123,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
}
// Begin building file entity.
$values = array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'status' => 0,
'filename' => trim(drupal_basename($name, '.')),
'uri' => $uploaded_files['files']['tmp_name'][$form_field_name][$i],
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 7d1a253a5b27e5fb1bf940b95e3831cce21262fa..d602d5435b1287801efb78188fe95fabbc14303e 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -546,7 +546,7 @@ function drupal_rebuild_form($form_id, &$form_state, $old_form = NULL) {
function form_get_cache($form_build_id, &$form_state) {
if ($form = Drupal::keyValueExpirable('form')->get($form_build_id)) {
global $user;
- if ((isset($form['#cache_token']) && drupal_valid_token($form['#cache_token'])) || (!isset($form['#cache_token']) && !$user->uid)) {
+ if ((isset($form['#cache_token']) && drupal_valid_token($form['#cache_token'])) || (!isset($form['#cache_token']) && $user->isAnonymous())) {
if ($stored_form_state = Drupal::keyValueExpirable('form_state')->get($form_build_id)) {
// Re-populate $form_state for subsequent rebuilds.
$form_state = $stored_form_state + $form_state;
@@ -578,7 +578,7 @@ function form_set_cache($form_build_id, $form, $form_state) {
// Cache form structure.
if (isset($form)) {
- if ($GLOBALS['user']->uid) {
+ if ($GLOBALS['user']->isAuthenticated()) {
$form['#cache_token'] = drupal_get_token();
}
Drupal::keyValueExpirable('form')->setWithExpire($form_build_id, $form, $expire);
@@ -1069,7 +1069,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
// tokens are session-bound and forms displayed to anonymous users are very
// likely cached, we cannot assign a token for them.
// During installation, there is no $user yet.
- if (!empty($user->uid) && !$form_state['programmed']) {
+ if ($user && $user->isAuthenticated() && !$form_state['programmed']) {
// Form constructors may explicitly set #token to FALSE when cross site
// request forgery is irrelevant to the form, such as search forms.
if (isset($form['#token']) && $form['#token'] === FALSE) {
@@ -4888,7 +4888,7 @@ function _drupal_form_send_response(Response $response) {
* $batch = array(
* 'title' => t('Exporting'),
* 'operations' => array(
- * array('my_function_1', array($account->uid, 'story')),
+ * array('my_function_1', array($account->id(), 'story')),
* array('my_function_2', array()),
* ),
* 'finished' => 'my_finished_callback',
diff --git a/core/includes/language.inc b/core/includes/language.inc
index 5f7d823863593df3a61df152182cfb2dc2355209..e63acaa52470b6856ee68337ba1189c2279097d8 100644
--- a/core/includes/language.inc
+++ b/core/includes/language.inc
@@ -470,7 +470,7 @@ function language_negotiation_method_invoke($method_id, $method = NULL, $request
}
// If the language negotiation method has no cache preference or this is
// satisfied we can execute the callback.
- $cache = !isset($method['cache']) || $user->uid || $method['cache'] == variable_get('cache', 0);
+ $cache = !isset($method['cache']) || $user->isAuthenticated() || $method['cache'] == variable_get('cache', 0);
$callback = isset($method['callbacks']['negotiation']) ? $method['callbacks']['negotiation'] : FALSE;
$langcode = $cache && function_exists($callback) ? $callback($languages, $request) : FALSE;
$results[$method_id] = isset($languages[$langcode]) ? $languages[$langcode] : FALSE;
diff --git a/core/includes/session.inc b/core/includes/session.inc
index 40e495f2071351641e92e6204f4348e831df2645..572ac216ed9c93f0ac35660a0b9293a7c7080329 100644
--- a/core/includes/session.inc
+++ b/core/includes/session.inc
@@ -115,7 +115,7 @@ function _drupal_session_read($sid) {
if ($values && $values['uid'] > 0 && $values['status'] == 1) {
$user = new UserSession($values);
// Add roles element to $user.
- $rids = db_query("SELECT ur.rid FROM {users_roles} ur WHERE ur.uid = :uid", array(':uid' => $user->uid))->fetchCol();
+ $rids = db_query("SELECT ur.rid FROM {users_roles} ur WHERE ur.uid = :uid", array(':uid' => $user->id()))->fetchCol();
$user->roles = array_merge(array(DRUPAL_AUTHENTICATED_RID), $rids);
}
elseif ($user) {
@@ -180,7 +180,7 @@ function _drupal_session_write($sid, $value) {
if ($is_changed || !isset($user->timestamp) || REQUEST_TIME - $user->timestamp > settings()->get('session_write_interval', 180)) {
// Either ssid or sid or both will be added from $key below.
$fields = array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'hostname' => Drupal::request()->getClientIP(),
'session' => $value,
'timestamp' => REQUEST_TIME,
@@ -214,12 +214,12 @@ function _drupal_session_write($sid, $value) {
}
// Likewise, do not update access time more than once per 180 seconds.
- if ($user->uid && REQUEST_TIME - $user->access > settings()->get('session_write_interval', 180)) {
+ if ($user->isAuthenticated() && REQUEST_TIME - $user->access > settings()->get('session_write_interval', 180)) {
db_update('users')
->fields(array(
'access' => REQUEST_TIME
))
- ->condition('uid', $user->uid)
+ ->condition('uid', $user->id())
->execute();
}
@@ -254,7 +254,7 @@ function drupal_session_initialize() {
// anonymous users not use a session cookie unless something is stored in
// $_SESSION. This allows HTTP proxies to cache anonymous pageviews.
drupal_session_start();
- if (!empty($user->uid) || !empty($_SESSION)) {
+ if ($user->isAuthenticated() || !empty($_SESSION)) {
drupal_page_is_cacheable(FALSE);
}
}
@@ -312,7 +312,7 @@ function drupal_session_commit() {
return;
}
- if (empty($user->uid) && empty($_SESSION)) {
+ if ($user->isAnonymous() && empty($_SESSION)) {
// There is no session data to store, destroy the session if it was
// previously started.
if (drupal_session_started()) {
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index c8e71ae05ec6de7f5f6d2f7d45a9930affabe4c6..2a2de1fd975fdcac715a0949eaad81a96dcde3aa 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2229,7 +2229,7 @@ function template_preprocess_tablesort_indicator(&$variables) {
function theme_mark($variables) {
$type = $variables['status'];
global $user;
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
if ($type == MARK_NEW) {
return ' <span class="marker">' . t('new') . '</span>';
}
diff --git a/core/lib/Drupal/Core/Entity/Field/Field.php b/core/lib/Drupal/Core/Entity/Field/Field.php
index 004ad92da9bbc48135c00ea6d19f67a1a95909c8..0ff36d778d3a8918d70d2e930dda0a2a560a0c2c 100644
--- a/core/lib/Drupal/Core/Entity/Field/Field.php
+++ b/core/lib/Drupal/Core/Entity/Field/Field.php
@@ -172,8 +172,8 @@ public function __unset($property_name) {
*/
public function access($operation = 'view', AccountInterface $account = NULL) {
global $user;
- if (!isset($account) && $user->uid) {
- $account = user_load($user->uid);
+ if (!isset($account)) {
+ $account = $user;
}
// Get the default access restriction that lives within this field.
$access = $this->defaultAccess($operation, $account);
diff --git a/core/lib/Drupal/Core/Session/UserSession.php b/core/lib/Drupal/Core/Session/UserSession.php
index 41d55fce46fb6da3346840e30d54e46c57cb2f5e..b3dae614db8c2902b409cc3ed2ead0a13c01dd56 100644
--- a/core/lib/Drupal/Core/Session/UserSession.php
+++ b/core/lib/Drupal/Core/Session/UserSession.php
@@ -19,7 +19,7 @@ class UserSession implements AccountInterface {
*
* @var int
*/
- public $uid;
+ protected $uid;
/**
* Session hostname.
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 10b4c73e358d5e31e0db05008d3f2559b10046ae..cfbad28a350f3ba8bf5de34055edd0c0a61e9c88 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -289,7 +289,7 @@ function _block_get_renderable_region($list = array()) {
// the regular 'roles define permissions' schema, it brings too many
// chances of having unwanted output get in the cache and later be served
// to other users. We therefore exclude user 1 from block caching.
- $not_cacheable = $GLOBALS['user']->uid == 1 ||
+ $not_cacheable = $GLOBALS['user']->id() == 1 ||
count(module_implements('node_grants')) ||
!\Drupal::request()->isMethodSafe();
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index 1bceb3a0f631bc30641c21a133c5c2faef7cb02b..7f7855dca24a19273ba493f1db3ab21e5d35b2a1 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -49,7 +49,7 @@ function testBlockVisibility() {
$this->drupalGet('user');
$this->assertNoText($title, 'Block was not displayed according to block visibility rules.');
- $this->drupalGet('USER/' . $this->adminUser->uid);
+ $this->drupalGet('USER/' . $this->adminUser->id());
$this->assertNoText($title, 'Block was not displayed according to block visibility rules regardless of path case.');
// Confirm that the block is not displayed to anonymous users.
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 8ba44d1f0976a0e4658b6c2ffe15f5552ebd60ad..f43696675f0ae4aeebe21ddd4c64928fa55ac63f 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1252,7 +1252,7 @@ function comment_node_search_result(EntityInterface $node) {
function comment_user_cancel($edit, $account, $method) {
switch ($method) {
case 'user_cancel_block_unpublish':
- $comments = entity_load_multiple_by_properties('comment', array('uid' => $account->uid));
+ $comments = entity_load_multiple_by_properties('comment', array('uid' => $account->id()));
foreach ($comments as $comment) {
$comment->status->value = 0;
$comment->save();
@@ -1260,7 +1260,7 @@ function comment_user_cancel($edit, $account, $method) {
break;
case 'user_cancel_reassign':
- $comments = entity_load_multiple_by_properties('comment', array('uid' => $account->uid));
+ $comments = entity_load_multiple_by_properties('comment', array('uid' => $account->id()));
foreach ($comments as $comment) {
$comment->uid->target_id = 0;
$comment->save();
@@ -1273,7 +1273,7 @@ function comment_user_cancel($edit, $account, $method) {
* Implements hook_user_predelete().
*/
function comment_user_predelete($account) {
- $cids = db_query('SELECT c.cid FROM {comment} c WHERE uid = :uid', array(':uid' => $account->uid))->fetchCol();
+ $cids = db_query('SELECT c.cid FROM {comment} c WHERE uid = :uid', array(':uid' => $account->id()))->fetchCol();
entity_delete_multiple('comment', $cids);
}
@@ -1325,7 +1325,7 @@ function comment_load($cid, $reset = FALSE) {
function comment_num_new($nid, $timestamp = 0) {
global $user;
- if ($user->uid && module_exists('history')) {
+ if ($user->isAuthenticated() && module_exists('history')) {
// Retrieve the timestamp at which the current user last viewed this node.
if (!$timestamp) {
$timestamp = history_read($nid);
@@ -1423,12 +1423,12 @@ function comment_preview(Comment $comment) {
if (!empty($comment->name->value)) {
$account = user_load_by_name($comment->name->value);
}
- elseif ($user->uid && empty($comment->is_anonymous)) {
+ elseif ($user->isAuthenticated() && empty($comment->is_anonymous)) {
$account = $user;
}
- if (!empty($account->uid)) {
- $comment->uid->target_id = $account->uid;
+ if ($account->id()) {
+ $comment->uid->target_id = $account->id();
$comment->name->value = check_plain($account->name);
}
elseif (empty($comment->name->value)) {
@@ -1613,7 +1613,7 @@ function template_preprocess_comment(&$variables) {
if ($comment->uid->target_id == $variables['node']->uid) {
$variables['attributes']['class'][] = 'by-node-author';
}
- if ($comment->uid->target_id == $variables['user']->uid) {
+ if ($comment->uid->target_id == $variables['user']->id()) {
$variables['attributes']['class'][] = 'by-viewer';
}
}
@@ -1640,7 +1640,7 @@ function theme_comment_post_forbidden($variables) {
// comments only has to query the database once for all the links.
$authenticated_post_comments = &drupal_static(__FUNCTION__, NULL);
- if (!$user->uid) {
+ if ($user->isAnonymous()) {
if (!isset($authenticated_post_comments)) {
// We only output a link if we are certain that users will get permission
// to post comments by logging in.
diff --git a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php b/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
index 4749428a4fbde1745a0fea4194718762a2f1e695..da728d54cdf1824f4c6b1fa1010a9ceb2eca1686 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
@@ -32,7 +32,7 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A
break;
case 'update':
- return ($account->uid && $account->uid == $entity->uid->value && $entity->status->value == COMMENT_PUBLISHED && user_access('edit own comments', $account)) || user_access('administer comments', $account);
+ return ($account->id() && $account->id() == $entity->uid->value && $entity->status->value == COMMENT_PUBLISHED && user_access('edit own comments', $account)) || user_access('administer comments', $account);
break;
case 'delete':
diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/Drupal/comment/CommentFormController.php
index 0584ae3138e4e03e067b6f86150bf3e91e881555..2264290a136233e8f70e0aad80123e7a586c172f 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentFormController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentFormController.php
@@ -31,7 +31,7 @@ public function form(array $form, array &$form_state) {
$anonymous_contact = variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT);
$is_admin = $comment->id() && user_access('administer comments');
- if (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
+ if (!$user->isAuthenticated() && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
$form['#attached']['library'][] = array('system', 'jquery.cookie');
$form['#attributes']['class'][] = 'user-info-from-cookie';
}
@@ -65,7 +65,7 @@ public function form(array $form, array &$form_state) {
$date = (!empty($comment->date) ? $comment->date : new DrupalDateTime($comment->created->value));
}
else {
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
$author = $user->name;
}
else {
@@ -80,7 +80,7 @@ public function form(array $form, array &$form_state) {
'#type' => 'textfield',
'#title' => t('Your name'),
'#default_value' => $author,
- '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
+ '#required' => ($user->isAnonymous() && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
'#maxlength' => 60,
'#size' => 30,
);
@@ -89,7 +89,7 @@ public function form(array $form, array &$form_state) {
$form['author']['name']['#description'] = t('Leave blank for %anonymous.', array('%anonymous' => config('user.settings')->get('anonymous')));
$form['author']['name']['#autocomplete_path'] = 'user/autocomplete';
}
- elseif ($user->uid) {
+ elseif ($user->isAuthenticated()) {
$form['author']['name']['#type'] = 'item';
$form['author']['name']['#value'] = $form['author']['name']['#default_value'];
$username = array(
@@ -104,11 +104,11 @@ public function form(array $form, array &$form_state) {
'#type' => 'email',
'#title' => t('E-mail'),
'#default_value' => $comment->mail->value,
- '#required' => (!$user->uid && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
+ '#required' => ($user->isAnonymous() && $anonymous_contact == COMMENT_ANONYMOUS_MUST_CONTACT),
'#maxlength' => 64,
'#size' => 30,
'#description' => t('The content of this field is kept private and will not be shown publicly.'),
- '#access' => $is_admin || (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
+ '#access' => $is_admin || ($user->isAnonymous() && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
);
$form['author']['homepage'] = array(
@@ -117,7 +117,7 @@ public function form(array $form, array &$form_state) {
'#default_value' => $comment->homepage->value,
'#maxlength' => 255,
'#size' => 30,
- '#access' => $is_admin || (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
+ '#access' => $is_admin || ($user->isAnonymous() && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
);
// Add administrative comment publishing options.
@@ -151,7 +151,7 @@ public function form(array $form, array &$form_state) {
// Used for conditional validation of author fields.
$form['is_anonymous'] = array(
'#type' => 'value',
- '#value' => ($comment->id() ? !$comment->uid->target_id : !$user->uid),
+ '#value' => ($comment->id() ? !$comment->uid->target_id : $user->isAnonymous()),
);
// Make the comment inherit the current content language unless specifically
@@ -215,7 +215,7 @@ public function validate(array $form, array &$form_state) {
if (!empty($form_state['values']['cid'])) {
// Verify the name in case it is being changed from being anonymous.
$account = user_load_by_name($form_state['values']['name']);
- $form_state['values']['uid'] = $account ? $account->uid : 0;
+ $form_state['values']['uid'] = $account ? $account->id() : 0;
$date = $form_state['values']['date'];
if ($date instanceOf DrupalDateTime && $date->hasErrors()) {
@@ -269,7 +269,7 @@ public function submit(array $form, array &$form_state) {
// @todo Too fragile. Should be prepared and stored in comment_form()
// already.
if (!$comment->is_anonymous && !empty($comment->name->value) && ($account = user_load_by_name($comment->name->value))) {
- $comment->uid->target_id = $account->uid;
+ $comment->uid->target_id = $account->id();
}
// If the comment was posted by an anonymous user and no author name was
// required, use "Anonymous" by default.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
index 700b629d7a6942e6bb29a6a39a65dd5e894d8f85..27dbf173b91b2d7cb4448f2f7585a2acc8703361 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
@@ -301,7 +301,7 @@ public function preSave(EntityStorageControllerInterface $storage_controller) {
}
// We test the value with '===' because we need to modify anonymous
// users as well.
- if ($this->uid->target_id === $user->uid && $user->uid) {
+ if ($this->uid->target_id === $user->id() && $user->isAuthenticated()) {
$this->name->value = $user->name;
}
// Add the values which aren't passed into the function.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
index c19b84ccc9dfc3c6e896582ce70924eda6089737..0c7fbff330fbf2abd4d80d94364e188b0a1bedbf 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
@@ -93,7 +93,7 @@ public function query() {
public function preRender(&$values) {
global $user;
- if (!$user->uid || empty($values)) {
+ if ($user->isAnonymous() || empty($values)) {
return;
}
@@ -114,7 +114,7 @@ public function preRender(&$values) {
LEFT JOIN {history} h ON h.nid = n.nid AND h.uid = :h_uid WHERE n.nid IN (:nids)
AND c.changed > GREATEST(COALESCE(h.timestamp, :timestamp), :timestamp) AND c.status = :status GROUP BY n.nid', array(
':status' => COMMENT_PUBLISHED,
- ':h_uid' => $user->uid,
+ ':h_uid' => $user->id(),
':nids' => $nids,
':timestamp' => HISTORY_READ_LIMIT,
));
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
index 8b07aec8562eee154da910b54389516122c5c542..2b506ce573c7b38c7ea7d07ebc8827eb84fe31b2 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
@@ -38,8 +38,8 @@ function setUp() {
function testCommentClasses() {
// Create all permutations for comments, users, and nodes.
$parameters = array(
- 'node_uid' => array(0, $this->web_user->uid),
- 'comment_uid' => array(0, $this->web_user->uid, $this->admin_user->uid),
+ 'node_uid' => array(0, $this->web_user->id()),
+ 'comment_uid' => array(0, $this->web_user->id(), $this->admin_user->id()),
'comment_status' => array(COMMENT_PUBLISHED, COMMENT_NOT_PUBLISHED),
'user' => array('anonymous', 'authenticated', 'admin'),
);
@@ -72,12 +72,12 @@ function testCommentClasses() {
case 'authenticated':
$this->drupalLogin($this->web_user);
- $case['user_uid'] = $this->web_user->uid;
+ $case['user_uid'] = $this->web_user->id();
break;
case 'admin':
$this->drupalLogin($this->admin_user);
- $case['user_uid'] = $this->admin_user->uid;
+ $case['user_uid'] = $this->admin_user->id();
break;
}
// Request the node with the comment.
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
index 8d7a472bd72daee8f8e53db80f2dd00043e571b0..ed1a528d5c09d1a9f15249aa6a912c6b92567a81 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
@@ -81,7 +81,7 @@ function testCommentInterface() {
// Test changing the comment author to a verified user.
$this->drupalGet('comment/' . $comment->id() . '/edit');
$comment = $this->postComment(NULL, $comment->comment_body->value, $comment->subject->value, array('name' => $this->web_user->name));
- $this->assertTrue($comment->name->value == $this->web_user->name && $comment->uid->target_id == $this->web_user->uid, 'Comment author successfully changed to a registered user.');
+ $this->assertTrue($comment->name->value == $this->web_user->name && $comment->uid->target_id == $this->web_user->id(), 'Comment author successfully changed to a registered user.');
$this->drupalLogout();
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
index 47efe82b6827a93a9b4f442758f83382e8b6f54e..1e443ac0b9c02c5714cb2aa041fc5cab5d71d228 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
@@ -68,7 +68,7 @@ function setUp() {
// Change user language preference, this way interface language is always
// French no matter what path prefix the URLs have.
$edit = array('preferred_langcode' => 'fr');
- $this->drupalPost("user/{$admin_user->uid}/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $admin_user->id() . "/edit", $edit, t('Save'));
// Make comment body translatable.
$field = field_info_field('comment_body');
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
index e121432bbcc66e6c5e2819ac092381ef6bd22f43..6d84a76b6eb8856182bdd6fadfb0d64e029c50f3 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
@@ -51,7 +51,7 @@ public function testCommentNewCommentsIndicator() {
'nid' => $this->node->nid,
'node_type' => $this->node->type,
'pid' => 0,
- 'uid' => $this->loggedInUser->uid,
+ 'uid' => $this->loggedInUser->id(),
'status' => COMMENT_PUBLISHED,
'subject' => $this->randomName(),
'hostname' => '127.0.0.1',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
index bf1cf6b7e026473fde8df287d86a022a212a30f5..0b7cd2088bf89089a45cf5a54aa821463093d963 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
@@ -52,7 +52,7 @@ function testCommentPreview() {
$edit['signature[value]'] = '<a href="http://example.com/">' . $test_signature. '</a>';
$image = current($this->drupalGetTestFiles('image'));
$edit['files[user_picture_und_0]'] = drupal_realpath($image->uri);
- $this->drupalPost('user/' . $this->web_user->uid . '/edit', $edit, t('Save'));
+ $this->drupalPost('user/' . $this->web_user->id() . '/edit', $edit, t('Save'));
// As the web user, fill in the comment form and preview the comment.
$edit = array();
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php
index 4578adefd1e1d33593df3f618005948213a6b13f..06ebf8649a8ce29c9667c30f94b40864ee4bf142 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php
@@ -51,7 +51,7 @@ function testCommentNodeCommentStatistics() {
$node = node_load($this->node->nid);
$this->assertEqual($node->last_comment_timestamp, $this->node->created, 'The initial value of node last_comment_timestamp is the node created date.');
$this->assertEqual($node->last_comment_name, NULL, 'The initial value of node last_comment_name is NULL.');
- $this->assertEqual($node->last_comment_uid, $this->web_user->uid, 'The initial value of node last_comment_uid is the node uid.');
+ $this->assertEqual($node->last_comment_uid, $this->web_user->id(), 'The initial value of node last_comment_uid is the node uid.');
$this->assertEqual($node->comment_count, 0, 'The initial value of node comment_count is zero.');
// Post comment #1 as web_user2.
@@ -63,7 +63,7 @@ function testCommentNodeCommentStatistics() {
// The node needs to be reloaded with a node_load_multiple cache reset.
$node = node_load($this->node->nid, TRUE);
$this->assertEqual($node->last_comment_name, NULL, 'The value of node last_comment_name is NULL.');
- $this->assertEqual($node->last_comment_uid, $this->web_user2->uid, 'The value of node last_comment_uid is the comment #1 uid.');
+ $this->assertEqual($node->last_comment_uid, $this->web_user2->id(), 'The value of node last_comment_uid is the comment #1 uid.');
$this->assertEqual($node->comment_count, 1, 'The value of node comment_count is 1.');
// Prepare for anonymous comment submission (comment approval enabled).
@@ -86,7 +86,7 @@ function testCommentNodeCommentStatistics() {
// The node needs to be reloaded with a node_load_multiple cache reset.
$node = node_load($this->node->nid, TRUE);
$this->assertEqual($node->last_comment_name, NULL, 'The value of node last_comment_name is still NULL.');
- $this->assertEqual($node->last_comment_uid, $this->web_user2->uid, 'The value of node last_comment_uid is still the comment #1 uid.');
+ $this->assertEqual($node->last_comment_uid, $this->web_user2->id(), 'The value of node last_comment_uid is still the comment #1 uid.');
$this->assertEqual($node->comment_count, 1, 'The value of node comment_count is still 1.');
// Prepare for anonymous comment submission (no approval required).
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
index 22132c13d78a733bd4fd785ffcad6d0022fbbc46..0332dd7b3966ee216d338003d52403bf9ea03950 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
@@ -75,7 +75,7 @@ function setUp() {
));
// Create a test node authored by the web user.
- $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->uid));
+ $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->id()));
}
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
index 3636f91d51514d6f1656caa30134f4b8a41359ec..98860fc642516a1936db70e007632cab8cd24dfa 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
@@ -36,7 +36,7 @@ function testCommentThreading() {
// Create a node.
$this->drupalLogin($this->web_user);
- $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->uid));
+ $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->id()));
// Post comment #1.
$this->drupalLogin($this->web_user);
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
index 8234cb56b6b7abc8f693af1cdc2836c538e00a12..40a6f7615c326da9d48c78f7842cb53f58498491 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
@@ -29,7 +29,7 @@ public static function getInfo() {
function testCommentUserUIDTest() {
$view = views_get_view('test_comment_user_uid');
- $this->executeView($view, array($this->account->uid));
+ $this->executeView($view, array($this->account->id()));
$result_set = array(
array(
'nid' => $this->node_user_posted->nid,
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
index c9138839d9c14ac0f68aa29d5a84872079336ca8..2a14f1f0f303947cc5a8666d79890eb5cb56f2b5 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
@@ -44,7 +44,7 @@ function setUp() {
$this->node_user_commented = $this->drupalCreateNode(array('uid' => $this->account2->uid));
$comment = array(
- 'uid' => $this->loggedInUser->uid,
+ 'uid' => $this->loggedInUser->id(),
'nid' => $this->node_user_commented->nid,
'cid' => '',
'pid' => '',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
index 9c8c88049ae2ea09ec805655f43ff088396e7671..e775687743c68997d97a3eb5c22b792cfdbc1632 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
@@ -38,10 +38,10 @@ function testCommentUserUIDTest() {
'id' => 'uid_touch',
'table' => 'node_field_data',
'field' => 'uid_touch',
- 'value' => array($this->loggedInUser->uid),
+ 'value' => array($this->loggedInUser->id()),
);
$view->addItem('default', 'filter', 'node_field_data', 'uid_touch', $options);
- $this->executeView($view, array($this->account->uid));
+ $this->executeView($view, array($this->account->id()));
$result_set = array(
array(
'nid' => $this->node_user_posted->nid,
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index a2d2359fa85a62d147ebece96ef99fe42d9e2b50..6412d327a74ee70d70aac61b8d55179db4a3584c 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -126,12 +126,12 @@ function _contact_personal_tab_access($account) {
global $user;
// Anonymous users cannot have contact forms.
- if (!$account->uid) {
+ if ($account->isAnonymous()) {
return FALSE;
}
// Users may not contact themselves.
- if ($user->uid == $account->uid) {
+ if ($user->id() == $account->id()) {
return FALSE;
}
@@ -269,7 +269,7 @@ function contact_mail($key, &$message, $params) {
'!form-url' => url(current_path(), array('absolute' => TRUE, 'language' => $language)),
'!sender-name' => user_format_name($sender),
);
- if (!empty($sender->uid)) {
+ if ($sender->isAuthenticated()) {
$sender_uri = $sender->uri();
$variables['!sender-url'] = url($sender_uri['path'], array('absolute' => TRUE, 'language' => $language) + $sender_uri['options']);
}
@@ -297,7 +297,7 @@ function contact_mail($key, &$message, $params) {
case 'user_copy':
$variables += array(
'!recipient-name' => user_format_name($params['recipient']),
- '!recipient-edit-url' => url('user/' . $params['recipient']->uid . '/edit', array('absolute' => TRUE, 'language' => $language)),
+ '!recipient-edit-url' => url('user/' . $params['recipient']->id() . '/edit', array('absolute' => TRUE, 'language' => $language)),
);
$message['subject'] .= t('[!site-name] !subject', $variables, $options);
$message['body'][] = t('Hello !recipient-name,', $variables, $options);
diff --git a/core/modules/contact/lib/Drupal/contact/MessageFormController.php b/core/modules/contact/lib/Drupal/contact/MessageFormController.php
index 6390abaf29b445a2524ed0daec5ff40ba9d68952..a4abbac13070d15275c335225e8357246003aa6d 100644
--- a/core/modules/contact/lib/Drupal/contact/MessageFormController.php
+++ b/core/modules/contact/lib/Drupal/contact/MessageFormController.php
@@ -44,7 +44,7 @@ public function form(array $form, array &$form_state) {
'#title' => t('Your e-mail address'),
'#required' => TRUE,
);
- if (!$user->uid) {
+ if ($user->isAnonymous()) {
$form['#attached']['library'][] = array('system', 'jquery.cookie');
$form['#attributes']['class'][] = 'user-info-from-cookie';
}
@@ -93,7 +93,7 @@ public function form(array $form, array &$form_state) {
'#title' => t('Send yourself a copy.'),
// Do not allow anonymous users to send themselves a copy, because it can
// be abused to spam people.
- '#access' => !empty($user->uid),
+ '#access' => $user->isAuthenticated(),
);
return $form;
}
@@ -136,8 +136,8 @@ public function save(array $form, array &$form_state) {
$language_interface = language(Language::TYPE_INTERFACE);
$message = $this->entity;
- $sender = clone user_load($user->uid);
- if (!$user->uid) {
+ $sender = clone user_load($user->id());
+ if ($user->isAnonymous()) {
// At this point, $sender contains drupal_anonymous_user(), so we need to
// take over the submitted form values.
$sender->name = $message->getSenderName();
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
index e027b6383b93ae75e923974c2948818c9b950561..0f6c72bd499a72ed9936fc327b89a3abc680b18a 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
@@ -92,22 +92,22 @@ function testSendPersonalContactMessage() {
function testPersonalContactAccess() {
// Test allowed access to admin user's contact form.
$this->drupalLogin($this->web_user);
- $this->drupalGet('user/' . $this->admin_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->admin_user->id() . '/contact');
$this->assertResponse(200);
// Test denied access to admin user's own contact form.
$this->drupalLogout();
$this->drupalLogin($this->admin_user);
- $this->drupalGet('user/' . $this->admin_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->admin_user->id() . '/contact');
$this->assertResponse(403);
// Test allowed access to user with contact form enabled.
$this->drupalLogin($this->web_user);
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(200);
// Test denied access to the user's own contact form.
- $this->drupalGet('user/' . $this->web_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->web_user->id() . '/contact');
$this->assertResponse(403);
// Test always denied access to the anonymous user contact form.
@@ -117,18 +117,18 @@ function testPersonalContactAccess() {
// Test that anonymous users can access the contact form.
$this->drupalLogout();
user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms'));
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(200);
// Test that anonymous users can access admin user's contact form.
- $this->drupalGet('user/' . $this->admin_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->admin_user->id() . '/contact');
$this->assertResponse(200);
// Revoke the personal contact permission for the anonymous user.
user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms'));
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(403);
- $this->drupalGet('user/' . $this->admin_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->admin_user->id() . '/contact');
$this->assertResponse(403);
// Disable the personal contact form.
@@ -144,12 +144,12 @@ function testPersonalContactAccess() {
// Test denied access to a user with contact form disabled.
$this->drupalLogin($this->web_user);
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(403);
// Test allowed access for admin user to a user with contact form disabled.
$this->drupalLogin($this->admin_user);
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(200);
// Re-create our contacted user as a blocked user.
@@ -158,12 +158,12 @@ function testPersonalContactAccess() {
$this->contact_user->save();
// Test that blocked users can still be contacted by admin.
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(200);
// Test that blocked users cannot be contacted by non-admins.
$this->drupalLogin($this->web_user);
- $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
$this->assertResponse(403);
}
@@ -188,7 +188,7 @@ function testPersonalContactFlood() {
}
// Submit contact form one over limit.
- $this->drupalGet('user/' . $this->contact_user->uid. '/contact');
+ $this->drupalGet('user/' . $this->contact_user->id(). '/contact');
$this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => $flood_limit, '@interval' => format_interval(config('contact.settings')->get('flood.interval')))), 'Normal user denied access to flooded contact form.');
// Test that the admin user can still access the contact form even though
@@ -211,7 +211,7 @@ protected function submitPersonalContact($account, array $message = array()) {
'subject' => $this->randomName(16),
'message' => $this->randomName(64),
);
- $this->drupalPost('user/' . $account->uid . '/contact', $message, t('Send message'));
+ $this->drupalPost('user/' . $account->id() . '/contact', $message, t('Send message'));
return $message;
}
}
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index e09e1cff6cdf6992d2ee8de1eaee479e7af6ace4..a6988cf9ea2b336cca7a776659b4ddc82ae9172e 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -730,7 +730,7 @@ function content_translation_entity_insert(EntityInterface $entity) {
$translation += array(
'source' => '',
- 'uid' => $GLOBALS['user']->uid,
+ 'uid' => $GLOBALS['user']->id(),
'outdated' => FALSE,
'status' => TRUE,
'created' => REQUEST_TIME,
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
index 2386f1f49b165075c7278b1dbc7e671fb2a4f8d1..694864204c60ddcddd1ec9a7886e257b26f362c0 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
@@ -410,7 +410,7 @@ public function entityFormEntityBuild($entity_type, EntityInterface $entity, arr
// @todo Use the entity setter when all entities support multilingual
// properties.
- $translation['uid'] = !empty($values['name']) && ($account = user_load_by_name($values['name'])) ? $account->uid : 0;
+ $translation['uid'] = !empty($values['name']) && ($account = user_load_by_name($values['name'])) ? $account->id() : 0;
$translation['status'] = !empty($values['status']);
$translation['created'] = !empty($values['created']) ? strtotime($values['created']) : REQUEST_TIME;
$translation['changed'] = REQUEST_TIME;
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php
index c9bf33d55bf66a25d487422e038de94a6ee60a25..54d234e655c087158b592325cb1f4997298c0d53 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php
@@ -107,7 +107,7 @@ function testImageFieldSync() {
// identifier.
$field_values = array(
'uri' => $this->files[$index]->uri,
- 'uid' => $GLOBALS['user']->uid,
+ 'uid' => $GLOBALS['user']->id(),
'status' => FILE_STATUS_PERMANENT,
);
$file = entity_create('file', $field_values);
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php
index a206f1bf688fdb961985dddab744360af48a3662..1e21d53f6f9e686e52fad9dfaaa6a29433ee75e0 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php
@@ -165,7 +165,7 @@ protected function assertAuthoringInfo() {
foreach ($this->langcodes as $index => $langcode) {
$user = $this->drupalCreateUser();
$values[$langcode] = array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'created' => REQUEST_TIME - mt_rand(0, 1000),
);
$edit = array(
diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php b/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
index e619fff7f037cf2b2d4d31abb66f3355ec4264b4..5e3f66338c87fcb918d53dca6fc80a1e9713b214 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
@@ -136,7 +136,7 @@ private function generateLogEntries($count, $type = 'custom', $severity = WATCHD
'severity' => $severity,
'link' => NULL,
'user' => $this->big_user,
- 'uid' => isset($this->big_user->uid) ? $this->big_user->uid : 0,
+ 'uid' => $this->big_user->id(),
'request_uri' => $base_root . request_uri(),
'referer' => $_SERVER['HTTP_REFERER'],
'ip' => '127.0.0.1',
@@ -238,7 +238,7 @@ private function doUser() {
// Logout user.
$this->drupalLogout();
// Fetch the row IDs in watchdog that relate to the user.
- $result = db_query('SELECT wid FROM {watchdog} WHERE uid = :uid', array(':uid' => $user->uid));
+ $result = db_query('SELECT wid FROM {watchdog} WHERE uid = :uid', array(':uid' => $user->id()));
foreach ($result as $row) {
$ids[] = $row->wid;
}
@@ -249,7 +249,7 @@ private function doUser() {
$this->drupalLogin($this->big_user);
// Delete the user created at the start of this test.
// We need to POST here to invoke batch_process() in the internal browser.
- $this->drupalPost('user/' . $user->uid . '/cancel', array('user_cancel_method' => 'user_cancel_reassign'), t('Cancel account'));
+ $this->drupalPost('user/' . $user->id() . '/cancel', array('user_cancel_method' => 'user_cancel_reassign'), t('Cancel account'));
// View the database log report.
$this->drupalGet('admin/reports/dblog');
@@ -423,7 +423,7 @@ protected function testDBLogAddAndClear() {
'severity' => WATCHDOG_NOTICE,
'link' => NULL,
'user' => $this->big_user,
- 'uid' => isset($this->big_user->uid) ? $this->big_user->uid : 0,
+ 'uid' => $this->big_user->id(),
'request_uri' => $base_root . request_uri(),
'referer' => $_SERVER['HTTP_REFERER'],
'ip' => '127.0.0.1',
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php
index 909b78028928b3a1ce8168522feb1bccd83a2daa..9798a53183978994d87adb48b64e59612ac01108 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php
@@ -94,7 +94,7 @@ public function formElement(array $items, $delta, array $element, $langcode, arr
'#placeholder' => $this->getSetting('placeholder'),
'#element_validate' => array(array($this, 'elementValidate')),
// @todo: Use wrapper to get the user if exists or needed.
- '#autocreate_uid' => isset($entity->uid) ? $entity->uid : $user->uid,
+ '#autocreate_uid' => isset($entity->uid) ? $entity->uid : $user->id(),
);
return array('target_id' => $element);
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
index 9a611d4bd5334fbdd8547398403f041b0a8c7c0b..f064b77de377968cc6468862b91975c91548d1e4 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
@@ -272,8 +272,8 @@ public function testUserHandler() {
),
'result' => array(
'user' => array(
- $users['admin']->uid => $user_labels['admin'],
- $users['non_admin']->uid => $user_labels['non_admin'],
+ $users['admin']->id() => $user_labels['admin'],
+ $users['non_admin']->id() => $user_labels['non_admin'],
),
),
),
@@ -284,7 +284,7 @@ public function testUserHandler() {
),
'result' => array(
'user' => array(
- $users['non_admin']->uid => $user_labels['non_admin'],
+ $users['non_admin']->id() => $user_labels['non_admin'],
),
),
),
@@ -311,10 +311,10 @@ public function testUserHandler() {
),
'result' => array(
'user' => array(
- $users['anonymous']->uid => $user_labels['anonymous'],
- $users['admin']->uid => $user_labels['admin'],
- $users['non_admin']->uid => $user_labels['non_admin'],
- $users['blocked']->uid => $user_labels['blocked'],
+ $users['anonymous']->id() => $user_labels['anonymous'],
+ $users['admin']->id() => $user_labels['admin'],
+ $users['non_admin']->id() => $user_labels['non_admin'],
+ $users['blocked']->id() => $user_labels['blocked'],
),
),
),
@@ -324,7 +324,7 @@ public function testUserHandler() {
),
'result' => array(
'user' => array(
- $users['blocked']->uid => $user_labels['blocked'],
+ $users['blocked']->id() => $user_labels['blocked'],
),
),
),
@@ -335,7 +335,7 @@ public function testUserHandler() {
),
'result' => array(
'user' => array(
- $users['anonymous']->uid => $user_labels['anonymous'],
+ $users['anonymous']->id() => $user_labels['anonymous'],
),
),
),
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index bcdb460154bcb81faf0b1e2c725fdab803aeabc0..0d66adbfe71b28562d0583115deecb9fa0099248 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -400,7 +400,7 @@ function file_validate_size(File $file, $file_limit = 0, $user_limit = 0) {
}
// Save a query by only calling spaceUsed() when a limit is provided.
- if ($user_limit && (Drupal::entityManager()->getStorageController('file')->spaceUsed($user->uid) + $file->getSize()) > $user_limit) {
+ if ($user_limit && (Drupal::entityManager()->getStorageController('file')->spaceUsed($user->id()) + $file->getSize()) > $user_limit) {
$errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->getSize()), '%quota' => format_size($user_limit)));
}
@@ -525,7 +525,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
// Create a file entity.
$file = entity_create('file', array(
'uri' => $uri,
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'status' => FILE_STATUS_PERMANENT,
));
// If we are replacing an existing file re-use its database record.
@@ -635,7 +635,7 @@ function file_file_download($uri, $field_type = 'file') {
// temporary files where the host entity has not yet been saved (for example,
// an image preview on a node/add form) in which case, allow download by the
// file's owner.
- if (empty($references) && ($file->isPermanent() || $file->getOwner()->id() != $user->uid)) {
+ if (empty($references) && ($file->isPermanent() || $file->getOwner()->id() != $user->id())) {
return;
}
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php
index 84e23c3a52e32d9e40d64568e1049af644fc7ae1..bfe24142b3cd4a28d8ab2571b14bcd985306a34b 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php
@@ -99,7 +99,7 @@ function testRevisions() {
$user->{$field_name}[Language::LANGCODE_NOT_SPECIFIED][0]['target_id'] = $node_file_r3->id();
$user->{$field_name}[Language::LANGCODE_NOT_SPECIFIED][0]['display'] = 1;
$user->save();
- $this->drupalGet('user/' . $user->uid . '/edit');
+ $this->drupalGet('user/' . $user->id() . '/edit');
// Delete the third revision and check that the file is not deleted yet.
$this->drupalPost('node/' . $nid . '/revisions/' . $node_vid_r3 . '/delete', array(), t('Delete'));
@@ -108,7 +108,7 @@ function testRevisions() {
$this->assertFileIsPermanent($node_file_r3, 'Second file entry is still permanent after deleting third revision, since it is being used by the user.');
// Delete the user and check that the file is also deleted.
- user_delete($user->uid);
+ $user->delete();
// TODO: This seems like a bug in File API. Clearing the stat cache should
// not be necessary here. The file really is deleted, but stream wrappers
// doesn't seem to think so unless we clear the PHP file stat() cache.
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 495f245739a4ffdf7719bf33d5486535d395ed42..1a0d9d132024e607de32573b7556b35855178445 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -275,16 +275,16 @@ function filter_formats($account = NULL) {
}
// Build a list of user-specific formats.
- if (isset($account) && !isset($formats['user'][$account->uid])) {
- $formats['user'][$account->uid] = array();
+ if (isset($account) && !isset($formats['user'][$account->id()])) {
+ $formats['user'][$account->id()] = array();
foreach ($formats['all'] as $format) {
if (filter_access($format, $account)) {
- $formats['user'][$account->uid][$format->format] = $format;
+ $formats['user'][$account->id()][$format->format] = $format;
}
}
}
- return isset($account) ? $formats['user'][$account->uid] : $formats['all'];
+ return isset($account) ? $formats['user'][$account->id()] : $formats['all'];
}
/**
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 1c9b89d450814464acd4999fe437d1826ae16b97..18dd4e9f0b9f3f6aa4debf5d0153545a1c607e29 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -199,7 +199,7 @@ function forum_menu_local_tasks(&$data, $router_item, $root_path) {
}
if (empty($links)) {
// Authenticated user does not have access to create new topics.
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
$links['disallowed'] = array(
'#theme' => 'menu_local_action',
'#link' => array(
@@ -912,7 +912,7 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
$topics = array();
$first_new_found = FALSE;
foreach ($result as $topic) {
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
// A forum is new if the topic is new, or if there are new comments since
// the user's last visit.
if ($topic->forum_tid != $tid) {
@@ -1060,8 +1060,8 @@ function template_preprocess_forum_list(&$variables) {
$variables['forums'][$id]->old_topics = $forum->num_topics;
$variables['forums'][$id]->icon_class = 'default';
$variables['forums'][$id]->icon_title = t('No new posts');
- if ($user->uid) {
- $variables['forums'][$id]->new_topics = _forum_topics_unread($forum->id(), $user->uid);
+ if ($user->isAuthenticated()) {
+ $variables['forums'][$id]->new_topics = _forum_topics_unread($forum->id(), $user->id());
if ($variables['forums'][$id]->new_topics) {
$variables['forums'][$id]->new_text = format_plural($variables['forums'][$id]->new_topics, '1 new post<span class="visually-hidden"> in forum %title</span>', '@count new posts<span class="visually-hidden"> in forum %title</span>', array('%title' => $variables['forums'][$id]->label()));
$variables['forums'][$id]->new_url = url('forum/' . $forum->id(), array('fragment' => 'new'));
@@ -1230,7 +1230,7 @@ function _forum_user_last_visit($nid) {
$history = &drupal_static(__FUNCTION__, array());
if (empty($history)) {
- $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = :uid', array(':uid' => $user->uid));
+ $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = :uid', array(':uid' => $user->id()));
foreach ($result as $t) {
$history[$t->nid] = $t->timestamp > HISTORY_READ_LIMIT ? $t->timestamp : HISTORY_READ_LIMIT;
}
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index 63f1da39e59db124654e02fa29daba3689f90093..149441f8787066cbd72a2100bd654112756832c0 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -190,7 +190,7 @@ function testForum() {
$this->assertEqual($topics, '6', 'Number of topics found.');
// Verify the number of unread topics.
- $unread_topics = _forum_topics_unread($this->forum['tid'], $this->edit_any_topics_user->uid);
+ $unread_topics = _forum_topics_unread($this->forum['tid'], $this->edit_any_topics_user->id());
$unread_topics = format_plural($unread_topics, '1 new post', '@count new posts');
$xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="topics"]//a', $forum_arg);
$this->assertFieldByXPath($xpath, $unread_topics, 'Number of unread topics found.');
diff --git a/core/modules/history/history.module b/core/modules/history/history.module
index 84abadef2b640a69e8946c7ddcea2c55d8035096..2a182c01908d6ce77a00e91a861af18c491d7846 100644
--- a/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -34,7 +34,7 @@ function history_read($nid) {
$history = &drupal_static(__FUNCTION__, array());
if (!isset($history[$nid])) {
- $history[$nid] = db_query("SELECT timestamp FROM {history} WHERE uid = :uid AND nid = :nid", array(':uid' => $user->uid, ':nid' => $nid))->fetchObject();
+ $history[$nid] = db_query("SELECT timestamp FROM {history} WHERE uid = :uid AND nid = :nid", array(':uid' => $user->id(), ':nid' => $nid))->fetchObject();
}
return (isset($history[$nid]->timestamp) ? $history[$nid]->timestamp : 0);
@@ -56,10 +56,10 @@ function history_write($nid, $account = NULL) {
$account = $user;
}
- if ($account->uid) {
+ if ($account->isAuthenticated()) {
db_merge('history')
->key(array(
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'nid' => $nid,
))
->fields(array('timestamp' => REQUEST_TIME))
@@ -92,7 +92,7 @@ function history_user_cancel($edit, $account, $method) {
switch ($method) {
case 'user_cancel_reassign':
db_delete('history')
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
break;
}
@@ -103,6 +103,6 @@ function history_user_cancel($edit, $account, $method) {
*/
function history_user_delete($account) {
db_delete('history')
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
}
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
index 5d5a69783d538f28fe3c8ffc6a299b03ea9c8096..d2fcecf13f39b436e67f4fce337afb870ef5cdf3 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
@@ -31,7 +31,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
parent::init($view, $display, $options);
global $user;
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
$this->additional_fields['created'] = array('table' => 'node_field_data', 'field' => 'created');
$this->additional_fields['changed'] = array('table' => 'node_field_data', 'field' => 'changed');
if (module_exists('comment') && !empty($this->options['comments'])) {
@@ -63,7 +63,7 @@ public function buildOptionsForm(&$form, &$form_state) {
public function query() {
// Only add ourselves to the query if logged in.
global $user;
- if (!$user->uid) {
+ if ($user->isAnonymous()) {
return;
}
parent::query();
@@ -75,7 +75,7 @@ function render($values) {
// we already have that info.
$mark = MARK_READ;
global $user;
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
$last_read = $this->getValue($values);
$changed = $this->getValue($values, 'changed');
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
index 8569329d00de2b3080123b5fa32dc5d6a1800be7..beae395007c94154fac638cb8822636103ff27b8 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
@@ -54,8 +54,8 @@ protected function valueForm(&$form, &$form_state) {
public function query() {
global $user;
- // This can only work if we're logged in.
- if (!$user || !$user->uid) {
+ // This can only work if we're authenticated in.
+ if (!$user->isAuthenticated()) {
return;
}
diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
index 7a43181f49816b347103c25ab6a68383510d96cb..8395fcb2cf50412252d4ddbe4f6a4cb92663be02 100644
--- a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
+++ b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
@@ -96,7 +96,7 @@ public function getConfirmText() {
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state) {
- $this->nodes = $this->tempStoreFactory->get('node_multiple_delete_confirm')->get($GLOBALS['user']->uid);
+ $this->nodes = $this->tempStoreFactory->get('node_multiple_delete_confirm')->get($GLOBALS['user']->id());
if (empty($this->nodes)) {
return new RedirectResponse(url($this->getCancelPath(), array('absolute' => TRUE)));
}
@@ -116,7 +116,7 @@ public function buildForm(array $form, array &$form_state) {
public function submitForm(array &$form, array &$form_state) {
if ($form_state['values']['confirm'] && !empty($this->nodes)) {
$this->storageController->delete($this->nodes);
- $this->tempStoreFactory->get('node_multiple_delete_confirm')->delete($GLOBALS['user']->uid);
+ $this->tempStoreFactory->get('node_multiple_delete_confirm')->delete($GLOBALS['user']->id());
$count = count($this->nodes);
watchdog('content', 'Deleted @count posts.', array('@count' => $count));
drupal_set_message(format_plural($count, 'Deleted 1 post.', 'Deleted @count posts.'));
diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php
index e55e056638dae76a0d3ea8d37b6b89b9b13fda94..814d937e8c42774f21ea7e7d8854807406bf47c1 100644
--- a/core/modules/node/lib/Drupal/node/NodeFormController.php
+++ b/core/modules/node/lib/Drupal/node/NodeFormController.php
@@ -47,7 +47,7 @@ protected function prepareEntity() {
}
}
global $user;
- $node->uid = $user->uid;
+ $node->uid = $user->id();
$node->created = REQUEST_TIME;
}
else {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
index 186bb3e8c02bdb5a9f7583b5a2cb1ddc24897dbe..9b839d0b572176c17477f74f7a16218ceb8482b4 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
@@ -62,7 +62,7 @@ public static function create(ContainerInterface $container, array $configuratio
* {@inheritdoc}
*/
public function executeMultiple(array $entities) {
- $this->tempStore->set($GLOBALS['user']->uid, $entities);
+ $this->tempStore->set($GLOBALS['user']->id(), $entities);
}
/**
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
index adee17d4f28a4f7965684720ac472361ca02405b..5107337f831159e396f03f97b2e5736f14e115f4 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
@@ -92,7 +92,7 @@ function testNodeAccessBasic() {
$private_nodes[] = $nid;
}
$titles[$nid] = $edit['title'];
- $this->nodesByUser[$this->webUser->uid][$nid] = $is_private;
+ $this->nodesByUser[$this->webUser->id()][$nid] = $is_private;
}
}
$this->publicTid = db_query('SELECT tid FROM {taxonomy_term_data} WHERE name = :name', array(':name' => 'public'))->fetchField();
@@ -106,7 +106,7 @@ function testNodeAccessBasic() {
foreach ($data as $nid => $is_private) {
$this->drupalGet('node/' . $nid);
if ($is_private) {
- $should_be_visible = $uid == $this->webUser->uid;
+ $should_be_visible = $uid == $this->webUser->id();
}
else {
$should_be_visible = TRUE;
@@ -115,7 +115,7 @@ function testNodeAccessBasic() {
'%private' => $is_private ? 'private' : 'public',
'%uid' => $uid,
'%visible' => $should_be_visible ? 'visible' : 'not visible',
- '%current_uid' => $this->webUser->uid,
+ '%current_uid' => $this->webUser->id(),
)));
}
}
@@ -165,13 +165,13 @@ protected function assertTaxonomyPage($is_admin) {
// Non-administrators can only see their own nodes on the private
// term page.
if (!$is_admin && $tid_is_private) {
- $should_be_visible = $should_be_visible && $uid == $this->webUser->uid;
+ $should_be_visible = $should_be_visible && $uid == $this->webUser->id();
}
$this->assertIdentical(isset($this->nids_visible[$nid]), $should_be_visible, strtr('A %private node by user %uid is %visible for user %current_uid on the %tid_is_private page.', array(
'%private' => $is_private ? 'private' : 'public',
'%uid' => $uid,
'%visible' => isset($this->nids_visible[$nid]) ? 'visible' : 'not visible',
- '%current_uid' => $this->webUser->uid,
+ '%current_uid' => $this->webUser->id(),
'%tid_is_private' => $tid_is_private ? 'private' : 'public',
)));
}
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php
index 4a5e0f8b06f0d6d635d32b7380f3bb8084b0a214..66448d01954e2b2749e2ec36cea7266852c58c42 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php
@@ -47,7 +47,7 @@ function testNodeAccess() {
// User cannot 'view own unpublished content'.
$web_user3 = $this->drupalCreateUser(array('access content'));
- $node3 = $this->drupalCreateNode(array('status' => 0, 'uid' => $web_user3->uid));
+ $node3 = $this->drupalCreateNode(array('status' => 0, 'uid' => $web_user3->id()));
$this->assertNodeAccess(array('view' => FALSE), $node3, $web_user3);
// User cannot create content without permission.
@@ -56,7 +56,7 @@ function testNodeAccess() {
// User can 'view own unpublished content', but another user cannot.
$web_user4 = $this->drupalCreateUser(array('access content', 'view own unpublished content'));
$web_user5 = $this->drupalCreateUser(array('access content', 'view own unpublished content'));
- $node4 = $this->drupalCreateNode(array('status' => 0, 'uid' => $web_user4->uid));
+ $node4 = $this->drupalCreateNode(array('status' => 0, 'uid' => $web_user4->id()));
$this->assertNodeAccess(array('view' => TRUE, 'update' => FALSE), $node4, $web_user4);
$this->assertNodeAccess(array('view' => FALSE), $node4, $web_user5);
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
index 6ad8a19e5c0a514f757dc6cbdc25e14107ea928d..73d8a3b0a9b6a7554a0d2d808d4fcf9e7d33f9e6 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
@@ -96,8 +96,8 @@ function testContentAdminPages() {
$nodes['published_page'] = $this->drupalCreateNode(array('type' => 'page'));
$nodes['published_article'] = $this->drupalCreateNode(array('type' => 'article'));
- $nodes['unpublished_page_1'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user_1->uid, 'status' => 0));
- $nodes['unpublished_page_2'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user_2->uid, 'status' => 0));
+ $nodes['unpublished_page_1'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user_1->id(), 'status' => 0));
+ $nodes['unpublished_page_2'] = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->base_user_2->id(), 'status' => 0));
// Verify view, edit, and delete links for any content.
$this->drupalGet('admin/content');
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
index 8d95c06658402d2a4b3bb8d7d1f992d1aae0722c..b308072c655db4aa954832b4381ce9330084c31d 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
@@ -68,7 +68,7 @@ public function testRecentNodeBlock() {
$this->assertText(t('No content available.'), 'Block with "No content available." found.');
// Add some test nodes.
- $default_settings = array('uid' => $this->webUser->uid, 'type' => 'article');
+ $default_settings = array('uid' => $this->webUser->id(), 'type' => 'article');
$node1 = $this->drupalCreateNode($default_settings);
$node2 = $this->drupalCreateNode($default_settings);
$node3 = $this->drupalCreateNode($default_settings);
@@ -136,7 +136,7 @@ public function testRecentNodeBlock() {
$this->assertTrue(isset($visibility['node_type']['types']['article']), 'Visibility settings were saved to configuration');
// Create a page node.
- $node5 = $this->drupalCreateNode(array('uid' => $this->adminUser->uid, 'type' => 'page'));
+ $node5 = $this->drupalCreateNode(array('uid' => $this->adminUser->id(), 'type' => 'page'));
// Verify visibility rules.
$this->drupalGet('');
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php
index 55719bb1cab0750faf6f424d3145f05646bf2cfb..90592b0c81a80f35d9fa7b774c72835f463a7f24 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php
@@ -64,7 +64,7 @@ function testNodeCreation() {
function testFailedPageCreation() {
// Create a node.
$edit = array(
- 'uid' => $this->loggedInUser->uid,
+ 'uid' => $this->loggedInUser->id(),
'name' => $this->loggedInUser->name,
'type' => 'page',
'langcode' => Language::LANGCODE_NOT_SPECIFIED,
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
index 2caeca96793f4bfe9dd0e608a5a0ed557851e583..4d621368bea30f3e8ec00e88f7872605842d11f7 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
@@ -169,7 +169,7 @@ function testNodeQueryAlterOverride() {
// $account instead of the global $user, we will log in as
// noAccessUser2.
$this->drupalLogin($this->noAccessUser2);
- \Drupal::state()->set('node_access_test.no_access_uid', $this->noAccessUser->uid);
+ \Drupal::state()->set('node_access_test.no_access_uid', $this->noAccessUser->id());
drupal_static_reset('node_access_view_all_nodes');
try {
$query = db_select('node', 'mytab')
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php
index 6157fb0e3bc1eb8a8b77a5d0570254c0325e3d8f..0a1c2108ade95b1212ec2bf93c570795826dafed 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php
@@ -52,7 +52,7 @@ function testImport() {
$node = array(
'title' => $title,
'body' => array(array('value' => $this->randomName(32))),
- 'uid' => $this->web_user->uid,
+ 'uid' => $this->web_user->id(),
'type' => 'article',
'nid' => $test_nid,
);
@@ -60,7 +60,7 @@ function testImport() {
$node->enforceIsNew();
// Verify that node_submit did not overwrite the user ID.
- $this->assertEqual($node->uid, $this->web_user->uid, 'Function node_submit() preserves user ID');
+ $this->assertEqual($node->uid, $this->web_user->id(), 'Function node_submit() preserves user ID');
$node->save();
// Test the import.
@@ -77,7 +77,7 @@ function testImport() {
function testTimestamps() {
// Use the default timestamps.
$edit = array(
- 'uid' => $this->web_user->uid,
+ 'uid' => $this->web_user->id(),
'type' => 'article',
'title' => $this->randomName(8),
);
@@ -105,7 +105,7 @@ function testTimestamps() {
// Programmatically set the timestamps on the node.
$edit = array(
- 'uid' => $this->web_user->uid,
+ 'uid' => $this->web_user->id(),
'type' => 'article',
'title' => $this->randomName(8),
'created' => 280299600, // Sun, 19 Nov 1978 05:00:00 GMT
@@ -136,7 +136,7 @@ function testTimestamps() {
function testDeterminingChanges() {
// Initial creation.
$node = entity_create('node', array(
- 'uid' => $this->web_user->uid,
+ 'uid' => $this->web_user->id(),
'type' => 'article',
'title' => 'test_changes',
));
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
index 9037751c7970d7c203380aad7320700e8e923a3d..8bb425da1ca2ec7ca4fa676ec5a1ed22d2318223 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
@@ -36,7 +36,7 @@ function testNodeTokenReplacement() {
$account = $this->drupalCreateUser();
$settings = array(
'type' => 'article',
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'title' => '<blink>Blinking Text</blink>',
'body' => array(array('value' => $this->randomName(32), 'summary' => $this->randomName(16))),
);
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
index bea3245cf0241278b786b66ff26638f5d6214eaa..473947bf59d265fe11eb98985bb5baad79ebc540 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
@@ -120,7 +120,7 @@ protected function assertAuthoringInfo() {
foreach ($this->langcodes as $index => $langcode) {
$user = $this->drupalCreateUser();
$values[$langcode] = array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'created' => REQUEST_TIME - mt_rand(0, 1000),
);
$edit = array(
diff --git a/core/modules/node/lib/Drupal/node/Tests/PageEditTest.php b/core/modules/node/lib/Drupal/node/Tests/PageEditTest.php
index c37a22734432283108ac12bd6f23bcab3b783b38..2407dfbaeef76aa7ca694c7d4517d8fc761103c7 100644
--- a/core/modules/node/lib/Drupal/node/Tests/PageEditTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/PageEditTest.php
@@ -114,7 +114,7 @@ function testPageAuthoredBy() {
// Check that the node was authored by the currently logged in user.
$node = $this->drupalGetNodeByTitle($edit['title']);
- $this->assertIdentical($node->uid, $this->admin_user->uid, 'Node authored by admin user.');
+ $this->assertIdentical($node->uid, $this->admin_user->id(), 'Node authored by admin user.');
// Try to change the 'authored by' field to an invalid user name.
$edit = array(
@@ -135,7 +135,7 @@ function testPageAuthoredBy() {
$edit['name'] = $this->web_user->name;
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save and keep published'));
$node = node_load($node->nid, TRUE);
- $this->assertIdentical($node->uid, $this->web_user->uid, 'Node authored by normal user.');
+ $this->assertIdentical($node->uid, $this->web_user->id(), 'Node authored by normal user.');
// Check that normal users cannot change the authored by information.
$this->drupalLogin($this->web_user);
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
index 375bd329ef1f774ba4ba4d781b8b2faf80815bb6..67b4cbaed0f637097ac4d0162c738e044b5773d6 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
@@ -55,7 +55,7 @@ public function testFilter() {
$view = views_get_view('test_filter_node_uid_revision');
$view->initHandlers();
- $view->filter['uid_revision']->value = array($author->uid);
+ $view->filter['uid_revision']->value = array($author->id());
$this->executeView($view);
$this->assertIdenticalResultset($view, $expected_result, array('nid' => 'nid'), 'Make sure that the view only returns nodes which match either the node or the revision author.');
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 7afef9fb640794e3540740097dd6d22bedab5419..eeec22becc68f684cf1afe1c8e55c59a075d7cfe 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -229,7 +229,7 @@ function node_admin_nodes() {
// If the user is able to view their own unpublished nodes, allow them
// to see these in addition to published nodes. Check that they actually
// have some unpublished nodes to view before adding the condition.
- if (user_access('view own unpublished content') && $own_unpublished = db_query('SELECT DISTINCT nid FROM {node_field_data} WHERE uid = :uid AND status = :status', array(':uid' => $GLOBALS['user']->uid, ':status' => 0))->fetchCol()) {
+ if (user_access('view own unpublished content') && $own_unpublished = db_query('SELECT DISTINCT nid FROM {node_field_data} WHERE uid = :uid AND status = :status', array(':uid' => $GLOBALS['user']->id(), ':status' => 0))->fetchCol()) {
$query->condition(db_or()
->condition('n.status', 1)
->condition('n.nid', $own_unpublished, 'IN')
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index bb67b20fcb44215da16d19c4e50d48ec51678c0a..a3e01384cf89b31c8c0cda1dc3c02ea31d607131 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -187,7 +187,7 @@ function hook_node_grants($account, $op) {
if (user_access('access private content', $account)) {
$grants['example'] = array(1);
}
- $grants['example_owner'] = array($account->uid);
+ $grants['example_owner'] = array($account->id());
return $grants;
}
@@ -577,13 +577,13 @@ function hook_node_access($node, $op, $account, $langcode) {
}
if ($op == 'update') {
- if (user_access('edit any ' . $type . ' content', $account) || (user_access('edit own ' . $type . ' content', $account) && ($account->uid == $node->uid))) {
+ if (user_access('edit any ' . $type . ' content', $account) || (user_access('edit own ' . $type . ' content', $account) && ($account->id() == $node->uid))) {
return NODE_ACCESS_ALLOW;
}
}
if ($op == 'delete') {
- if (user_access('delete any ' . $type . ' content', $account) || (user_access('delete own ' . $type . ' content', $account) && ($account->uid == $node->uid))) {
+ if (user_access('delete any ' . $type . ' content', $account) || (user_access('delete own ' . $type . ' content', $account) && ($account->id() == $node->uid))) {
return NODE_ACCESS_ALLOW;
}
}
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 7878a5f236b090bfdf21fb522b85e5b4269b7e2a..e83670076273deb43f6a7ba9cdc1cdbfc7896867 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -281,7 +281,7 @@ function node_mark($nid, $timestamp) {
global $user;
$cache = &drupal_static(__FUNCTION__, array());
- if (!$user->uid || !module_exists('history')) {
+ if ($user->isAnonymous() || !module_exists('history')) {
return MARK_READ;
}
if (!isset($cache[$nid])) {
@@ -1015,7 +1015,7 @@ function node_user_cancel($edit, $account, $method) {
$nodes = db_select('node_field_data', 'n')
->distinct()
->fields('n', array('nid'))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute()
->fetchCol();
node_mass_update($nodes, array('status' => 0), NULL, TRUE);
@@ -1027,14 +1027,14 @@ function node_user_cancel($edit, $account, $method) {
$nodes = db_select('node_field_data', 'n')
->distinct()
->fields('n', array('nid'))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute()
->fetchCol();
node_mass_update($nodes, array('uid' => 0), NULL, TRUE);
// Anonymize old revisions.
db_update('node_field_revision')
->fields(array('uid' => 0))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
break;
}
@@ -1049,12 +1049,12 @@ function node_user_predelete($account) {
$nodes = db_select('node_field_data', 'n')
->distinct()
->fields('n', array('nid'))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute()
->fetchCol();
entity_delete_multiple('node', $nodes);
// Delete old revisions.
- $revisions = db_query('SELECT DISTINCT vid FROM {node_field_revision} WHERE uid = :uid', array(':uid' => $account->uid))->fetchCol();
+ $revisions = db_query('SELECT DISTINCT vid FROM {node_field_revision} WHERE uid = :uid', array(':uid' => $account->id()))->fetchCol();
foreach ($revisions as $revision) {
node_revision_delete($revision);
}
@@ -1425,7 +1425,7 @@ function node_get_recent($number = 10) {
// If the user is able to view their own unpublished nodes, allow them
// to see these in addition to published nodes. Check that they actually
// have some unpublished nodes to view before adding the condition.
- if (user_access('view own unpublished content') && $own_unpublished = db_query('SELECT DISTINCT nid FROM {node_field_data} WHERE uid = :uid AND status = :status', array(':uid' => $GLOBALS['user']->uid, ':status' => NODE_NOT_PUBLISHED))->fetchCol()) {
+ if (user_access('view own unpublished content') && $own_unpublished = db_query('SELECT DISTINCT nid FROM {node_field_data} WHERE uid = :uid AND status = :status', array(':uid' => $GLOBALS['user']->id(), ':status' => NODE_NOT_PUBLISHED))->fetchCol()) {
$query->condition(db_or()
->condition('n.status', NODE_PUBLISHED)
->condition('n.nid', $own_unpublished, 'IN')
@@ -2135,7 +2135,7 @@ function node_access($op, $node, $account = NULL, $langcode = NULL) {
// Make sure that if an account is passed, that it is a fully loaded user
// object.
if ($account && !($account instanceof UserInterface)) {
- $account = user_load($account->uid);
+ $account = user_load($account->id());
}
return Drupal::entityManager()->getAccessController('node')->access($node, $op, $langcode, $account);
@@ -2154,13 +2154,13 @@ function node_node_access($node, $op, $account) {
}
if ($op == 'update') {
- if (user_access('edit any ' . $type . ' content', $account) || (user_access('edit own ' . $type . ' content', $account) && ($account->uid == $node->getAuthorId()))) {
+ if (user_access('edit any ' . $type . ' content', $account) || (user_access('edit own ' . $type . ' content', $account) && ($account->id() == $node->getAuthorId()))) {
return NODE_ACCESS_ALLOW;
}
}
if ($op == 'delete') {
- if (user_access('delete any ' . $type . ' content', $account) || (user_access('delete own ' . $type . ' content', $account) && ($account->uid == $node->getAuthorId()))) {
+ if (user_access('delete any ' . $type . ' content', $account) || (user_access('delete own ' . $type . ' content', $account) && ($account->id() == $node->getAuthorId()))) {
return NODE_ACCESS_ALLOW;
}
}
@@ -2299,21 +2299,21 @@ function node_access_view_all_nodes($account = NULL) {
$account = $user;
}
- // Statically cache results in an array keyed by $account->uid.
+ // Statically cache results in an array keyed by $account->id().
$access = &drupal_static(__FUNCTION__);
- if (isset($access[$account->uid])) {
- return $access[$account->uid];
+ if (isset($access[$account->id()])) {
+ return $access[$account->id()];
}
// If no modules implement the node access system, access is always TRUE.
if (!module_implements('node_grants')) {
- $access[$account->uid] = TRUE;
+ $access[$account->id()] = TRUE;
}
else {
- $access[$account->uid] = Drupal::entityManager()->getAccessController('node')->checkAllGrants($account);
+ $access[$account->id()] = Drupal::entityManager()->getAccessController('node')->checkAllGrants($account);
}
- return $access[$account->uid];
+ return $access[$account->id()];
}
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 6a668aba75f0fd3d33caf32602b4536d67322c17..0532aa2592c0f66e339a2c289612ca7c5e2e86a3 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -87,7 +87,7 @@ function node_add($node_type) {
$type = $node_type->type;
$langcode = module_invoke('language', 'get_default_langcode', 'node', $type);
$node = entity_create('node', array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'name' => (isset($user->name) ? $user->name : ''),
'type' => $type,
'langcode' => $langcode ? $langcode : language_default()->id,
@@ -114,7 +114,7 @@ function node_preview(EntityInterface $node) {
// The use of isset() is mandatory in the context of user IDs, because
// user ID 0 denotes the anonymous user.
if ($user = user_load_by_name($node->name)) {
- $node->uid = $user->uid;
+ $node->uid = $user->id();
}
else {
$node->uid = 0; // anonymous user
diff --git a/core/modules/node/tests/modules/node_access_test/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module
index 82994566768fb32ba01962d32a79342305efbb4a..6a9492ce4d42b3a9e13be7d693257b5eee4802dc 100644
--- a/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -17,13 +17,13 @@
function node_access_test_node_grants($account, $op) {
$grants = array();
// First grant a grant to the author for own content.
- $grants['node_access_test_author'] = array($account->uid);
+ $grants['node_access_test_author'] = array($account->id());
if ($op == 'view' && user_access('node test view', $account)) {
$grants['node_access_test'] = array(8888, 8889);
}
$no_access_uid = Drupal::state()->get('node_access_test.no_access_uid') ?: 0;
- if ($op == 'view' && $account->uid == $no_access_uid) {
+ if ($op == 'view' && $account->id() == $no_access_uid) {
$grants['node_access_all'] = array(0);
}
return $grants;
diff --git a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php b/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
index 18d90866d54726e4c63277df4fbd4659ce541fd9..86ed1d0d92b2be5d0a7d43d292d0ab50c91157c5 100644
--- a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
+++ b/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
@@ -78,7 +78,7 @@ public function onRequest(GetResponseEvent $event) {
// Only act if the user has access to the overlay and a mode was not already
// set. Other modules can also enable the overlay directly for other uses.
- $user_data = $this->userData->get('overlay', $user->uid, 'enabled');
+ $user_data = $this->userData->get('overlay', $user->id(), 'enabled');
$use_overlay = !isset($user_data) || $user_data;
if (empty($mode) && user_access('access overlay') && $use_overlay) {
$current_path = $request->attributes->get('system_path');
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 0a316e501b0f71e0648368857bf3ad95052d9444..3e6f989c34752a81b5bcf45cb41cbc5ad29a4a4e 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -230,11 +230,11 @@ function overlay_disable_message() {
global $user;
$build = array();
- if (empty($user->uid) || !user_access('access overlay')) {
+ if ($user->isAnonymous() || !user_access('access overlay')) {
return $build;
}
- $user_data = Drupal::service('user.data')->get('overlay', $user->uid);
+ $user_data = Drupal::service('user.data')->get('overlay', $user->id());
if (empty($user_data['message_dismissed']) && (!isset($user_data['enabled']) || $user_data['enabled'])) {
$build = array(
'#theme' => 'overlay_disable_message',
@@ -243,7 +243,7 @@ function overlay_disable_message() {
'profile_link' => array(
'#type' => 'link',
'#title' => t('If you have problems accessing administrative pages on this site, disable the overlay on your profile page.'),
- '#href' => 'user/' . $user->uid . '/edit',
+ '#href' => 'user/' . $user->id() . '/edit',
'#options' => array(
'query' => drupal_get_destination(),
'fragment' => 'edit-overlay-control',
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
index 291b633abc740e88c9ef756b0e7cf549620e0788..4e37019ea1fe4b80287494abb79aa69bb16b1ce4 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
@@ -115,7 +115,7 @@ function testAliasTranslation() {
// Change user language preference.
$edit = array('preferred_langcode' => 'fr');
- $this->drupalPost("user/{$this->web_user->uid}/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $this->web_user->id() . "/edit", $edit, t('Save'));
// Check that the English alias works. In this situation French is the
// current UI and content language, while URL language is English (since we
diff --git a/core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php b/core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php
index dd581161cffc493b5a24067771bcff7612567fbc..88353ba6a28a63bcfc5bfc16d0266d121f418047 100644
--- a/core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php
+++ b/core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php
@@ -58,7 +58,7 @@ public function tips($long = FALSE) {
$output .= '<li>' . t('<p>To display the name of a registered user, use this instead:</p>
<pre>
global $user;
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
print t(\'Welcome @name! Thank you for visiting.\', array(\'@name\' => user_format_name($user)));
}
else {
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
index 61b4b3d82507c82a19356db129f0f2975baf2491..345ae8c51c79c440bf03bcbf87aad1f4b53fe92e 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
@@ -109,8 +109,8 @@ public function setUp() {
*/
public function testNumberOfCommentsRdfaMarkup() {
// Posts 2 comments on behalf of registered user.
- $this->saveComment($this->node->nid, $this->web_user->uid);
- $this->saveComment($this->node->nid, $this->web_user->uid);
+ $this->saveComment($this->node->nid, $this->web_user->id());
+ $this->saveComment($this->node->nid, $this->web_user->id());
// Tests number of comments in teaser view.
$this->drupalLogin($this->web_user);
@@ -144,7 +144,7 @@ public function testNumberOfCommentsRdfaMarkup() {
*/
public function testCommentRdfaMarkup() {
// Posts comment #1 on behalf of registered user.
- $comment1 = $this->saveComment($this->node->nid, $this->web_user->uid);
+ $comment1 = $this->saveComment($this->node->nid, $this->web_user->id());
// Tests comment #1 with access to the user profile.
$this->drupalLogin($this->web_user);
@@ -187,12 +187,12 @@ public function testCommentRdfaMarkup() {
public function testCommentReplyOfRdfaMarkup() {
// Posts comment #1 on behalf of registered user.
$this->drupalLogin($this->web_user);
- $comment_1 = $this->saveComment($this->node->nid, $this->web_user->uid);
+ $comment_1 = $this->saveComment($this->node->nid, $this->web_user->id());
$comment_1_uri = url('comment/' . $comment_1->id(), array('absolute' => TRUE));
// Posts a reply to the first comment.
- $comment_2 = $this->saveComment($this->node->nid, $this->web_user->uid, NULL, $comment_1->id());
+ $comment_2 = $this->saveComment($this->node->nid, $this->web_user->id(), NULL, $comment_1->id());
$comment_2_uri = url('comment/' . $comment_2->id(), array('absolute' => TRUE));
$parser = new \EasyRdf_Parser_Rdfa();
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
index f1e4fb11a2cf528d3f8f1ab81af9d368258b8a18..8abf53863132eed4bfa08b12dd088ea11ab2a2cb 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
@@ -96,7 +96,7 @@ public function setUp() {
$page_uri_info = $this->page->uri();
$this->pageUri = url($page_uri_info['path'], array('absolute' => TRUE));
// Author.
- $this->authorUri = url('user/' . $this->adminUser->uid, array('absolute' => TRUE));
+ $this->authorUri = url('user/' . $this->adminUser->id(), array('absolute' => TRUE));
// Comment.
$article_comment_uri_info = $this->articleComment->uri();
$this->articleCommentUri = url($article_comment_uri_info['path'], array('absolute' => TRUE));
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php
index e3803689d6d89c85e11ac9bff3560d6249627ecb..c5ba5f8c7bdc72a4068bacb58765e7a88cc55b5f 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php
@@ -53,15 +53,15 @@ function testUserAttributesInMarkup() {
$user2 = $this->drupalCreateUser();
$this->drupalLogin($user1);
- $account_uri = url('user/' . $user2->uid, array('absolute' => TRUE));
- $person_uri = url('user/' . $user2->uid, array('fragment' => 'me', 'absolute' => TRUE));
+ $account_uri = url('user/' . $user2->id(), array('absolute' => TRUE));
+ $person_uri = url('user/' . $user2->id(), array('fragment' => 'me', 'absolute' => TRUE));
// Parses the user profile page where the default bundle mapping for user
// should be used.
$parser = new \EasyRdf_Parser_Rdfa();
$graph = new \EasyRdf_Graph();
$base_uri = url('<front>', array('absolute' => TRUE));
- $parser->parse($graph, $this->drupalGet('user/' . $user2->uid), 'rdfa', $base_uri);
+ $parser->parse($graph, $this->drupalGet('user/' . $user2->id()), 'rdfa', $base_uri);
// Inspects RDF graph output.
// User type.
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php b/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php
index 46ad0cc984a0900bb7be965580566b005ef12cbf..c8a4862ecbd05704f8dbb3032f1708534664737b 100644
--- a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php
+++ b/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php
@@ -54,7 +54,7 @@ protected function setUp() {
// Create a test entity to serialize.
$this->values = array(
'name' => $this->randomName(),
- 'user_id' => $GLOBALS['user']->uid,
+ 'user_id' => $GLOBALS['user']->id(),
'field_test_text' => array(
'value' => $this->randomName(),
'format' => 'full_html',
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php
index a7150b10a28bd9458989bcf8924026975b4d9c4e..bae0e5cddaf1f095723bf983a4299b91ccf9a2f1 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutStorageController.php
@@ -45,7 +45,7 @@ public function deleteAssignedShortcutSets(Shortcut $entity) {
*/
public function assignUser($shortcut_set, $account) {
db_merge('shortcut_set_users')
- ->key(array('uid' => $account->uid))
+ ->key(array('uid' => $account->id()))
->fields(array('set_name' => $shortcut_set->id()))
->execute();
drupal_static_reset('shortcut_current_displayed_set');
@@ -56,7 +56,7 @@ public function assignUser($shortcut_set, $account) {
*/
public function unassignUser($account) {
$deleted = db_delete('shortcut_set_users')
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
return (bool) $deleted;
}
@@ -67,7 +67,7 @@ public function unassignUser($account) {
public function getAssignedToUser($account) {
$query = db_select('shortcut_set_users', 'ssu');
$query->fields('ssu', array('set_name'));
- $query->condition('ssu.uid', $account->uid);
+ $query->condition('ssu.uid', $account->id());
return $query->execute()->fetchField();
}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
index 8a55dfd8d665cfcf83cdc6f1b2df4d3e7071f224..b02cd5665505dfee312233699bbc76e185919a4f 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
@@ -29,7 +29,7 @@ function testShortcutSetAdd() {
$new_set = $this->generateShortcutSet($this->randomName());
$sets = entity_load_multiple('shortcut');
$this->assertTrue(isset($sets[$new_set->id()]), 'Successfully created a shortcut set.');
- $this->drupalGet('user/' . $this->admin_user->uid . '/shortcuts');
+ $this->drupalGet('user/' . $this->admin_user->id() . '/shortcuts');
$this->assertText($new_set->label(), 'Generated shortcut set was listed as a choice on the user account page.');
}
@@ -41,7 +41,7 @@ function testShortcutSetSwitchOwn() {
// Attempt to switch the default shortcut set to the newly created shortcut
// set.
- $this->drupalPost('user/' . $this->admin_user->uid . '/shortcuts', array('set' => $new_set->id()), t('Change set'));
+ $this->drupalPost('user/' . $this->admin_user->id() . '/shortcuts', array('set' => $new_set->id()), t('Change set'));
$this->assertResponse(200);
$current_set = shortcut_current_displayed_set($this->admin_user);
$this->assertTrue($new_set->id() == $current_set->id(), 'Successfully switched own shortcut set.');
@@ -67,7 +67,7 @@ function testShortcutSetSwitchCreate() {
'id' => strtolower($this->randomName()),
'label' => $this->randomString(),
);
- $this->drupalPost('user/' . $this->admin_user->uid . '/shortcuts', $edit, t('Change set'));
+ $this->drupalPost('user/' . $this->admin_user->id() . '/shortcuts', $edit, t('Change set'));
$current_set = shortcut_current_displayed_set($this->admin_user);
$this->assertNotEqual($current_set->id(), $this->set->id(), 'A shortcut set can be switched to at the same time as it is created.');
$this->assertEqual($current_set->label(), $edit['label'], 'The new set is correctly assigned to the user.');
@@ -78,7 +78,7 @@ function testShortcutSetSwitchCreate() {
*/
function testShortcutSetSwitchNoSetName() {
$edit = array('set' => 'new');
- $this->drupalPost('user/' . $this->admin_user->uid . '/shortcuts', $edit, t('Change set'));
+ $this->drupalPost('user/' . $this->admin_user->id() . '/shortcuts', $edit, t('Change set'));
$this->assertText(t('The new set label is required.'));
$current_set = shortcut_current_displayed_set($this->admin_user);
$this->assertEqual($current_set->id(), $this->set->id(), 'Attempting to switch to a new shortcut set without providing a set name does not succeed.');
@@ -167,7 +167,7 @@ function testShortcutSetCreateWithSetName() {
$new_set = $this->generateShortcutSet($random_name, $random_name, TRUE);
$sets = entity_load_multiple('shortcut');
$this->assertTrue(isset($sets[$random_name]), 'Successfully created a shortcut set with a defined set name.');
- $this->drupalGet('user/' . $this->admin_user->uid . '/shortcuts');
+ $this->drupalGet('user/' . $this->admin_user->id() . '/shortcuts');
$this->assertText($new_set->label(), 'Generated shortcut set was listed as a choice on the user account page.');
}
}
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index 3ee8e0b72965aeccc943402f24a4fa1e1646b397..30530afa40e2f90a6ebd904cd48f74aba5227214 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -55,7 +55,7 @@ function shortcut_set_switch($form, &$form_state, $account = NULL) {
$form['set'] = array(
'#type' => 'radios',
- '#title' => $user->uid == $account->uid ? t('Choose a set of shortcuts to use') : t('Choose a set of shortcuts for this user'),
+ '#title' => $user->id() == $account->id() ? t('Choose a set of shortcuts to use') : t('Choose a set of shortcuts for this user'),
'#options' => $options,
'#default_value' => $current_set->id(),
);
@@ -85,7 +85,7 @@ function shortcut_set_switch($form, &$form_state, $account = NULL) {
'#required' => FALSE,
);
- if ($user->uid != $account->uid) {
+ if ($user->id() != $account->id()) {
$default_set = shortcut_default_set($account);
$form['new']['#description'] = t('The new set is created by copying items from the %default set.', array('%default' => $default_set->label()));
}
@@ -147,7 +147,7 @@ function shortcut_set_switch_submit($form, &$form_state) {
'%set_name' => $set->label(),
'@switch-url' => url(current_path()),
);
- if ($account->uid == $user->uid) {
+ if ($account->id() == $user->id()) {
// Only administrators can create new shortcut sets, so we know they have
// access to switch back.
drupal_set_message(t('You are now using the new %set_name shortcut set. You can edit it from this page or <a href="@switch-url">switch back to a different one.</a>', $replacements));
@@ -164,7 +164,7 @@ function shortcut_set_switch_submit($form, &$form_state) {
'%user' => $account->name,
'%set_name' => $set->label(),
);
- drupal_set_message($account->uid == $user->uid ? t('You are now using the %set_name shortcut set.', $replacements) : t('%user is now using the %set_name shortcut set.', $replacements));
+ drupal_set_message($account->id() == $user->id() ? t('You are now using the %set_name shortcut set.', $replacements) : t('%user is now using the %set_name shortcut set.', $replacements));
}
// Assign the shortcut set to the provided user account.
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 6923f695e4dd4de4ee53b947f48ce99e7bc71231..dd094a158e3354b1d9cdfc3bf37c253e4b1d4154 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -32,7 +32,7 @@ function shortcut_help($path, $arg) {
case 'admin/config/user-interface/shortcut':
case 'admin/config/user-interface/shortcut/%':
if (user_access('switch shortcut sets')) {
- $output = '<p>' . t('Define which shortcut set you are using on the <a href="@shortcut-link">Shortcuts tab</a> of your account page.', array('@shortcut-link' => url("user/{$user->uid}/shortcuts"))) . '</p>';
+ $output = '<p>' . t('Define which shortcut set you are using on the <a href="@shortcut-link">Shortcuts tab</a> of your account page.', array('@shortcut-link' => url("user/{$user->id()}/shortcuts"))) . '</p>';
return $output;
}
}
@@ -206,7 +206,7 @@ function shortcut_set_switch_access($account = NULL) {
return FALSE;
}
- if (!isset($account) || $user->uid == $account->uid) {
+ if (!isset($account) || $user->id() == $account->id()) {
// Users with the 'switch shortcut sets' permission can switch their own
// shortcuts sets.
return TRUE;
@@ -327,8 +327,8 @@ function shortcut_current_displayed_set($account = NULL) {
$account = $user;
}
// Try to return a shortcut set from the static cache.
- if (isset($shortcut_sets[$account->uid])) {
- return $shortcut_sets[$account->uid];
+ if (isset($shortcut_sets[$account->id()])) {
+ return $shortcut_sets[$account->id()];
}
// If none was found, try to find a shortcut set that is explicitly assigned
// to this user.
@@ -343,7 +343,7 @@ function shortcut_current_displayed_set($account = NULL) {
$shortcut_set = shortcut_default_set($account);
}
- $shortcut_sets[$account->uid] = $shortcut_set;
+ $shortcut_sets[$account->id()] = $shortcut_set;
return $shortcut_set;
}
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 7b927da2a29ccb607821f0a9793889482f34494c..f0aa5fd0e010c86cc30864809df24c16dae5573c 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -269,11 +269,11 @@ protected function drupalCreateNode(array $settings = array()) {
// logged in user if available, or else the user running the test.
if (!isset($settings['uid'])) {
if ($this->loggedInUser) {
- $settings['uid'] = $this->loggedInUser->uid;
+ $settings['uid'] = $this->loggedInUser->id();
}
else {
global $user;
- $settings['uid'] = $user->uid;
+ $settings['uid'] = $user->id();
}
}
@@ -487,8 +487,8 @@ protected function drupalCreateUser(array $permissions = array(), $name = NULL)
$account = entity_create('user', $edit);
$account->save();
- $this->assertTrue(!empty($account->uid), String::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
- if (empty($account->uid)) {
+ $this->assertTrue($account->id(), String::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
+ if (!$account->id()) {
return FALSE;
}
@@ -610,7 +610,7 @@ protected function checkPermissions(array $permissions, $reset = FALSE) {
* $this->drupalLogin($account);
* // Load real user object.
* $pass_raw = $account->pass_raw;
- * $account = user_load($account->uid);
+ * $account = user_load($account->id());
* $account->pass_raw = $pass_raw;
* @endcode
*
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php
index af45ffd7e1c88eb3953b6daacf0211496a0ad442..949206f2ac9b7e211d63d93684710f901dc9fe5a 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php
@@ -61,7 +61,7 @@ function setUp() {
}
$this->privileged_user = $this->drupalCreateUser(array('administer statistics', 'view post access counter', 'create page content'));
$this->drupalLogin($this->privileged_user);
- $this->test_node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->privileged_user->uid));
+ $this->test_node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->privileged_user->id()));
$this->client = \Drupal::httpClient();
$this->client->setConfig(array('curl.options' => array(CURLOPT_TIMEOUT => 10)));
}
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php
index 86c7b42fe3517e15ce28941074c43b63dab2cf86..76551c704d4f0c339eab68fc77179c2cd7dcce54 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php
@@ -51,7 +51,7 @@ function setUp() {
$this->auth_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content'));
// Ensure we have a node page to access.
- $this->node = $this->drupalCreateNode(array('title' => $this->randomName(255), 'uid' => $this->auth_user->uid));
+ $this->node = $this->drupalCreateNode(array('title' => $this->randomName(255), 'uid' => $this->auth_user->id()));
// Enable page caching.
$config = config('system.performance');
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php
index b897f993fe0c47180ce85a0a658005fcd0dc1280..9a6b22f561c453f95da486c9e8aa6760ae5df532 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php
@@ -28,7 +28,7 @@ function testPopularContentBlock() {
$this->container->get('plugin.manager.block')->clearCachedDefinitions();
// Visit a node to have something show up in the block.
- $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->blocking_user->uid));
+ $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->blocking_user->id()));
$this->drupalGet('node/' . $node->nid);
// Manually calling statistics.php, simulating ajax behavior.
$nid = $node->nid;
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php
index f13d5cbb07bb25ece414f8cee3647360d2f7601c..56246cdad1596ecffe53119280b56117bd54110f 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php
@@ -30,7 +30,7 @@ function testStatisticsTokenReplacement() {
// Create user and node.
$user = $this->drupalCreateUser(array('create page content'));
$this->drupalLogin($user);
- $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $user->uid));
+ $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $user->id()));
// Hit the node.
$this->drupalGet('node/' . $node->nid);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
index 8e7879e363092b1bfe9391022f58cc5f53d8fc25..1daf4bff231722de97a4328a6809cfade32e00dd 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
@@ -29,7 +29,7 @@ class SystemMenuBlock extends BlockBase {
public function access() {
// @todo The 'Tools' menu should be available to anonymous users.
list($plugin, $derivative) = explode(':', $this->getPluginId());
- return ($GLOBALS['user']->uid || in_array($derivative, array('menu-main', 'menu-tools', 'menu-footer')));
+ return ($GLOBALS['user']->isAuthenticated() || in_array($derivative, array('menu-main', 'menu-tools', 'menu-footer')));
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
index 6c0d23af46776d0f08326292ab0b4daaed3fbf75..b46f7519bc65d8c33c54a709c905cf78e515e2ec 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
@@ -121,13 +121,13 @@ function testFormatDate() {
$test_user = $this->drupalCreateUser();
$this->drupalLogin($test_user);
$edit = array('preferred_langcode' => self::LANGCODE, 'mail' => $test_user->mail, 'timezone' => 'America/Los_Angeles');
- $this->drupalPost('user/' . $test_user->uid . '/edit', $edit, t('Save'));
+ $this->drupalPost('user/' . $test_user->id() . '/edit', $edit, t('Save'));
// Disable session saving as we are about to modify the global $user.
drupal_save_session(FALSE);
// Save the original user and language and then replace it with the test user and language.
$real_user = $user;
- $user = user_load($test_user->uid, TRUE);
+ $user = user_load($test_user->id(), TRUE);
$real_language = $language_interface->id;
$language_interface->id = $user->preferred_langcode;
// Simulate a Drupal bootstrap with the logged-in user.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php
index 698ea1adc1626b83441b055ee289105ebfb79605..ea2b4db701bad1bbe241019d4367daf1679062a0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php
@@ -83,13 +83,13 @@ public function testDateTimezone() {
// Set up the user with a different timezone than the site.
$edit = array('mail' => $test_user->mail, 'timezone' => 'Asia/Manila');
- $this->drupalPost('user/' . $test_user->uid . '/edit', $edit, t('Save'));
+ $this->drupalPost('user/' . $test_user->id() . '/edit', $edit, t('Save'));
// Disable session saving as we are about to modify the global $user.
drupal_save_session(FALSE);
// Save the original user and then replace it with the test user.
$real_user = $user;
- $user = user_load($test_user->uid, TRUE);
+ $user = user_load($test_user->id(), TRUE);
// Simulate a Drupal bootstrap with the logged-in user.
date_default_timezone_set(drupal_get_user_timezone());
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
index a9fd8bf3a1d74ca218c3ab71898ced48f7048a3b..57f9355f5c0086b315dff6ecfab692ec320d0d16 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
@@ -56,9 +56,9 @@ public function testCRUD() {
*/
protected function assertCRUD($entity_type, UserInterface $user1) {
// Create some test entities.
- $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => $user1->uid));
+ $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => $user1->id()));
$entity->save();
- $entity = entity_create($entity_type, array('name' => 'test2', 'user_id' => $user1->uid));
+ $entity = entity_create($entity_type, array('name' => 'test2', 'user_id' => $user1->id()));
$entity->save();
$entity = entity_create($entity_type, array('name' => 'test', 'user_id' => NULL));
$entity->save();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
index 055b0144343a81718cb26c4f23e70bd141793a65..4d989086ed0352c76e653cf27c3b3385194f7b4d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
@@ -134,7 +134,7 @@ public function testCommentHooks() {
$account = $this->createUser();
$node = entity_create('node', array(
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'type' => 'article',
'title' => 'Test node',
'status' => 1,
@@ -154,7 +154,7 @@ public function testCommentHooks() {
'cid' => NULL,
'pid' => 0,
'nid' => $nid,
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'subject' => 'Test comment',
'created' => REQUEST_TIME,
'changed' => REQUEST_TIME,
@@ -490,7 +490,7 @@ public function testUserHooks() {
));
$_SESSION['entity_crud_hook_test'] = array();
- user_load($account->uid);
+ user_load($account->id());
$this->assertHookMessageOrder(array(
'entity_crud_hook_test_entity_load called for type user',
@@ -509,7 +509,7 @@ public function testUserHooks() {
));
$_SESSION['entity_crud_hook_test'] = array();
- user_delete($account->uid);
+ user_delete($account->id());
$this->assertHookMessageOrder(array(
'entity_crud_hook_test_user_predelete called',
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
index 7bc91079f61762bc56b3b1e45d0ce64871ea4f0e..07817162c2c75e008430048ed434259d3d3334b3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
@@ -67,7 +67,7 @@ protected function createTestEntity($entity_type) {
// Pass in the value of the name field when creating. With the user
// field we test setting a field after creation.
$entity = entity_create($entity_type, array());
- $entity->user_id->target_id = $this->entity_user->uid;
+ $entity->user_id->target_id = $this->entity_user->id();
$entity->name->value = $this->entity_name;
// Set a value for the test field.
@@ -117,19 +117,19 @@ protected function assertReadWrite($entity_type) {
$this->assertTrue($entity->user_id instanceof FieldInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
$this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->uid, $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($this->entity_user->name, $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
// Change the assigned user by entity.
$new_user = $this->createUser();
$entity->user_id->entity = $new_user;
- $this->assertEqual($new_user->uid, $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($new_user->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($new_user->name, $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
// Change the assigned user by id.
$new_user = $this->createUser();
- $entity->user_id->target_id = $new_user->uid;
- $this->assertEqual($new_user->uid, $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+ $entity->user_id->target_id = $new_user->id();
+ $this->assertEqual($new_user->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($new_user->name, $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
// Try unsetting a field.
@@ -207,7 +207,7 @@ protected function assertReadWrite($entity_type) {
$this->entity_name = $this->randomName();
$name_item[0]['value'] = $this->entity_name;
$this->entity_user = $this->createUser();
- $user_item[0]['target_id'] = $this->entity_user->uid;
+ $user_item[0]['target_id'] = $this->entity_user->id();
$this->entity_field_text = $this->randomName();
$text_item[0]['value'] = $this->entity_field_text;
@@ -217,7 +217,7 @@ protected function assertReadWrite($entity_type) {
'field_test_text' => $text_item,
));
$this->assertEqual($this->entity_name, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->uid, $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($this->entity_user->name, $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
@@ -328,7 +328,7 @@ protected function assertSave($entity_type) {
$this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual(Language::LANGCODE_NOT_SPECIFIED, $entity->langcode->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual(language_load(Language::LANGCODE_NOT_SPECIFIED), $entity->langcode->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
- $this->assertEqual($this->entity_user->uid, $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+ $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($this->entity_user->name, $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
$this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
index 71b8141dd4dd25d6a74b6810936a4ca7f42b3aba..90ac1da8f49b504a566fde6c99d7b932000b043a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
@@ -109,7 +109,7 @@ public function setUp() {
$entity = entity_create('entity_test', array());
$entity->name->value = $this->randomName();
$index = $i ? 1 : 0;
- $entity->user_id->target_id = $this->accounts[$index]->uid;
+ $entity->user_id->target_id = $this->accounts[$index]->id();
$entity->{$this->fieldName}->target_id = $this->terms[$index]->id();
$entity->save();
$this->entities[] = $entity;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php
index 152527bccb4d0a3622b5e7c8a47f131df2cbab17..e2d31ab4b91222cde3ab8cfa01648a7c26c72c17 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php
@@ -64,7 +64,7 @@ protected function assertRevisions($entity_type) {
// Create initial entity.
$entity = entity_create($entity_type, array(
'name' => 'foo',
- 'user_id' => $this->web_user->uid,
+ 'user_id' => $this->web_user->id(),
));
$entity->field_test_text->value = 'bar';
$entity->save();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
index d9e464f57379b07adb3a50e5b3456d28894494d0..40a7e442cc4ab77bc4a561a0eb7b419be61441bc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
@@ -107,7 +107,7 @@ public function testEntityLanguageMethods() {
protected function assertEntityLanguageMethods($entity_type) {
$entity = entity_create($entity_type, array(
'name' => 'test',
- 'user_id' => $GLOBALS['user']->uid,
+ 'user_id' => $GLOBALS['user']->id(),
));
$this->assertEqual($entity->language()->id, Language::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type)));
$this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
index f1a0fdb4cb20cc1dc42c879482efb544b3d8f3b9..f00a35be1fc394712168fcf49c9e30973cab86d0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
@@ -72,7 +72,7 @@ protected function createTestEntity($entity_type) {
// Pass in the value of the name field when creating. With the user
// field we test setting a field after creation.
$entity = entity_create($entity_type, array());
- $entity->user_id->target_id = $this->entity_user->uid;
+ $entity->user_id->target_id = $this->entity_user->id();
$entity->name->value = $this->entity_name;
// Set a value for the test field.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
index aa94a68525fad93fc36d57bb2ae29c7fe25802d8..07e39926f2afaa96e24666ede8b7803dfdfb1514 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
@@ -7,6 +7,7 @@
namespace Drupal\system\Tests\Form;
+use Drupal\Core\Session\UserSession;
use Drupal\simpletest\DrupalUnitTestBase;
/**
@@ -45,7 +46,7 @@ public function setUp() {
* Tests the form cache with a logged-in user.
*/
function testCacheToken() {
- $GLOBALS['user']->uid = 1;
+ $GLOBALS['user'] = new UserSession(array('uid' => 1));
form_set_cache($this->form_build_id, $this->form, $this->form_state);
$cached_form_state = form_state_defaults();
@@ -74,7 +75,7 @@ function testCacheToken() {
* Tests the form cache without a logged-in user.
*/
function testNoCacheToken() {
- $GLOBALS['user']->uid = 0;
+ $GLOBALS['user'] = new UserSession(array('uid' => 0));
$this->form_state['example'] = $this->randomName();
form_set_cache($this->form_build_id, $this->form, $this->form_state);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
index fd1c08f5b3fa16aef287ca6329c8f86d9f67ff38..fdb3a702e17d428b2631b3e7649c316bc1ef0f53 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
@@ -384,17 +384,17 @@ function testBreadCrumbs() {
// Verify breadcrumb on user pages (without menu link) for anonymous user.
$trail = $home;
$this->assertBreadcrumb('user', $trail, t('Log in'));
- $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $this->admin_user->name);
// Verify breadcrumb on user pages (without menu link) for registered users.
$this->drupalLogin($this->admin_user);
$trail = $home;
$this->assertBreadcrumb('user', $trail, $this->admin_user->name);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $this->admin_user->name);
$trail += array(
- 'user/' . $this->admin_user->uid => $this->admin_user->name,
+ 'user/' . $this->admin_user->id() => $this->admin_user->name,
);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $this->admin_user->name);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id() . '/edit', $trail, $this->admin_user->name);
// Create a second user to verify breadcrumb on user pages again.
$this->web_user = $this->drupalCreateUser(array(
@@ -406,23 +406,23 @@ function testBreadCrumbs() {
// Verify correct breadcrumb and page title on another user's account pages
// (without menu link).
$trail = $home;
- $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $this->admin_user->name);
$trail += array(
- 'user/' . $this->admin_user->uid => $this->admin_user->name,
+ 'user/' . $this->admin_user->id() => $this->admin_user->name,
);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $this->admin_user->name);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id() . '/edit', $trail, $this->admin_user->name);
// Verify correct breadcrumb and page title when viewing own user account
// pages (without menu link).
$trail = $home;
- $this->assertBreadcrumb('user/' . $this->web_user->uid, $trail, $this->web_user->name);
+ $this->assertBreadcrumb('user/' . $this->web_user->id(), $trail, $this->web_user->name);
$trail += array(
- 'user/' . $this->web_user->uid => $this->web_user->name,
+ 'user/' . $this->web_user->id() => $this->web_user->name,
);
$tree = array(
'user' => t('My account'),
);
- $this->assertBreadcrumb('user/' . $this->web_user->uid . '/edit', $trail, $this->web_user->name, $tree);
+ $this->assertBreadcrumb('user/' . $this->web_user->id() . '/edit', $trail, $this->web_user->name, $tree);
// Add a Tools menu links for 'user' and $this->admin_user.
// Although it may be faster to manage these links via low-level API
@@ -438,7 +438,7 @@ function testBreadCrumbs() {
$edit = array(
'link_title' => $this->admin_user->name . ' link',
- 'link_path' => 'user/' . $this->admin_user->uid,
+ 'link_path' => 'user/' . $this->admin_user->id(),
);
$this->drupalPost("admin/structure/menu/manage/$menu/add", $edit, t('Save'));
$menu_links_admin_user = entity_load_multiple_by_properties('menu_link', array('link_title' => $edit['link_title'], 'link_path' => $edit['link_path']));
@@ -454,13 +454,13 @@ function testBreadCrumbs() {
$tree = array(
$link_admin_user['link_path'] => $link_admin_user['link_title'],
);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $link_admin_user['link_title'], $tree);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $link_admin_user['link_title'], $tree);
$this->drupalLogin($this->admin_user);
$trail += array(
$link_admin_user['link_path'] => $link_admin_user['link_title'],
);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id() . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE);
// Move 'user/%' below 'user' and verify again.
$edit = array(
@@ -480,13 +480,13 @@ function testBreadCrumbs() {
$tree += array(
$link_admin_user['link_path'] => $link_admin_user['link_title'],
);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $link_admin_user['link_title'], $tree);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id(), $trail, $link_admin_user['link_title'], $tree);
$this->drupalLogin($this->admin_user);
$trail += array(
$link_admin_user['link_path'] => $link_admin_user['link_title'],
);
- $this->assertBreadcrumb('user/' . $this->admin_user->uid . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE);
+ $this->assertBreadcrumb('user/' . $this->admin_user->id() . '/edit', $trail, $link_admin_user['link_title'], $tree, FALSE);
// Create an only slightly privileged user being able to access site reports
// but not administration pages.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
index afb7e3223119dd2288945ffc9feb90a9efdfc7f0..00b16344c5912f7e4105cff93c0d1743827cd754 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
@@ -205,11 +205,11 @@ function testAuthUserUserLogin() {
$this->drupalGet('user/login');
// Check that we got to 'user'.
- $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid, array('absolute' => TRUE)), "Logged-in user redirected to user on accessing user/login");
+ $this->assertTrue($this->url == url('user/' . $this->loggedInUser->id(), array('absolute' => TRUE)), "Logged-in user redirected to user on accessing user/login");
// user/register should redirect to user/UID/edit.
$this->drupalGet('user/register');
- $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid . '/edit', array('absolute' => TRUE)), "Logged-in user redirected to user/UID/edit on accessing user/register");
+ $this->assertTrue($this->url == url('user/' . $this->loggedInUser->id() . '/edit', array('absolute' => TRUE)), "Logged-in user redirected to user/UID/edit on accessing user/register");
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php b/core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php
index 14a042276480e3ffb0b069e6b69875e5e5885b23..d56ee5fecdb0eca9986bb9a1a394a0a8b4f0cf6a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php
@@ -46,13 +46,13 @@ public function testUpcasting() {
$foo = 'bar';
// paramconverter_test/test_user_node_foo/{user}/{node}/{foo}
- $this->drupalGet("paramconverter_test/test_user_node_foo/{$user->uid}/{$node->nid}/$foo");
+ $this->drupalGet("paramconverter_test/test_user_node_foo/" . $user->id() . "/{$node->nid}/$foo");
$this->assertRaw("user: {$user->label()}, node: {$node->label()}, foo: $foo", 'user and node upcast by entity name');
// paramconverter_test/test_node_user_user/{node}/{foo}/{user}
// converters:
// foo: 'user'
- $this->drupalGet("paramconverter_test/test_node_user_user/{$node->nid}/{$user->uid}/{$user->uid}");
+ $this->drupalGet("paramconverter_test/test_node_user_user/{$node->nid}/" . $user->id() . "/" . $user->id());
$this->assertRaw("user: {$user->label()}, node: {$node->label()}, foo: {$user->label()}", 'foo converted to user as well');
// paramconverter_test/test_node_node_foo/{user}/{node}/{foo}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
index eef40d4e7349ed269b130d89c158fab732376e27..201b58a603950057ac8fc7b1bf7e41841179c5de 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
@@ -36,7 +36,7 @@ function testUrlAlter() {
$account = $this->drupalCreateUser(array('administer url aliases'));
$this->drupalLogin($account);
- $uid = $account->uid;
+ $uid = $account->id();
$name = $account->name;
// Test a single altered path.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php b/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
index b338b7bcbf30588821098ec09b02201348068b21..e0e8e10fe148fc27843a648b3b23a288d86b5319 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
@@ -209,7 +209,7 @@ protected function testHttpsSession() {
$this->drupalPost(NULL, $edit, t('Log in'));
// Test that the user is also authenticated on the insecure site.
- $this->drupalGet("user/{$user->uid}/edit");
+ $this->drupalGet("user/" . $user->id() . "/edit");
$this->assertResponse(200);
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php b/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
index f96b13e88a64e9e3e3aa3daf0d8b76576bc4de29..220e672a9c4c0641367c1c75e1cabe153fece953 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
@@ -42,7 +42,7 @@ function testSessionSaveRegenerate() {
$user = $this->drupalCreateUser(array('access content'));
// Enable sessions.
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->id());
// Make sure the session cookie is set as HttpOnly.
$this->drupalLogin($user);
@@ -84,7 +84,7 @@ function testSessionSaveRegenerate() {
function testDataPersistence() {
$user = $this->drupalCreateUser(array('access content'));
// Enable sessions.
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->id());
$this->drupalLogin($user);
@@ -104,7 +104,7 @@ function testDataPersistence() {
// Switch browser cookie to anonymous user, then back to user 1.
$this->sessionReset();
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->id());
$this->assertText($value_1, 'Session data persists through browser close.', 'Session');
// Logout the user and make sure the stored value no longer persists.
@@ -129,13 +129,13 @@ function testDataPersistence() {
// Login, the data should persist.
$this->drupalLogin($user);
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->id());
$this->drupalGet('session-test/get');
$this->assertNoText($value_1, 'Session has persisted for an authenticated user after logging out and then back in.', 'Session');
// Change session and create another user.
$user2 = $this->drupalCreateUser(array('access content'));
- $this->sessionReset($user2->uid);
+ $this->sessionReset($user2->id());
$this->drupalLogin($user2);
}
@@ -203,7 +203,7 @@ function testSessionWrite() {
$this->drupalLogin($user);
$sql = 'SELECT u.access, s.timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE u.uid = :uid';
- $times1 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
+ $times1 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
// Before every request we sleep one second to make sure that if the session
// is saved, its timestamp will change.
@@ -211,21 +211,21 @@ function testSessionWrite() {
// Modify the session.
sleep(1);
$this->drupalGet('session-test/set/foo');
- $times2 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
+ $times2 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
$this->assertEqual($times2->access, $times1->access, 'Users table was not updated.');
$this->assertNotEqual($times2->timestamp, $times1->timestamp, 'Sessions table was updated.');
// Write the same value again, i.e. do not modify the session.
sleep(1);
$this->drupalGet('session-test/set/foo');
- $times3 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
+ $times3 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
$this->assertEqual($times3->access, $times1->access, 'Users table was not updated.');
$this->assertEqual($times3->timestamp, $times2->timestamp, 'Sessions table was not updated.');
// Do not change the session.
sleep(1);
$this->drupalGet('');
- $times4 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
+ $times4 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
$this->assertEqual($times4->access, $times3->access, 'Users table was not updated.');
$this->assertEqual($times4->timestamp, $times3->timestamp, 'Sessions table was not updated.');
@@ -238,7 +238,7 @@ function testSessionWrite() {
);
$this->writeSettings($settings);
$this->drupalGet('');
- $times5 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
+ $times5 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
$this->assertNotEqual($times5->access, $times4->access, 'Users table was updated.');
$this->assertNotEqual($times5->timestamp, $times4->timestamp, 'Sessions table was updated.');
}
@@ -254,7 +254,7 @@ function testEmptySessionID() {
// Reset the sid in {sessions} to a blank string. This may exist in the
// wild in some cases, although we normally prevent it from happening.
- db_query("UPDATE {sessions} SET sid = '' WHERE uid = :uid", array(':uid' => $user->uid));
+ db_query("UPDATE {sessions} SET sid = '' WHERE uid = :uid", array(':uid' => $user->id()));
// Send a blank sid in the session cookie, and the session should no longer
// be valid. Closing the curl handler will stop the previous session ID
// from persisting.
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php b/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
index 5ad1676fa6a8f6b009d367eaeb30afb0985fff45..eb4ba4ac2892626a5fb4d4d6a59ea6ba0401022c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
@@ -49,7 +49,7 @@ function testAccessDenied() {
// Use a custom 403 page.
$this->drupalLogin($this->admin_user);
$edit = array(
- 'site_403' => 'user/' . $this->admin_user->uid,
+ 'site_403' => 'user/' . $this->admin_user->id(),
);
$this->drupalPost('admin/config/system/site-information', $edit, t('Save configuration'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
index 4e79ae92c3b32a9db2907c92ed4fb3cb3855d9c8..ae39a1075d3030fc74943f3a4dbe6b06b0eb9b3d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
@@ -81,7 +81,7 @@ function testMainContentFallback() {
// Request a user* page and see if it is displayed.
$this->drupalLogin($this->web_user);
- $this->drupalGet('user/' . $this->web_user->uid . '/edit');
+ $this->drupalGet('user/' . $this->web_user->id() . '/edit');
$this->assertField('mail', 'User interface still available.');
// Enable the block module again.
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php b/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
index dde182295c1f269ab629f86b2e8199a8fbd955b0..a794f776a87a4266d80bb017975e1e2c6de057c5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
@@ -37,7 +37,7 @@ function testPageNotFound() {
// Use a custom 404 page.
$edit = array(
- 'site_404' => 'user/' . $this->admin_user->uid,
+ 'site_404' => 'user/' . $this->admin_user->id(),
);
$this->drupalPost('admin/config/system/site-information', $edit, t('Save configuration'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
index 761adf250df765db07f6ed412073d2a604063d63..a5a689cbaaec675f8386f1037e5537fdc77e71dd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
@@ -112,8 +112,8 @@ function testSiteMaintenance() {
);
$this->drupalPost('user/password', $edit, t('E-mail new password'));
$mails = $this->drupalGetMails();
- $start = strpos($mails[0]['body'], 'user/reset/'. $this->user->uid);
- $path = substr($mails[0]['body'], $start, 66 + strlen($this->user->uid));
+ $start = strpos($mails[0]['body'], 'user/reset/'. $this->user->id());
+ $path = substr($mails[0]['body'], $start, 66 + strlen($this->user->id()));
// Log in with temporary login link.
$this->drupalPost($path, array(), t('Log in'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php b/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
index a2208350308f30da96cdb13435e4535e621127ef..24dbb26f172a61292696e3e1a1699af6269fc67d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
@@ -30,7 +30,7 @@ function testTokenReplacement() {
// Create the initial objects.
$account = $this->drupalCreateUser();
- $node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $node = $this->drupalCreateNode(array('uid' => $account->id()));
$node->title = '<blink>Blinking Text</blink>';
global $user;
$language_interface = language(Language::TYPE_INTERFACE);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
index b0e255ee543b9c17516e716a5ad7294a8e8f77d4..3f625b1e1db20f96d952c95c58e71046f9cd5301 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
@@ -64,7 +64,7 @@ function testUpdateAccess() {
$user1 = user_load(1);
$user1->pass_raw = user_password();
$user1->pass = drupal_container()->get('password')->hash(trim($user1->pass_raw));
- db_query("UPDATE {users} SET pass = :pass WHERE uid = :uid", array(':pass' => $user1->pass, ':uid' => $user1->uid));
+ db_query("UPDATE {users} SET pass = :pass WHERE uid = :uid", array(':pass' => $user1->pass, ':uid' => $user1->id()));
$this->drupalLogin($user1);
$this->drupalGet($this->update_url, array('external' => TRUE));
$this->assertResponse(200);
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 3fe115e7d13b9864eafdf23099f81bb69592accb..ac571211b996f8a3b93e4e9a49d6107ff1302cb8 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -2160,7 +2160,7 @@ function hook_file_url_alter(&$uri) {
global $user;
// User 1 will always see the local file in this example.
- if ($user->uid == 1) {
+ if ($user->id() == 1) {
return;
}
@@ -2631,11 +2631,11 @@ function hook_update_N(&$sandbox) {
$user->name .= '!';
db_update('users')
->fields(array('name' => $user->name))
- ->condition('uid', $user->uid)
+ ->condition('uid', $user->id())
->execute();
$sandbox['progress']++;
- $sandbox['current_uid'] = $user->uid;
+ $sandbox['current_uid'] = $user->id();
}
$sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['progress'] / $sandbox['max']);
@@ -3059,7 +3059,7 @@ function hook_url_outbound_alter(&$path, &$options, $original_path) {
// Instead of pointing to user/[uid]/edit, point to user/me/edit.
if (preg_match('|^user/([0-9]*)/edit(/.*)?|', $path, $matches)) {
global $user;
- if ($user->uid == $matches[1]) {
+ if ($user->id() == $matches[1]) {
$path = 'user/me/edit' . $matches[2];
}
}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 96e08dc12886001690fecab6d55ed69f914369e3..ac42ea3a19cba7286f4576c3dfedb712ef63fbc5 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -124,7 +124,7 @@ function system_help($path, $arg) {
break;
case 'admin/config/development/maintenance':
global $user;
- if ($user->uid == 1) {
+ if ($user->id() == 1) {
return '<p>' . t('Use maintenance mode when making major updates, particularly if the updates could disrupt visitors or the update process. Examples include upgrading, importing or exporting content, modifying a theme, modifying content types, and making backups.') . '</p>';
}
break;
@@ -2427,7 +2427,7 @@ function system_user_login($account) {
$config = config('system.timezone');
// If the user has a NULL time zone, notify them to set a time zone.
if (!$account->timezone && $config->get('user.configurable') && $config->get('user.warn')) {
- drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->id()/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
}
}
@@ -2446,11 +2446,11 @@ function system_user_timezone(&$form, &$form_state) {
$form['timezone']['timezone'] = array(
'#type' => 'select',
'#title' => t('Time zone'),
- '#default_value' => isset($account->timezone) ? $account->timezone : ($account->uid == $user->uid ? config('system.timezone')->get('default') : ''),
- '#options' => system_time_zones($account->uid != $user->uid),
+ '#default_value' => isset($account->timezone) ? $account->timezone : ($account->id() == $user->id() ? config('system.timezone')->get('default') : ''),
+ '#options' => system_time_zones($account->id() != $user->id()),
'#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
);
- if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) {
+ if (!isset($account->timezone) && $account->id() == $user->id() && empty($form_state['input']['timezone'])) {
$form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
drupal_add_library('system', 'drupal.timezone');
diff --git a/core/modules/system/tests/modules/database_test/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module
index 04400827e38e9392f74256b5d4682bdcf3673615..87726623e3e2c6c7ef95437ed78203bfea5a9f1c 100644
--- a/core/modules/system/tests/modules/database_test/database_test.module
+++ b/core/modules/system/tests/modules/database_test/database_test.module
@@ -221,18 +221,19 @@ function database_test_theme_tablesort($form, &$form_state) {
->extend('Drupal\Core\Database\Query\PagerSelectExtender')
->extend('Drupal\Core\Database\Query\TableSortExtender');
$query
- ->fields('u', array('uid', 'name', 'status', 'created', 'access'))
+ ->fields('u', array('uid'))
->limit(50)
->orderByHeader($header)
->setCountQuery($count_query);
- $result = $query->execute();
+ $uids = $query
+ ->execute()
+ ->fetchCol();
$options = array();
$status = array(t('blocked'), t('active'));
- $accounts = array();
- foreach ($result as $account) {
- $options[$account->uid] = array(
+ foreach (user_load_multiple($uids) as $account) {
+ $options[$account->id()] = array(
'username' => check_plain($account->name),
'status' => $status[$account->status],
);
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index 25ae931c158f0917f2a18834bc0b35bd9b8f42c3..cb56e2b080114c6e3b5db65f2b1597715974aa3e 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -2262,7 +2262,7 @@ function form_test_user_register_form_rebuild($form, &$form_state) {
function form_test_two_instances() {
global $user;
$node1 = entity_create('node', array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'name' => (isset($user->name) ? $user->name : ''),
'type' => 'page',
'langcode' => Language::LANGCODE_NOT_SPECIFIED,
diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php
index b3611be40eb1f8013069f141b3a9da6b89e6dd3f..1632d5e5f197b3153a988252cc178f269f1b1c49 100644
--- a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php
+++ b/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php
@@ -22,7 +22,7 @@ public function processInbound($path, Request $request) {
if (preg_match('!^user/([^/]+)(/.*)?!', $path, $matches)) {
if ($account = user_load_by_name($matches[1])) {
$matches += array(2 => '');
- $path = 'user/' . $account->uid . $matches[2];
+ $path = 'user/' . $account->id() . $matches[2];
}
}
diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php
index e649f6d05c4d22406f98adb748298d5c8f373abf..a27c65c48c9d1d041d2975b21e7a5342a62487e3 100644
--- a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php
+++ b/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php
@@ -24,7 +24,7 @@ public function processInbound($path, Request $request) {
if (preg_match('!^user/([^/]+)(/.*)?!', $path, $matches)) {
if ($account = user_load_by_name($matches[1])) {
$matches += array(2 => '');
- $path = 'user/' . $account->uid . $matches[2];
+ $path = 'user/' . $account->id() . $matches[2];
}
}
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 23fd4b5944623252f214db4d39708ca519f200bb..26520c6f7323f21fa96eb18a1e577a2c42ccd226 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -630,7 +630,7 @@ function toolbar_library_info() {
*/
function _toolbar_get_subtree_hash() {
global $user;
- $cid = $user->uid . ':' . language(Language::TYPE_INTERFACE)->id;
+ $cid = $user->id() . ':' . language(Language::TYPE_INTERFACE)->id;
if ($cache = cache('toolbar')->get($cid)) {
$hash = $cache->data;
}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
index d9db5132171d1b3c0fe966ca52c001dc871d1a3f..76033fb52b612c12c8802c09727f2ea0da05dd70 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
@@ -61,7 +61,7 @@ function testTrackerNodeAccess() {
$this->drupalGet('tracker');
$this->assertText($private_node->title, 'Private node is visible to user with private access.');
$this->assertText($public_node->title, 'Public node is visible to user with private access.');
- $this->drupalGet('user/' . $access_user->uid . '/track');
+ $this->drupalGet('user/' . $access_user->id() . '/track');
$this->assertText($private_node->title, 'Private node is visible to user with private access.');
$this->assertText($public_node->title, 'Public node is visible to user with private access.');
@@ -70,7 +70,7 @@ function testTrackerNodeAccess() {
$this->drupalGet('tracker');
$this->assertNoText($private_node->title, 'Private node is not visible to user without private access.');
$this->assertText($public_node->title, 'Public node is visible to user without private access.');
- $this->drupalGet('user/' . $access_user->uid . '/track');
+ $this->drupalGet('user/' . $access_user->id() . '/track');
$this->assertNoText($private_node->title, 'Private node is not visible to user without private access.');
$this->assertText($public_node->title, 'Public node is visible to user without private access.');
}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
index b68b7220ccf67761563f83bb1bc293d77aa8bcc0..baa48d076390a0b9cfc4524e14540396c1497fb3 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
@@ -91,22 +91,22 @@ function testTrackerUser() {
$unpublished = $this->drupalCreateNode(array(
'title' => $this->randomName(8),
- 'uid' => $this->user->uid,
+ 'uid' => $this->user->id(),
'status' => 0,
));
$my_published = $this->drupalCreateNode(array(
'title' => $this->randomName(8),
- 'uid' => $this->user->uid,
+ 'uid' => $this->user->id(),
'status' => 1,
));
$other_published_no_comment = $this->drupalCreateNode(array(
'title' => $this->randomName(8),
- 'uid' => $this->other_user->uid,
+ 'uid' => $this->other_user->id(),
'status' => 1,
));
$other_published_my_comment = $this->drupalCreateNode(array(
'title' => $this->randomName(8),
- 'uid' => $this->other_user->uid,
+ 'uid' => $this->other_user->id(),
'status' => 1,
));
$comment = array(
@@ -115,7 +115,7 @@ function testTrackerUser() {
);
$this->drupalPost('comment/reply/' . $other_published_my_comment->nid, $comment, t('Save'));
- $this->drupalGet('user/' . $this->user->uid . '/track');
+ $this->drupalGet('user/' . $this->user->id() . '/track');
$this->assertNoText($unpublished->label(), "Unpublished nodes do not show up in the users's tracker listing.");
$this->assertText($my_published->label(), "Published nodes show up in the user's tracker listing.");
$this->assertNoText($other_published_no_comment->label(), "Other user's nodes do not show up in the user's tracker listing.");
@@ -125,7 +125,7 @@ function testTrackerUser() {
$admin_user = $this->drupalCreateUser(array('post comments', 'administer comments', 'access user profiles'));
$this->drupalLogin($admin_user);
$this->drupalPost('comment/1/edit', array('status' => COMMENT_NOT_PUBLISHED), t('Save'));
- $this->drupalGet('user/' . $this->user->uid . '/track');
+ $this->drupalGet('user/' . $this->user->id() . '/track');
$this->assertNoText($other_published_my_comment->label(), 'Unpublished comments are not counted on the tracker listing.');
}
@@ -234,7 +234,7 @@ function testTrackerCronIndexing() {
$this->drupalLogin($this->user);
// Fetch the user's tracker.
- $this->drupalGet('tracker/' . $this->user->uid);
+ $this->drupalGet('tracker/' . $this->user->id());
// Assert that all node titles are displayed.
foreach ($nodes as $i => $node) {
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index 58de9696442db38d0dca00d5a048aaa7f7ed150a..edcd297ee262da07bbf1bcba16cc99949dcce577 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -171,7 +171,7 @@ function tracker_cron() {
*/
function _tracker_myrecent_access($account) {
// This path is only allowed for authenticated users looking at their own content.
- return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('access content');
+ return $account->id() && ($GLOBALS['user']->id() == $account->id()) && user_access('access content');
}
/**
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index 529e97efe42128ad46febf340c0c3be7b8dbfd58..eabd7f49334306e3b99973d98d1a995ab12d35d9 100644
--- a/core/modules/tracker/tracker.pages.inc
+++ b/core/modules/tracker/tracker.pages.inc
@@ -22,7 +22,7 @@ function tracker_page($account = NULL, $set_title = FALSE) {
$query = db_select('tracker_user', 't')
->extend('Drupal\Core\Database\Query\PagerSelectExtender')
->addMetaData('base_table', 'tracker_user')
- ->condition('t.uid', $account->uid);
+ ->condition('t.uid', $account->id());
if ($set_title) {
// When viewed from user/%user/track, display the name of the user
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index 9c88847243d2e75eb537053a235393d3339f7eae..993cf136061b9dbeeadd3cd3ba1c3d1e4927a2a8 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -154,7 +154,7 @@ function translation_user_can_translate_node($node, $account = NULL) {
if (empty($account)) {
$account = $GLOBALS['user'];
}
- return node_access('view', $node, $account) && (user_access('translate all content', $account) || ($node->uid == $account->uid && user_access('translate own content', $account)));
+ return node_access('view', $node, $account) && (user_access('translate all content', $account) || ($node->uid == $account->id() && user_access('translate own content', $account)));
}
/**
diff --git a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php
index 7148709f94752c51070e6e6470b9c60d847743dc..c2bdc10f7984c99c5035b5a330aa5e6837ef1a95 100644
--- a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php
+++ b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php
@@ -27,7 +27,7 @@ public function applies(Route $route) {
* {@inheritdoc}
*/
public function access(Route $route, Request $request) {
- return (bool) $GLOBALS['user']->uid;
+ return (bool) $GLOBALS['user']->id();
}
}
diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index 94250a0f10ad790916bae27da0f3cc97e45f484b..950c341f2bfb342e3cf91930139a412ce9ed0b4f 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -24,7 +24,7 @@ public function form(array $form, array &$form_state) {
$config = config('user.settings');
$language_interface = language(Language::TYPE_INTERFACE);
- $register = empty($account->uid);
+ $register = $account->isAnonymous();
$admin = user_access('administer users');
// Account information.
@@ -43,7 +43,7 @@ public function form(array $form, array &$form_state) {
'#attributes' => array('class' => array('username'), 'autocorrect' => 'off', 'autocomplete' => 'off', 'autocapitalize' => 'off',
'spellcheck' => 'false'),
'#default_value' => (!$register ? $account->name : ''),
- '#access' => ($register || ($user->uid == $account->uid && user_access('change own username')) || $admin),
+ '#access' => ($register || ($user->id() == $account->id() && user_access('change own username')) || $admin),
'#weight' => -10,
);
@@ -70,7 +70,7 @@ public function form(array $form, array &$form_state) {
// To skip the current password field, the user must have logged in via a
// one-time link and have the token in the URL.
- $pass_reset = isset($_SESSION['pass_reset_' . $account->uid]) && isset($_GET['pass-reset-token']) && ($_GET['pass-reset-token'] == $_SESSION['pass_reset_' . $account->uid]);
+ $pass_reset = isset($_SESSION['pass_reset_' . $account->id()]) && isset($_GET['pass-reset-token']) && ($_GET['pass-reset-token'] == $_SESSION['pass_reset_' . $account->id()]);
$protected_values = array();
$current_pass_description = '';
@@ -84,7 +84,7 @@ public function form(array $form, array &$form_state) {
}
// The user must enter their current password to change to a new one.
- if ($user->uid == $account->uid) {
+ if ($user->id() == $account->id()) {
$form['account']['current_pass_required_values'] = array(
'#type' => 'value',
'#value' => $protected_values,
@@ -259,7 +259,7 @@ public function validate(array $form, array &$form_state) {
else {
$name_taken = (bool) db_select('users')
->fields('users', array('uid'))
- ->condition('uid', (int) $account->uid, '<>')
+ ->condition('uid', (int) $account->id(), '<>')
->condition('name', db_like($form_state['values']['name']), 'LIKE')
->range(0, 1)
->execute()
@@ -276,7 +276,7 @@ public function validate(array $form, array &$form_state) {
if (!empty($mail)) {
$mail_taken = (bool) db_select('users')
->fields('users', array('uid'))
- ->condition('uid', (int) $account->uid, '<>')
+ ->condition('uid', (int) $account->id(), '<>')
->condition('mail', db_like($mail), 'LIKE')
->range(0, 1)
->execute()
@@ -284,7 +284,7 @@ public function validate(array $form, array &$form_state) {
if ($mail_taken) {
// Format error message dependent on whether the user is logged in or not.
- if ($GLOBALS['user']->uid) {
+ if ($GLOBALS['user']->isAuthenticated()) {
form_set_error('mail', t('The e-mail address %email is already taken.', array('%email' => $mail)));
}
else {
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserController.php b/core/modules/user/lib/Drupal/user/Controller/UserController.php
index eb1dbdedb81727e686eeaf500d6a3774f419db33..cd63cb062d1f99e803fd78936beaf32b89e9ee74 100644
--- a/core/modules/user/lib/Drupal/user/Controller/UserController.php
+++ b/core/modules/user/lib/Drupal/user/Controller/UserController.php
@@ -32,8 +32,8 @@ class UserController extends ContainerAware {
*/
public function userPage(Request $request) {
global $user;
- if ($user->uid) {
- $response = new RedirectResponse(url('user/' . $user->uid, array('absolute' => TRUE)));
+ if ($user->id()) {
+ $response = new RedirectResponse(url('user/' . $user->id(), array('absolute' => TRUE)));
}
else {
$response = drupal_get_form(UserLoginForm::create($this->container), $request);
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
index 185a16fc6ed7b9b8e6b7ec43027259ff96d83e96..8e623d1bfbfd3412a8f264c5d48b45c74143b2d2 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
@@ -87,7 +87,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU
),
);
// Allow logged in users to request this also.
- if ($user->uid > 0) {
+ if ($user->isAuthenticated()) {
$form['name']['#type'] = 'value';
$form['name']['#value'] = $user->mail;
$form['mail'] = array(
@@ -117,7 +117,7 @@ public function validateForm(array &$form, array &$form_state) {
$users = $this->userStorageController->loadByProperties(array('name' => $name, 'status' => '1'));
}
$account = reset($users);
- if (isset($account->uid)) {
+ if ($account && $account->id()) {
form_set_value(array('#parents' => array('account')), $account, $form_state);
}
else {
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
index 2c5c742a4b655091e246604d1497a49612a0e096..009cb5bb7564f67de0596d79bbc27e33c175e4e5 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
@@ -62,7 +62,7 @@ public static function create(ContainerInterface $container, array $configuratio
* {@inheritdoc}
*/
public function executeMultiple(array $entities) {
- $this->tempStoreFactory->get('user_user_operations_cancel')->set($GLOBALS['user']->uid, $entities);
+ $this->tempStoreFactory->get('user_user_operations_cancel')->set($GLOBALS['user']->id(), $entities);
}
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
index 0d5c711ccc729ee0d479f6c244f6ac1d74d1d3f7..ab4401c0e3b40a08c99731a734015434ce8ea200 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
@@ -79,7 +79,7 @@ public static function create(ContainerInterface $container, array $configuratio
* Overrides \Drupal\block\BlockBase::access().
*/
public function access() {
- return (!$GLOBALS['user']->uid && !(arg(0) == 'user' && !is_numeric(arg(1))));
+ return (!$GLOBALS['user']->id() && !(arg(0) == 'user' && !is_numeric(arg(1))));
}
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
index ee8d818cd74cdfe341c94fbc8c4d4dd313572b1d..413cdb71da3a200d984d4e5c7684cb2fda645198 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
@@ -108,7 +108,7 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
// user and recreate the current one.
if ($this->pass->value != $this->original->pass->value) {
drupal_session_destroy_uid($this->id());
- if ($this->id() == $GLOBALS['user']->uid) {
+ if ($this->id() == $GLOBALS['user']->id()) {
drupal_session_regenerate();
}
}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
index 8ed758e9a5d231e93d8afacc23d86ff780dd54ab..8ffac71da81344e1907f38c0b719ca5a70ec45e0 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
@@ -26,7 +26,7 @@ class CurrentUser extends ArgumentDefaultPluginBase {
public function getArgument() {
global $user;
- return $user->uid;
+ return $user->id();
}
}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php
index 45c4c2af32e0c1831c70785cc02f6480fb691920..f58c641eed06fae113625b0ee9934ee57d2e09b5 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php
@@ -41,14 +41,14 @@ public function getArgument() {
foreach (range(1, 3) as $i) {
$user = menu_get_object('user', $i);
if (!empty($user)) {
- return $user->uid;
+ return $user->id();
}
}
foreach (range(1, 3) as $i) {
$user = menu_get_object('user_uid_optional', $i);
if (!empty($user)) {
- return $user->uid;
+ return $user->id();
}
}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
index 52aaad63c3f6e992298b8c8184bc3c167481db29..d01460248332dbee12c6be6c79afb91d7aae1ffe 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
@@ -112,7 +112,7 @@ public function validateArgument($argument) {
// However, is_integer() will always fail, since $argument is a string.
if (is_numeric($argument) && $argument == (int)$argument) {
if ($type == 'uid' || $type == 'either') {
- if ($argument == $GLOBALS['user']->uid) {
+ if ($argument == $GLOBALS['user']->id()) {
// If you assign an object to a variable in PHP, the variable
// automatically acts as a reference, not a copy, so we use
// clone to ensure that we don't actually mess with the
@@ -159,7 +159,7 @@ public function validateArgument($argument) {
}
}
- $this->argument->argument = $account->uid;
+ $this->argument->argument = $account->id();
$this->argument->validated_title = check_plain(user_format_name($account));
return TRUE;
}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
index b09e84a85061c03a39df0e80eb71aa432811b710..f781756e248b0d59deacb9e5948be20bb58c6297 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
@@ -79,7 +79,7 @@ function render_link($data, $values) {
$account->uid = $this->getValue($values, 'uid');
$account->name = $this->getValue($values);
if (!empty($this->options['link_to_user']) || !empty($this->options['overwrite_anonymous'])) {
- if (!empty($this->options['overwrite_anonymous']) && !$account->uid) {
+ if (!empty($this->options['overwrite_anonymous']) && !$account->id()) {
// This is an anonymous user, and we're overriting the text.
return check_plain($this->options['anonymous_text']);
}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
index b34485704dd84068ee346f0e5ddac7a4a9c8cf40..5e272a1cb455361cfb501a447425f1e5176a9b4b 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
@@ -155,7 +155,7 @@ public function adminSummary() {
if ($this->value) {
$result = entity_load_multiple_by_properties('user', array('uid' => $this->value));
foreach ($result as $account) {
- if ($account->uid) {
+ if ($account->id()) {
$this->value_options[$account->id()] = $account->label();
}
else {
diff --git a/core/modules/user/lib/Drupal/user/ProfileFormController.php b/core/modules/user/lib/Drupal/user/ProfileFormController.php
index 484a4aff6e7b1114c3864194f2564aa15dde8156..53b29b10d60522a5f46f13f7b2fec0b7e1c030dc 100644
--- a/core/modules/user/lib/Drupal/user/ProfileFormController.php
+++ b/core/modules/user/lib/Drupal/user/ProfileFormController.php
@@ -22,7 +22,7 @@ protected function actions(array $form, array &$form_state) {
$element['delete']['#type'] = 'submit';
$element['delete']['#value'] = t('Cancel account');
$element['delete']['#submit'] = array('user_edit_cancel_submit');
- $element['delete']['#access'] = $account->uid > 1 && (($account->uid == $GLOBALS['user']->uid && user_access('cancel account')) || user_access('administer users'));
+ $element['delete']['#access'] = $account->id() > 1 && (($account->id() == $GLOBALS['user']->id() && user_access('cancel account')) || user_access('administer users'));
return $element;
}
diff --git a/core/modules/user/lib/Drupal/user/RegisterFormController.php b/core/modules/user/lib/Drupal/user/RegisterFormController.php
index 1b0b76f49f36f5c965cfa10e7fa97d10cd81f7e0..116f6c28b3f23adfc499cbcb711dbac5113e875a 100644
--- a/core/modules/user/lib/Drupal/user/RegisterFormController.php
+++ b/core/modules/user/lib/Drupal/user/RegisterFormController.php
@@ -32,8 +32,8 @@ public function form(array $form, array &$form_state) {
);
// If we aren't admin but already logged on, go to the user page instead.
- if (!$admin && $user->uid) {
- return new RedirectResponse(url('user/' . $user->uid, array('absolute' => TRUE)));
+ if (!$admin && $user->isAuthenticated()) {
+ return new RedirectResponse(url('user/' . $user->id(), array('absolute' => TRUE)));
}
$form['#attached']['library'][] = array('system', 'jquery.cookie');
@@ -99,9 +99,9 @@ public function save(array $form, array &$form_state) {
$account->save();
$form_state['user'] = $account;
- $form_state['values']['uid'] = $account->uid;
+ $form_state['values']['uid'] = $account->id();
- watchdog('user', 'New user: %name %email.', array('%name' => $form_state['values']['name'], '%email' => '<' . $form_state['values']['mail'] . '>'), WATCHDOG_NOTICE, l(t('edit'), 'user/' . $account->uid . '/edit'));
+ watchdog('user', 'New user: %name %email.', array('%name' => $form_state['values']['name'], '%email' => '<' . $form_state['values']['mail'] . '>'), WATCHDOG_NOTICE, l(t('edit'), 'user/' . $account->id() . '/edit'));
// Add plain text password into user account to generate mail tokens.
$account->password = $pass;
diff --git a/core/modules/user/lib/Drupal/user/TempStoreFactory.php b/core/modules/user/lib/Drupal/user/TempStoreFactory.php
index ddd1a75204727ba8d04b029685c59bba597490f2..e7410487d521836dca83e126c2d53a9cf715fc2e 100644
--- a/core/modules/user/lib/Drupal/user/TempStoreFactory.php
+++ b/core/modules/user/lib/Drupal/user/TempStoreFactory.php
@@ -61,7 +61,7 @@ function get($collection, $owner = NULL) {
// Use the currently authenticated user ID or the active user ID unless
// the owner is overridden.
if (!isset($owner)) {
- $owner = $GLOBALS['user']->uid ?: session_id();
+ $owner = $GLOBALS['user']->id() ?: session_id();
}
// Store the data for this collection in the database.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
index 171d40224bfed5c4aa4b2194556fa773ec12dc99..b9c01fa1019e3d287f18e5cc90bbb5e8825f4351 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
@@ -46,7 +46,7 @@ function testUserAdmin() {
$this->assertText($admin_user->name, 'Found Admin user on admin users page');
// Test for existence of edit link in table.
- $link = l(t('Edit'), "user/$user_a->uid/edit", array('query' => array('destination' => 'admin/people')));
+ $link = l(t('Edit'), "user/" . $user_a->id() . "/edit", array('query' => array('destination' => 'admin/people')));
$this->assertRaw($link, 'Found user A edit link on admin users page');
// Filter the users by name/e-mail.
@@ -79,13 +79,13 @@ function testUserAdmin() {
$this->assertText($user_c->name, 'User C on filtered by role on admin users page');
// Test blocking of a user.
- $account = user_load($user_c->uid);
+ $account = user_load($user_c->id());
$this->assertEqual($account->status, 1, 'User C not blocked');
$edit = array();
$edit['action'] = 'user_block_user_action';
$edit['user_bulk_form[1]'] = TRUE;
$this->drupalPost('admin/people', $edit, t('Apply'));
- $account = user_load($user_c->uid, TRUE);
+ $account = user_load($user_c->id(), TRUE);
$this->assertEqual($account->status, 0, 'User C blocked');
// Test filtering on admin page for blocked users
@@ -99,18 +99,18 @@ function testUserAdmin() {
$editunblock['action'] = 'user_unblock_user_action';
$editunblock['user_bulk_form[1]'] = TRUE;
$this->drupalPost('admin/people', $editunblock, t('Apply'));
- $account = user_load($user_c->uid, TRUE);
+ $account = user_load($user_c->id(), TRUE);
$this->assertEqual($account->status, 1, 'User C unblocked');
$this->assertMail("to", $account->mail, "Activation mail sent to user C");
// Test blocking and unblocking another user from /user/[uid]/edit form and sending of activation mail
$user_d = $this->drupalCreateUser(array());
- $account1 = user_load($user_d->uid, TRUE);
- $this->drupalPost('user/' . $account1->uid . '/edit', array('status' => 0), t('Save'));
- $account1 = user_load($user_d->uid, TRUE);
+ $account1 = user_load($user_d->id(), TRUE);
+ $this->drupalPost('user/' . $account1->id() . '/edit', array('status' => 0), t('Save'));
+ $account1 = user_load($user_d->id(), TRUE);
$this->assertEqual($account1->status, 0, 'User D blocked');
- $this->drupalPost('user/' . $account1->uid . '/edit', array('status' => TRUE), t('Save'));
- $account1 = user_load($user_d->uid, TRUE);
+ $this->drupalPost('user/' . $account1->id() . '/edit', array('status' => TRUE), t('Save'));
+ $account1 = user_load($user_d->id(), TRUE);
$this->assertEqual($account1->status, 1, 'User D unblocked');
$this->assertMail("to", $account1->mail, "Activation mail sent to user D");
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
index bf8c98879d1fa119e85b12908b0b77263be0efd3..776f3835d64a1e4eb789f55e0f3d67d09cf50aea 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
@@ -73,7 +73,7 @@ function testUserLoginBlock() {
$this->drupalLogout();
$this->drupalPost('http://example.com/', $edit, t('Log in'), array('external' => FALSE));
// Check that we remain on the site after login.
- $this->assertEqual(url('user/' . $user->uid, array('absolute' => TRUE)), $this->getUrl(), 'Redirected to user profile page after login from the frontpage');
+ $this->assertEqual(url('user/' . $user->id(), array('absolute' => TRUE)), $this->getUrl(), 'Redirected to user profile page after login from the frontpage');
}
/**
@@ -89,14 +89,14 @@ function testWhosOnlineBlock() {
$user3 = $this->drupalCreateUser(array());
// Update access of two users to be within the active timespan.
- $this->updateAccess($user1->uid);
- $this->updateAccess($user2->uid, REQUEST_TIME + 1);
+ $this->updateAccess($user1->id());
+ $this->updateAccess($user2->id(), REQUEST_TIME + 1);
// Insert an inactive user who should not be seen in the block, and ensure
// that the admin user used in setUp() does not appear.
$inactive_time = REQUEST_TIME - $config['seconds_online'] - 1;
- $this->updateAccess($user3->uid, $inactive_time);
- $this->updateAccess($this->adminUser->uid, $inactive_time);
+ $this->updateAccess($user3->id(), $inactive_time);
+ $this->updateAccess($this->adminUser->id(), $inactive_time);
// Test block output.
$content = entity_view($block, 'block');
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index 15e9912b0fc4efe6e5851e8a0427ee145b28a3ba..c45a21fdc334741a58c671fb7cddf70780866257 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -39,25 +39,25 @@ function testUserCancelWithoutPermission() {
$account = $this->drupalCreateUser(array());
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
// Create a node.
- $node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $node = $this->drupalCreateNode(array('uid' => $account->id()));
// Attempt to cancel account.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->assertNoRaw(t('Cancel account'), 'No cancel account button displayed.');
// Attempt bogus account cancellation request confirmation.
$timestamp = $account->login;
- $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
$this->assertResponse(403, 'Bogus cancelling request rejected.');
- $account = user_load($account->uid);
+ $account = user_load($account->id());
$this->assertTrue($account->status == 1, 'User account was not canceled.');
// Confirm user's content has not been altered.
$test_node = node_load($node->nid, TRUE);
- $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), 'Node of the user has not been altered.');
+ $this->assertTrue(($test_node->uid == $account->id() && $test_node->status == 1), 'Node of the user has not been altered.');
}
/**
@@ -109,13 +109,13 @@ function testUserCancelInvalid() {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
// Create a node.
- $node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $node = $this->drupalCreateNode(array('uid' => $account->id()));
// Attempt to cancel account.
- $this->drupalPost('user/' . $account->uid . '/edit', NULL, t('Cancel account'));
+ $this->drupalPost('user/' . $account->id() . '/edit', NULL, t('Cancel account'));
// Confirm account cancellation.
$timestamp = time();
@@ -124,21 +124,21 @@ function testUserCancelInvalid() {
// Attempt bogus account cancellation request confirmation.
$bogus_timestamp = $timestamp + 60;
- $this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
$this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Bogus cancelling request rejected.');
- $account = user_load($account->uid);
+ $account = user_load($account->id());
$this->assertTrue($account->status == 1, 'User account was not canceled.');
// Attempt expired account cancellation request confirmation.
$bogus_timestamp = $timestamp - 86400 - 60;
- $this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
$this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Expired cancel account request rejected.');
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
$this->assertTrue($account->status, 'User account was not canceled.');
// Confirm user's content has not been altered.
$test_node = node_load($node->nid, TRUE);
- $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), 'Node of the user has not been altered.');
+ $this->assertTrue(($test_node->uid == $account->id() && $test_node->status == 1), 'Node of the user has not been altered.');
}
/**
@@ -152,10 +152,10 @@ function testUserBlock() {
$this->drupalLogin($web_user);
// Load real user object.
- $account = user_load($web_user->uid, TRUE);
+ $account = user_load($web_user->id(), TRUE);
// Attempt to cancel account.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your user name.'), 'Informs that all content will be remain as is.');
@@ -168,8 +168,8 @@ function testUserBlock() {
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
- $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $account = user_load($account->uid, TRUE);
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
+ $account = user_load($account->id(), TRUE);
$this->assertTrue($account->status == 0, 'User has been blocked.');
// Confirm that the confirmation message made it through to the end user.
@@ -186,16 +186,16 @@ function testUserBlockUnpublish() {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
// Create a node with two revisions.
- $node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $node = $this->drupalCreateNode(array('uid' => $account->id()));
$settings = get_object_vars($node);
$settings['revision'] = 1;
$node = $this->drupalCreateNode($settings);
// Attempt to cancel account.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'), 'Informs that all content will be unpublished.');
@@ -206,8 +206,8 @@ function testUserBlockUnpublish() {
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
- $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $account = user_load($account->uid, TRUE);
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
+ $account = user_load($account->id(), TRUE);
$this->assertTrue($account->status == 0, 'User has been blocked.');
// Confirm user's content has been unpublished.
@@ -230,14 +230,14 @@ function testUserAnonymize() {
$account = $this->drupalCreateUser(array('cancel account'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
// Create a simple node.
- $node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $node = $this->drupalCreateNode(array('uid' => $account->id()));
// Create a node with two revisions, the initial one belonging to the
// cancelling user.
- $revision_node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $revision_node = $this->drupalCreateNode(array('uid' => $account->id()));
$revision = $revision_node->vid;
$settings = get_object_vars($revision_node);
$settings['revision'] = 1;
@@ -245,7 +245,7 @@ function testUserAnonymize() {
$revision_node = $this->drupalCreateNode($settings);
// Attempt to cancel account.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => config('user.settings')->get('anonymous'))), 'Informs that all content will be attributed to anonymous account.');
@@ -256,8 +256,8 @@ function testUserAnonymize() {
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
- $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertFalse(user_load($account->uid, TRUE), 'User is not found in the database.');
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
+ $this->assertFalse(user_load($account->id(), TRUE), 'User is not found in the database.');
// Confirm that user's content has been attributed to anonymous user.
$test_node = node_load($node->nid, TRUE);
@@ -283,10 +283,10 @@ function testUserDelete() {
$account = $this->drupalCreateUser(array('cancel account', 'post comments', 'skip comment approval'));
$this->drupalLogin($account);
// Load real user object.
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
// Create a simple node.
- $node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $node = $this->drupalCreateNode(array('uid' => $account->id()));
// Create comment.
$langcode = Language::LANGCODE_NOT_SPECIFIED;
@@ -303,7 +303,7 @@ function testUserDelete() {
// Create a node with two revisions, the initial one belonging to the
// cancelling user.
- $revision_node = $this->drupalCreateNode(array('uid' => $account->uid));
+ $revision_node = $this->drupalCreateNode(array('uid' => $account->id()));
$revision = $revision_node->vid;
$settings = get_object_vars($revision_node);
$settings['revision'] = 1;
@@ -311,7 +311,7 @@ function testUserDelete() {
$revision_node = $this->drupalCreateNode($settings);
// Attempt to cancel account.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Your account will be removed and all account information deleted. All of your content will also be deleted.'), 'Informs that all content will be deleted.');
@@ -322,8 +322,8 @@ function testUserDelete() {
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
- $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertFalse(user_load($account->uid, TRUE), 'User is not found in the database.');
+ $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
+ $this->assertFalse(user_load($account->id(), TRUE), 'User is not found in the database.');
// Confirm that user's content has been deleted.
$this->assertFalse(node_load($node->nid, TRUE), 'Node of the user has been deleted.');
@@ -349,7 +349,7 @@ function testUserCancelByAdmin() {
$this->drupalLogin($admin_user);
// Delete regular user.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
@@ -357,7 +357,7 @@ function testUserCancelByAdmin() {
// Confirm deletion.
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), 'User deleted.');
- $this->assertFalse(user_load($account->uid), 'User is not found in the database.');
+ $this->assertFalse(user_load($account->id()), 'User is not found in the database.');
}
/**
@@ -377,7 +377,7 @@ function testUserWithoutEmailCancelByAdmin() {
$this->drupalLogin($admin_user);
// Delete regular user without e-mail address.
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), 'Confirmation form to cancel account displayed.');
$this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
@@ -385,7 +385,7 @@ function testUserWithoutEmailCancelByAdmin() {
// Confirm deletion.
$this->drupalPost(NULL, NULL, t('Cancel account'));
$this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), 'User deleted.');
- $this->assertFalse(user_load($account->uid), 'User is not found in the database.');
+ $this->assertFalse(user_load($account->id()), 'User is not found in the database.');
}
/**
@@ -405,7 +405,7 @@ function testMassUserCancelByAdmin() {
$users = array();
for ($i = 0; $i < 3; $i++) {
$account = $this->drupalCreateUser(array());
- $users[$account->uid] = $account;
+ $users[$account->id()] = $account;
}
// Cancel user accounts, including own one.
@@ -425,13 +425,13 @@ function testMassUserCancelByAdmin() {
$status = TRUE;
foreach ($users as $account) {
$status = $status && (strpos($this->content, t('%name has been deleted.', array('%name' => $account->name))) !== FALSE);
- $status = $status && !user_load($account->uid, TRUE);
+ $status = $status && !user_load($account->id(), TRUE);
}
$this->assertTrue($status, 'Users deleted and not found in the database.');
// Ensure that admin account was not cancelled.
$this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
- $admin_user = user_load($admin_user->uid);
+ $admin_user = user_load($admin_user->id());
$this->assertTrue($admin_user->status == 1, 'Administrative user is found in the database and enabled.');
// Verify that uid 1's account was not cancelled.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php b/core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php
index 2b9442dcad4159178e37dba3383cc2e5055293ce..5626096b490d75528c2210593e8cd33f04ae1ad2 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php
@@ -31,7 +31,7 @@ function testUserDeleteMultiple() {
$user_b = $this->drupalCreateUser(array('access content'));
$user_c = $this->drupalCreateUser(array('access content'));
- $uids = array($user_a->uid, $user_b->uid, $user_c->uid);
+ $uids = array($user_a->id(), $user_b->id(), $user_c->id());
// These users should have a role
$query = db_select('users_roles', 'r');
@@ -44,7 +44,7 @@ function testUserDeleteMultiple() {
$this->assertTrue($roles_created > 0, 'Role assigments created for new users and deletion of role assigments can be tested');
// We should be able to load one of the users.
- $this->assertTrue(user_load($user_a->uid), 'User is created and deltion of user can be tested');
+ $this->assertTrue(user_load($user_a->id()), 'User is created and deltion of user can be tested');
// Delete the users.
user_delete_multiple($uids);
// Test if the roles assignments are deleted.
@@ -57,8 +57,8 @@ function testUserDeleteMultiple() {
->fetchField();
$this->assertTrue($roles_after_deletion == 0, 'Role assigments deleted along with users');
// Test if the users are deleted, user_load() will return FALSE.
- $this->assertFalse(user_load($user_a->uid), format_string('User with id @uid deleted.', array('@uid' => $user_a->uid)));
- $this->assertFalse(user_load($user_b->uid), format_string('User with id @uid deleted.', array('@uid' => $user_b->uid)));
- $this->assertFalse(user_load($user_c->uid), format_string('User with id @uid deleted.', array('@uid' => $user_c->uid)));
+ $this->assertFalse(user_load($user_a->id()), format_string('User with id @uid deleted.', array('@uid' => $user_a->id())));
+ $this->assertFalse(user_load($user_b->id()), format_string('User with id @uid deleted.', array('@uid' => $user_b->id())));
+ $this->assertFalse(user_load($user_c->id()), format_string('User with id @uid deleted.', array('@uid' => $user_c->id())));
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
index 178dddaf8ff1c8448d7054971e0ad038824a9a8d..0c9ded0c01093cc8f25bc881f47fa6ed8bff8091 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
@@ -33,42 +33,42 @@ function testUserEdit() {
// Test that error message appears when attempting to use a non-unique user name.
$edit['name'] = $user2->name;
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t('The name %name is already taken.', array('%name' => $edit['name'])));
// Check that filling out a single password field does not validate.
$edit = array();
$edit['pass[pass1]'] = '';
$edit['pass[pass2]'] = $this->randomName();
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertText(t("The specified passwords do not match."), 'Typing mismatched passwords displays an error message.');
$edit['pass[pass1]'] = $this->randomName();
$edit['pass[pass2]'] = '';
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertText(t("The specified passwords do not match."), 'Typing mismatched passwords displays an error message.');
// Test that the error message appears when attempting to change the mail or
// pass without the current password.
$edit = array();
$edit['mail'] = $this->randomName() . '@new.example.com';
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => t('E-mail address'))));
$edit['current_pass'] = $user1->pass_raw;
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t("The changes have been saved."));
// Test that the user must enter current password before changing passwords.
$edit = array();
$edit['pass[pass1]'] = $new_pass = $this->randomName();
$edit['pass[pass2]'] = $new_pass;
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => t('Password'))));
// Try again with the current password.
$edit['current_pass'] = $user1->pass_raw;
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t("The changes have been saved."));
// Make sure the user can log in with their new password.
@@ -82,11 +82,11 @@ function testUserEdit() {
$this->drupalLogin($user1);
$config->set('password_strength', TRUE)->save();
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertRaw(t('Password strength:'), 'The password strength indicator is displayed.');
$config->set('password_strength', FALSE)->save();
- $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", $edit, t('Save'));
$this->assertNoRaw(t('Password strength:'), 'The password strength indicator is not displayed.');
}
@@ -102,7 +102,7 @@ function testUserWithoutEmailEdit() {
// This user has no e-mail address.
$user1->mail = '';
$user1->save();
- $this->drupalPost("user/$user1->uid/edit", array('mail' => ''), t('Save'));
+ $this->drupalPost("user/" . $user1->id() . "/edit", array('mail' => ''), t('Save'));
$this->assertRaw(t("The changes have been saved."));
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php
index e06298f73354f41cdecf7baf864e040b58f9a8dc..6bdb9d096c05e4a62209bab177e29637847dd518 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php
@@ -34,7 +34,7 @@ function testUserEditedOwnAccount() {
// Change own username.
$edit = array();
$edit['name'] = $this->randomName();
- $this->drupalPost('user/' . $account->uid . '/edit', $edit, t('Save'));
+ $this->drupalPost('user/' . $account->id() . '/edit', $edit, t('Save'));
// Log out.
$this->drupalLogout();
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
index 13f648997765b2625abb01a6b33bdf1d5384b16d..eb6f1c36fea4fcc22c7874cf4fe777c1254c0a89 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
@@ -53,6 +53,6 @@ function testLabelCallback() {
*/
function testUriCallback() {
$uri = $this->account->uri();
- $this->assertEqual('user/' . $this->account->uid, $uri['path'], 'Correct user URI.');
+ $this->assertEqual('user/' . $this->account->id(), $uri['path'], 'Correct user URI.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
index 65e3c24b90adf5f765e9766dca16cd0e8491a013..c89dd26fe6cb8080171bd386b536693c596b5ff2 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
@@ -94,7 +94,7 @@ function testLocalUserCreation() {
// Test if the admin can use the language selector and if the
// correct language is was saved.
- $user_edit = $langcode . '/user/' . $user->uid . '/edit';
+ $user_edit = $langcode . '/user/' . $user->id() . '/edit';
$this->drupalLogin($admin_user);
$this->drupalGet($user_edit);
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
index 407bd224a495304803bd7adbd32f242bf41dd74c..e2adf7276becba9f5a373bf4913e325b11fccdd3 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
@@ -57,7 +57,7 @@ function testUserLanguageConfiguration() {
// Login as normal user and edit account settings.
$this->drupalLogin($web_user);
- $path = 'user/' . $web_user->uid . '/edit';
+ $path = 'user/' . $web_user->id() . '/edit';
$this->drupalGet($path);
// Ensure language settings widget is available.
$this->assertText(t('Language'), 'Language selector available.');
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
index 36c5f47dd02e88c6ba12d3f3c103c1730ad0f624..4dd289b499cfc28f9453410c6f6ee5be5f6faed4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
@@ -115,7 +115,7 @@ function testPasswordRehashOnLogin() {
$this->drupalLogin($account);
$this->drupalLogout();
// Load the stored user. The password hash should reflect $default_count_log2.
- $account = user_load($account->uid);
+ $account = user_load($account->id());
$this->assertIdentical($password_hasher->getCountLog2($account->pass), $default_count_log2);
// Change the required number of iterations by loading a test-module
@@ -127,7 +127,7 @@ function testPasswordRehashOnLogin() {
$account->pass_raw = $password;
$this->drupalLogin($account);
// Load the stored user, which should have a different password hash now.
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
$this->assertIdentical($password_hasher->getCountLog2($account->pass), $overridden_count_log2);
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
index abddd204fc8b117f3029c803f5950f72bb1a16e4..f01c14eff9d59173155cf649b22afdd99cde63f6 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
@@ -37,7 +37,7 @@ public function setUp() {
// Activate user by logging in.
$this->drupalLogin($account);
- $this->account = user_load($account->uid);
+ $this->account = user_load($account->id());
$this->drupalLogout();
// Set the last login time that is used to generate the one-time link so
@@ -45,7 +45,7 @@ public function setUp() {
$account->login = REQUEST_TIME - mt_rand(10, 100000);
db_update('users')
->fields(array('login' => $account->login))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
}
@@ -99,7 +99,7 @@ function testUserPasswordReset() {
// Create a password reset link as if the request time was 60 seconds older than the allowed limit.
$timeout = config('user.settings')->get('password_reset_timeout');
$bogus_timestamp = REQUEST_TIME - $timeout - 60;
- $_uid = $this->account->uid;
+ $_uid = $this->account->id();
$this->drupalGet("user/reset/$_uid/$bogus_timestamp/" . user_pass_rehash($this->account->pass, $bogus_timestamp, $this->account->login));
$this->assertText(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'Expired password reset request rejected.');
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
index 282dd6505e6f2ae1e3aa9bd8ae827712bb147b9f..f4a06629860b5b5030d794d0d006869ddb4b50a1 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
@@ -65,7 +65,7 @@ function testCreateDeletePicture() {
// Delete the picture.
$edit = array();
- $this->drupalPost('user/' . $this->web_user->uid . '/edit', $edit, t('Remove'));
+ $this->drupalPost('user/' . $this->web_user->id() . '/edit', $edit, t('Remove'));
$this->drupalPost(NULL, array(), t('Save'));
// Call system_cron() to clean up the file. Make sure the timestamp
@@ -131,10 +131,10 @@ function testPictureOnNodeComment() {
*/
function saveUserPicture($image) {
$edit = array('files[user_picture_und_0]' => drupal_realpath($image->uri));
- $this->drupalPost('user/' . $this->web_user->uid . '/edit', $edit, t('Save'));
+ $this->drupalPost('user/' . $this->web_user->id() . '/edit', $edit, t('Save'));
// Load actual user data from database.
- $account = user_load($this->web_user->uid, TRUE);
+ $account = user_load($this->web_user->id(), TRUE);
return file_load($account->user_picture[Language::LANGCODE_NOT_SPECIFIED][0]['target_id'], TRUE);
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php
index e6123743b0e07787ef57575b8347b3058c7696f9..e6e37dcb25e5931a9ae6a4822c322d1ad7f9cc64 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php
@@ -38,13 +38,13 @@ function testAssignAndRemoveRole() {
$account = $this->drupalCreateUser();
// Assign the role to the user.
- $this->drupalPost('user/' . $account->uid . '/edit', array("roles[$rid]" => $rid), t('Save'));
+ $this->drupalPost('user/' . $account->id() . '/edit', array("roles[$rid]" => $rid), t('Save'));
$this->assertText(t('The changes have been saved.'));
$this->assertFieldChecked('edit-roles-' . $rid, 'Role is assigned.');
$this->userLoadAndCheckRoleAssigned($account, $rid);
// Remove the role from the user.
- $this->drupalPost('user/' . $account->uid . '/edit', array("roles[$rid]" => FALSE), t('Save'));
+ $this->drupalPost('user/' . $account->id() . '/edit', array("roles[$rid]" => FALSE), t('Save'));
$this->assertText(t('The changes have been saved.'));
$this->assertNoFieldChecked('edit-roles-' . $rid, 'Role is removed from user.');
$this->userLoadAndCheckRoleAssigned($account, $rid, FALSE);
@@ -69,12 +69,12 @@ function testCreateUserWithRole() {
// Get the newly added user.
$account = user_load_by_name($edit['name']);
- $this->drupalGet('user/' . $account->uid . '/edit');
+ $this->drupalGet('user/' . $account->id() . '/edit');
$this->assertFieldChecked('edit-roles-' . $rid, 'Role is assigned.');
$this->userLoadAndCheckRoleAssigned($account, $rid);
// Remove the role again.
- $this->drupalPost('user/' . $account->uid . '/edit', array("roles[$rid]" => FALSE), t('Save'));
+ $this->drupalPost('user/' . $account->id() . '/edit', array("roles[$rid]" => FALSE), t('Save'));
$this->assertText(t('The changes have been saved.'));
$this->assertNoFieldChecked('edit-roles-' . $rid, 'Role is removed from user.');
$this->userLoadAndCheckRoleAssigned($account, $rid, FALSE);
@@ -92,7 +92,7 @@ function testCreateUserWithRole() {
* Defaults to TRUE.
*/
private function userLoadAndCheckRoleAssigned($account, $rid, $is_assigned = TRUE) {
- $account = user_load($account->uid, TRUE);
+ $account = user_load($account->id(), TRUE);
if ($is_assigned) {
$this->assertTrue(array_search($rid, $account->roles), 'The role is present in the user object.');
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php b/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php
index 85925e7319e6cf8bf98b4a9733dd72b536d9d443..a83a8ca6498dda9bca5c77fed5c08e27eb2d82e4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php
@@ -95,7 +95,7 @@ function testUserSignature() {
$edit = array(
'signature[value]' => $signature_text,
);
- $this->drupalPost('user/' . $this->web_user->uid . '/edit', $edit, t('Save'));
+ $this->drupalPost('user/' . $this->web_user->id() . '/edit', $edit, t('Save'));
// Verify that values were stored.
$this->assertFieldByName('signature[value]', $edit['signature[value]'], 'Submitted signature text found.');
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php b/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
index 894555eb6538f8fe1098c2d9a099e696cadc2e42..c4ff9ff0ca7b36e26a812e23ea98899d2cb99e5c 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
@@ -60,7 +60,7 @@ function testUserTimeZone() {
$edit = array();
$edit['mail'] = $web_user->mail;
$edit['timezone'] = 'America/Santiago';
- $this->drupalPost("user/$web_user->uid/edit", $edit, t('Save'));
+ $this->drupalPost("user/" . $web_user->id() . "/edit", $edit, t('Save'));
$this->assertText(t('The changes have been saved.'), 'Time zone changed to Santiago time.');
// Confirm date format and time zone.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php b/core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php
index 347f3d084ebb6fce935994be454fe8e9ac74fd6b..56f33c0fd4b4e03007e1c9a561b3208d57c98904 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php
@@ -56,16 +56,16 @@ function testUserTokenReplacement() {
$this->drupalLogout();
$this->drupalLogin($user2);
- $account = user_load($user1->uid);
- $global_account = user_load($GLOBALS['user']->uid);
+ $account = user_load($user1->id());
+ $global_account = user_load($GLOBALS['user']->id());
// Generate and test sanitized tokens.
$tests = array();
- $tests['[user:uid]'] = $account->uid;
+ $tests['[user:uid]'] = $account->id();
$tests['[user:name]'] = check_plain(user_format_name($account));
$tests['[user:mail]'] = check_plain($account->mail);
- $tests['[user:url]'] = url("user/$account->uid", $url_options);
- $tests['[user:edit-url]'] = url("user/$account->uid/edit", $url_options);
+ $tests['[user:url]'] = url("user/" . $account->id(), $url_options);
+ $tests['[user:edit-url]'] = url("user/" . $account->id() . "/edit", $url_options);
$tests['[user:last-login]'] = format_date($account->login, 'medium', '', NULL, $language_interface->id);
$tests['[user:last-login:short]'] = format_date($account->login, 'short', '', NULL, $language_interface->id);
$tests['[user:created]'] = format_date($account->created, 'medium', '', NULL, $language_interface->id);
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php b/core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php
index 56dbc62f358303d82138c3c06da8c07226fdcc44..8379bbeb9d4db6c31396c8570a79cafa7ad13337 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php
@@ -57,7 +57,7 @@ function testUserValidateCurrentPassCustomForm() {
$edit = array();
$edit['user_form_test_field'] = $this->accessUser->name;
$edit['current_pass'] = $this->accessUser->pass_raw;
- $this->drupalPost('user_form_test_current_password/' . $this->accessUser->uid, $edit, t('Test'));
+ $this->drupalPost('user_form_test_current_password/' . $this->accessUser->id(), $edit, t('Test'));
$this->assertText(t('The password has been validated and the form submitted successfully.'));
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
index 970e1c368286dad4d75ab2f3fd5d81ae522e0f16..654d1d72166ae7c710a46e4619550d2561555e67 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
@@ -41,7 +41,7 @@ public function test_plugin_argument_default_current_user() {
$view = views_get_view('test_plugin_argument_default_current_user');
$view->initHandlers();
- $this->assertEqual($view->argument['null']->getDefaultArgument(), $account->uid, 'Uid of the current user is used.');
+ $this->assertEqual($view->argument['null']->getDefaultArgument(), $account->id(), 'Uid of the current user is used.');
// Switch back.
$user = $admin;
drupal_save_session(TRUE);
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
index 0d89d47dfbb042fabf63e9f1cfe7c17feae7d001..6a1145e3a9a4015838237934350059371850552d 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
@@ -37,7 +37,7 @@ function testArgumentValidateUserUid() {
$account = $this->account;
// test 'uid' case
$view = $this->view_argument_validate_user('uid');
- $this->assertTrue($view->argument['null']->validateArgument($account->uid));
+ $this->assertTrue($view->argument['null']->validateArgument($account->id()));
// Reset safed argument validation.
$view->argument['null']->argument_validated = NULL;
// Fail for a string variable since type is 'uid'
@@ -56,7 +56,7 @@ function testArgumentValidateUserName() {
// Reset safed argument validation.
$view->argument['null']->argument_validated = NULL;
// Fail for a uid variable since type is 'name'
- $this->assertFalse($view->argument['null']->validateArgument($account->uid));
+ $this->assertFalse($view->argument['null']->validateArgument($account->id()));
// Reset safed argument validation.
$view->argument['null']->argument_validated = NULL;
// Fail for a valid string, but for a user that doesn't exist
@@ -71,7 +71,7 @@ function testArgumentValidateUserEither() {
// Reset safed argument validation.
$view->argument['null']->argument_validated = NULL;
// Fail for a uid variable since type is 'name'
- $this->assertTrue($view->argument['null']->validateArgument($account->uid));
+ $this->assertTrue($view->argument['null']->validateArgument($account->id()));
// Reset safed argument validation.
$view->argument['null']->argument_validated = NULL;
// Fail for a valid string, but for a user that doesn't exist
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
index 24be6f8ccb26f129453e486eda683412790cc8a1..db9c51f4cd39c80f48e95b5771d20ae596cbc453 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
@@ -40,7 +40,7 @@ public function testArgumentTitle() {
// Tests a valid user.
$account = $this->drupalCreateUser();
- $this->executeView($view, array($account->uid));
+ $this->executeView($view, array($account->id()));
$this->assertEqual($view->getTitle(), $account->label());
$view->destroy();
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
index 4e9b95a86acab93e9a86b976c3f4f811d07db138..45f77b36e0559cf6cb95b0a797cecfd0193d6bc4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
@@ -172,7 +172,7 @@ public function testExposedFilter() {
$this->assertNoRaw('Unable to find user');
// The actual result should contain all of the user ids.
foreach ($this->accounts as $account) {
- $this->assertRaw($account->uid);
+ $this->assertRaw($account->id());
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
index 34a0d83733d879b15f37be88bb1a082e69069532..c2b3a30b4a88b71f6e01456649cf99d0dbe7162e 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
@@ -36,11 +36,11 @@ public function testRelationship() {
$map = array('node_users_nid' => 'nid', 'uid' => 'uid');
$expected_result = array(
array(
- 'uid' => $this->users[1]->uid,
+ 'uid' => $this->users[1]->id(),
'nid' => $this->nodes[1]->nid,
),
array(
- 'uid' => $this->users[0]->uid,
+ 'uid' => $this->users[0]->id(),
'nid' => $this->nodes[0]->nid,
),
);
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php b/core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php
index 6ea9454232c675636711ce14102faa83cf3c4a97..88b1c78070b182dd4001359cb28941a5b719ddd2 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php
@@ -43,7 +43,7 @@ protected function setUp() {
$this->users[] = $this->drupalCreateUser();
$this->users[] = user_load(1);
- $this->nodes[] = $this->drupalCreateNode(array('uid' => $this->users[0]->uid));
+ $this->nodes[] = $this->drupalCreateNode(array('uid' => $this->users[0]->id()));
$this->nodes[] = $this->drupalCreateNode(array('uid' => 1));
}
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index a745bfaf4d465f44fbf59d85aa5c0ebe5cafd016..bb486ff5d2009512bc63aee3706d8befeb57f4b0 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -41,7 +41,7 @@ function user_admin_account() {
foreach ($result as $account) {
$account = user_load($account->uid);
$users_roles = array();
- $roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = :uid', array(':uid' => $account->uid));
+ $roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = :uid', array(':uid' => $account->id()));
foreach ($roles_result as $user_role) {
$users_roles[] = $roles[$user_role->rid];
}
@@ -54,7 +54,7 @@ function user_admin_account() {
'#theme' => 'item_list',
'#items' => $users_roles,
);
- $options[$account->uid] = array(
+ $options[$account->id()] = array(
'username' => drupal_render($username),
'status' => $status[$account->status],
'roles' => drupal_render($item_list),
@@ -64,22 +64,22 @@ function user_admin_account() {
$links = array();
$links['edit'] = array(
'title' => t('Edit'),
- 'href' => 'user/' . $account->uid . '/edit',
+ 'href' => 'user/' . $account->id() . '/edit',
'query' => $destination,
);
if (module_invoke('content_translation', 'translate_access', $account)) {
$links['translate'] = array(
'title' => t('Translate'),
- 'href' => 'user/' . $account->uid . '/translations',
+ 'href' => 'user/' . $account->id() . '/translations',
'query' => $destination,
);
}
- $options[$account->uid]['operations']['data'] = array(
+ $options[$account->id()]['operations']['data'] = array(
'#type' => 'operations',
'#links' => $links,
);
- $options[$account->uid]['title']['data']['#title'] = check_plain($account->name);
+ $options[$account->id()]['title']['data']['#title'] = check_plain($account->name);
}
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index 2f337d94bdcc9c98dde6537d1b8c7e053b89d007..edb2d6f124ff3a1afd6d27adb627ede9d0f1336f 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -65,7 +65,7 @@ function hook_user_load($users) {
*/
function hook_user_predelete($account) {
db_delete('mytable')
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
}
@@ -121,7 +121,7 @@ function hook_user_cancel($edit, $account, $method) {
module_load_include('inc', 'node', 'node.admin');
$nodes = db_select('node_field_data', 'n')
->fields('n', array('nid'))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute()
->fetchCol();
node_mass_update($nodes, array('status' => 0), NULL, TRUE);
@@ -132,14 +132,14 @@ function hook_user_cancel($edit, $account, $method) {
module_load_include('inc', 'node', 'node.admin');
$nodes = db_select('node_field_data', 'n')
->fields('n', array('nid'))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute()
->fetchCol();
node_mass_update($nodes, array('uid' => 0), NULL, TRUE);
// Anonymize old revisions.
db_update('node_field_revision')
->fields(array('uid' => 0))
- ->condition('uid', $account->uid)
+ ->condition('uid', $account->id())
->execute();
break;
}
@@ -200,8 +200,8 @@ function hook_user_cancel_methods_alter(&$methods) {
*/
function hook_user_format_name_alter(&$name, $account) {
// Display the user's uid instead of name.
- if (isset($account->uid)) {
- $name = t('User !uid', array('!uid' => $account->uid));
+ if ($account->id()) {
+ $name = t('User !uid', array('!uid' => $account->id()));
}
}
@@ -244,7 +244,7 @@ function hook_user_presave($account) {
function hook_user_insert($account) {
db_insert('user_changes')
->fields(array(
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'created' => time(),
))
->execute();
@@ -271,7 +271,7 @@ function hook_user_insert($account) {
function hook_user_update($account) {
db_insert('user_changes')
->fields(array(
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'changed' => time(),
))
->execute();
@@ -287,7 +287,7 @@ function hook_user_login($account) {
$config = config('system.timezone');
// If the user has a NULL time zone, notify them to set a time zone.
if (!$account->timezone && $config->get('user.configurable') && $config->get('user.warn')) {
- drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/" . $account->id() . "/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
}
}
@@ -300,7 +300,7 @@ function hook_user_login($account) {
function hook_user_logout($account) {
db_insert('logouts')
->fields(array(
- 'uid' => $account->uid,
+ 'uid' => $account->id(),
'time' => time(),
))
->execute();
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index 37dc77075e89aa27d7b15d867c73bebcde1d26cd..871c18d499a180eb8f0bcfc142d269b47c74632e 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -640,7 +640,7 @@ function user_update_8011() {
'uri' => $destination,
))
->fields(array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'status' => FILE_STATUS_PERMANENT,
'filename' => drupal_basename($destination),
'uuid' => $uuid->generate(),
@@ -800,7 +800,7 @@ function user_update_8012(&$sandbox) {
// Update file usage from user to file module.
// @see file_field_insert()
- // Old: file_usage_add($picture, 'user', 'user', $entity->uid);
+ // Old: file_usage_add($picture, 'user', 'user', $entity->id();
// New: file_usage_add(file_load($item['fid']), 'file', $entity_type, $id);
db_update('file_usage')
->condition('fid', $fid)
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index f5f164fa38eecbd57dd640e02f91c085592475a9..6077a271075c731ebca293e2179f8c12af12e977 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -19,10 +19,10 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
// When processing the one-time login link, we have to make sure that a user
// isn't already logged in.
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
// The existing user is already logged in.
- if ($user->uid == $uid) {
- drupal_set_message(t('You are logged in as %user. <a href="!user_edit">Change your password.</a>', array('%user' => $user->name, '!user_edit' => url("user/$user->uid/edit"))));
+ if ($user->id() == $uid) {
+ drupal_set_message(t('You are logged in as %user. <a href="!user_edit">Change your password.</a>', array('%user' => $user->name, '!user_edit' => url("user/" . $user->id() . "/edit"))));
}
// A different user is already logged in on the computer.
else {
@@ -49,7 +49,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
return new RedirectResponse(url('user/password', array('absolute' => TRUE)));
}
- elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
+ elseif ($account->isAuthenticated() && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
// First stage is a confirmation form, then login
if ($action == 'login') {
// Set the new user.
@@ -60,8 +60,8 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
// Let the user's password be changed without the current password check.
$token = Crypt::randomStringHashed(55);
- $_SESSION['pass_reset_' . $user->uid] = $token;
- return new RedirectResponse(url('user/' . $user->uid . '/edit', array(
+ $_SESSION['pass_reset_' . $user->id()] = $token;
+ return new RedirectResponse(url('user/' . $user->id() . '/edit', array(
'query' => array('pass-reset-token' => $token),
'absolute' => TRUE,
)));
@@ -129,7 +129,7 @@ function user_edit_cancel_submit($form, &$form_state) {
}
// Note: We redirect from user/uid/edit to user/uid/cancel to make the tabs disappear.
$account = $form_state['controller']->getEntity();
- $form_state['redirect'] = array("user/" . $account->uid . "/cancel", array('query' => $destination));
+ $form_state['redirect'] = array("user/" . $account->id() . "/cancel", array('query' => $destination));
}
/**
@@ -148,7 +148,7 @@ function user_cancel_confirm_form($form, &$form_state, $account) {
$can_select_method = $admin_access || user_access('select account cancellation method');
$form['user_cancel_method'] = array(
'#type' => 'radios',
- '#title' => ($account->uid == $user->uid ? t('When cancelling your account') : t('When cancelling the account')),
+ '#title' => ($account->id() == $user->id() ? t('When cancelling your account') : t('When cancelling the account')),
'#access' => $can_select_method,
);
$form['user_cancel_method'] += user_cancel_methods();
@@ -156,7 +156,7 @@ function user_cancel_confirm_form($form, &$form_state, $account) {
// Allow user administrators to skip the account cancellation confirmation
// mail (by default), as long as they do not attempt to cancel their own
// account.
- $override_access = $admin_access && ($account->uid != $user->uid);
+ $override_access = $admin_access && ($account->id() != $user->id());
$form['user_cancel_confirm'] = array(
'#type' => 'checkbox',
'#title' => t('Require e-mail confirmation to cancel account.'),
@@ -175,7 +175,7 @@ function user_cancel_confirm_form($form, &$form_state, $account) {
);
// Prepare confirmation form page title and description.
- if ($account->uid == $user->uid) {
+ if ($account->id() == $user->id()) {
$question = t('Are you sure you want to cancel your account?');
}
else {
@@ -193,10 +193,10 @@ function user_cancel_confirm_form($form, &$form_state, $account) {
}
// Always provide entity id in the same form key as in the entity edit form.
- $form['uid'] = array('#type' => 'value', '#value' => $account->uid);
+ $form['uid'] = array('#type' => 'value', '#value' => $account->id());
return confirm_form($form,
$question,
- 'user/' . $account->uid,
+ 'user/' . $account->id(),
$description . ' ' . t('This action cannot be undone.'),
t('Cancel account'), t('Cancel'));
}
@@ -214,8 +214,8 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
// Cancel account immediately, if the current user has administrative
// privileges, no confirmation mail shall be sent, and the user does not
// attempt to cancel the own account.
- if (user_access('administer users') && empty($form_state['values']['user_cancel_confirm']) && $account->uid != $user->uid) {
- user_cancel($form_state['values'], $account->uid, $form_state['values']['user_cancel_method']);
+ if (user_access('administer users') && empty($form_state['values']['user_cancel_confirm']) && $account->id() != $user->id()) {
+ user_cancel($form_state['values'], $account->id(), $form_state['values']['user_cancel_method']);
$form_state['redirect'] = 'admin/people';
}
@@ -229,7 +229,7 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
drupal_set_message(t('A confirmation request to cancel your account has been sent to your e-mail address.'));
watchdog('user', 'Sent account cancellation request to %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
- $form_state['redirect'] = "user/$account->uid";
+ $form_state['redirect'] = "user/" . $account->id();
}
}
@@ -306,7 +306,7 @@ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') {
$account_data = drupal_container()->get('user.data')->get('user', $account->id());
if (isset($account_data['cancel_method']) && !empty($timestamp) && !empty($hashed_pass)) {
// Validate expiration and hashed password/login.
- if ($timestamp <= $current && $current - $timestamp < $timeout && $account->uid && $timestamp >= $account->login && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
+ if ($timestamp <= $current && $current - $timestamp < $timeout && $account->id() && $timestamp >= $account->login && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
$edit = array(
'user_cancel_notify' => isset($account_data['cancel_notify']) ? $account_data['cancel_notify'] : config('user.settings')->get('notify.status_canceled'),
);
@@ -318,7 +318,7 @@ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') {
}
else {
drupal_set_message(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'));
- return new RedirectResponse(url("user/$account->uid/cancel", array('absolute' => TRUE)));
+ return new RedirectResponse(url("user/" . $account->id() . "/cancel", array('absolute' => TRUE)));
}
}
throw new AccessDeniedHttpException();
diff --git a/core/modules/user/user.tokens.inc b/core/modules/user/user.tokens.inc
index 185ad6e3a46f99edbad017b9ad8889f698309581..1f980068678bace4d7552a4beb767d54138ce92d 100644
--- a/core/modules/user/user.tokens.inc
+++ b/core/modules/user/user.tokens.inc
@@ -83,7 +83,7 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
// Basic user account information.
case 'uid':
// In the case of hook user_presave uid is not set yet.
- $replacements[$original] = !empty($account->uid) ? $account->uid : t('not yet assigned');
+ $replacements[$original] = $account->id() ?: t('not yet assigned');
break;
case 'name':
@@ -96,11 +96,11 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
break;
case 'url':
- $replacements[$original] = !empty($account->uid) ? url("user/$account->uid", $url_options) : t('not yet assigned');
+ $replacements[$original] = $account->id() ? url("user/" . $account->id(), $url_options) : t('not yet assigned');
break;
case 'edit-url':
- $replacements[$original] = !empty($account->uid) ? url("user/$account->uid/edit", $url_options) : t('not yet assigned');
+ $replacements[$original] = $account->id() ? url("user/" . $account->id() . "/edit", $url_options) : t('not yet assigned');
break;
// These tokens are default variations on the chained tokens handled below.
@@ -125,7 +125,7 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
}
if ($type == 'current-user') {
- $account = user_load($GLOBALS['user']->uid);
+ $account = user_load($GLOBALS['user']->id());
$replacements += $token_service->generate('user', $tokens, array('user' => $account), $options);
}
diff --git a/core/modules/user/user.views_execution.inc b/core/modules/user/user.views_execution.inc
index 371d11290a8935e6cad64ec2cf93c1b2e848f6af..622cdbfdd0e8c4d75d6ce8c2761c3b29e70f49f3 100644
--- a/core/modules/user/user.views_execution.inc
+++ b/core/modules/user/user.views_execution.inc
@@ -14,5 +14,5 @@
*/
function user_views_query_substitutions(ViewExecutable $view) {
global $user;
- return array('***CURRENT_USER***' => intval($user->uid));
+ return array('***CURRENT_USER***' => $user->id());
}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
index 62ed73574aa09203bb9837d942ea40b8499b6a2d..5dab9c74a85c4b060370883ab92b6b1365cc36a9 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
@@ -286,7 +286,7 @@ public function generateResultsKey() {
$key_data = array(
'build_info' => $build_info,
'roles' => $user->roles,
- 'super-user' => $user->uid == 1, // special caching for super user.
+ 'super-user' => $user->id() == 1, // special caching for super user.
'langcode' => language(Language::TYPE_INTERFACE)->id,
'base_url' => $GLOBALS['base_url'],
);
@@ -315,7 +315,7 @@ public function generateOutputKey() {
$key_data = array(
'result' => $this->view->result,
'roles' => $user->roles,
- 'super-user' => $user->uid == 1, // special caching for super user.
+ 'super-user' => $user->id() == 1, // special caching for super user.
'theme' => $GLOBALS['theme'],
'langcode' => language(Language::TYPE_INTERFACE)->id,
'base_url' => $GLOBALS['base_url'],
diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
index 1fa868975573d933a1b80aa74cc8003427a4c108..730b123de336df41de3528ce4c6c063beda0e515 100644
--- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
@@ -100,7 +100,7 @@ protected function setUp() {
search_index($node->nid, 'node', $node->body[Language::LANGCODE_NOT_SPECIFIED][0]['value'], Language::LANGCODE_NOT_SPECIFIED);
$comment = array(
- 'uid' => $user->uid,
+ 'uid' => $user->id(),
'nid' => $node->nid,
'node_type' => 'node_type_' . $node->bundle(),
);
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
index 92fa27b82d9b5699839cb58ef5020228716f636e..e3538e69faf3113b81b69ab478c116970cef71d7 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -775,7 +775,7 @@ public function cacheSet() {
* TRUE if the view is locked, FALSE otherwise.
*/
public function isLocked() {
- return is_object($this->lock) && ($this->lock->owner != $GLOBALS['user']->uid);
+ return is_object($this->lock) && ($this->lock->owner != $GLOBALS['user']->id());
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
index a0ba259117a502ae256ef4d9f3ced1c0dc919e16..97b6e237c9d0349e734b2dec098d5320e12d97b3 100644
--- a/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
@@ -9,9 +9,9 @@
use Drupal\Core\Access\AccessCheckInterface;
use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Session\UserSession;
use Drupal\Tests\UnitTestCase;
use Drupal\user\Access\RoleAccessCheck;
-use Drupal\user\Plugin\Core\Entity\User;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -108,25 +108,25 @@ public function roleAccessProvider() {
// Setup one user with the first role, one with the second, one with both
// and one final without any of these two roles.
- $account_1 = (object) array(
+ $account_1 = new UserSession(array(
'uid' => 1,
'roles' => array($rid_1),
- );
+ ));
- $account_2 = (object) array(
+ $account_2 = new UserSession(array(
'uid' => 2,
'roles' => array($rid_2),
- );
+ ));
- $account_12 = (object) array(
+ $account_12 = new UserSession(array(
'uid' => 3,
'roles' => array($rid_1, $rid_2),
- );
+ ));
- $account_none = (object) array(
+ $account_none = new UserSession(array(
'uid' => 1,
'roles' => array(),
- );
+ ));
// Setup expected values; specify which paths can be accessed by which user.
return array(
@@ -169,7 +169,7 @@ public function testRoleAccess($path, $grant_accounts, $deny_accounts) {
foreach ($deny_accounts as $account) {
$subrequest = Request::create($path, 'GET');
$subrequest->attributes->set('account', $account);
- $message = sprintf('Access denied for user %s with the roles %s on path: %s', $account->uid, implode(', ', $account->roles), $path);
+ $message = sprintf('Access denied for user %s with the roles %s on path: %s', $account->id(), implode(', ', $account->roles), $path);
$has_access = $role_access_check->access($collection->get($path), $subrequest);
$this->assertSame(AccessCheckInterface::DENY, $has_access , $message);
}
diff --git a/core/update.php b/core/update.php
index b74e22660f89b420b6c3dae62c36bf5e805f50d6..fba6b86f842938cda9384aa684a975bef6143850 100644
--- a/core/update.php
+++ b/core/update.php
@@ -354,7 +354,7 @@ function update_access_allowed() {
return user_access('administer software updates');
}
catch (\Exception $e) {
- return ($user->uid == 1);
+ return ($user->id() == 1);
}
}