' . filter_xss($revision->log) . '
' : ''), @@ -263,7 +263,7 @@ function node_revision_overview($node) { else { $username = array( '#theme' => 'username', - '#account' => $revision, + '#account' => user_load($revision->uid), ); $row[] = t('!date by !username', array('!date' => l(format_date($revision->revision_timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => drupal_render($username))) . (($revision->log != '') ? '' . filter_xss($revision->log) . '
' : ''); 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 8299456..6a9492c 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 18d9086..86ed1d0 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 40a0c76..8a6a43a 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -237,7 +237,7 @@ function overlay_user_dismiss_message_access() { // It's unlikely, but possible that "access overlay" permission is granted to // the anonymous role. In this case, we do not display the message to disable // the overlay, so there is nothing to dismiss. - if (empty($user->uid)) { + if ($user->isAnonymous()) { return FALSE; } return TRUE; @@ -263,10 +263,10 @@ function overlay_user_dismiss_message() { throw new AccessDeniedHttpException(); } - Drupal::service('user.data')->set('overlay', $user->uid, 'message_dismissed', 1); + Drupal::service('user.data')->set('overlay', $user->id(), 'message_dismissed', 1); drupal_set_message(t('The message has been dismissed. You can change your overlay settings at any time by visiting your profile page.')); // Destination is normally given. Go to the user profile as a fallback. - return new RedirectResponse(url('user/' . $user->uid . '/edit', array('absolute' => TRUE))); + return new RedirectResponse(url('user/' . $user->id() . '/edit', array('absolute' => TRUE))); } /** @@ -286,11 +286,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', @@ -299,7 +299,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 291b633..4e37019 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 dd58116..88353ba 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 .= 'To display the name of a registered user, use this instead:
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 61b4b3d..345ae8c 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 f7b797c..8ae8c1e 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 e380368..c5ba5f8 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('', 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/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php b/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php
index 584be0c..52a33ea 100644
--- a/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php
+++ b/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php
@@ -50,7 +50,7 @@ public function access(Route $route, Request $request) {
// 2. the user was successfully authenticated and
// 3. the request comes with a session cookie.
if (!in_array($method, array('GET', 'HEAD', 'OPTIONS', 'TRACE'))
- && user_is_logged_in()
+ && $GLOBALS['user']->isAuthenticated()
&& $cookie
) {
$csrf_token = $request->headers->get('X-CSRF-Token');
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php b/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php
index 46ad0cc..c8a4862 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 a7150b1..bae0e5c 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 8a55dfd..b02cd56 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 a75c4e1..1ad739d 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 switch back to a different one.', $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 c58bf8a..3953cd4 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 = '' . t('Define which shortcut set you are using on the Shortcuts tab of your account page.', array('@shortcut-link' => url("user/{$user->uid}/shortcuts"))) . '
';
+ $output = '' . t('Define which shortcut set you are using on the Shortcuts tab of your account page.', array('@shortcut-link' => url("user/{$user->id()}/shortcuts"))) . '
';
return $output;
}
}
@@ -208,7 +208,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;
@@ -329,8 +329,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.
@@ -345,7 +345,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 8e295b3..a390648 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -266,11 +266,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();
}
}
@@ -482,8 +482,8 @@ protected function drupalCreateUser(array $permissions = array(), $name = NULL)
$account = entity_create('user', $edit);
$account->save();
- $this->assertTrue(!empty($account->uid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
- if (empty($account->uid)) {
+ $this->assertTrue($account->id(), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
+ if (!$account->id()) {
return FALSE;
}
@@ -605,7 +605,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 af45ffd..949206f 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 86c7b42..76551c7 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 b897f99..9a6b22f 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 f13d5cb..56246cd 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 8e7879e..1daf4bf 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 af933e4..657ffb5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
@@ -120,13 +120,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 698ea1a..ea2b4db 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 a9fd8bf..57f9355 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 055b014..4d98908 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 e8878be..2c525a8 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 71b8141..90ac1da 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 152527b..e2d31ab 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 15d6fc3..9f78222 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 f1a0fdb..f00a35b 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/Menu/BreadcrumbTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
index fd1c08f..fdb3a70 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 afb7e32..00b1634 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 14a0422..d56ee5f 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 eef40d4..201b58a 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 b338b7b..e0e8e10 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 f96b13e..220e672 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 7c8c85b..85c68ba 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 4e79ae9..ae39a10 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 dde1822..a794f77 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 761adf2..a5a689c 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 a220835..24dbb26 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 = '';
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 b0e255e..3f625b1 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/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
index 2ebeb66..d7052fa 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
@@ -11,6 +11,7 @@
use Drupal\Core\Database\Database;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\DrupalKernel;
+use Drupal\Core\Session\UserSession;
use Drupal\simpletest\WebTestBase;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\HttpFoundation\Request;
@@ -148,15 +149,12 @@ protected function setUp() {
// Ensure that the session is not written to the new environment and replace
// the global $user session with uid 1 from the new test site.
drupal_save_session(FALSE);
- // Login as uid 1.
- $user = db_query('SELECT * FROM {users} WHERE uid = :uid', array(':uid' => 1))->fetchObject();
- // Load roles for the user object.
- $roles = array(DRUPAL_AUTHENTICATED_RID => DRUPAL_AUTHENTICATED_RID);
- $result = db_query('SELECT rid, uid FROM {users_roles} WHERE uid = :uid', array(':uid' => 1));
- foreach ($result as $record) {
- $roles[$record->rid] = $record->rid;
- }
- $user->roles = $roles;
+ // Load values for uid 1.
+ $values = db_query('SELECT * FROM {users} WHERE uid = :uid', array(':uid' => 1))->fetchAssoc();
+ // Load rolest.
+ $values['roles'] = array_merge(array(DRUPAL_AUTHENTICATED_RID), db_query('SELECT rid FROM {users_roles} WHERE uid = :uid', array(':uid' => 1))->fetchCol());
+ // Create a new user session object.
+ $user = new UserSession($values);
// Generate and set a D8-compatible session cookie.
$this->prepareD8Session();
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 1e1bae3..82f0868 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -2175,7 +2175,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;
}
@@ -2646,11 +2646,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']);
@@ -3074,7 +3074,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 a6a7786..e065b28 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 '' . 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.') . '
';
}
break;
@@ -2438,7 +2438,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 account time zone setting.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Configure your account time zone setting.', array('@user-edit' => url("user/$account->id()/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
}
}
@@ -2457,11 +2457,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 0440082..9240f9f 100644
--- a/core/modules/system/tests/modules/database_test/database_test.module
+++ b/core/modules/system/tests/modules/database_test/database_test.module
@@ -232,7 +232,7 @@ function database_test_theme_tablesort($form, &$form_state) {
$status = array(t('blocked'), t('active'));
$accounts = array();
foreach ($result as $account) {
- $options[$account->uid] = array(
+ $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 25ae931..cb56e2b 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 b3611be..1632d5e 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 e649f6d..a27c65c 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 51b7d25..e9f1afd 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -632,7 +632,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 d9db513..76033fb 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 b68b722..baa48d0 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 58de969..edcd297 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 3d274e8..eabd7f4 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
@@ -83,7 +83,7 @@ function tracker_page($account = NULL, $set_title = FALSE) {
'type' => check_plain(node_get_type_label($node)),
// Do not use $node->label(), because $node comes from the database.
'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . drupal_render($mark_build)),
- 'author' => array('data' => array('#theme' => 'username', '#account' => $node)),
+ 'author' => array('data' => array('#theme' => 'username', '#account' => user_load($node->uid))),
'replies' => array('class' => array('replies'), 'data' => $comments),
'last updated' => array('data' => t('!time ago', array('!time' => format_interval(REQUEST_TIME - $node->last_activity)))),
);
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index 9c88847..993cf13 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/update/update.fetch.inc b/core/modules/update/update.fetch.inc
index 2d03d49..3fce023 100644
--- a/core/modules/update/update.fetch.inc
+++ b/core/modules/update/update.fetch.inc
@@ -355,7 +355,7 @@ function _update_cron_notify() {
$default_langcode = language_default()->id;
foreach ($notify_list as $target) {
if ($target_user = user_load_by_mail($target)) {
- $target_langcode = user_preferred_langcode($target_user);
+ $target_langcode = $target_user->getPreferredLangcode();
}
else {
$target_langcode = $default_langcode;
diff --git a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php b/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php
index 7148709..c2bdc10 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 6505d29..950c341 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,
@@ -176,9 +176,9 @@ public function form(array $form, array &$form_state) {
'#format' => isset($account->signature_format) ? $account->signature_format : NULL,
);
- $user_preferred_langcode = $register ? $language_interface->id : user_preferred_langcode($account);
+ $user_preferred_langcode = $register ? $language_interface->id : $account->getPreferredLangcode();
- $user_preferred_admin_langcode = $register ? $language_interface->id : user_preferred_langcode($account, 'admin');
+ $user_preferred_admin_langcode = $register ? $language_interface->id : $account->getPreferredAdminLangcode();
// Is default the interface language?
include_once DRUPAL_ROOT . '/core/includes/language.inc';
@@ -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 eb1dbde..cd63cb0 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/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php
index bfaee91..2c47414 100644
--- a/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php
@@ -29,7 +29,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
$path = $request->attributes->get('system_path');
if ($site_status == MENU_SITE_OFFLINE) {
// If the site is offline, log out unprivileged users.
- if (user_is_logged_in() && !user_access('access site in maintenance mode')) {
+ if ($GLOBALS['user']->isAuthenticated() && !user_access('access site in maintenance mode')) {
user_logout();
// Redirect to homepage.
$event->setResponse(new RedirectResponse(url('', array('absolute' => TRUE))));
@@ -56,7 +56,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
}
}
}
- if (user_is_logged_in()) {
+ if ($GLOBALS['user']->isAuthenticated()) {
if ($path == 'user/login') {
// If user is logged in, redirect to 'user' instead of giving 403.
$event->setResponse(new RedirectResponse(url('user', array('absolute' => TRUE))));
@@ -64,7 +64,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) {
}
if ($path == 'user/register') {
// Authenticated user should be redirected to user edit page.
- $event->setResponse(new RedirectResponse(url('user/' . $GLOBALS['user']->uid . '/edit', array('absolute' => TRUE))));
+ $event->setResponse(new RedirectResponse(url('user/' . $GLOBALS['user']->id() . '/edit', array('absolute' => TRUE))));
return;
}
}
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
index 185a16f..186bd60 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->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 58e9e37..9fab45f 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
@@ -61,7 +61,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 0cc09b7..d8c50e4 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/Block/UserNewBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
index d7269a3..26be5ba 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
@@ -66,12 +66,12 @@ public function blockSubmit($form, &$form_state) {
*/
public function build() {
// Retrieve a list of new users who have accessed the site successfully.
- $items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, $this->configuration['whois_new_count'])->fetchAll();
+ $uids = db_query_range('SELECT uid FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, $this->configuration['whois_new_count'])->fetchCol();
$build = array(
'#theme' => 'item_list__user__new',
'#items' => array(),
);
- foreach ($items as $account) {
+ foreach (user_load_multiple($uids) as $account) {
$username = array(
'#theme' => 'username',
'#account' => $account,
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 4f89128..413cdb7 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
@@ -52,134 +52,6 @@
class User extends EntityNG implements UserInterface {
/**
- * The user ID.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $uid;
-
- /**
- * The user UUID.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $uuid;
-
- /**
- * The unique user name.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $name;
-
- /**
- * The user's password (hashed).
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $pass;
-
- /**
- * The user's email address.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $mail;
-
- /**
- * The user's default theme.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $theme;
-
- /**
- * The user's signature.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $signature;
-
- /**
- * The user's signature format.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $signature_format;
-
- /**
- * The timestamp when the user was created.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $created;
-
- /**
- * The timestamp when the user last accessed the site. A value of 0 means the
- * user has never accessed the site.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $access;
-
- /**
- * The timestamp when the user last logged in. A value of 0 means the user has
- * never logged in.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $login;
-
- /**
- * Whether the user is active (1) or blocked (0).
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $status;
-
- /**
- * The user's timezone.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $timezone;
-
- /**
- * The user's langcode.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $langcode;
-
- /**
- * The user's preferred langcode for receiving emails and viewing the site.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $preferred_langcode;
-
- /**
- * The user's preferred langcode for viewing administration pages.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $preferred_admin_langcode;
-
- /**
- * The email address used for initial account creation.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $init;
-
- /**
- * The user's roles.
- *
- * @var \Drupal\Core\Entity\Field\FieldInterface
- */
- public $roles;
-
- /**
* {@inheritdoc}
*/
public function id() {
@@ -189,30 +61,6 @@ public function id() {
/**
* {@inheritdoc}
*/
- protected function init() {
- parent::init();
- unset($this->access);
- unset($this->created);
- unset($this->init);
- unset($this->login);
- unset($this->mail);
- unset($this->name);
- unset($this->pass);
- unset($this->preferred_admin_langcode);
- unset($this->preferred_langcode);
- unset($this->roles);
- unset($this->signature);
- unset($this->signature_format);
- unset($this->status);
- unset($this->theme);
- unset($this->timezone);
- unset($this->uid);
- unset($this->uuid);
- }
-
- /**
- * {@inheritdoc}
- */
static function preCreate(EntityStorageControllerInterface $storage_controller, array &$values) {
if (!isset($values['created'])) {
$values['created'] = REQUEST_TIME;
@@ -260,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();
}
}
@@ -300,6 +148,7 @@ public static function postDelete(EntityStorageControllerInterface $storage_cont
$storage_controller->deleteUserRoles($uids);
}
+
/**
* {@inheritdoc}
*/
@@ -336,7 +185,6 @@ public function getSecureSessionId() {
public function getSessionData() {
return array();
}
-
/**
* {@inheritdoc}
*/
@@ -367,4 +215,182 @@ public function removeRole($rid) {
$this->set('roles', array_diff($this->getRoles(), array($rid)));
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getPassword() {
+ return $this->get('pass')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setPassword($password) {
+ $this->get('pass')->value = $password;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getEmail() {
+ return $this->get('mail')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setEmail($mail) {
+ $this->get('mail')->value = $mail;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefaultTheme() {
+ return $this->get('theme')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSignature() {
+ return $this->get('signature')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSignatureFormat() {
+ return $this->get('signature_format')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCreatedTime() {
+ return $this->get('created')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLastAccessedTime() {
+ return $this->get('access')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setLastAccessTime($timestamp) {
+ $this->get('access')->value = $timestamp;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLastLoginTime() {
+ return $this->get('login')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setLastLoginTime($timestamp) {
+ $this->get('login')->value = $timestamp;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isActive() {
+ return $this->get('status')->value == 1;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isBlocked() {
+ return $this->get('status')->value == 0;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function activate() {
+ $this->get('status')->value = 1;
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function block() {
+ $this->get('status')->value = 0;
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTimeZone() {
+ return $this->get('timezone')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function getPreferredLangcode($default = NULL) {
+ $language_list = language_list();
+ $preferred_langcode = $this->get('preferred_langcode')->value;
+ if (!empty($preferred_langcode) && isset($language_list[$preferred_langcode])) {
+ return $language_list[$preferred_langcode]->id;
+ }
+ else {
+ return $default ? $default : language_default()->id;
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function getPreferredAdminLangcode($default = NULL) {
+ $language_list = language_list();
+ $preferred_langcode = $this->get('preferred_admin_langcode')->value;
+ if (!empty($preferred_langcode) && isset($language_list[$preferred_langcode])) {
+ return $language_list[$preferred_langcode]->id;
+ }
+ else {
+ return $default ? $default : language_default()->id;
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getInitialEmail() {
+ return $this->get('init')->value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isAuthenticated() {
+ return $this->id() > 0;
+ }
+ /**
+ * {@inheritdoc}
+ */
+ public function isAnonymous() {
+ return $this->id() == 0;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getUsername() {
+ $name = $this->get('name')->value ?: \Drupal::config('user.settings')->get('anonymous');
+ \Drupal::moduleHandler()->alter('user_format_name', $name, $this);
+ return $name;
+ }
+
}
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 8ed758e..8ffac71 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 45c4c2a..f58c641 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 dc3b42b..d014602 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
@@ -124,7 +124,7 @@ public function validateArgument($argument) {
}
else {
if ($type == 'name' || $type == 'either') {
- $name = !empty($GLOBALS['user']->name) ? $GLOBALS['user']->name : config('user.settings')->get('anonymous');
+ $name = $GLOBALS['user']->getUserName() ?: config('user.settings')->get('anonymous');
if ($argument == $name) {
$account = clone $GLOBALS['user'];
}
@@ -138,31 +138,28 @@ public function validateArgument($argument) {
}
if (!isset($account)) {
- $account = $this->database->select('users', 'u')
- ->fields('u', array('uid', 'name'))
+ $uid = $this->database->select('users', 'u')
+ ->fields('u', array('uid'))
->condition($condition, $argument)
->execute()
- ->fetchObject();
- }
- if (empty($account)) {
- // User not found.
- return FALSE;
+ ->fetchField();
+
+ if ($uid === FALSE) {
+ // User not found.
+ return FALSE;
+ }
}
+ $account = user_load($uid);
// See if we're filtering users based on roles.
if (!empty($this->options['restrict_roles']) && !empty($this->options['roles'])) {
$roles = $this->options['roles'];
- $account->roles = array();
- $account->roles[] = $account->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID;
- foreach ($account->getRoles() as $rid) {
- $account->roles[] = $rid;
- }
- if (!(bool) array_intersect($account->roles, $roles)) {
+ if (!(bool) array_intersect($account->getRoles(), $roles)) {
return FALSE;
}
}
- $this->argument->argument = $account->uid;
+ $this->argument->argument = $account->id();
$this->argument->validated_title = check_plain(user_format_name($account));
return TRUE;
}
@@ -174,7 +171,7 @@ public function processSummaryArguments(&$args) {
if ($this->options['type'] == 'name') {
$users = user_load_multiple($args);
foreach ($users as $uid => $account) {
- $args[$uids_arg_keys[$uid]] = $account->name;
+ $args[$uids_arg_keys[$uid]] = $account->label();
}
}
}
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 b09e84a..f781756 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 b344857..5e272a1 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 484a4af..53b29b1 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 1b0b76f..116f6c2 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 ddd1a75..e741048 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 171d402..b9c01fa 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 bf8c988..776f383 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 15e9912..c45a21f 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 2b9442d..5626096 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 178ddda..0c9ded0 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 e06298f..6bdb9d0 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 13f6489..eb6f1c3 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 65e3c24..c89dd26 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 407bd22..e2adf72 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 36c5f47..4dd289b 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 09a2cf4..9f87d04 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 282dd65..f4a0662 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 e612374..e6e37dc 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 85925e7..a83a8ca 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 8b77915..79cc539 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 347f3d0..56f33c0 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 56dbc62..8379bbe 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 970e1c3..654d1d7 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 0d89d47..6a1145e 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 24be6f8..db9c51f 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 4e9b95a..45f77b3 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 34a0d83..c2b3a30 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 6ea9454..88b1c78 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/lib/Drupal/user/UserBCDecorator.php b/core/modules/user/lib/Drupal/user/UserBCDecorator.php
index eed508b..4568f00 100644
--- a/core/modules/user/lib/Drupal/user/UserBCDecorator.php
+++ b/core/modules/user/lib/Drupal/user/UserBCDecorator.php
@@ -15,6 +15,13 @@
class UserBCDecorator extends EntityBCDecorator implements UserInterface {
/**
+ * The decorated user entity.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $decorated;
+
+ /**
* {@inheritdoc}
*/
public function &__get($name) {
@@ -76,4 +83,166 @@ public function removeRole($rid) {
$this->decorated->removeRole($rid);
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getPassword() {
+ return $this->decorated->getPassword();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setPassword($password) {
+ $this->decorated->setPassword($password);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getEmail() {
+ return $this->decorated->getEmail();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setEmail($mail) {
+ $this->decorated->setEmail($mail);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefaultTheme() {
+ return $this->decorated->getDefaultTheme();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSignature() {
+ return $this->decorated->getDefaultTheme();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSignatureFormat() {
+ return $this->decorated->getSignatureFormat();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCreatedTime() {
+ return $this->decorated->getCreatedTime();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLastAccessedTime() {
+ return $this->decorated->getLastAccessedTime();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setLastAccessTime($timestamp) {
+ $this->decorated->setLastAccessTime($timestamp);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLastLoginTime() {
+ return $this->decorated->getLastLoginTime();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setLastLoginTime($timestamp) {
+ $this->decorated->setLastLoginTime($timestamp);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isActive() {
+ $this->decorated->isActive();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isBlocked() {
+ return $this->decorated->isBlocked();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function activate() {
+ return $this->decorated->activate();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function block() {
+ return $this->decorated->block();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTimeZone() {
+ return $this->decorated->getTimeZone();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPreferredLangcode($default = NULL) {
+ return $this->decorated->getPreferredLangcode($default);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPreferredAdminLangcode($default = NULL) {
+ return $this->decorated->getPreferredAdminLangcode($default);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getInitialEmail() {
+ return $this->decorated->getInitialEmail();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isAuthenticated() {
+ return $this->decorated->id() > 0;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isAnonymous() {
+ return $this->decorated->id() == 0;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getUsername() {
+ return $this->decorated->getUsername();
+ }
+
+
}
diff --git a/core/modules/user/lib/Drupal/user/UserInterface.php b/core/modules/user/lib/Drupal/user/UserInterface.php
index 4dc1481..fbede92 100644
--- a/core/modules/user/lib/Drupal/user/UserInterface.php
+++ b/core/modules/user/lib/Drupal/user/UserInterface.php
@@ -50,4 +50,152 @@ public function addRole($rid);
*/
public function removeRole($rid);
+ /**
+ * Returns the hashed password.
+ *
+ * @return string
+ * The hashed password.
+ */
+ public function getPassword();
+
+ /**
+ * Sets the user password.
+ *
+ * @param string $password
+ * The new unhashed password.
+ */
+ public function setPassword($password);
+
+ /**
+ * Returns the e-mail address of the user.
+ *
+ * @return string
+ * The e-mail address.
+ */
+ public function getEmail();
+
+ /**
+ * Sets the e-mail address of the user.
+ *
+ * @param string $mail
+ * The new e-mail address of the user.
+ */
+ public function setEmail($mail);
+
+ /**
+ * Returns the default theme of the user.
+ *
+ * @return string
+ * Name of the theme.
+ */
+ public function getDefaultTheme();
+
+ /**
+ * Returns the user signature.
+ *
+ * @todo: Convert this to a configurable field.
+ *
+ * @return string
+ * The signature text.
+ */
+ public function getSignature();
+
+ /**
+ * Returns the signature format.
+ *
+ * @return string
+ * Name of the filter format.
+ */
+ public function getSignatureFormat();
+
+ /**
+ * Returns the creation time of the user as a UNIX timestamp.
+ *
+ * @return int
+ * Timestamp of the creation date.
+ */
+ public function getCreatedTime();
+
+ /**
+ * The timestamp when the user last accessed the site.
+ *
+ * A value of 0 means the user has never accessed the site.
+ *
+ * @return int
+ * Timestamp of the last access.
+ */
+ public function getLastAccessedTime();
+
+ /**
+ * Sets the UNIX timestamp when the user last accessed the site..
+ *
+ * @param int $timestamp
+ * Timestamp of the last access.
+ */
+ public function setLastAccessTime($timestamp);
+
+ /**
+ * Returns the UNIX timestamp when the user last logged in.
+ *
+ * @return int
+ * Timestamp of the last login time.
+ */
+ public function getLastLoginTime();
+
+ /**
+ * Sets the UNIX timestamp when the user last logged in.
+ *
+ * @param int $timestamp
+ * Timestamp of the last login time.
+ */
+ public function setLastLoginTime($timestamp);
+
+ /**
+ * Returns TRUE if the user is active.
+ *
+ * @return bool
+ * TRUE if the user is active, false otherwise.
+ */
+ public function isActive();
+
+ /**
+ * Returns TRUE if the user is blocked.
+ *
+ * @return bool
+ * TRUE if the user is blocked, false otherwise.
+ */
+ public function isBlocked();
+
+ /**
+ * Activates the user.
+ *
+ * @return \Drupal\user\UserInterface
+ * The called user entity.
+ */
+ public function activate();
+
+ /**
+ * Blocks the user.
+ *
+ * @return \Drupal\user\UserInterface
+ * The called user entity.
+ */
+ public function block();
+
+ /**
+ * Returns the timezone of the user.
+ *
+ * @return string
+ * Name of the timezone.
+ */
+ public function getTimeZone();
+
+ /**
+ * Returns the e-mail that was used when the user was registered.
+ *
+ * @return string
+ * Initial e-mail address of the user.
+ */
+ public function getInitialEmail();
+
}
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index a745bfa..bb486ff 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 2f337d9..edb2d6f 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 account time zone setting.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Configure your account time zone setting.', 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 37dc770..871c18d 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.module b/core/modules/user/user.module
index 05a516a..db9f833 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -159,7 +159,7 @@ function user_uri($user) {
* @see user_format_name()
*/
function user_label($entity_type, $entity) {
- return user_format_name($entity->getBCEntity());
+ return $entity->getUsername();
}
/**
@@ -462,11 +462,8 @@ function user_access($string, AccountInterface $account = NULL) {
$account = Drupal::request()->attributes->get('account') ?: $user;
}
- // Make sure we are working with the BC decorator.
- $account = $account instanceof User ? $account->getBCEntity() : $account;
-
// User #1 has all privileges:
- if ($account->uid == 1) {
+ if ($account->id() == 1) {
return TRUE;
}
@@ -478,14 +475,14 @@ function user_access($string, AccountInterface $account = NULL) {
$drupal_static_fast['perm'] = &drupal_static(__FUNCTION__);
}
$perm = &$drupal_static_fast['perm'];
- if (!isset($perm[$account->uid])) {
- $perm[$account->uid] = array();
+ if (!isset($perm[$account->id()])) {
+ $perm[$account->id()] = array();
foreach (user_role_permissions($account->getRoles()) as $role_permissions) {
- $perm[$account->uid] += array_fill_keys($role_permissions, TRUE);
+ $perm[$account->id()] += array_fill_keys($role_permissions, TRUE);
}
}
- return isset($perm[$account->uid][$string]);
+ return isset($perm[$account->id()][$string]);
}
/**
@@ -586,10 +583,10 @@ function user_search_execute($keys = NULL, $conditions = NULL) {
foreach ($accounts as $account) {
$result = array(
'title' => user_format_name($account),
- 'link' => url('user/' . $account->uid, array('absolute' => TRUE)),
+ 'link' => url('user/' . $account->id(), array('absolute' => TRUE)),
);
if (user_access('administer users')) {
- $result['title'] .= ' (' . $account->mail . ')';
+ $result['title'] .= ' (' . $account->getEmail() . ')';
}
$results[] = $result;
}
@@ -666,25 +663,18 @@ function user_preprocess_block(&$variables) {
/**
* Format a username.
*
- * By default, the passed-in object's 'name' property is used if it exists, or
- * else, the site-defined value for the 'anonymous' variable. However, a module
- * may override this by implementing
- * hook_user_format_name_alter(&$name, $account).
- *
- * @see hook_user_format_name_alter()
- *
- * @param $account
+ * @param \Drupal\Core\Session\Interface $account
* The account object for the user whose name is to be formatted.
*
* @return
* An unsanitized string with the username to display. The code receiving
* this result must ensure that check_plain() is called on it before it is
* printed to the page.
+ *
+ * @deprecated Use \Drupal\Core\Session\Interface::getUsername() instead.
*/
-function user_format_name($account) {
- $name = !empty($account->name) ? $account->name : config('user.settings')->get('anonymous');
- drupal_alter('user_format_name', $name, $account);
- return $name;
+function user_format_name(AccountInterface $account) {
+ return $account->getUsername();
}
/**
@@ -707,7 +697,7 @@ function user_template_preprocess_default_variables_alter(&$variables) {
unset($variables['user']->pass, $variables['user']->sid, $variables['user']->ssid);
$variables['is_admin'] = user_access('access administration pages');
- $variables['logged_in'] = ($user->uid > 0);
+ $variables['logged_in'] = $user->isAuthenticated();
}
/**
@@ -720,20 +710,14 @@ function user_template_preprocess_default_variables_alter(&$variables) {
* @see template_process_username()
*/
function template_preprocess_username(&$variables) {
- $account = $variables['account'];
- if ($account instanceof User) {
- $account = $account->getBCEntity();
- }
+ $account = $variables['account'] ?: drupal_anonymous_user();
$variables['extra'] = '';
- if (empty($account->uid)) {
- $variables['uid'] = 0;
- if (theme_get_setting('features.comment_user_verification')) {
- $variables['extra'] = ' (' . t('not verified') . ')';
- }
- }
- else {
- $variables['uid'] = (int) $account->uid;
+ $variables['uid'] = $account->id();
+ if (empty($variables['uid'])) {
+ if (theme_get_setting('features.comment_user_verification')) {
+ $variables['extra'] = ' (' . t('not verified') . ')';
+ }
}
// Set the name to a formatted name that is safe for printing and
@@ -741,7 +725,7 @@ function template_preprocess_username(&$variables) {
// unsanitized version, in case other preprocess functions want to implement
// their own shortening logic or add markup. If they do so, they must ensure
// that $variables['name'] is safe for printing.
- $name = $variables['name_raw'] = user_format_name($account);
+ $name = $variables['name_raw'] = $account->getUsername();
if (drupal_strlen($name) > 20) {
$name = drupal_substr($name, 0, 15) . '...';
}
@@ -810,7 +794,7 @@ function theme_username($variables) {
*/
function user_is_anonymous() {
// Menu administrators can see items for anonymous when administering.
- return !$GLOBALS['user']->uid || !empty($GLOBALS['menu_admin']);
+ return $GLOBALS['user']->isAnonymous() || !empty($GLOBALS['menu_admin']);
}
/**
@@ -818,9 +802,11 @@ function user_is_anonymous() {
*
* @return bool
* TRUE if the user is logged in, FALSE if the user is anonymous.
+ *
+ * @deprecated Use \Drupal\Core\Session\UserSession::isAuthenticated().
*/
function user_is_logged_in() {
- return (bool) $GLOBALS['user']->uid;
+ return $GLOBALS['user']->isAuthenticated();
}
/**
@@ -1043,7 +1029,7 @@ function user_menu_breadcrumb_alter(&$active_trail, $item) {
function user_menu_link_load($menu_links) {
// Hide the "User account" link for anonymous users.
foreach ($menu_links as $link) {
- if ($link['link_path'] == 'user' && $link['module'] == 'system' && !$GLOBALS['user']->uid) {
+ if ($link['link_path'] == 'user' && $link['module'] == 'system' && !$GLOBALS['user']->id()) {
$link['hidden'] = 1;
}
}
@@ -1089,7 +1075,7 @@ function user_uid_only_optional_to_arg($arg) {
*/
function user_uid_optional_load($uid = NULL) {
if (!isset($uid)) {
- $uid = $GLOBALS['user']->uid;
+ $uid = $GLOBALS['user']->id();
}
return user_load($uid);
}
@@ -1103,7 +1089,7 @@ function user_uid_optional_to_arg($arg) {
// Give back the current user uid when called from eg. tracker, aka.
// with an empty arg. Also use the current user uid when called from
// the menu with a % for the current account link.
- return empty($arg) || $arg == '%' ? $GLOBALS['user']->uid : $arg;
+ return empty($arg) || $arg == '%' ? $GLOBALS['user']->id() : $arg;
}
/**
@@ -1113,7 +1099,7 @@ function user_uid_optional_to_arg($arg) {
* authenticated users are expected to see "My account".
*/
function user_menu_title() {
- if (!user_is_logged_in()) {
+ if ($GLOBALS['user']->isAnonymous()) {
switch (current_path()) {
case 'user' :
case 'user/login' :
@@ -1134,8 +1120,8 @@ function user_menu_title() {
/**
* Menu item title callback - use the user name.
*/
-function user_page_title($account) {
- return is_object($account) ? user_format_name($account) : '';
+function user_page_title(UserInterface $account = NULL) {
+ return $account ? $account->getUsername() : '';
}
/**
@@ -1178,11 +1164,11 @@ function user_authenticate($name, $password) {
$password_hasher = drupal_container()->get('password');
if ($password_hasher->check($password, $account)) {
// Successful authentication.
- $uid = $account->uid;
+ $uid = $account->id();
// Update user to new password scheme if needed.
if ($password_hasher->userNeedsNewHash($account)) {
- $account->pass = $password;
+ $account->setPassword($password);
$account->save();
}
}
@@ -1200,21 +1186,21 @@ function user_authenticate($name, $password) {
*
* The global $user object is replaced with the passed in account.
*
- * @param \Drupal\Core\Session\AccountInterface $account
+ * @param \Drupal\user\UserInterface $account
* The account to log in.
*
* @see hook_user_login()
*/
-function user_login_finalize(AccountInterface $account) {
+function user_login_finalize(UserInterface $account) {
global $user;
$user = $account;
- watchdog('user', 'Session opened for %name.', array('%name' => $user->name));
+ watchdog('user', 'Session opened for %name.', array('%name' => $user->getUsername()));
// Update the user table timestamp noting user has logged in.
// This is also used to invalidate one-time login links.
- $user->login = REQUEST_TIME;
+ $account->setLastLoginTime(REQUEST_TIME);
db_update('users')
- ->fields(array('login' => $user->login))
- ->condition('uid', $user->uid)
+ ->fields(array('login' => $user->getLastLoginTime()))
+ ->condition('uid', $user->id())
->execute();
// Regenerate the session ID to prevent against session fixation attacks.
@@ -1262,9 +1248,9 @@ function user_user_logout($account) {
*/
function user_pass_reset_url($account, $options = array()) {
$timestamp = REQUEST_TIME;
- $langcode = isset($options['langcode']) ? $options['langcode'] : user_preferred_langcode($account);
+ $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode();
$url_options = array('absolute' => TRUE, 'language' => language_load($langcode));
- return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), $url_options);
+ return url("user/reset/" . $account->id() . "/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime()), $url_options);
}
/**
@@ -1290,9 +1276,9 @@ function user_pass_reset_url($account, $options = array()) {
*/
function user_cancel_url($account, $options = array()) {
$timestamp = REQUEST_TIME;
- $langcode = isset($options['langcode']) ? $options['langcode'] : user_preferred_langcode($account);
+ $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode();
$url_options = array('absolute' => TRUE, 'language' => language_load($langcode));
- return url("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), $url_options);
+ return url("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->login), $url_options);
}
/**
@@ -1371,7 +1357,7 @@ function user_cancel($edit, $uid, $method) {
);
// After cancelling account, ensure that user is logged out.
- if ($account->uid == $user->uid) {
+ if ($account->id() == $user->id()) {
// Batch API stores data in the session, so use the finished operation to
// manipulate the current user's session id.
$batch['finished'] = '_user_cancel_session_regenerate';
@@ -1414,7 +1400,7 @@ function _user_cancel($edit, $account, $method) {
if (!empty($edit['user_cancel_notify'])) {
_user_mail_notify('status_canceled', $account);
}
- user_delete($account->uid);
+ $account->delete();
drupal_set_message(t('%name has been deleted.', array('%name' => $account->name)));
watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
break;
@@ -1424,7 +1410,7 @@ function _user_cancel($edit, $account, $method) {
// their session though, as we might have information in it, and we can't
// regenerate it because batch API uses the session ID, we will regenerate it
// in _user_cancel_session_regenerate().
- if ($account->uid == $user->uid) {
+ if ($account->id() == $user->id()) {
$user = drupal_anonymous_user();
}
@@ -1808,7 +1794,7 @@ function user_role_revoke_permissions($rid, array $permissions = array()) {
function user_multiple_cancel_confirm($form, &$form_state) {
// Retrieve the accounts to be canceled from the temp store.
- $accounts = Drupal::service('user.tempstore')->get('user_user_operations_cancel')->get($GLOBALS['user']->uid);
+ $accounts = Drupal::service('user.tempstore')->get('user_user_operations_cancel')->get($GLOBALS['user']->id());
$form['accounts'] = array('#prefix' => '', '#suffix' => '
', '#tree' => TRUE);
foreach ($accounts as $account) {
$uid = $account->id();
@@ -1876,7 +1862,7 @@ function user_multiple_cancel_confirm_submit($form, &$form_state) {
global $user;
// Clear out the accounts from the temp store.
- Drupal::service('user.tempstore')->get('user_user_operations_cancel')->delete($user->uid);
+ Drupal::service('user.tempstore')->get('user_user_operations_cancel')->delete($user->id());
if ($form_state['values']['confirm']) {
foreach ($form_state['values']['accounts'] as $uid => $value) {
// Prevent programmatic form submissions from cancelling user 1.
@@ -1884,12 +1870,12 @@ function user_multiple_cancel_confirm_submit($form, &$form_state) {
continue;
}
// Prevent user administrators from deleting themselves without confirmation.
- if ($uid == $user->uid) {
+ if ($uid == $user->id()) {
$admin_form_state = $form_state;
unset($admin_form_state['values']['user_cancel_confirm']);
// The $user global is not a complete user entity, so load the full
// entity.
- $admin_form_state['values']['_account'] = user_load($user->uid);
+ $admin_form_state['values']['_account'] = user_load($user->id());
user_cancel_confirm_form_submit(array(), $admin_form_state);
}
else {
@@ -1924,40 +1910,6 @@ function theme_user_signature($variables) {
}
/**
- * Get the language object preferred by the user. This user preference can
- * be set on the user account editing page, and is only available if there
- * are more than one languages enabled on the site. If the user did not
- * choose a preferred language, or is the anonymous user, the $default
- * value, or if it is not set, the site default language will be returned.
- *
- * @param $account
- * User account to look up language for.
- * @param $type
- * Optional string to define which preferred langcode should be used.
- * Default to 'preferred_langcode' property.
- * If set 'preferred_$type_langcode' is used.
- * @param $default
- * Optional default language code to return if the account
- * has no valid language.
- */
-function user_preferred_langcode($account, $type = NULL, $default = NULL) {
- $language_list = language_list();
- $account = $account->getBCEntity();
- if (isset($type)) {
- $preferred_langcode = $account->{'preferred_' . $type . '_langcode'};
- }
- else {
- $preferred_langcode = $account->preferred_langcode;
- }
- if (!empty($preferred_langcode) && isset($language_list[$preferred_langcode])) {
- return $language_list[$preferred_langcode]->id;
- }
- else {
- return $default ? $default : language_default()->id;
- }
-}
-
-/**
* Conditionally create and send a notification email when a certain
* operation happens on the given user account.
*
@@ -1993,7 +1945,7 @@ function _user_mail_notify($op, $account, $langcode = NULL) {
$notify = config('user.settings')->get('notify.' . $op);
if ($notify || ($op != 'status_canceled' && $op != 'status_blocked')) {
$params['account'] = $account;
- $langcode = $langcode ? $langcode : user_preferred_langcode($account);
+ $langcode = $langcode ? $langcode : $account->getPreferredLangcode();
// Get the custom site notification email to use as the from email address
// if it has been set.
$site_mail = config('system.site')->get('mail_notification');
@@ -2157,7 +2109,7 @@ function user_toolbar() {
global $user;
// Add logout & user account links or login link.
- if ($user->uid) {
+ if ($user->isAuthenticated()) {
$links = array(
'account' => array(
'title' => t('View profile'),
@@ -2169,7 +2121,7 @@ function user_toolbar() {
),
'account_edit' => array(
'title' => t('Edit profile'),
- 'href' => 'user/' . $user->uid . '/edit',
+ 'href' => 'user/' . $user->id() . '/edit',
'html' => TRUE,
'attributes' => array(
'title' => t('Edit user account'),
@@ -2194,7 +2146,7 @@ function user_toolbar() {
'#type' => 'toolbar_item',
'tab' => array(
'#type' => 'link',
- '#title' => user_format_name($user),
+ '#title' => $user->getUsername(),
'#href' => 'user',
'#options' => array(
'attributes' => array(
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index f5f164f..6077a27 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. Change your password.', 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. Change your password.', 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 185ad6e..1f98006 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 371d112..622cdbf 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 62ed735..5dab9c7 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 1fa8689..730b123 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 92fa27b..e3538e6 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 a0ba259..97b6e23 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 b74e226..fba6b86 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);
}
}