diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc
index 265b3810f700f8ebf93ea558ffe2b3217df10d1b..80a07700649f684432f923b63359d13b273443b0 100644
--- a/core/modules/book/book.admin.inc
+++ b/core/modules/book/book.admin.inc
@@ -5,6 +5,8 @@
* Admin page callbacks for the book module.
*/
+use Drupal\node\Node;
+
/**
* Page callback: Returns an administrative overview of all books.
*
@@ -66,7 +68,7 @@ function book_admin_settings_validate($form, &$form_state) {
/**
* Form constructor for administering a single book's hierarchy.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node of the top-level page in the book.
*
* @see book_menu()
@@ -74,7 +76,7 @@ function book_admin_settings_validate($form, &$form_state) {
* @see book_admin_edit_submit()
* @ingroup forms
*/
-function book_admin_edit($form, $form_state, $node) {
+function book_admin_edit($form, $form_state, Node $node) {
drupal_set_title($node->title);
$form['#node'] = $node;
_book_admin_table($node, $form);
@@ -135,7 +137,7 @@ function book_admin_edit_submit($form, &$form_state) {
$node->revision = 1;
$node->log = t('Title changed from %original to %current.', array('%original' => $node->title, '%current' => $values['title']));
- node_save($node);
+ $node->save();
watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/' . $node->nid));
}
}
@@ -147,14 +149,14 @@ function book_admin_edit_submit($form, &$form_state) {
/**
* Builds the table portion of the form for the book administration page.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node of the top-level page in the book.
* @param $form
* The form that is being modified.
*
* @see book_admin_edit()
*/
-function _book_admin_table($node, &$form) {
+function _book_admin_table(Node $node, &$form) {
$form['table'] = array(
'#theme' => 'book_admin_table',
'#tree' => TRUE,
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index a29a3313e143415fc8b7b3bf550102e0e0269176..44de175b656453b4b13c4f17aceca9a101d41c44 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -5,6 +5,8 @@
* Allows users to create and organize related content in an outline.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_help().
*/
@@ -86,12 +88,12 @@ function book_permission() {
/**
* Adds relevant book links to the node's links.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The book page node to add links to.
* @param $view_mode
* The view mode of the node.
*/
-function book_node_view_link($node, $view_mode) {
+function book_node_view_link(Node $node, $view_mode) {
$links = array();
if (isset($node->book['depth'])) {
@@ -201,24 +203,24 @@ function book_menu() {
* - admin/content/book/%node
* - node/%node/outline
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node whose outline tab is to be viewed.
*
* @see book_menu()
*/
-function _book_outline_access($node) {
+function _book_outline_access(Node $node) {
return user_access('administer book outlines') && node_access('view', $node);
}
/**
* Access callback: Determines if the user can remove nodes from the outline.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to remove from the outline.
*
* @see book_menu()
*/
-function _book_outline_remove_access($node) {
+function _book_outline_remove_access(Node $node) {
return _book_node_is_removable($node) && _book_outline_access($node);
}
@@ -520,10 +522,10 @@ function _book_parent_select($book_link) {
/**
* Builds the common elements of the book form for the node and outline forms.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node whose form is being viewed.
*/
-function _book_add_form_elements(&$form, &$form_state, $node) {
+function _book_add_form_elements(&$form, &$form_state, Node $node) {
// If the form is being processed during the Ajax callback of our book bid
// dropdown, then $form_state will hold the value that was selected.
if (isset($form_state['values']['book'])) {
@@ -625,13 +627,13 @@ function book_form_update($form, $form_state) {
* outline through node addition, node editing, node deletion, or the outline
* tab.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being saved, added, deleted, or moved.
*
* @return
* TRUE if the menu link was saved; FALSE otherwise.
*/
-function _book_update_outline($node) {
+function _book_update_outline(Node $node) {
if (empty($node->book['bid'])) {
return FALSE;
}
@@ -889,7 +891,7 @@ function book_node_load($nodes, $types) {
/**
* Implements hook_node_view().
*/
-function book_node_view($node, $view_mode) {
+function book_node_view(Node $node, $view_mode) {
if ($view_mode == 'full') {
if (!empty($node->book['bid']) && empty($node->in_preview)) {
$node->content['book_navigation'] = array(
@@ -921,14 +923,10 @@ function book_page_alter(&$page) {
/**
* Implements hook_node_presave().
*/
-function book_node_presave($node) {
+function book_node_presave(Node $node) {
// Always save a revision for non-administrators.
if (!empty($node->book['bid']) && !user_access('administer nodes')) {
$node->revision = 1;
- // The database schema requires a log message for every revision.
- if (!isset($node->log)) {
- $node->log = '';
- }
}
// Make sure a new node gets a new menu link.
if (empty($node->nid)) {
@@ -939,7 +937,7 @@ function book_node_presave($node) {
/**
* Implements hook_node_insert().
*/
-function book_node_insert($node) {
+function book_node_insert(Node $node) {
if (!empty($node->book['bid'])) {
if ($node->book['bid'] == 'new') {
// New nodes that are their own book.
@@ -954,7 +952,7 @@ function book_node_insert($node) {
/**
* Implements hook_node_update().
*/
-function book_node_update($node) {
+function book_node_update(Node $node) {
if (!empty($node->book['bid'])) {
if ($node->book['bid'] == 'new') {
// New nodes that are their own book.
@@ -969,7 +967,7 @@ function book_node_update($node) {
/**
* Implements hook_node_predelete().
*/
-function book_node_predelete($node) {
+function book_node_predelete(Node $node) {
if (!empty($node->book['bid'])) {
if ($node->nid == $node->book['bid']) {
// Handle deletion of a top-level post.
@@ -993,7 +991,7 @@ function book_node_predelete($node) {
/**
* Implements hook_node_prepare().
*/
-function book_node_prepare($node) {
+function book_node_prepare(Node $node) {
// Prepare defaults for the add/edit form.
if (empty($node->book) && (user_access('add content to books') || user_access('administer book outlines'))) {
$node->book = array();
@@ -1291,7 +1289,7 @@ function book_export_traverse($tree, $visit_func) {
/**
* Generates printer-friendly HTML for a node.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that will be output.
* @param $children
* All the rendered child nodes within the current node.
@@ -1301,7 +1299,7 @@ function book_export_traverse($tree, $visit_func) {
*
* @see book_export_traverse()
*/
-function book_node_export($node, $children = '') {
+function book_node_export(Node $node, $children = '') {
$build = node_view($node, 'print');
unset($build['#theme']);
// @todo Rendering should happen in the template using render().
diff --git a/core/modules/book/book.pages.inc b/core/modules/book/book.pages.inc
index 042bcf58fb0d06e1df6cd77976792f62aa291de8..aedde1654ae8ead0bb726ea452fe305a5f520a6e 100644
--- a/core/modules/book/book.pages.inc
+++ b/core/modules/book/book.pages.inc
@@ -5,6 +5,8 @@
* User page callbacks for the book module.
*/
+use Drupal\node\Node;
+
/**
* Page callback: Prints a listing of all books.
*
@@ -93,12 +95,12 @@ function book_export_html($nid) {
/**
* Page callback: Shows the outline form for a single node.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The book node for which to show the outline.
*
* @see book_menu()
*/
-function book_outline($node) {
+function book_outline(Node $node) {
drupal_set_title($node->title);
return drupal_get_form('book_outline_form', $node);
}
@@ -108,14 +110,14 @@ function book_outline($node) {
*
* Allows handling of all book outline operations via the outline tab.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The book node for which to show the outline.
*
* @see book_outline_form_submit()
* @see book_remove_button_submit()
* @ingroup forms
*/
-function book_outline_form($form, &$form_state, $node) {
+function book_outline_form($form, &$form_state, Node $node) {
if (!isset($node->book)) {
// The node is not part of any book yet - set default options.
$node->book = _book_link_defaults($node->nid);
@@ -197,14 +199,14 @@ function book_outline_form_submit($form, &$form_state) {
/**
* Form constructor to confirm removal of a node from a book.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to delete.
*
* @see book_remove_form_submit()
* @see book_menu()
* @ingroup forms
*/
-function book_remove_form($form, &$form_state, $node) {
+function book_remove_form($form, &$form_state, Node $node) {
$form['#node'] = $node;
$title = array('%title' => $node->title);
diff --git a/core/modules/book/book.test b/core/modules/book/book.test
index 54444b28d8f82a6ec5c682f30460a5709eced0d9..f7d82807a9f0f2dd5f71301fb4b16e290cb2aae0 100644
--- a/core/modules/book/book.test
+++ b/core/modules/book/book.test
@@ -5,6 +5,8 @@
* Tests for book.module.
*/
+use Drupal\node\Node;
+
class BookTestCase extends DrupalWebTestCase {
protected $book;
// $book_author is a user with permission to create and edit books.
@@ -108,7 +110,7 @@ class BookTestCase extends DrupalWebTestCase {
/**
* Check the outline of sub-pages; previous, up, and next; and printer friendly version.
*
- * @param $node
+ * @param Node $node
* Node to check.
* @param $nodes
* Nodes that should be in outline.
@@ -121,7 +123,7 @@ class BookTestCase extends DrupalWebTestCase {
* @param $breadcrumb
* The nodes that should be displayed in the breadcrumb.
*/
- function checkBookNode($node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) {
+ function checkBookNode(Node $node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) {
// $number does not use drupal_static as it should not be reset
// since it uniquely identifies each call to checkBookNode().
static $number = 0;
diff --git a/core/modules/comment/comment-wrapper.tpl.php b/core/modules/comment/comment-wrapper.tpl.php
index 5e58a676724d7f49b7c1eb3e8b93687068325829..1f9785127dcd5aec368a0e7bc3a8ba8e11eaa0c5 100644
--- a/core/modules/comment/comment-wrapper.tpl.php
+++ b/core/modules/comment/comment-wrapper.tpl.php
@@ -20,7 +20,7 @@
* the template.
*
* The following variables are provided for contextual information.
- * - $node: Node object the comments are attached to.
+ * - $node: Node entity the comments are attached to.
* The constants below the variables show the possible values and should be
* used for comparison.
* - $display_mode
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 8c33424aed319b022f94b5e3fe3c39b3e8055383..03029131b1e2106a7e63eba2fb04de1fa8f583c1 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -9,6 +9,8 @@
* book page, etc.
*/
+use Drupal\node\Node;
+
/**
* Comment is awaiting approval.
*/
@@ -545,13 +547,13 @@ function comment_get_recent($number = 10) {
* Number of comments.
* @param $new_replies
* Number of new replies.
- * @param $node
+ * @param Drupal\node\Node $node
* The first new comment node.
*
* @return
* "page=X" if the page number is greater than zero; empty string otherwise.
*/
-function comment_new_page_count($num_comments, $new_replies, $node) {
+function comment_new_page_count($num_comments, $new_replies, Node $node) {
$mode = variable_get('comment_default_mode_' . $node->type, COMMENT_MODE_THREADED);
$comments_per_page = variable_get('comment_default_per_page_' . $node->type, 50);
$pagenum = NULL;
@@ -629,7 +631,7 @@ function theme_comment_block() {
/**
* Implements hook_node_view().
*/
-function comment_node_view($node, $view_mode) {
+function comment_node_view(Node $node, $view_mode) {
$links = array();
if ($node->comment != COMMENT_NODE_HIDDEN) {
@@ -737,14 +739,14 @@ function comment_node_view($node, $view_mode) {
/**
* Builds the comment-related elements for node detail pages.
*
- * @param $node
- * The node object for which to build the comment-related elements.
+ * @param Drupal\node\Node $node
+ * The node entity for which to build the comment-related elements.
*
* @return
* A renderable array representing the comment-related page elements for the
* node.
*/
-function comment_node_page_additions($node) {
+function comment_node_page_additions(Node $node) {
$additions = array();
// Only attempt to render comments if the node has visible comments.
@@ -783,7 +785,7 @@ function comment_node_page_additions($node) {
/**
* Retrieves comments for a thread.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node whose comment(s) needs rendering.
* @param $mode
* The comment display mode; COMMENT_MODE_FLAT or COMMENT_MODE_THREADED.
@@ -847,7 +849,7 @@ function comment_node_page_additions($node) {
* spoil the reverse ordering, "ORDER BY thread ASC" -- here, we do not need
* to consider the trailing "/" so we use a substring only.
*/
-function comment_get_thread($node, $mode, $comments_per_page) {
+function comment_get_thread(Node $node, $mode, $comments_per_page) {
$query = db_select('comment', 'c')->extend('PagerDefault');
$query->addField('c', 'cid');
$query
@@ -936,7 +938,7 @@ function comment_prepare_thread(&$comments) {
*
* @param Comment $comment
* The comment object.
- * @param $node
+ * @param Drupal\node\Node $node
* The node the comment is attached to.
* @param $view_mode
* View mode, e.g. 'full', 'teaser'...
@@ -947,7 +949,7 @@ function comment_prepare_thread(&$comments) {
* @return
* An array as expected by drupal_render().
*/
-function comment_view(Comment $comment, $node, $view_mode = 'full', $langcode = NULL) {
+function comment_view(Comment $comment, Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = $GLOBALS['language_content']->langcode;
}
@@ -1006,7 +1008,7 @@ function comment_view(Comment $comment, $node, $view_mode = 'full', $langcode =
*
* @param Comment $comment
* A comment object.
- * @param $node
+ * @param Drupal\node\Node $node
* The node the comment is attached to.
* @param $view_mode
* View mode, e.g. 'full', 'teaser'...
@@ -1014,7 +1016,7 @@ function comment_view(Comment $comment, $node, $view_mode = 'full', $langcode =
* (optional) A language code to use for rendering. Defaults to the global
* content language of the current request.
*/
-function comment_build_content(Comment $comment, $node, $view_mode = 'full', $langcode = NULL) {
+function comment_build_content(Comment $comment, Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = $GLOBALS['language_content']->langcode;
}
@@ -1050,13 +1052,13 @@ function comment_build_content(Comment $comment, $node, $view_mode = 'full', $la
*
* @param Comment $comment
* The comment object.
- * @param $node
+ * @param Drupal\node\Node $node
* The node the comment is attached to.
*
* @return
* A structured array of links.
*/
-function comment_links(Comment $comment, $node) {
+function comment_links(Comment $comment, Node $node) {
$links = array();
if ($node->comment == COMMENT_NODE_OPEN) {
if (user_access('administer comments') && user_access('post comments')) {
@@ -1111,7 +1113,7 @@ function comment_links(Comment $comment, $node) {
*
* @param $comments
* An array of comments as returned by comment_load_multiple().
- * @param $node
+ * @param Drupal\node\Node $node
* The node the comments are attached to.
* @param $view_mode
* View mode, e.g. 'full', 'teaser'...
@@ -1126,7 +1128,7 @@ function comment_links(Comment $comment, $node) {
*
* @see drupal_render()
*/
-function comment_view_multiple($comments, $node, $view_mode = 'full', $weight = 0, $langcode = NULL) {
+function comment_view_multiple($comments, Node $node, $view_mode = 'full', $weight = 0, $langcode = NULL) {
field_attach_prepare_view('comment', $comments, $view_mode, $langcode);
entity_prepare_view('comment', $comments, $langcode);
@@ -1308,7 +1310,7 @@ function comment_node_load($nodes, $types) {
/**
* Implements hook_node_prepare().
*/
-function comment_node_prepare($node) {
+function comment_node_prepare(Node $node) {
if (!isset($node->comment)) {
$node->comment = variable_get("comment_$node->type", COMMENT_NODE_OPEN);
}
@@ -1317,7 +1319,7 @@ function comment_node_prepare($node) {
/**
* Implements hook_node_insert().
*/
-function comment_node_insert($node) {
+function comment_node_insert(Node $node) {
// Allow bulk updates and inserts to temporarily disable the
// maintenance of the {node_comment_statistics} table.
if (variable_get('comment_maintain_node_statistics', TRUE)) {
@@ -1337,7 +1339,7 @@ function comment_node_insert($node) {
/**
* Implements hook_node_predelete().
*/
-function comment_node_predelete($node) {
+function comment_node_predelete(Node $node) {
$cids = db_query('SELECT cid FROM {comment} WHERE nid = :nid', array(':nid' => $node->nid))->fetchCol();
comment_delete_multiple($cids);
db_delete('node_comment_statistics')
@@ -1348,7 +1350,7 @@ function comment_node_predelete($node) {
/**
* Implements hook_node_update_index().
*/
-function comment_node_update_index($node) {
+function comment_node_update_index(Node $node) {
$index_comments = &drupal_static(__FUNCTION__);
if ($index_comments === NULL) {
@@ -1397,7 +1399,7 @@ function comment_update_index() {
* Formats a comment count string and returns it, for display with search
* results.
*/
-function comment_node_search_result($node) {
+function comment_node_search_result(Node $node) {
// Do not make a string if comments are hidden.
if (user_access('access comments') && $node->comment != COMMENT_NODE_HIDDEN) {
$comments = db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array('nid' => $node->nid))->fetchField();
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index 21fe465e5daa9a93937b2042b2c83f881e99bf9e..bac078b3ec7590b04ae8122c4507bd3e11958bef 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -5,6 +5,8 @@
* User page callbacks for the Comment module.
*/
+use Drupal\node\Node;
+
/**
* Form constructor for the comment reply form.
*
@@ -17,7 +19,7 @@
* The node or comment that is being replied to must appear above the comment
* form to provide the user context while authoring the comment.
*
- * @param $node
+ * @param Drupal\node\Node $node
* Every comment belongs to a node. This is that node.
* @param $pid
* (optional) Some comments are replies to other comments. In those cases,
@@ -26,7 +28,7 @@
* @return
* The rendered parent node or comment plus the new comment form.
*/
-function comment_reply($node, $pid = NULL) {
+function comment_reply(Node $node, $pid = NULL) {
// Set the breadcrumb trail.
drupal_set_breadcrumb(array(l(t('Home'), NULL), l($node->title, 'node/' . $node->nid)));
$op = isset($_POST['op']) ? $_POST['op'] : '';
diff --git a/core/modules/comment/comment.test b/core/modules/comment/comment.test
index 259e420c9794593ec516854a57c485ecf0225557..1fc82975e3110fcae1514370678d7f2b6bc598e2 100644
--- a/core/modules/comment/comment.test
+++ b/core/modules/comment/comment.test
@@ -23,8 +23,8 @@ class CommentHelperCase extends DrupalWebTestCase {
/**
* Posts a comment.
*
- * @param $node
- * Node to post comment on.
+ * @param Node|NULL $node
+ * Node to post comment on or NULL to post to the previusly loaded page.
* @param $comment
* Comment body.
* @param $subject
diff --git a/core/modules/comment/comment.tpl.php b/core/modules/comment/comment.tpl.php
index 6a1738713a58445e03f7313234ac78d5fc30bcf2..e94e6e41453558f952fa6326577d6a4a34ff29ee 100644
--- a/core/modules/comment/comment.tpl.php
+++ b/core/modules/comment/comment.tpl.php
@@ -46,7 +46,7 @@
*
* These two variables are provided for context:
* - $comment: Full comment object.
- * - $node: Node object the comments are attached to.
+ * - $node: Node entity the comments are attached to.
*
* Other variables:
* - $classes_array: Array of html class attribute values. It is flattened
diff --git a/core/modules/entity/entity.class.inc b/core/modules/entity/entity.class.inc
index 9136c5856ff7835260cc510efa6be9381a2142c7..9a007184a773b9f88dfbd4f526719a9f7425413e 100644
--- a/core/modules/entity/entity.class.inc
+++ b/core/modules/entity/entity.class.inc
@@ -414,7 +414,7 @@ public function delete() {
*/
public function createDuplicate() {
$duplicate = clone $this;
- $duplicate->{$this->idKey} = NULL;
+ $duplicate->id = NULL;
return $duplicate;
}
diff --git a/core/modules/entity/tests/entity_crud_hook_test.test b/core/modules/entity/tests/entity_crud_hook_test.test
index f582c7406c5299640c54ea1008a6e9d1bcdddf98..33dbb2ecaa2824274f24278dd53299df2e65975e 100644
--- a/core/modules/entity/tests/entity_crud_hook_test.test
+++ b/core/modules/entity/tests/entity_crud_hook_test.test
@@ -62,7 +62,7 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
* Tests hook invocations for CRUD operations on comments.
*/
public function testCommentHooks() {
- $node = (object) array(
+ $node = entity_create('node', array(
'uid' => 1,
'type' => 'article',
'title' => 'Test node',
@@ -70,11 +70,11 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
'comment' => 2,
'promote' => 0,
'sticky' => 0,
- 'language' => LANGUAGE_NOT_SPECIFIED,
+ 'langcode' => LANGUAGE_NOT_SPECIFIED,
'created' => REQUEST_TIME,
'changed' => REQUEST_TIME,
- );
- node_save($node);
+ ));
+ $node->save();
$nid = $node->nid;
$comment = entity_create('comment', array(
@@ -86,7 +86,7 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
'created' => REQUEST_TIME,
'changed' => REQUEST_TIME,
'status' => 1,
- 'language' => LANGUAGE_NOT_SPECIFIED,
+ 'langcode' => LANGUAGE_NOT_SPECIFIED,
));
$_SESSION['entity_crud_hook_test'] = array();
@@ -189,7 +189,7 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
* Tests hook invocations for CRUD operations on nodes.
*/
public function testNodeHooks() {
- $node = (object) array(
+ $node = entity_create('node', array(
'uid' => 1,
'type' => 'article',
'title' => 'Test node',
@@ -197,12 +197,12 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
'comment' => 2,
'promote' => 0,
'sticky' => 0,
- 'language' => LANGUAGE_NOT_SPECIFIED,
+ 'langcode' => LANGUAGE_NOT_SPECIFIED,
'created' => REQUEST_TIME,
'changed' => REQUEST_TIME,
- );
+ ));
$_SESSION['entity_crud_hook_test'] = array();
- node_save($node);
+ $node->save();
$this->assertHookMessageOrder(array(
'entity_crud_hook_test_node_presave called',
@@ -221,7 +221,7 @@ class EntityCrudHookTestCase extends DrupalWebTestCase {
$_SESSION['entity_crud_hook_test'] = array();
$node->title = 'New title';
- node_save($node);
+ $node->save();
$this->assertHookMessageOrder(array(
'entity_crud_hook_test_node_presave called',
diff --git a/core/modules/field_ui/field_ui.test b/core/modules/field_ui/field_ui.test
index 9b710641c63a587c5279f2617ae26ad089170b60..fb71c5d3d191dd01db9ae5d4d1ea071eb6856bd2 100644
--- a/core/modules/field_ui/field_ui.test
+++ b/core/modules/field_ui/field_ui.test
@@ -5,6 +5,8 @@
* Tests for field_ui.module.
*/
+use Drupal\node\Node;
+
/**
* Provides common functionality for the Field UI test classes.
*/
@@ -615,7 +617,7 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
/**
* Asserts that a string is found in the rendered node in a view mode.
*
- * @param $node
+ * @param Node $node
* The node.
* @param $view_mode
* The view mode in which the node should be displayed.
@@ -627,14 +629,14 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
* @return
* TRUE on pass, FALSE on fail.
*/
- function assertNodeViewText($node, $view_mode, $text, $message) {
+ function assertNodeViewText(Node $node, $view_mode, $text, $message) {
return $this->assertNodeViewTextHelper($node, $view_mode, $text, $message, FALSE);
}
/**
* Asserts that a string is not found in the rendered node in a view mode.
*
- * @param $node
+ * @param Node $node
* The node.
* @param $view_mode
* The view mode in which the node should be displayed.
@@ -645,7 +647,7 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
* @return
* TRUE on pass, FALSE on fail.
*/
- function assertNodeViewNoText($node, $view_mode, $text, $message) {
+ function assertNodeViewNoText(Node $node, $view_mode, $text, $message) {
return $this->assertNodeViewTextHelper($node, $view_mode, $text, $message, TRUE);
}
@@ -655,7 +657,7 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
* This helper function is used by assertNodeViewText() and
* assertNodeViewNoText().
*
- * @param $node
+ * @param Node $node
* The node.
* @param $view_mode
* The view mode in which the node should be displayed.
@@ -669,7 +671,7 @@ class FieldUIManageDisplayTestCase extends FieldUITestCase {
* @return
* TRUE on pass, FALSE on fail.
*/
- function assertNodeViewTextHelper($node, $view_mode, $text, $message, $not_exists) {
+ function assertNodeViewTextHelper(Node $node, $view_mode, $text, $message, $not_exists) {
// Make sure caches on the tester side are refreshed after changes
// submitted on the tested side.
field_info_cache_clear();
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 635754cb9740b409190ddbac4416feba7387fa59..2d7313f9d53d2ede399dfb14dcd0378a6c654bdb 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -5,6 +5,8 @@
* Provides discussion forums.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_help().
*/
@@ -244,13 +246,13 @@ function forum_uri($forum) {
/**
* Check whether a content type can be used in a forum.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
*
* @return
* Boolean indicating if the node can be assigned to a forum.
*/
-function _forum_node_check_node_type($node) {
+function _forum_node_check_node_type(Node $node) {
// Fetch information about the forum field.
$field = field_info_instance('node', 'taxonomy_forums', $node->type);
@@ -260,7 +262,7 @@ function _forum_node_check_node_type($node) {
/**
* Implements hook_node_view().
*/
-function forum_node_view($node, $view_mode) {
+function forum_node_view(Node $node, $view_mode) {
$vid = variable_get('forum_nav_vocabulary', 0);
$vocabulary = taxonomy_vocabulary_load($vid);
if (_forum_node_check_node_type($node)) {
@@ -285,7 +287,7 @@ function forum_node_view($node, $view_mode) {
*
* Check in particular that only a "leaf" term in the associated taxonomy.
*/
-function forum_node_validate($node, $form) {
+function forum_node_validate(Node $node, $form) {
if (_forum_node_check_node_type($node)) {
$langcode = $form['taxonomy_forums']['#language'];
// vocabulary is selected, not a "container" term.
@@ -321,7 +323,7 @@ function forum_node_validate($node, $form) {
*
* Assign forum taxonomy when adding a topic from within a forum.
*/
-function forum_node_presave($node) {
+function forum_node_presave(Node $node) {
if (_forum_node_check_node_type($node)) {
// Make sure all fields are set properly:
$node->icon = !empty($node->icon) ? $node->icon : '';
@@ -341,7 +343,7 @@ function forum_node_presave($node) {
/**
* Implements hook_node_update().
*/
-function forum_node_update($node) {
+function forum_node_update(Node $node) {
if (_forum_node_check_node_type($node)) {
if (empty($node->revision) && db_query('SELECT tid FROM {forum} WHERE nid=:nid', array(':nid' => $node->nid))->fetchField()) {
if (!empty($node->forum_tid)) {
@@ -389,7 +391,7 @@ function forum_node_update($node) {
/**
* Implements hook_node_insert().
*/
-function forum_node_insert($node) {
+function forum_node_insert(Node $node) {
if (_forum_node_check_node_type($node)) {
if (!empty($node->forum_tid)) {
$nid = db_insert('forum')
@@ -406,7 +408,7 @@ function forum_node_insert($node) {
/**
* Implements hook_node_predelete().
*/
-function forum_node_predelete($node) {
+function forum_node_predelete(Node $node) {
if (_forum_node_check_node_type($node)) {
db_delete('forum')
->condition('nid', $node->nid)
@@ -901,9 +903,10 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
$nids[] = $record->nid;
}
if ($nids) {
+ $nodes = node_load_multiple($nids);
+
$query = db_select('node', 'n')->extend('TableSort');
- $query->fields('n', array('title', 'nid', 'type', 'sticky', 'created', 'uid'));
- $query->addField('n', 'comment', 'comment_mode');
+ $query->fields('n', array('nid'));
$query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid');
$query->fields('ncs', array('cid', 'last_comment_uid', 'last_comment_timestamp', 'comment_count'));
@@ -923,7 +926,16 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
->orderByHeader($forum_topic_list_header)
->condition('n.nid', $nids);
- $result = $query->execute();
+ $result = array();
+ foreach ($query->execute() as $row) {
+ $topic = $nodes[$row->nid];
+ $topic->comment_mode = $topic->comment;
+
+ foreach ($row as $key => $value) {
+ $topic->{$key} = $value;
+ }
+ $result[] = $topic;
+ }
}
else {
$result = array();
diff --git a/core/modules/forum/forum.test b/core/modules/forum/forum.test
index 4991752d8a23525fe1f851859ae3a7f660509d41..135f551c331725522fcbe510d44fe4bf94a7b2c0 100644
--- a/core/modules/forum/forum.test
+++ b/core/modules/forum/forum.test
@@ -5,6 +5,8 @@
* Tests for forum.module.
*/
+use Drupal\node\Node;
+
class ForumTestCase extends DrupalWebTestCase {
protected $admin_user;
protected $edit_own_topics_user;
@@ -457,14 +459,14 @@ class ForumTestCase extends DrupalWebTestCase {
*
* @param $node_user
* The user who creates the node.
- * @param $node
+ * @param Node $node
* The node being checked.
* @param $admin
* Boolean to indicate whether the user can 'access administration pages'.
* @param $response
* The exptected HTTP response code.
*/
- private function verifyForums($node_user, $node, $admin, $response = 200) {
+ private function verifyForums($node_user, Node $node, $admin, $response = 200) {
$response2 = ($admin) ? 200 : 403;
// View forum help node.
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 24ac5e3fce175e3a2ace6ef9c81a263142f8a64b..4351342604e632a8ca6074f748e3eac294323b95 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -239,9 +239,8 @@ function locale_form_node_form_alter(&$form, &$form_state) {
*/
function locale_field_node_form_submit($form, &$form_state) {
if (field_has_translation_handler('node', 'locale')) {
- $node = (object) $form_state['values'];
- $available_languages = field_content_languages();
- list(, , $bundle) = entity_extract_ids('node', $node);
+ $bundle = $form_state['values']['type'];
+ $node_language = $form_state['values']['langcode'];
foreach (field_info_instances('node', $bundle) as $instance) {
$field_name = $instance['field_name'];
@@ -250,8 +249,8 @@ function locale_field_node_form_submit($form, &$form_state) {
// Handle a possible language change: new language values are inserted,
// previous ones are deleted.
- if ($field['translatable'] && $previous_langcode != $node->langcode) {
- $form_state['values'][$field_name][$node->langcode] = $node->{$field_name}[$previous_langcode];
+ if ($field['translatable'] && $previous_langcode != $node_language) {
+ $form_state['values'][$field_name][$node_language] = $form_state['values'][$field_name][$previous_langcode];
$form_state['values'][$field_name][$previous_langcode] = array();
}
}
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 1f8bd3aefc4765051cf493bf293dc9ca39ffb335..5d55d066e8c803a47019ec888a21bb91abdcf973 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -11,6 +11,8 @@
* URLs to be added to the main site navigation menu.
*/
+use Drupal\node\Node;
+
/**
* Maximum length of menu name as entered by the user. Database length is 32
* and we add a menu- prefix.
@@ -508,21 +510,21 @@ function menu_block_view_alter(&$data, $block) {
/**
* Implements hook_node_insert().
*/
-function menu_node_insert($node) {
+function menu_node_insert(Node $node) {
menu_node_save($node);
}
/**
* Implements hook_node_update().
*/
-function menu_node_update($node) {
+function menu_node_update(Node $node) {
menu_node_save($node);
}
/**
* Helper for hook_node_insert() and hook_node_update().
*/
-function menu_node_save($node) {
+function menu_node_save(Node $node) {
if (isset($node->menu)) {
$link = &$node->menu;
if (empty($link['enabled'])) {
@@ -551,7 +553,7 @@ function menu_node_save($node) {
/**
* Implements hook_node_predelete().
*/
-function menu_node_predelete($node) {
+function menu_node_predelete(Node $node) {
// Delete all menu module links that point to this node.
$result = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND module = 'menu'", array(':path' => 'node/' . $node->nid), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $m) {
@@ -562,7 +564,7 @@ function menu_node_predelete($node) {
/**
* Implements hook_node_prepare().
*/
-function menu_node_prepare($node) {
+function menu_node_prepare(Node $node) {
if (empty($node->menu)) {
// Prepare the node for the edit form so that $node->menu always exists.
$menu_name = strtok(variable_get('menu_parent_' . $node->type, 'main-menu:0'), ':');
@@ -715,7 +717,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
*
* @see menu_form_node_form_alter()
*/
-function menu_node_submit($node, $form, $form_state) {
+function menu_node_submit(Node $node, $form, $form_state) {
// Decompose the selected menu parent option into 'menu_name' and 'plid', if
// the form used the default parent selection widget.
if (!empty($form_state['values']['menu']['parent'])) {
diff --git a/core/modules/node/lib/Drupal/node/Node.php b/core/modules/node/lib/Drupal/node/Node.php
new file mode 100644
index 0000000000000000000000000000000000000000..787358e22dd012432e1f9ac2b019e2b820195802
--- /dev/null
+++ b/core/modules/node/lib/Drupal/node/Node.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+ * @file
+ * Entity class for nodes.
+ */
+
+namespace Drupal\node;
+
+use Entity;
+
+/**
+ * Defines the node entity class.
+ */
+class Node extends Entity {
+
+ /**
+ * The node ID.
+ *
+ * @var integer
+ */
+ public $nid;
+
+ /**
+ * The node revision ID.
+ *
+ * @var integer
+ */
+ public $vid;
+
+ /**
+ * The node content type (bundle).
+ *
+ * @var string
+ */
+ public $type;
+
+ /**
+ * The node language code.
+ *
+ * @var string
+ */
+ public $langcode = LANGUAGE_NOT_SPECIFIED;
+
+ /**
+ * The node title.
+ *
+ * @var string
+ */
+ public $title;
+
+ /**
+ * The node owner's user ID.
+ *
+ * @var integer
+ */
+ public $uid;
+
+ /**
+ * The node published status indicator.
+ *
+ * Unpublished nodes are only visible to their authors and to administrators.
+ * The value is either NODE_PUBLISHED or NODE_NOT_PUBLISHED.
+ *
+ * @var integer
+ */
+ public $status;
+
+ /**
+ * The node creation timestamp.
+ *
+ * @var integer
+ */
+ public $created;
+
+ /**
+ * The node modification timestamp.
+ *
+ * @var integer
+ */
+ public $changed;
+
+ /**
+ * The node comment status indicator.
+ *
+ * COMMENT_NODE_HIDDEN => no comments
+ * COMMENT_NODE_CLOSED => comments are read-only
+ * COMMENT_NODE_OPEN => open (read/write)
+ *
+ * @var integer
+ */
+ public $comment;
+
+ /**
+ * The node promotion status.
+ *
+ * Promoted nodes should be displayed on the front page of the site. The
+ * value is either NODE_PROMOTED or NODE_NOT_PROMOTED.
+ *
+ * @var integer
+ */
+ public $promote;
+
+ /**
+ * The node sticky status.
+ *
+ * Sticky nodes should be displayed at the top of lists in which they appear.
+ * The value is either NODE_STICKY or NODE_NOT_STICKY.
+ *
+ * @var integer
+ */
+ public $sticky;
+
+ /**
+ * The node translation set ID.
+ *
+ * Translations sets are based on the ID of the node containing the source
+ * text for the translation set.
+ *
+ * @var integer
+ */
+ public $tnid;
+
+ /**
+ * The node translation status.
+ *
+ * If the translation page needs to be updated the value is 1, otherwise 0.
+ *
+ * @var integer
+ */
+ public $translate;
+
+ /**
+ * The node revision creation timestamp.
+ *
+ * @var integer
+ */
+ public $revision_timestamp;
+
+ /**
+ * The node revision author's user ID.
+ *
+ * @var integer
+ */
+ public $revision_uid;
+
+ /**
+ * Implements EntityInterface::id().
+ */
+ public function id() {
+ return $this->nid;
+ }
+
+ /**
+ * Implements EntityInterface::bundle().
+ */
+ public function bundle() {
+ return $this->type;
+ }
+
+ /**
+ * Overrides Entity::createDuplicate().
+ */
+ public function createDuplicate() {
+ $duplicate = clone $this;
+ $duplicate->nid = NULL;
+ $duplicate->vid = NULL;
+ return $duplicate;
+ }
+}
diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/Drupal/node/NodeStorageController.php
new file mode 100644
index 0000000000000000000000000000000000000000..0cdca80df753f743b10bf15ae6c2b461c8a9a5d6
--- /dev/null
+++ b/core/modules/node/lib/Drupal/node/NodeStorageController.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * @file
+ * Entity controller class for nodes.
+ */
+
+namespace Drupal\node;
+
+use EntityDatabaseStorageController;
+use EntityInterface;
+use EntityStorageException;
+use Exception;
+
+/**
+ * Controller class for nodes.
+ *
+ * This extends the EntityDatabaseStorageController class, adding required
+ * special handling for node entities.
+ */
+class NodeStorageController extends EntityDatabaseStorageController {
+
+ /**
+ * Overrides EntityDatabaseStorageController::create().
+ */
+ public function create(array $values) {
+ $node = parent::create($values);
+
+ // Set the created time to now.
+ if (empty($node->created)) {
+ $node->created = REQUEST_TIME;
+ }
+
+ return $node;
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::delete().
+ */
+ public function delete($ids) {
+ $entities = $ids ? $this->load($ids) : FALSE;
+ if (!$entities) {
+ // If no IDs or invalid IDs were passed, do nothing.
+ return;
+ }
+ $transaction = db_transaction();
+
+ try {
+ $this->preDelete($entities);
+ foreach ($entities as $id => $entity) {
+ $this->invokeHook('predelete', $entity);
+ }
+ $ids = array_keys($entities);
+
+ db_delete($this->entityInfo['base table'])
+ ->condition($this->idKey, $ids, 'IN')
+ ->execute();
+
+ if ($this->revisionKey) {
+ db_delete($this->revisionTable)
+ ->condition($this->idKey, $ids, 'IN')
+ ->execute();
+ }
+
+ // Reset the cache as soon as the changes have been applied.
+ $this->resetCache($ids);
+
+ $this->postDelete($entities);
+ foreach ($entities as $id => $entity) {
+ $this->invokeHook('delete', $entity);
+ }
+ // Ignore slave server temporarily.
+ db_ignore_slave();
+ }
+ catch (Exception $e) {
+ $transaction->rollback();
+ watchdog_exception($this->entityType, $e);
+ throw new EntityStorageException($e->getMessage, $e->getCode, $e);
+ }
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::save().
+ */
+ public function save(EntityInterface $entity) {
+ $transaction = db_transaction();
+ try {
+ // Load the stored entity, if any.
+ if (!$entity->isNew() && !isset($entity->original)) {
+ $entity->original = entity_load_unchanged($this->entityType, $entity->id());
+ }
+
+ $this->preSave($entity);
+ $this->invokeHook('presave', $entity);
+
+ if ($entity->isNew()) {
+ $op = 'insert';
+ $return = drupal_write_record($this->entityInfo['base table'], $entity);
+ $entity->enforceIsNew(FALSE);
+ }
+ else {
+ $op = 'update';
+ $return = drupal_write_record($this->entityInfo['base table'], $entity, $this->idKey);
+ }
+
+ if ($this->revisionKey) {
+ $this->saveRevision($entity);
+ }
+
+ // Reset general caches, but keep caches specific to certain entities.
+ $this->resetCache($op == 'update' ? array($entity->{$this->idKey}): array());
+
+ $this->postSave($entity, $op == 'update');
+ $this->invokeHook($op, $entity);
+
+ // Ignore slave server temporarily.
+ db_ignore_slave();
+ unset($entity->original);
+
+ return $return;
+ }
+ catch (Exception $e) {
+ $transaction->rollback();
+ watchdog_exception($this->entityType, $e);
+ throw new EntityStorageException($e->getMessage(), $e->getCode(), $e);
+ }
+ }
+
+ /**
+ * Saves a node revision.
+ *
+ * @param EntityInterface $node
+ * The node entity.
+ */
+ protected function saveRevision(EntityInterface $entity) {
+ $record = clone $entity;
+ $record->uid = $entity->revision_uid;
+ $record->timestamp = $entity->revision_timestamp;
+
+ if (empty($entity->{$this->revisionKey}) || !empty($entity->revision)) {
+ drupal_write_record($this->revisionTable, $record);
+ db_update($this->entityInfo['base table'])
+ ->fields(array($this->revisionKey => $record->{$this->revisionKey}))
+ ->condition($this->idKey, $entity->{$this->idKey})
+ ->execute();
+ }
+ else {
+ drupal_write_record($this->revisionTable, $record, $this->revisionKey);
+ }
+ // Make sure to update the new revision key for the entity.
+ $entity->{$this->revisionKey} = $record->{$this->revisionKey};
+ }
+
+ /**
+ * Overrides DrupalDefaultEntityController::attachLoad().
+ */
+ protected function attachLoad(&$nodes, $revision_id = FALSE) {
+ // Create an array of nodes for each content type and pass this to the
+ // object type specific callback.
+ $typed_nodes = array();
+ foreach ($nodes as $id => $entity) {
+ $typed_nodes[$entity->type][$id] = $entity;
+ }
+
+ // Call object type specific callbacks on each typed array of nodes.
+ foreach ($typed_nodes as $node_type => $nodes_of_type) {
+ if (node_hook($node_type, 'load')) {
+ $function = node_type_get_base($node_type) . '_load';
+ $function($nodes_of_type);
+ }
+ }
+ // Besides the list of nodes, pass one additional argument to
+ // hook_node_load(), containing a list of node types that were loaded.
+ $argument = array_keys($typed_nodes);
+ $this->hookLoadArguments = array($argument);
+ parent::attachLoad($nodes, $revision_id);
+ }
+
+ /**
+ * Overrides DrupalDefaultEntityController::buildQuery().
+ */
+ protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
+ // Ensure that uid is taken from the {node} table,
+ // alias timestamp to revision_timestamp and add revision_uid.
+ $query = parent::buildQuery($ids, $conditions, $revision_id);
+ $fields =& $query->getFields();
+ unset($fields['timestamp']);
+ $query->addField('revision', 'timestamp', 'revision_timestamp');
+ $fields['uid']['table'] = 'base';
+ $query->addField('revision', 'uid', 'revision_uid');
+ return $query;
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::invokeHook().
+ */
+ protected function invokeHook($hook, EntityInterface $node) {
+ if ($hook == 'insert' || $hook == 'update') {
+ node_invoke($node, $hook);
+ }
+ else if ($hook == 'predelete') {
+ // 'delete' is triggered in 'predelete' is here to preserve hook ordering
+ // from Drupal 7.
+ node_invoke($node, 'delete');
+ }
+
+ parent::invokeHook($hook, $node);
+
+ if ($hook == 'presave') {
+ if ($node->isNew() || !empty($node->revision)) {
+ // When inserting either a new node or a new node revision, $node->log
+ // must be set because {node_revision}.log is a text column and therefore
+ // cannot have a default value. However, it might not be set at this
+ // point (for example, if the user submitting a node form does not have
+ // permission to create revisions), so we ensure that it is at least an
+ // empty string in that case.
+ // @todo: Make the {node_revision}.log column nullable so that we can
+ // remove this check.
+ if (!isset($node->log)) {
+ $node->log = '';
+ }
+ }
+ elseif (!isset($node->log) || $node->log === '') {
+ // If we are updating an existing node without adding a new revision, we
+ // need to make sure $node->log is unset whenever it is empty. As long as
+ // $node->log is unset, drupal_write_record() will not attempt to update
+ // the existing database column when re-saving the revision; therefore,
+ // this code allows us to avoid clobbering an existing log entry with an
+ // empty one.
+ unset($node->log);
+ }
+
+ // When saving a new node revision, unset any existing $node->vid so as to
+ // ensure that a new revision will actually be created, then store the old
+ // revision ID in a separate property for use by node hook implementations.
+ if (!$node->isNew() && !empty($node->revision) && $node->vid) {
+ $node->old_vid = $node->vid;
+ $node->vid = NULL;
+ }
+ }
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::preSave().
+ */
+ protected function preSave(EntityInterface $node) {
+ // Before saving the node, set changed and revision times.
+ $node->changed = REQUEST_TIME;
+
+ if ($this->revisionKey && !empty($node->revision)) {
+ $node->revision_timestamp = REQUEST_TIME;
+
+ if (!isset($node->revision_uid)) {
+ $node->revision_uid = $GLOBALS['user']->uid;
+ }
+ }
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::postSave().
+ */
+ function postSave(EntityInterface $node, $update) {
+ node_access_acquire_grants($node, $update);
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::preDelete().
+ */
+ function preDelete($entities) {
+ if (module_exists('search')) {
+ foreach ($entities as $id => $entity) {
+ search_reindex($entity->nid, 'node');
+ }
+ }
+ }
+
+ /**
+ * Overrides EntityDatabaseStorageController::postDelete().
+ */
+ protected function postDelete($nodes) {
+ // Delete values from other tables also referencing this node.
+ $ids = array_keys($nodes);
+
+ db_delete('history')
+ ->condition('nid', $ids, 'IN')
+ ->execute();
+ db_delete('node_access')
+ ->condition('nid', $ids, 'IN')
+ ->execute();
+ }
+}
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 5388a875db1416849894f0b9c4be8a212a7615d4..ac362e823244f59d89ae3397dbb545b69facb7d9 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -319,7 +319,7 @@ function _node_mass_update_helper($nid, $updates) {
foreach ($updates as $name => $value) {
$node->$name = $value;
}
- node_save($node);
+ $node->save();
return $node;
}
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index b54f1ad2315b22987e014c96a544530cd90651b0..2511ce5bdd88fc429393d37323a96e5a14b166cf 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -253,7 +253,7 @@ function hook_node_grants($account, $op) {
*
* Note: a deny all grant is not written to the database; denies are implicit.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that has just been saved.
*
* @return
@@ -262,7 +262,7 @@ function hook_node_grants($account, $op) {
* @see _node_access_write_grants()
* @ingroup node_access
*/
-function hook_node_access_records($node) {
+function hook_node_access_records(Drupal\node\Node $node) {
// We only care about the node if it has been marked private. If not, it is
// treated just like any other node and we completely ignore it.
if ($node->private) {
@@ -313,7 +313,7 @@ function hook_node_access_records($node) {
*
* @param $grants
* The $grants array returned by hook_node_access_records().
- * @param $node
+ * @param Drupal\node\Node $node
* The node for which the grants were acquired.
*
* The preferred use of this hook is in a module that bridges multiple node
@@ -325,7 +325,7 @@ function hook_node_access_records($node) {
* @see hook_node_grants_alter()
* @ingroup node_access
*/
-function hook_node_access_records_alter(&$grants, $node) {
+function hook_node_access_records_alter(&$grants, Drupal\node\Node $node) {
// Our module allows editors to mark specific articles with the 'is_preview'
// field. If the node being saved has a TRUE value for that field, then only
// our grants are retained, and other grants are removed. Doing so ensures
@@ -456,14 +456,14 @@ function hook_node_operations() {
* field_attach_delete() are called, and before the node is removed from the
* node table in the database.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is about to be deleted.
*
* @see hook_node_predelete()
* @see node_delete_multiple()
* @ingroup node_api_hooks
*/
-function hook_node_predelete($node) {
+function hook_node_predelete(Drupal\node\Node $node) {
db_delete('mytable')
->condition('nid', $node->nid)
->execute();
@@ -475,14 +475,14 @@ function hook_node_predelete($node) {
* This hook is invoked from node_delete_multiple() after field_attach_delete()
* has been called and after the node has been removed from the database.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that has been deleted.
*
* @see hook_node_predelete()
* @see node_delete_multiple()
* @ingroup node_api_hooks
*/
-function hook_node_delete($node) {
+function hook_node_delete(Drupal\node\Node $node) {
drupal_set_message(t('Node: @title has been deleted', array('@title' => $node->title)));
}
@@ -493,12 +493,12 @@ function hook_node_delete($node) {
* removed from the node_revision table, and before
* field_attach_delete_revision() is called.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node revision (node object) that is being deleted.
*
* @ingroup node_api_hooks
*/
-function hook_node_revision_delete($node) {
+function hook_node_revision_delete(Drupal\node\Node $node) {
db_delete('mytable')
->condition('vid', $node->vid)
->execute();
@@ -511,12 +511,12 @@ function hook_node_revision_delete($node) {
* node table in the database, after the type-specific hook_insert() is invoked,
* and after field_attach_insert() is called.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being created.
*
* @ingroup node_api_hooks
*/
-function hook_node_insert($node) {
+function hook_node_insert(Drupal\node\Node $node) {
db_insert('mytable')
->fields(array(
'nid' => $node->nid,
@@ -583,8 +583,8 @@ function hook_node_load($nodes, $types) {
* the default home page at path 'node', a recent content block, etc.) See
* @link node_access Node access rights @endlink for a full explanation.
*
- * @param object|string $node
- * Either a node object or the machine name of the content type on which to
+ * @param Drupal\node\Node|string $node
+ * Either a node entity or the machine name of the content type on which to
* perform the access check.
* @param string $op
* The operation to be performed. Possible values:
@@ -634,12 +634,12 @@ function hook_node_access($node, $op, $account) {
* This hook is invoked from node_object_prepare() after the type-specific
* hook_prepare() is invoked.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is about to be shown on the add/edit form.
*
* @ingroup node_api_hooks
*/
-function hook_node_prepare($node) {
+function hook_node_prepare(Drupal\node\Node $node) {
if (!isset($node->comment)) {
$node->comment = variable_get("comment_$node->type", COMMENT_NODE_OPEN);
}
@@ -651,7 +651,7 @@ function hook_node_prepare($node) {
* This hook is invoked from node_search_execute(), after node_load()
* and node_view() have been called.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node being displayed in a search result.
*
* @return array
@@ -665,7 +665,7 @@ function hook_node_prepare($node) {
*
* @ingroup node_api_hooks
*/
-function hook_node_search_result($node) {
+function hook_node_search_result(Drupal\node\Node $node) {
$comments = db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array('nid' => $node->nid))->fetchField();
return array('comment' => format_plural($comments, '1 comment', '@count comments'));
}
@@ -676,12 +676,12 @@ function hook_node_search_result($node) {
* This hook is invoked from node_save() before the node is saved to the
* database.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being inserted or updated.
*
* @ingroup node_api_hooks
*/
-function hook_node_presave($node) {
+function hook_node_presave(Drupal\node\Node $node) {
if ($node->nid && $node->moderate) {
// Reset votes when node is updated:
$node->score = 0;
@@ -697,12 +697,12 @@ function hook_node_presave($node) {
* table in the database, after the type-specific hook_update() is invoked, and
* after field_attach_update() is called.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being updated.
*
* @ingroup node_api_hooks
*/
-function hook_node_update($node) {
+function hook_node_update(Drupal\node\Node $node) {
db_update('mytable')
->fields(array('extra' => $node->extra))
->condition('nid', $node->nid)
@@ -715,7 +715,7 @@ function hook_node_update($node) {
* This hook is invoked during search indexing, after node_load(), and after
* the result of node_view() is added as $node->rendered to the node object.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node being indexed.
*
* @return string
@@ -723,7 +723,7 @@ function hook_node_update($node) {
*
* @ingroup node_api_hooks
*/
-function hook_node_update_index($node) {
+function hook_node_update_index(Drupal\node\Node $node) {
$text = '';
$comments = db_query('SELECT subject, comment, format FROM {comment} WHERE nid = :nid AND status = :status', array(':nid' => $node->nid, ':status' => COMMENT_PUBLISHED));
foreach ($comments as $comment) {
@@ -747,7 +747,7 @@ function hook_node_update_index($node) {
* hook_node_presave() instead. If it is really necessary to change
* the node at the validate stage, you can use form_set_value().
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node being validated.
* @param $form
* The form being used to edit the node.
@@ -756,7 +756,7 @@ function hook_node_update_index($node) {
*
* @ingroup node_api_hooks
*/
-function hook_node_validate($node, $form, &$form_state) {
+function hook_node_validate(Drupal\node\Node $node, $form, &$form_state) {
if (isset($node->end) && isset($node->start)) {
if ($node->start > $node->end) {
form_set_error('time', t('An event may not end before it starts.'));
@@ -775,8 +775,8 @@ function hook_node_validate($node, $form, &$form_state) {
* properties. See hook_field_attach_submit() for customizing field-related
* properties.
*
- * @param $node
- * The node object being updated in response to a form submission.
+ * @param Drupal\node\Node $node
+ * The node entity being updated in response to a form submission.
* @param $form
* The form being used to edit the node.
* @param $form_state
@@ -784,7 +784,7 @@ function hook_node_validate($node, $form, &$form_state) {
*
* @ingroup node_api_hooks
*/
-function hook_node_submit($node, $form, &$form_state) {
+function hook_node_submit(Drupal\node\Node $node, $form, &$form_state) {
// Decompose the selected menu parent option into 'menu_name' and 'plid', if
// the form used the default parent selection widget.
if (!empty($form_state['values']['menu']['parent'])) {
@@ -804,7 +804,7 @@ function hook_node_submit($node, $form, &$form_state) {
* the RSS item generated for this node.
* For details on how this is used, see node_feed().
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being assembled for rendering.
* @param $view_mode
* The $view_mode parameter from node_view().
@@ -817,7 +817,7 @@ function hook_node_submit($node, $form, &$form_state) {
*
* @ingroup node_api_hooks
*/
-function hook_node_view($node, $view_mode, $langcode) {
+function hook_node_view(Drupal\node\Node $node, $view_mode, $langcode) {
$node->content['my_additional_field'] = array(
'#markup' => $additional_field,
'#weight' => 10,
@@ -1027,12 +1027,12 @@ function hook_node_type_delete($info) {
* removed from the node table in the database, before hook_node_delete() is
* invoked, and before field_attach_delete() is called.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being deleted.
*
* @ingroup node_api_hooks
*/
-function hook_delete($node) {
+function hook_delete(Drupal\node\Node $node) {
db_delete('mytable')
->condition('nid', $node->nid)
->execute();
@@ -1047,12 +1047,12 @@ function hook_delete($node) {
* This hook is invoked from node_object_prepare() before the general
* hook_node_prepare() is invoked.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is about to be shown on the add/edit form.
*
* @ingroup node_api_hooks
*/
-function hook_prepare($node) {
+function hook_prepare(Drupal\node\Node $node) {
if ($file = file_check_upload($field_name)) {
$file = file_save_upload($field_name, _image_filename($file->filename, NULL, TRUE));
if ($file) {
@@ -1083,7 +1083,7 @@ function hook_prepare($node) {
* displayed automatically by the node module. This hook just needs to
* return the node title and form editing fields specific to the node type.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node being added or edited.
* @param $form_state
* The form state array.
@@ -1094,7 +1094,7 @@ function hook_prepare($node) {
*
* @ingroup node_api_hooks
*/
-function hook_form($node, &$form_state) {
+function hook_form(Drupal\node\Node $node, &$form_state) {
$type = node_type_get_type($node);
$form['title'] = array(
@@ -1135,12 +1135,12 @@ function hook_form($node, &$form_state) {
* node table in the database, before field_attach_insert() is called, and
* before hook_node_insert() is invoked.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being created.
*
* @ingroup node_api_hooks
*/
-function hook_insert($node) {
+function hook_insert(Drupal\node\Node $node) {
db_insert('mytable')
->fields(array(
'nid' => $node->nid,
@@ -1193,12 +1193,12 @@ function hook_load($nodes) {
* node table in the database, before field_attach_update() is called, and
* before hook_node_update() is invoked.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node that is being updated.
*
* @ingroup node_api_hooks
*/
-function hook_update($node) {
+function hook_update(Drupal\node\Node $node) {
db_update('mytable')
->fields(array('extra' => $node->extra))
->condition('nid', $node->nid)
@@ -1222,7 +1222,7 @@ function hook_update($node) {
* have no effect. The preferred method to change a node's content is to use
* hook_node_presave() instead.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node being validated.
* @param $form
* The form being used to edit the node.
@@ -1231,7 +1231,7 @@ function hook_update($node) {
*
* @ingroup node_api_hooks
*/
-function hook_validate($node, $form, &$form_state) {
+function hook_validate(Drupal\node\Node $node, $form, &$form_state) {
if (isset($node->end) && isset($node->start)) {
if ($node->start > $node->end) {
form_set_error('time', t('An event may not end before it starts.'));
@@ -1249,7 +1249,7 @@ function hook_validate($node, $form, &$form_state) {
* so that the node type module can define a custom method for display, or
* add to the default display.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to be displayed, as returned by node_load().
* @param $view_mode
* View mode, e.g. 'full', 'teaser', ...
@@ -1268,7 +1268,7 @@ function hook_validate($node, $form, &$form_state) {
*
* @ingroup node_api_hooks
*/
-function hook_view($node, $view_mode) {
+function hook_view(Drupal\node\Node $node, $view_mode) {
if ($view_mode == 'full' && node_is_page($node)) {
$breadcrumb = array();
$breadcrumb[] = l(t('Home'), NULL);
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 748d8a7d2935090c1d9a693a55d4bb589ce70e9f..5e1c3b31c91f0b67f32040545ace4f6ed74a4469 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -3,6 +3,7 @@
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Database\Query\SelectExtender;
use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\node\Node;
/**
* @file
@@ -183,7 +184,8 @@ function node_entity_info() {
$return = array(
'node' => array(
'label' => t('Node'),
- 'controller class' => 'NodeController',
+ 'controller class' => 'Drupal\node\NodeStorageController',
+ 'entity class' => 'Drupal\node\Node',
'base table' => 'node',
'revision table' => 'node_revision',
'uri callback' => 'node_uri',
@@ -260,8 +262,11 @@ function node_field_display_node_alter(&$display, $context) {
/**
* Entity uri callback.
+ *
+ * @param Drupal\node\Node $node
+ * A node entity.
*/
-function node_uri($node) {
+function node_uri(Node $node) {
return array(
'path' => 'node/' . $node->nid,
);
@@ -314,10 +319,10 @@ function node_title_list($result, $title = NULL) {
/**
* Updates the 'last viewed' timestamp of the specified node for current user.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
*/
-function node_tag_new($node) {
+function node_tag_new(Node $node) {
global $user;
if ($user->uid) {
db_merge('history')
@@ -377,7 +382,7 @@ function node_mark($nid, $timestamp) {
/**
* Extracts the type name.
*
- * @param $node
+ * @param Drupal\node\Node|string $node
* Either a string or object, containing the node type information.
*
* @return
@@ -405,8 +410,8 @@ function node_type_get_types() {
/**
* Returns the node type of the passed node or node type string.
*
- * @param $node
- * A node object or string that indicates the node type to return.
+ * @param Drupal\node\Node|string $node
+ * A node entity or string that indicates the node type to return.
*
* @return
* A single node type, as an object, or FALSE if the node type is not found.
@@ -428,8 +433,8 @@ function node_type_get_type($node) {
* execute node-type-specific hooks. For types defined in the user interface
* and managed by node.module, the base is 'node_content'.
*
- * @param $node
- * A node object or string that indicates the node type to return.
+ * @param Drupal\node\Node|string $node
+ * A node entity or string that indicates the node type to return.
*
* @return
* The node type base or FALSE if the node type is not found.
@@ -458,8 +463,8 @@ function node_type_get_names() {
/**
* Returns the node type name of the passed node or node type string.
*
- * @param $node
- * A node object or string that indicates the node type to return.
+ * @param Drupal\node\Node|string $node
+ * A node entity or string that indicates the node type to return.
*
* @return
* The node type name or FALSE if the node type is not found.
@@ -872,8 +877,8 @@ function node_rdf_mapping() {
/**
* Determines whether a node hook exists.
*
- * @param $node
- * A node object or a string containing the node type.
+ * @param Drupal\node\Node|string $node
+ * A node entity or a string containing the node type.
* @param $hook
* A string containing the name of the hook.
*
@@ -888,8 +893,8 @@ function node_hook($node, $hook) {
/**
* Invokes a node hook.
*
- * @param $node
- * A node object or a string containing the node type.
+ * @param Drupal\node\Node|string $node
+ * A node entity or a string containing the node type.
* @param $hook
* A string containing the name of the hook.
* @param $a2, $a3, $a4
@@ -925,7 +930,7 @@ function node_invoke($node, $hook, $a2 = NULL, $a3 = NULL, $a4 = NULL) {
* (optional) Whether to reset the internal node_load() cache.
*
* @return array
- * An array of node objects indexed by nid.
+ * An array of node entities indexed by nid.
*
* @todo Remove $conditions in Drupal 8.
*
@@ -937,7 +942,7 @@ function node_load_multiple($nids = array(), array $conditions = array(), $reset
}
/**
- * Loads a node object from the database.
+ * Loads a node entity from the database.
*
* @param int $nid
* (optional) The node ID.
@@ -946,8 +951,8 @@ function node_load_multiple($nids = array(), array $conditions = array(), $reset
* @param bool $reset
* (optional) Whether to reset the node_load_multiple() cache.
*
- * @return object
- * A fully-populated node object, or FALSE if the node is not found.
+ * @return Drupal\node\Node|false
+ * A fully-populated node entity, or FALSE if the node is not found.
*/
function node_load($nid = NULL, $vid = NULL, $reset = FALSE) {
$nids = (isset($nid) ? array($nid) : array());
@@ -957,15 +962,15 @@ function node_load($nid = NULL, $vid = NULL, $reset = FALSE) {
}
/**
- * Prepares a node object for editing.
+ * Prepares a node entity for editing.
*
* Fills in a few default values, and then invokes hook_prepare() on the node
* type module, and hook_node_prepare() on all modules.
*
- * @param $node
- * The node object.
+ * @param Drupal\node\Node $node
+ * The node entity.
*/
-function node_object_prepare($node) {
+function node_object_prepare(Node $node) {
// Set up default values, if required.
$node_options = variable_get('node_options_' . $node->type, array('status', 'promote'));
// If this is a new node, fill in the default values.
@@ -982,7 +987,7 @@ function node_object_prepare($node) {
}
else {
$node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O');
- // Remove the log message from the original node object.
+ // Remove the log message from the original node entity.
$node->log = NULL;
}
// Always use the default revision setting.
@@ -1048,6 +1053,11 @@ function node_submit($node) {
}
}
+ // If a new revision is created, save the current user as revision author.
+ if (!empty($node->revision)) {
+ $node->revision_uid = $user->uid;
+ }
+
$node->created = !empty($node->date) ? strtotime($node->date) : REQUEST_TIME;
$node->validated = TRUE;
@@ -1057,166 +1067,12 @@ function node_submit($node) {
/**
* Saves changes to a node or adds a new node.
*
- * @param $node
- * The $node object to be saved. If $node->nid is
+ * @param Drupal\node\Node $node
+ * The $node entity to be saved. If $node->nid is
* omitted (or $node->is_new is TRUE), a new node will be added.
*/
-function node_save($node) {
- $transaction = db_transaction();
-
- try {
- // Load the stored entity, if any.
- if (!empty($node->nid) && !isset($node->original)) {
- $node->original = entity_load_unchanged('node', $node->nid);
- }
-
- field_attach_presave('node', $node);
- global $user;
-
- // Determine if we will be inserting a new node.
- if (!isset($node->is_new)) {
- $node->is_new = empty($node->nid);
- }
-
- // Set the timestamp fields.
- if (empty($node->created)) {
- $node->created = REQUEST_TIME;
- }
- // The changed timestamp is always updated for bookkeeping purposes,
- // for example: revisions, searching, etc.
- $node->changed = REQUEST_TIME;
-
- $node->timestamp = REQUEST_TIME;
- $update_node = TRUE;
-
- // Let modules modify the node before it is saved to the database.
- module_invoke_all('node_presave', $node);
- module_invoke_all('entity_presave', $node, 'node');
-
- if ($node->is_new || !empty($node->revision)) {
- // When inserting either a new node or a new node revision, $node->log
- // must be set because {node_revision}.log is a text column and therefore
- // cannot have a default value. However, it might not be set at this
- // point (for example, if the user submitting a node form does not have
- // permission to create revisions), so we ensure that it is at least an
- // empty string in that case.
- // @todo: Make the {node_revision}.log column nullable so that we can
- // remove this check.
- if (!isset($node->log)) {
- $node->log = '';
- }
- }
- elseif (!isset($node->log) || $node->log === '') {
- // If we are updating an existing node without adding a new revision, we
- // need to make sure $node->log is unset whenever it is empty. As long as
- // $node->log is unset, drupal_write_record() will not attempt to update
- // the existing database column when re-saving the revision; therefore,
- // this code allows us to avoid clobbering an existing log entry with an
- // empty one.
- unset($node->log);
- }
-
- // When saving a new node revision, unset any existing $node->vid so as to
- // ensure that a new revision will actually be created, then store the old
- // revision ID in a separate property for use by node hook implementations.
- if (!$node->is_new && !empty($node->revision) && $node->vid) {
- $node->old_vid = $node->vid;
- unset($node->vid);
- }
-
- // Save the node and node revision.
- if ($node->is_new) {
- // For new nodes, save new records for both the node itself and the node
- // revision.
- drupal_write_record('node', $node);
- _node_save_revision($node, $user->uid);
- $op = 'insert';
- }
- else {
- // For existing nodes, update the node record which matches the value of
- // $node->nid.
- drupal_write_record('node', $node, 'nid');
- // Then, if a new node revision was requested, save a new record for
- // that; otherwise, update the node revision record which matches the
- // value of $node->vid.
- if (!empty($node->revision)) {
- _node_save_revision($node, $user->uid);
- }
- else {
- _node_save_revision($node, $user->uid, 'vid');
- $update_node = FALSE;
- }
- $op = 'update';
- }
- if ($update_node) {
- db_update('node')
- ->fields(array('vid' => $node->vid))
- ->condition('nid', $node->nid)
- ->execute();
- }
-
- // Call the node specific callback (if any). This can be
- // node_invoke($node, 'insert') or
- // node_invoke($node, 'update').
- node_invoke($node, $op);
-
- // Save fields.
- $function = "field_attach_$op";
- $function('node', $node);
-
- module_invoke_all('node_' . $op, $node);
- module_invoke_all('entity_' . $op, $node, 'node');
-
- // Update the node access table for this node. There's no need to delete
- // existing records if the node is new.
- $delete = $op == 'update';
- node_access_acquire_grants($node, $delete);
-
- // Clear internal properties.
- unset($node->is_new);
- unset($node->original);
- // Clear the static loading cache.
- entity_get_controller('node')->resetCache(array($node->nid));
-
- // Ignore slave server temporarily to give time for the
- // saved node to be propagated to the slave.
- db_ignore_slave();
- }
- catch (Exception $e) {
- $transaction->rollback();
- watchdog_exception('node', $e);
- throw $e;
- }
-}
-
-/**
- * Saves a revision with the ID of the current user.
- *
- * The resulting revision ID is available afterward in $node->vid.
- *
- * @param $node
- * The node object to be processed.
- * @param $uid
- * User ID of the current user.
- * @param $update
- * (optional) To indicate that this is a new record to be inserted, omit this
- * argument. If this is an update, this argument specifies the primary keys'
- * field names. If there is only 1 field in the key, you may pass in a string;
- * if there are multiple fields in the key, pass in an array.
- *
- * @see node_save()
- */
-function _node_save_revision($node, $uid, $update = NULL) {
- $temp_uid = $node->uid;
- $node->uid = $uid;
- if (isset($update)) {
- drupal_write_record('node_revision', $node, $update);
- }
- else {
- drupal_write_record('node_revision', $node);
- }
- // Have node object still show node owner's uid, not revision author's.
- $node->uid = $temp_uid;
+function node_save(Node $node) {
+ $node->save();
}
/**
@@ -1239,59 +1095,7 @@ function node_delete($nid) {
* @see hook_node_delete()
*/
function node_delete_multiple($nids) {
- $transaction = db_transaction();
- if (!empty($nids)) {
- $nodes = node_load_multiple($nids, array());
-
- try {
- foreach ($nodes as $nid => $node) {
- // Call the node-specific callback (if any):
- node_invoke($node, 'delete');
-
- // Allow modules to act prior to node deletion.
- module_invoke_all('node_predelete', $node);
- module_invoke_all('entity_predelete', $node, 'node');
-
- field_attach_delete('node', $node);
-
- // Remove this node from the search index if needed.
- // This code is implemented in node module rather than in search module,
- // because node module is implementing search module's API, not the other
- // way around.
- if (module_exists('search')) {
- search_reindex($nid, 'node');
- }
- }
-
- // Delete after calling hooks so that they can query node tables as needed.
- db_delete('node')
- ->condition('nid', $nids, 'IN')
- ->execute();
- db_delete('node_revision')
- ->condition('nid', $nids, 'IN')
- ->execute();
- db_delete('history')
- ->condition('nid', $nids, 'IN')
- ->execute();
- db_delete('node_access')
- ->condition('nid', $nids, 'IN')
- ->execute();
-
- foreach ($nodes as $nid => $node) {
- // Allow modules to respond to node deletion.
- module_invoke_all('node_delete', $node);
- module_invoke_all('entity_delete', $node, 'node');
- }
- }
- catch (Exception $e) {
- $transaction->rollback();
- watchdog_exception('node', $e);
- throw $e;
- }
-
- // Clear the page and block and node_load_multiple caches.
- entity_get_controller('node')->resetCache();
- }
+ entity_delete_multiple('node', $nids);
}
/**
@@ -1325,8 +1129,8 @@ function node_revision_delete($revision_id) {
/**
* Generates an array for rendering the given node.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $view_mode
* (optional) View mode, e.g., 'full', 'teaser'... Defaults to 'full.'
* @param $langcode
@@ -1336,7 +1140,7 @@ function node_revision_delete($revision_id) {
* @return
* An array as expected by drupal_render().
*/
-function node_view($node, $view_mode = 'full', $langcode = NULL) {
+function node_view(Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = $GLOBALS['language_content']->langcode;
}
@@ -1390,15 +1194,15 @@ function node_view($node, $view_mode = 'full', $langcode = NULL) {
* Contributed modules might define additional view modes, or use existing
* view modes in additional contexts.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $view_mode
* (optional) View mode, e.g., 'full', 'teaser'... Defaults to 'full.'
* @param $langcode
* (optional) A language code to use for rendering. Defaults to the global
* content language of the current request.
*/
-function node_build_content($node, $view_mode = 'full', $langcode = NULL) {
+function node_build_content(Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = $GLOBALS['language_content']->langcode;
}
@@ -1451,8 +1255,8 @@ function node_build_content($node, $view_mode = 'full', $langcode = NULL) {
/**
* Page callback: Generates an array which displays a node detail page.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $message
* (optional) A flag which sets a page title relevant to the revision being
* viewed.
@@ -1462,7 +1266,7 @@ function node_build_content($node, $view_mode = 'full', $langcode = NULL) {
*
* @see node_menu()
*/
-function node_show($node, $message = FALSE) {
+function node_show(Node $node, $message = FALSE) {
if ($message) {
drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))), PASS_THROUGH);
}
@@ -1479,13 +1283,13 @@ function node_show($node, $message = FALSE) {
/**
* Checks whether the current page is the full page view of the passed-in node.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
*
* @return
* The ID of the node if this is a full page view, otherwise FALSE.
*/
-function node_is_page($node) {
+function node_is_page(Node $node) {
$page_node = menu_get_object();
return (!empty($page_node) ? $page_node->nid == $node->nid : FALSE);
}
@@ -1539,7 +1343,7 @@ function template_preprocess_node(&$variables) {
$variables['title'] = check_plain($node->title);
$variables['page'] = $variables['view_mode'] == 'full' && node_is_page($node);
- // Flatten the node object's member fields.
+ // Flatten the node entity's member fields.
$variables = array_merge((array) $node, $variables);
// Helpful $content variable for templates.
@@ -1908,7 +1712,7 @@ function theme_node_search_admin($variables) {
/**
* Access callback: Checks node revision access.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to check.
* @param $op
* (optional) The specific operation being checked. Defaults to 'view.'
@@ -1921,7 +1725,7 @@ function theme_node_search_admin($variables) {
*
* @see node_menu()
*/
-function _node_revision_access($node, $op = 'view', $account = NULL) {
+function _node_revision_access(Node $node, $op = 'view', $account = NULL) {
$access = &drupal_static(__FUNCTION__, array());
$map = array(
@@ -2209,12 +2013,12 @@ function node_type_page_title($type) {
/**
* Title callback: Displays the node's title.
*
- * @param $node
- * The node object.
+ * @param Drupal\node\Node $node
+ * The node entity.
*
* @see node_menu()
*/
-function node_page_title($node) {
+function node_page_title(Node $node) {
return $node->title;
}
@@ -2233,8 +2037,11 @@ function node_last_changed($nid) {
/**
* Returns a list of all the existing revision numbers for the node passed in.
+ *
+ * @param Drupal\node\Node $node
+ * The node entity.
*/
-function node_revision_list($node) {
+function node_revision_list(Node $node) {
$revisions = array();
$result = db_query('SELECT r.vid, r.title, r.log, r.uid, n.vid AS current_vid, r.timestamp, u.name FROM {node_revision} r LEFT JOIN {node} n ON n.vid = r.vid INNER JOIN {users} u ON u.uid = r.uid WHERE r.nid = :nid ORDER BY r.vid DESC', array(':nid' => $node->nid));
foreach ($result as $revision) {
@@ -2323,7 +2130,7 @@ function node_block_save($delta = '', $edit = array()) {
* (optional) The maximum number of nodes to find. Defaults to 10.
*
* @return
- * An array of partial node objects or an empty array if there are no recent
+ * An array of node entities or an empty array if there are no recent
* nodes visible to the current user.
*/
function node_get_recent($number = 10) {
@@ -2362,7 +2169,7 @@ function node_get_recent($number = 10) {
*
* @param $variables
* An associative array containing:
- * - nodes: An array of recent node objects.
+ * - nodes: An array of recent node entities.
*
* @ingroup themeable
*/
@@ -2403,7 +2210,7 @@ function theme_node_recent_block($variables) {
*
* @param $variables
* An associative array containing:
- * - node: A node object.
+ * - node: A node entity.
*
* @ingroup themeable
*/
@@ -2739,12 +2546,12 @@ function node_page_default() {
/**
* Page callback: Displays a single node.
*
- * @param $node
- * The node object.
+ * @param Drupal\node\Node $node
+ * The node entity.
*
* @see node_menu()
*/
-function node_page_view($node) {
+function node_page_view(Node $node) {
// If there is a menu link to this node, the link becomes the last part
// of the active trail, and the link name becomes the page title.
// Thus, we must explicitly set the page title to be the node title.
@@ -2764,8 +2571,12 @@ function node_update_index() {
$limit = (int)variable_get('search_cron_limit', 100);
$result = db_query_range("SELECT n.nid FROM {node} n LEFT JOIN {search_dataset} d ON d.type = 'node' AND d.sid = n.nid WHERE d.sid IS NULL OR d.reindex <> 0 ORDER BY d.reindex ASC, n.nid ASC", 0, $limit, array(), array('target' => 'slave'));
+ $nids = $result->fetchCol();
+ if (!$nids) {
+ return;
+ }
- foreach ($result as $node) {
+ foreach (node_load_multiple($nids) as $node) {
_node_index_node($node);
}
}
@@ -2773,11 +2584,10 @@ function node_update_index() {
/**
* Indexes a single node.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to index.
*/
-function _node_index_node($node) {
- $node = node_load($node->nid);
+function _node_index_node(Node $node) {
// Save the changed time of the most recent indexed node, for the search
// results half-life calculation.
@@ -2995,8 +2805,8 @@ function node_form_system_themes_admin_form_submit($form, &$form_state) {
* - "update"
* - "delete"
* - "create"
- * @param $node
- * The node object on which the operation is to be performed, or the node type
+ * @param Drupal\node\Node|string $node
+ * The node entity on which the operation is to be performed, or the node type
* (e.g., 'forum') for the 'create' operation.
* @param $account
* (optional) A user object representing the user for whom the operation is to
@@ -3485,13 +3295,13 @@ function _node_query_node_access_alter($query, $type) {
* via hook_node_access_records_alter() implementations, and saves the collected
* and altered grants to the database.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The $node to acquire grants for.
* @param $delete
* (optional) Whether to delete existing node access records before inserting
* new ones. Defaults to TRUE.
*/
-function node_access_acquire_grants($node, $delete = TRUE) {
+function node_access_acquire_grants(Node $node, $delete = TRUE) {
$grants = module_invoke_all('node_access_records', $node);
// Let modules alter the grants.
drupal_alter('node_access_records', $grants, $node);
@@ -3513,7 +3323,7 @@ function node_access_acquire_grants($node, $delete = TRUE) {
* Note: Don't call this function directly from a contributed module. Call
* node_access_acquire_grants() instead.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The $node being written to. All that is necessary is that it contains a
* nid.
* @param $grants
@@ -3529,7 +3339,7 @@ function node_access_acquire_grants($node, $delete = TRUE) {
* purposes, and assumes the caller has already performed a mass delete of
* some form.
*/
-function _node_access_write_grants($node, $grants, $realm = NULL, $delete = TRUE) {
+function _node_access_write_grants(Node $node, $grants, $realm = NULL, $delete = TRUE) {
if ($delete) {
$query = db_delete('node_access')->condition('nid', $node->nid);
if ($realm) {
@@ -3718,7 +3528,7 @@ function _node_access_rebuild_batch_finished($success, $results, $operations) {
/**
* Implements hook_form().
*/
-function node_content_form($node, $form_state) {
+function node_content_form(Node $node, $form_state) {
// It is impossible to define a content type without implementing hook_form()
// @todo: remove this requirement.
$form = array();
@@ -3829,15 +3639,15 @@ function node_action_info() {
/**
* Sets the status of a node to 1 (published).
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $context
* (optional) Array of additional information about what triggered the action.
* Not used for this action.
*
* @ingroup actions
*/
-function node_publish_action($node, $context = array()) {
+function node_publish_action(Node $node, $context = array()) {
$node->status = NODE_PUBLISHED;
watchdog('action', 'Set @type %title to published.', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
@@ -3845,15 +3655,15 @@ function node_publish_action($node, $context = array()) {
/**
* Sets the status of a node to 0 (unpublished).
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $context
* (optional) Array of additional information about what triggered the action.
* Not used for this action.
*
* @ingroup actions
*/
-function node_unpublish_action($node, $context = array()) {
+function node_unpublish_action(Node $node, $context = array()) {
$node->status = NODE_NOT_PUBLISHED;
watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
@@ -3861,15 +3671,15 @@ function node_unpublish_action($node, $context = array()) {
/**
* Sets the sticky-at-top-of-list property of a node to 1.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $context
* (optional) Array of additional information about what triggered the action.
* Not used for this action.
*
* @ingroup actions
*/
-function node_make_sticky_action($node, $context = array()) {
+function node_make_sticky_action(Node $node, $context = array()) {
$node->sticky = NODE_STICKY;
watchdog('action', 'Set @type %title to sticky.', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
@@ -3877,15 +3687,15 @@ function node_make_sticky_action($node, $context = array()) {
/**
* Sets the sticky-at-top-of-list property of a node to 0.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $context
* (optional) Array of additional information about what triggered the action.
* Not used for this action.
*
* @ingroup actions
*/
-function node_make_unsticky_action($node, $context = array()) {
+function node_make_unsticky_action(Node $node, $context = array()) {
$node->sticky = NODE_NOT_STICKY;
watchdog('action', 'Set @type %title to unsticky.', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
@@ -3893,15 +3703,15 @@ function node_make_unsticky_action($node, $context = array()) {
/**
* Sets the promote property of a node to 1.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $context
* (optional) Array of additional information about what triggered the action.
* Not used for this action.
*
* @ingroup actions
*/
-function node_promote_action($node, $context = array()) {
+function node_promote_action(Node $node, $context = array()) {
$node->promote = NODE_PROMOTED;
watchdog('action', 'Promoted @type %title to front page.', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
@@ -3909,15 +3719,15 @@ function node_promote_action($node, $context = array()) {
/**
* Sets the promote property of a node to 0.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
* @param $context
* (optional) Array of additional information about what triggered the action.
* Not used for this action.
*
* @ingroup actions
*/
-function node_unpromote_action($node, $context = array()) {
+function node_unpromote_action(Node $node, $context = array()) {
$node->promote = NODE_NOT_PROMOTED;
watchdog('action', 'Removed @type %title from front page.', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
@@ -3925,21 +3735,21 @@ function node_unpromote_action($node, $context = array()) {
/**
* Saves a node.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to be saved.
*
* @ingroup actions
*/
-function node_save_action($node) {
- node_save($node);
+function node_save_action(Node $node) {
+ $node->save();
watchdog('action', 'Saved @type %title', array('@type' => node_type_get_name($node), '%title' => $node->title));
}
/**
* Assigns ownership of a node to a user.
*
- * @param $node
- * A node object to modify.
+ * @param Drupal\node\Node $node
+ * A node entity to modify.
* @param $context
* Array of additional information about what triggered the action. Includes
* the following elements:
@@ -3950,7 +3760,7 @@ function node_save_action($node) {
* @see node_assign_owner_action_submit()
* @ingroup actions
*/
-function node_assign_owner_action($node, $context) {
+function node_assign_owner_action(Node $node, $context) {
$node->uid = $context['owner_uid'];
$owner_name = db_query("SELECT name FROM {users} WHERE uid = :uid", array(':uid' => $context['owner_uid']))->fetchField();
watchdog('action', 'Changed owner of @type %title to uid %name.', array('@type' => node_type_get_name($node), '%title' => $node->title, '%name' => $owner_name));
@@ -4051,8 +3861,8 @@ function node_unpublish_by_keyword_action_submit($form, $form_state) {
/**
* Unpublishes a node containing certain keywords.
*
- * @param $node
- * A node object to modify.
+ * @param Drupal\node\Node $node
+ * A node entity to modify.
* @param $context
* Array of additional information about what triggered the action. Includes
* the following elements:
@@ -4064,7 +3874,7 @@ function node_unpublish_by_keyword_action_submit($form, $form_state) {
*
* @ingroup actions
*/
-function node_unpublish_by_keyword_action($node, $context) {
+function node_unpublish_by_keyword_action(Node $node, $context) {
foreach ($context['keywords'] as $keyword) {
$elements = node_view(clone $node);
if (strpos(drupal_render($elements), $keyword) !== FALSE || strpos($node->title, $keyword) !== FALSE) {
@@ -4134,55 +3944,6 @@ function node_modules_disabled($modules) {
}
}
-/**
- * Controller class for nodes.
- *
- * This extends the DrupalDefaultEntityController class, adding required
- * special handling for node objects.
- */
-class NodeController extends DrupalDefaultEntityController {
-
- /**
- * Overrides DrupalDefaultEntityController::attachLoad().
- */
- protected function attachLoad(&$nodes, $revision_id = FALSE) {
- // Create an array of nodes for each content type and pass this to the
- // object type specific callback.
- $typed_nodes = array();
- foreach ($nodes as $id => $entity) {
- $typed_nodes[$entity->type][$id] = $entity;
- }
-
- // Call object type specific callbacks on each typed array of nodes.
- foreach ($typed_nodes as $node_type => $nodes_of_type) {
- if (node_hook($node_type, 'load')) {
- $function = node_type_get_base($node_type) . '_load';
- $function($nodes_of_type);
- }
- }
- // Besides the list of nodes, pass one additional argument to
- // hook_node_load(), containing a list of node types that were loaded.
- $argument = array_keys($typed_nodes);
- $this->hookLoadArguments = array($argument);
- parent::attachLoad($nodes, $revision_id);
- }
-
- /**
- * Overrides DrupalDefaultEntityController::buildQuery().
- */
- protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
- // Ensure that uid is taken from the {node} table,
- // alias timestamp to revision_timestamp and add revision_uid.
- $query = parent::buildQuery($ids, $conditions, $revision_id);
- $fields =& $query->getFields();
- unset($fields['timestamp']);
- $query->addField('revision', 'timestamp', 'revision_timestamp');
- $fields['uid']['table'] = 'base';
- $query->addField('revision', 'uid', 'revision_uid');
- return $query;
- }
-}
-
/**
* Implements hook_file_download_access().
*/
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 3ca34e03891c34f9113f1bf4e97870d5a2f3b5b4..ace9599a55f2e26059f8deaf73add4648c1a2fdd 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -9,6 +9,7 @@
* @see node_menu()
*/
+use Drupal\node\Node;
/**
* Page callback: Presents the node editing form.
@@ -81,7 +82,12 @@ function node_add($type) {
global $user;
$types = node_type_get_types();
- $node = (object) array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'langcode' => LANGUAGE_NOT_SPECIFIED);
+ $node = entity_create('node', array(
+ 'uid' => $user->uid,
+ 'name' => (isset($user->name) ? $user->name : ''),
+ 'type' => $type,
+ 'langcode' => LANGUAGE_NOT_SPECIFIED,
+ ));
drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
$output = drupal_get_form($type . '_node_form', $node);
@@ -100,7 +106,10 @@ function node_form_validate($form, &$form_state) {
// $form_state['node'] contains the actual entity being edited, but we must
// not update it with form values that have not yet been validated, so we
// create a pseudo-entity to use during validation.
- $node = (object) $form_state['values'];
+ $node = clone $form_state['node'];
+ foreach ($form_state['values'] as $key => $value) {
+ $node->{$key} = $value;
+ }
node_validate($node, $form, $form_state);
entity_form_field_validate('node', $form, $form_state);
}
@@ -115,16 +124,13 @@ function node_form_validate($form, &$form_state) {
* @see node_form_submit_build_node()
* @ingroup forms
*/
-function node_form($form, &$form_state, $node) {
+function node_form($form, &$form_state, Node $node) {
global $user;
// During initial form build, add the node entity to the form state for use
// during form building and processing. During a rebuild, use what is in the
// form state.
if (!isset($form_state['node'])) {
- if (!isset($node->title)) {
- $node->title = NULL;
- }
node_object_prepare($node);
$form_state['node'] = $node;
}
@@ -391,7 +397,7 @@ function node_form_build_preview($form, &$form_state) {
/**
* Generates a node preview.
*
- * @param $node
+ * @param Drupal\node\Node $node
* The node to preview.
*
* @return
@@ -399,7 +405,7 @@ function node_form_build_preview($form, &$form_state) {
*
* @see node_form_build_preview()
*/
-function node_preview($node) {
+function node_preview(Node $node) {
if (node_access('create', $node) || node_access('update', $node)) {
_field_invoke_multiple('load', 'node', array($node->nid => $node));
// Load the user's name when needed.
@@ -441,7 +447,7 @@ function node_preview($node) {
*
* @param $variables
* An associative array containing:
- * - node: The node object which is being previewed.
+ * - node: The node entity which is being previewed.
*
* @see node_preview()
* @ingroup themeable
@@ -484,7 +490,7 @@ function theme_node_preview($variables) {
function node_form_submit($form, &$form_state) {
$node = node_form_submit_build_node($form, $form_state);
$insert = empty($node->nid);
- node_save($node);
+ $node->save();
$node_link = l(t('view'), 'node/' . $node->nid);
$watchdog_args = array('@type' => $node->type, '%title' => $node->title);
$t_args = array('@type' => node_type_get_name($node), '%title' => $node->title);
@@ -658,7 +664,7 @@ function node_revision_revert_confirm_submit($form, &$form_state) {
$node_revision->revision = 1;
$node_revision->log = t('Copy of the revision from %date.', array('%date' => format_date($node_revision->revision_timestamp)));
- node_save($node_revision);
+ $node_revision->save();
watchdog('content', '@type: reverted %title revision %revision.', array('@type' => $node_revision->type, '%title' => $node_revision->title, '%revision' => $node_revision->vid));
drupal_set_message(t('@type %title has been reverted back to the revision from %revision-date.', array('@type' => node_type_get_name($node_revision), '%title' => $node_revision->title, '%revision-date' => format_date($node_revision->revision_timestamp))));
diff --git a/core/modules/node/node.test b/core/modules/node/node.test
index d2a2ca58db67a5aad0a7480b40cf3883fb3f07fd..655bc0bf567e3e4868ec216f5b68fc0f36a0ca24 100644
--- a/core/modules/node/node.test
+++ b/core/modules/node/node.test
@@ -245,15 +245,13 @@ class NodeRevisionsTestCase extends NodeWebTestCase {
// the "log message" field), and check that the original log message is
// preserved.
$new_title = $this->randomName(10) . 'testNodeRevisionWithoutLogMessage1';
- $updated_node = (object) array(
- 'nid' => $node->nid,
- 'vid' => $node->vid,
- 'uid' => $node->uid,
- 'type' => $node->type,
- 'title' => $new_title,
- 'log' => '',
- );
- node_save($updated_node);
+
+ $node = clone $node;
+ $node->title = $new_title;
+ $node->log = '';
+ $node->revision = FALSE;
+
+ $node->save();
$this->drupalGet('node/' . $node->nid);
$this->assertText($new_title, t('New node title appears on the page.'));
$node_revision = node_load($node->nid, NULL, TRUE);
@@ -265,15 +263,13 @@ class NodeRevisionsTestCase extends NodeWebTestCase {
// Save a new node revision without providing a log message, and check that
// this revision has an empty log message.
$new_title = $this->randomName(10) . 'testNodeRevisionWithoutLogMessage2';
- $updated_node = (object) array(
- 'nid' => $node->nid,
- 'vid' => $node->vid,
- 'uid' => $node->uid,
- 'type' => $node->type,
- 'title' => $new_title,
- 'revision' => 1,
- );
- node_save($updated_node);
+
+ $node = clone $node;
+ $node->title = $new_title;
+ $node->revision = TRUE;
+ $node->log = NULL;
+
+ $node->save();
$this->drupalGet('node/' . $node->nid);
$this->assertText($new_title, 'New node title appears on the page.');
$node_revision = node_load($node->nid, NULL, TRUE);
@@ -534,7 +530,7 @@ class NodeCreationTestCase extends NodeWebTestCase {
);
try {
- node_save((object) $edit);
+ entity_create('node', $edit)->save();
$this->fail(t('Expected exception has not been thrown.'));
}
catch (Exception $e) {
@@ -1156,7 +1152,7 @@ class NodeSaveTestCase extends NodeWebTestCase {
public static function getInfo() {
return array(
'name' => 'Node save',
- 'description' => 'Test node_save() for saving content.',
+ 'description' => 'Test $node->save() for saving content.',
'group' => 'Node',
);
}
@@ -1187,14 +1183,14 @@ class NodeSaveTestCase extends NodeWebTestCase {
'uid' => $this->web_user->uid,
'type' => 'article',
'nid' => $test_nid,
- 'is_new' => TRUE,
+ 'enforceIsNew' => TRUE,
);
- $node = node_submit((object) $node);
+ $node = node_submit(entity_create('node', $node));
// Verify that node_submit did not overwrite the user ID.
$this->assertEqual($node->uid, $this->web_user->uid, t('Function node_submit() preserves user ID'));
- node_save($node);
+ $node->save();
// Test the import.
$node_by_nid = node_load($test_nid);
$this->assertTrue($node_by_nid, t('Node load by node ID.'));
@@ -1215,7 +1211,7 @@ class NodeSaveTestCase extends NodeWebTestCase {
'title' => $this->randomName(8),
);
- node_save((object) $edit);
+ entity_create('node', $edit)->save();
$node = $this->drupalGetNodeByTitle($edit['title']);
$this->assertEqual($node->created, REQUEST_TIME, t('Creating a node sets default "created" timestamp.'));
$this->assertEqual($node->changed, REQUEST_TIME, t('Creating a node sets default "changed" timestamp.'));
@@ -1224,14 +1220,14 @@ class NodeSaveTestCase extends NodeWebTestCase {
$created = $node->created;
$changed = $node->changed;
- node_save($node);
+ $node->save();
$node = $this->drupalGetNodeByTitle($edit['title'], TRUE);
$this->assertEqual($node->created, $created, t('Updating a node preserves "created" timestamp.'));
// Programmatically set the timestamps using hook_node_presave.
$node->title = 'testing_node_presave';
- node_save($node);
+ $node->save();
$node = $this->drupalGetNodeByTitle('testing_node_presave', TRUE);
$this->assertEqual($node->created, 280299600, t('Saving a node uses "created" timestamp set in presave hook.'));
$this->assertEqual($node->changed, 979534800, t('Saving a node uses "changed" timestamp set in presave hook.'));
@@ -1245,7 +1241,7 @@ class NodeSaveTestCase extends NodeWebTestCase {
'changed' => 979534800, // Drupal 1.0 release.
);
- node_save((object) $edit);
+ entity_create('node', $edit)->save();
$node = $this->drupalGetNodeByTitle($edit['title']);
$this->assertEqual($node->created, 280299600, t('Creating a node uses user-set "created" timestamp.'));
$this->assertNotEqual($node->changed, 979534800, t('Creating a node doesn\'t use user-set "changed" timestamp.'));
@@ -1254,7 +1250,7 @@ class NodeSaveTestCase extends NodeWebTestCase {
$node->created = 979534800;
$node->changed = 280299600;
- node_save($node);
+ $node->save();
$node = $this->drupalGetNodeByTitle($edit['title'], TRUE);
$this->assertEqual($node->created, 979534800, t('Updating a node uses user-set "created" timestamp.'));
$this->assertNotEqual($node->changed, 280299600, t('Updating a node doesn\'t use user-set "changed" timestamp.'));
@@ -1266,20 +1262,20 @@ class NodeSaveTestCase extends NodeWebTestCase {
*/
function testDeterminingChanges() {
// Initial creation.
- $node = (object) array(
+ $node = entity_create('node', array(
'uid' => $this->web_user->uid,
'type' => 'article',
'title' => 'test_changes',
- );
- node_save($node);
+ ));
+ $node->save();
// Update the node without applying changes.
- node_save($node);
+ $node->save();
$this->assertEqual($node->title, 'test_changes', 'No changes have been determined.');
// Apply changes.
$node->title = 'updated';
- node_save($node);
+ $node->save();
// The hook implementations node_test_node_presave() and
// node_test_node_update() determine changes and change the title.
@@ -2414,7 +2410,6 @@ class NodeRevisionPermissionsTestCase extends NodeWebTestCase {
// Test that access is FALSE for a node administrator with an invalid $node
// or $op parameters.
$admin_account = $this->accounts['admin'];
- $this->assertFalse(_node_revision_access(FALSE, 'view', $admin_account), '_node_revision_access() returns FALSE with an invalid node.');
$this->assertFalse(_node_revision_access($revision, 'invalid-op', $admin_account), '_node_revision_access() returns FALSE with an invalid op.');
// Test that the $account parameter defaults to the "logged in" user.
diff --git a/core/modules/node/node.tpl.php b/core/modules/node/node.tpl.php
index a251ecc6c038ff8cba550fd394d4f8f683f6aef4..c3db5aea67556b33a1a10d86a1c927bdfe30f6d1 100644
--- a/core/modules/node/node.tpl.php
+++ b/core/modules/node/node.tpl.php
@@ -41,7 +41,7 @@
* the template.
*
* Other variables:
- * - $node: Full node object. Contains data that may not be safe.
+ * - $node: Full node entity. Contains data that may not be safe.
* - $type: Node type, i.e. page, article, etc.
* - $comment_count: Number of comments attached to the node.
* - $uid: User ID of the node author.
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 d9e6e2f87ec3f80b3a5255b3bf6da94126e98b84..cda5fdfa0d75d345bf18400b0124e74791b29f4d 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
@@ -7,6 +7,8 @@
* a special 'node test view' permission.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_node_grants().
*/
@@ -26,7 +28,7 @@ function node_access_test_node_grants($account, $op) {
/**
* Implements hook_node_access_records().
*/
-function node_access_test_node_access_records($node) {
+function node_access_test_node_access_records(Node $node) {
$grants = array();
// For NodeAccessBaseTableTestCase, only set records for private nodes.
if (!variable_get('node_access_test_private') || $node->private) {
@@ -199,28 +201,28 @@ function node_access_test_node_load($nodes, $types) {
* Implements hook_node_predelete().
*/
-function node_access_test_node_predelete($node) {
+function node_access_test_node_predelete(Node $node) {
db_delete('node_access_test')->condition('nid', $node->nid)->execute();
}
/**
* Implements hook_node_insert().
*/
-function node_access_test_node_insert($node) {
+function node_access_test_node_insert(Node $node) {
_node_access_test_node_write($node);
}
/**
* Implements hook_nodeapi_update().
*/
-function node_access_test_node_update($node) {
+function node_access_test_node_update(Node $node) {
_node_access_test_node_write($node);
}
/**
* Helper for node insert/update.
*/
-function _node_access_test_node_write($node) {
+function _node_access_test_node_write(Node $node) {
if (isset($node->private)) {
db_merge('node_access_test')
->key(array('nid' => $node->nid))
diff --git a/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
index b0ebc149a150199121999b6275bc98ecb8ba0019..f541d10832eab28ab0a52d0caa156b5ccaaa628c 100644
--- a/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -6,6 +6,8 @@
* the Node module.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_node_load().
*/
@@ -25,7 +27,7 @@ function node_test_node_load($nodes, $types) {
/**
* Implements hook_node_view().
*/
-function node_test_node_view($node, $view_mode) {
+function node_test_node_view(Node $node, $view_mode) {
if ($view_mode == 'rss') {
// Add RSS elements and namespaces when building the RSS feed.
$node->rss_elements[] = array(
@@ -66,7 +68,7 @@ function node_test_node_grants($account, $op) {
/**
* Implements hook_node_access_records().
*/
-function node_test_node_access_records($node) {
+function node_test_node_access_records(Node $node) {
// Return nothing when testing for empty responses.
if (!empty($node->disable_node_access)) {
return;
@@ -100,7 +102,7 @@ function node_test_node_access_records($node) {
/**
* Implements hook_node_access_records_alter().
*/
-function node_test_node_access_records_alter(&$grants, $node) {
+function node_test_node_access_records_alter(&$grants, Node $node) {
if (!empty($grants)) {
foreach ($grants as $key => $grant) {
// Alter grant from test_page_realm to test_alter_realm and modify the gid.
@@ -123,7 +125,7 @@ function node_test_node_grants_alter(&$grants, $account, $op) {
/**
* Implements hook_node_presave().
*/
-function node_test_node_presave($node) {
+function node_test_node_presave(Node $node) {
if ($node->title == 'testing_node_presave') {
// Sun, 19 Nov 1978 05:00:00 GMT
$node->created = 280299600;
@@ -141,7 +143,7 @@ function node_test_node_presave($node) {
/**
* Implements hook_node_update().
*/
-function node_test_node_update($node) {
+function node_test_node_update(Node $node) {
// Determine changes on update.
if (!empty($node->original) && $node->original->title == 'test_changes') {
if ($node->original->title != $node->title) {
diff --git a/core/modules/node/tests/modules/node_test_exception/node_test_exception.module b/core/modules/node/tests/modules/node_test_exception/node_test_exception.module
index 0fe9f35ea564e70e15f9c730183c56453488b812..570236b788d6dcb9b428f97e6f72ed6501450d77 100644
--- a/core/modules/node/tests/modules/node_test_exception/node_test_exception.module
+++ b/core/modules/node/tests/modules/node_test_exception/node_test_exception.module
@@ -6,10 +6,12 @@
* the Node module.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_node_insert().
*/
-function node_test_exception_node_insert($node) {
+function node_test_exception_node_insert(Node $node) {
if ($node->title == 'testing_transaction_exception') {
throw new Exception('Test exception for rollback.');
}
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 10eb1275b1aacb30719dfd7976b7f29bb6e2251b..1d638ad4217bdb528946b2d91de36fdfedd1991e 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -5,6 +5,8 @@
* Enables users to rename URLs.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_help().
*/
@@ -185,7 +187,7 @@ function path_form_element_validate($element, &$form_state, $complete_form) {
/**
* Implements hook_node_insert().
*/
-function path_node_insert($node) {
+function path_node_insert(Node $node) {
if (isset($node->path)) {
$path = $node->path;
$path['alias'] = trim($path['alias']);
@@ -202,7 +204,7 @@ function path_node_insert($node) {
/**
* Implements hook_node_update().
*/
-function path_node_update($node) {
+function path_node_update(Node $node) {
if (isset($node->path)) {
$path = $node->path;
$path['alias'] = trim($path['alias']);
@@ -223,7 +225,7 @@ function path_node_update($node) {
/**
* Implements hook_node_predelete().
*/
-function path_node_predelete($node) {
+function path_node_predelete(Node $node) {
// Delete all aliases associated with this node.
path_delete(array('source' => 'node/' . $node->nid));
}
diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module
index c8015798e6034e8af0c53da35ad8c8581ea9bf2e..beba2ed6d327a7bc00d58db1cc1f900b6420d9ae 100644
--- a/core/modules/poll/poll.module
+++ b/core/modules/poll/poll.module
@@ -6,6 +6,8 @@
* choice questions.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_help().
*/
@@ -606,10 +608,10 @@ function poll_delete($node) {
/**
* Return content for 'latest poll' block.
*
- * @param $node
- * The node object to load.
+ * @param Drupal\node\Node $node
+ * The node entity to load.
*/
-function poll_block_latest_poll_view($node) {
+function poll_block_latest_poll_view(Node $node) {
global $user;
$output = '';
diff --git a/core/modules/poll/poll.test b/core/modules/poll/poll.test
index 3ab570cc2ee31c74640e9b75ca05354a70cecad5..cba67bac62d34c07007fcaa1e5da510f5e1c4f1e 100644
--- a/core/modules/poll/poll.test
+++ b/core/modules/poll/poll.test
@@ -227,7 +227,7 @@ class PollCreateTestCase extends PollWebTestCase {
'weight' => 1000,
);
- node_save($node);
+ $node->save();
$this->drupalGet('poll');
$this->clickLink($title);
diff --git a/core/modules/rdf/rdf.test b/core/modules/rdf/rdf.test
index 6c7635fb02ea47352511f7dd12cc8929786dfe34..c160ccb915880bfd0e72472b4b37d489c7d32a93 100644
--- a/core/modules/rdf/rdf.test
+++ b/core/modules/rdf/rdf.test
@@ -5,6 +5,8 @@
* Tests for rdf.module.
*/
+use Drupal\node\Node;
+
class RdfMappingHookTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
@@ -620,10 +622,10 @@ class RdfTrackerAttributesTestCase extends DrupalWebTestCase {
*
* Tests the tracker page for RDFa markup.
*
- * @param $node
+ * @param Node $node
* The node just created.
*/
- function _testBasicTrackerRdfaMarkup($node) {
+ function _testBasicTrackerRdfaMarkup(Node $node) {
$url = url('node/' . $node->nid);
$user = ($node->uid == 0) ? 'Anonymous user' : 'Registered user';
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 587ef43636a6b97e0ba40c905ed08bc43fda6cf6..9a6a11adac0f63b51f83ae5d05bc8997f980666a 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -5,6 +5,8 @@
* Enables site-wide keyword searching.
*/
+use Drupal\node\Node;
+
/**
* Matches all 'N' Unicode character classes (numbers)
*/
@@ -798,7 +800,7 @@ function search_touch_node($nid) {
/**
* Implements hook_node_update_index().
*/
-function search_node_update_index($node) {
+function search_node_update_index(Node $node) {
// Transplant links to a node into the target node.
$result = db_query("SELECT caption FROM {search_node_links} WHERE nid = :nid", array(':nid' => $node->nid), array('target' => 'slave'));
$output = array();
@@ -813,7 +815,7 @@ function search_node_update_index($node) {
/**
* Implements hook_node_update().
*/
-function search_node_update($node) {
+function search_node_update(Node $node) {
// Reindex the node when it is updated. The node is automatically indexed
// when it is added, simply by being added to the node table.
search_touch_node($node->nid);
diff --git a/core/modules/search/search.test b/core/modules/search/search.test
index b01fcf7c46fb024a2bca44e55ce32738a3157495..dd63ec488ca5bc5443507cff914894e32cf2d84b 100644
--- a/core/modules/search/search.test
+++ b/core/modules/search/search.test
@@ -828,7 +828,7 @@ class SearchCommentTestCase extends SearchWebTestCase {
// Hide comments.
$this->drupalLogin($this->admin_user);
$node->comment = 0;
- node_save($node);
+ $node->save();
// Invoke search index update.
$this->drupalLogout();
diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php
index b996bbebca7257e7d03413ae8126bcc2c660803a..540dc0e9385a0856f0eaa3f16bab3128b7bcff04 100644
--- a/core/modules/simpletest/drupal_web_test_case.php
+++ b/core/modules/simpletest/drupal_web_test_case.php
@@ -902,7 +902,7 @@ function __construct($test_id = NULL) {
* (optional) Whether to reset the internal node_load() cache.
*
* @return
- * A node object matching $title.
+ * A node entity matching $title.
*/
function drupalGetNodeByTitle($title, $reset = FALSE) {
$nodes = node_load_multiple(array(), array('title' => $title), $reset);
@@ -918,7 +918,7 @@ function drupalGetNodeByTitle($title, $reset = FALSE) {
* An associative array of settings to change from the defaults, keys are
* node properties, for example 'title' => 'Hello, world!'.
* @return
- * Created node object.
+ * Created node entity.
*/
protected function drupalCreateNode($settings = array()) {
// Populate defaults array.
@@ -962,8 +962,8 @@ protected function drupalCreateNode($settings = array()) {
);
$settings['body'][$settings['langcode']][0] += $body;
- $node = (object) $settings;
- node_save($node);
+ $node = entity_create('node', $settings);
+ $node->save();
// Small hack to link revisions to our test user.
db_update('node_revision')
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 38cd0203ba3c7693bc58a5e8ec393db0498575e3..69d5f5be38fc4027490831dfcde6403920af70af 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -5,6 +5,8 @@
* Logs and displays access statistics for a site.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_help().
*/
@@ -97,7 +99,7 @@ function statistics_permission() {
/**
* Implements hook_node_view().
*/
-function statistics_node_view($node, $view_mode) {
+function statistics_node_view(Node $node, $view_mode) {
if (!empty($node->nid) && $view_mode == 'full') {
$node->content['#attached']['js'] = array(
drupal_get_path('module', 'statistics') . '/statistics.js' => array(
@@ -408,7 +410,7 @@ function _statistics_format_item($title, $path) {
/**
* Implements hook_node_predelete().
*/
-function statistics_node_predelete($node) {
+function statistics_node_predelete(Node $node) {
// clean up statistics table when node is deleted
db_delete('node_counter')
->condition('nid', $node->nid)
diff --git a/core/modules/system/page.tpl.php b/core/modules/system/page.tpl.php
index f77fdad07070fafad93fe78ad503c5721461ed71..5c53d2bdbab0026324f1e2ca27ae29b9f2b1bcd5 100644
--- a/core/modules/system/page.tpl.php
+++ b/core/modules/system/page.tpl.php
@@ -50,7 +50,7 @@
* - $action_links (array): Actions local to the page, such as 'Add menu' on the
* menu administration interface.
* - $feed_icons: A string of all feed icons for the current page.
- * - $node: The node object, if there is an automatically-loaded node
+ * - $node: The node entity, if there is an automatically-loaded node
* associated with the page, and the node ID is the second argument
* in the page's path (e.g. node/12345 and node/12345/revisions, but not
* comment/reply/12345).
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index dc73a596663d382a090b948e69ea79afaa25219b..c6e1288b9be4fa11cf1e2eebb55607e96daed461 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -1153,7 +1153,7 @@ function hook_menu_contextual_links_alter(&$links, $router_item, $root_path) {
* $page['content']['system_main']['nodes'][$nid]['body']
* // Array of links attached to the node (add comments, read more).
* $page['content']['system_main']['nodes'][$nid]['links']
- * // The node object itself.
+ * // The node entity itself.
* $page['content']['system_main']['nodes'][$nid]['#node']
* // The results pager.
* $page['content']['system_main']['pager']
@@ -1183,7 +1183,7 @@ function hook_page_alter(&$page) {
* Perform alterations before a form is rendered.
*
* One popular use of this hook is to add form elements to the node form. When
- * altering a node form, the node object can be accessed at $form['#node'].
+ * altering a node form, the node entity can be accessed at $form['#node'].
*
* In addition to hook_form_alter(), which is called for all forms, there are
* two more specific form hooks available. The first,
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index d9130a84cfc7206f66af8cea27b8ad984311d171..dfb8936cd47931a15907384e82548a0daa9cfc17 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -3212,7 +3212,7 @@ function system_send_email_action_submit($form, $form_state) {
* Sends an e-mail message.
*
* @param object $entity
- * An optional node object, which will be added as $context['node'] if
+ * An optional node entity, which will be added as $context['node'] if
* provided.
* @param array $context
* Array with the following elements:
@@ -3286,7 +3286,7 @@ function system_message_action_submit($form, $form_state) {
* Sends a message to the current user's screen.
*
* @param object $entity
- * An optional node object, which will be added as $context['node'] if
+ * An optional node entity, which will be added as $context['node'] if
* provided.
* @param array $context
* Array with the following elements:
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 c727c51455ff58e4f4d5a693bdd4fadcb0ee6de9..f42b5f5ddb42d6a3e3d03e8ea6236188b30d6fb6 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -1932,7 +1932,9 @@ function form_test_form_user_register_form_alter(&$form, &$form_state) {
);
// If requested, add the test field by attaching the node page form.
if (!empty($_REQUEST['field'])) {
- $node = (object)array('type' => 'page');
+ $node = entity_create('node', array(
+ 'type' => 'page',
+ ));
field_attach_form('node', $node, $form, $form_state);
}
}
@@ -1950,12 +1952,12 @@ function form_test_user_register_form_rebuild($form, &$form_state) {
*/
function form_test_two_instances() {
global $user;
- $node1 = (object) array(
+ $node1 = entity_create('node', array(
'uid' => $user->uid,
'name' => (isset($user->name) ? $user->name : ''),
'type' => 'page',
'langcode' => LANGUAGE_NOT_SPECIFIED,
- );
+ ));
$node2 = clone($node1);
$return['node_form_1'] = drupal_get_form('page_node_form', $node1);
$return['node_form_2'] = drupal_get_form('page_node_form', $node2);
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 27f7cb42f6f1608505f864f3c84a75f8824a6c30..024f3edcc8fbdc5b00bab1e86b88fab42f519c51 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -5,6 +5,8 @@
* Enables the organization of content into categories.
*/
+use Drupal\node\Node;
+
/**
* Denotes that no term in the vocabulary has a parent.
*/
@@ -1541,7 +1543,7 @@ function taxonomy_field_presave($entity_type, $entity, $field, $instance, $langc
/**
* Implements hook_node_insert().
*/
-function taxonomy_node_insert($node) {
+function taxonomy_node_insert(Node $node) {
// Add taxonomy index entries for the node.
taxonomy_build_node_index($node);
}
@@ -1552,8 +1554,8 @@ function taxonomy_node_insert($node) {
* The index lists all terms that are related to a given node entity, and is
* therefore maintained at the entity level.
*
- * @param $node
- * The node object.
+ * @param Drupal\node\Node $node
+ * The node entity.
*/
function taxonomy_build_node_index($node) {
// We maintain a denormalized table of term/node relationships, containing
@@ -1618,7 +1620,7 @@ function taxonomy_build_node_index($node) {
/**
* Implements hook_node_update().
*/
-function taxonomy_node_update($node) {
+function taxonomy_node_update(Node $node) {
// Always rebuild the node's taxonomy index entries on node save.
taxonomy_delete_node_index($node);
taxonomy_build_node_index($node);
@@ -1627,7 +1629,7 @@ function taxonomy_node_update($node) {
/**
* Implements hook_node_predelete().
*/
-function taxonomy_node_predelete($node) {
+function taxonomy_node_predelete(Node $node) {
// Clean up the {taxonomy_index} table when nodes are deleted.
taxonomy_delete_node_index($node);
}
@@ -1635,10 +1637,10 @@ function taxonomy_node_predelete($node) {
/**
* Deletes taxonomy index entries for a given node.
*
- * @param $node
- * The node object.
+ * @param Drupal\node\Node $node
+ * The node entity.
*/
-function taxonomy_delete_node_index($node) {
+function taxonomy_delete_node_index(Node $node) {
if (variable_get('taxonomy_maintain_index_table', TRUE)) {
db_delete('taxonomy_index')->condition('nid', $node->nid)->execute();
}
diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
index 2a588d2e99a1d9efa811c99402d25c0e07deb955..5c16884d8d8d29e7eed15c2e8cf49cc1105e6c41 100644
--- a/core/modules/taxonomy/taxonomy.test
+++ b/core/modules/taxonomy/taxonomy.test
@@ -1252,17 +1252,12 @@ class TaxonomyTermIndexTestCase extends TaxonomyWebTestCase {
$this->assertEqual(1, $index_count, 'Term 2 is indexed once.');
// Redo the above tests without interface.
- $update_node = array(
- 'nid' => $node->nid,
- 'vid' => $node->vid,
- 'uid' => $node->uid,
- 'type' => $node->type,
- 'title' => $this->randomName(),
- );
+ $node->title = $this->randomName();
+ unset($node->{$this->field_name_1});
+ unset($node->{$this->field_name_2});
// Update the article with no term changed.
- $updated_node = (object) $update_node;
- node_save($updated_node);
+ $node->save();
// Check that the index was not changed.
$index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
@@ -1277,9 +1272,8 @@ class TaxonomyTermIndexTestCase extends TaxonomyWebTestCase {
$this->assertEqual(1, $index_count, 'Term 2 is indexed once.');
// Update the article to change one term.
- $update_node[$this->field_name_1][$langcode] = array(array('tid' => $term_1->tid));
- $updated_node = (object) $update_node;
- node_save($updated_node);
+ $node->{$this->field_name_1}[$langcode] = array(array('tid' => $term_1->tid));
+ $node->save();
// Check that both terms are indexed.
$index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
@@ -1294,9 +1288,8 @@ class TaxonomyTermIndexTestCase extends TaxonomyWebTestCase {
$this->assertEqual(1, $index_count, 'Term 2 is indexed.');
// Update the article to change another term.
- $update_node[$this->field_name_2][$langcode] = array(array('tid' => $term_1->tid));
- $updated_node = (object) $update_node;
- node_save($updated_node);
+ $node->{$this->field_name_2}[$langcode] = array(array('tid' => $term_1->tid));
+ $node->save();
// Check that only one term is indexed.
$index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index a5887f24ee0b3d9d7d9883bbc3ab9bfcaaded869..dbedf127af9f61c2331e96b94eb6576efdbf4ace 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -5,6 +5,8 @@
* Tracks recent content posted by a user or users.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_help().
*/
@@ -190,7 +192,7 @@ function _tracker_user_access($account) {
*
* Adds new tracking information for this node since it's new.
*/
-function tracker_node_insert($node, $arg = 0) {
+function tracker_node_insert(Node $node, $arg = 0) {
_tracker_add($node->nid, $node->uid, $node->changed);
}
@@ -199,7 +201,7 @@ function tracker_node_insert($node, $arg = 0) {
*
* Adds tracking information for this node since it's been updated.
*/
-function tracker_node_update($node, $arg = 0) {
+function tracker_node_update(Node $node, $arg = 0) {
_tracker_add($node->nid, $node->uid, $node->changed);
}
@@ -208,7 +210,7 @@ function tracker_node_update($node, $arg = 0) {
*
* Deletes tracking information for a node.
*/
-function tracker_node_predelete($node, $arg = 0) {
+function tracker_node_predelete(Node $node, $arg = 0) {
db_delete('tracker_node')
->condition('nid', $node->nid)
->execute();
diff --git a/core/modules/translation/tests/translation_test.module b/core/modules/translation/tests/translation_test.module
index 3003bd7d4652c2006eb4ddf2e3d7786c2e4509b2..1bd0659589eb21af3ae95133bf4ec6f23854c9e3 100644
--- a/core/modules/translation/tests/translation_test.module
+++ b/core/modules/translation/tests/translation_test.module
@@ -5,10 +5,12 @@
* Mock module for content translation tests.
*/
+use Drupal\node\Node;
+
/**
* Implements hook_node_insert().
*/
-function translation_test_node_insert($node) {
+function translation_test_node_insert(Node $node) {
drupal_write_record('node', $node, 'nid');
}
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index d35a6bc4eaa43b7f1e2af42b84c2b2e5695c7141..b2c063588f2fe58dfb900680466229e98d70a78e 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -19,6 +19,8 @@
* date (0) or needs to be updated (1).
*/
+use Drupal\node\Node;
+
/**
* Identifies a content type which has translation support enabled.
*/
@@ -76,7 +78,7 @@ function translation_menu() {
* of types that have translation enabled.
*
* @param $node
- * A node object.
+ * A node entity.
*
* @return
* TRUE if the translation tab should be displayed, FALSE otherwise.
@@ -191,7 +193,7 @@ function translation_form_node_form_alter(&$form, &$form_state) {
* translation set. If no language provider is enabled, "fall back" to simple
* links built through the result of translation_node_get_translations().
*/
-function translation_node_view($node, $view_mode) {
+function translation_node_view(Node $node, $view_mode) {
// If the site has no translations or is not multilingual we have no content
// translation links to display.
if (isset($node->tnid) && language_multilingual() && $translations = translation_node_get_translations($node->tnid)) {
@@ -246,7 +248,7 @@ function translation_node_view($node, $view_mode) {
/**
* Implements hook_node_prepare().
*/
-function translation_node_prepare($node) {
+function translation_node_prepare(Node $node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type) &&
// And it's a new node.
@@ -296,7 +298,7 @@ function translation_node_prepare($node) {
/**
* Implements hook_node_insert().
*/
-function translation_node_insert($node) {
+function translation_node_insert(Node $node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type)) {
if (!empty($node->translation_source)) {
@@ -331,7 +333,7 @@ function translation_node_insert($node) {
/**
* Implements hook_node_update().
*/
-function translation_node_update($node) {
+function translation_node_update(Node $node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type)) {
if (isset($node->translation) && $node->translation && !empty($node->langcode) && $node->tnid) {
@@ -360,7 +362,7 @@ function translation_node_update($node) {
*
* Ensures that duplicate translations can't be created for the same source.
*/
-function translation_node_validate($node, $form) {
+function translation_node_validate(Node $node, $form) {
// Only act on translatable nodes with a tnid or translation_source.
if (translation_supported_type($node->type) && (!empty($node->tnid) || !empty($form['#node']->translation_source->nid))) {
$tnid = !empty($node->tnid) ? $node->tnid : $form['#node']->translation_source->nid;
@@ -374,7 +376,7 @@ function translation_node_validate($node, $form) {
/**
* Implements hook_node_predelete().
*/
-function translation_node_predelete($node) {
+function translation_node_predelete(Node $node) {
// Only act if we are dealing with a content type supporting translations.
if (translation_supported_type($node->type)) {
translation_remove_from_set($node);
@@ -385,7 +387,7 @@ function translation_node_predelete($node) {
* Removes a node from its translation set and updates accordingly.
*
* @param $node
- * A node object.
+ * A node entity.
*/
function translation_remove_from_set($node) {
if (isset($node->tnid)) {
diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc
index 66dfc42c26697779104a1c76ffda288c626f81e5..d85b5e240ddd3a158129e467f40435198ceb25b1 100644
--- a/core/modules/translation/translation.pages.inc
+++ b/core/modules/translation/translation.pages.inc
@@ -5,18 +5,20 @@
* User page callbacks for the Translation module.
*/
+use Drupal\node\Node;
+
/**
* Page callback: Displays a list of a node's translations.
*
- * @param $node
- * A node object.
+ * @param Drupal\node\Node $node
+ * A node entity.
*
* @return
* A render array for a page containing a list of content.
*
* @see translation_menu()
*/
-function translation_node_overview($node) {
+function translation_node_overview(Node $node) {
include_once DRUPAL_ROOT . '/core/includes/language.inc';
if ($node->tnid) {
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index d6939a85347959f99d450326d050dfcad6242a3d..15a324e81944c726c036a015c6b6c6e140a4c8f8 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -5,6 +5,8 @@
* Tests for the Translation module.
*/
+use Drupal\node\Node;
+
/**
* Functional tests for the Translation module.
*/
@@ -324,7 +326,7 @@ class TranslationTestCase extends DrupalWebTestCase {
/**
* Creates a translation for a basic page in the specified language.
*
- * @param $node
+ * @param Node $node
* The basic page to create the translation for.
* @param $title
* The title of a basic page in the specified language.
@@ -336,7 +338,7 @@ class TranslationTestCase extends DrupalWebTestCase {
* @return
* Translation object.
*/
- function createTranslation($node, $title, $body, $langcode) {
+ function createTranslation(Node $node, $title, $body, $langcode) {
$this->drupalGet('node/add/page', array('query' => array('translation' => $node->nid, 'target' => $langcode)));
$field_langcode = LANGUAGE_NOT_SPECIFIED;
diff --git a/core/themes/bartik/templates/comment-wrapper.tpl.php b/core/themes/bartik/templates/comment-wrapper.tpl.php
index 4ddb63948b53e3669832bd47d46c03cb21f0e031..dc06cf2c0fef6f1c7432a0dbf52d3c57aa0f9488 100644
--- a/core/themes/bartik/templates/comment-wrapper.tpl.php
+++ b/core/themes/bartik/templates/comment-wrapper.tpl.php
@@ -20,7 +20,7 @@
* the template.
*
* The following variables are provided for contextual information.
- * - $node: Node object the comments are attached to.
+ * - $node: Node entity the comments are attached to.
* The constants below the variables show the possible values and should be
* used for comparison.
* - $display_mode
diff --git a/core/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php
index 16485808cdaca66745d2860af8d120d536629aab..0b705941f51aa2cbd5240856a6ba98c34670e558 100644
--- a/core/themes/bartik/templates/comment.tpl.php
+++ b/core/themes/bartik/templates/comment.tpl.php
@@ -46,7 +46,7 @@
*
* These two variables are provided for context:
* - $comment: Full comment object.
- * - $node: Node object the comments are attached to.
+ * - $node: Node entity the comments are attached to.
*
* Other variables:
* - $classes_array: Array of html class attribute values. It is flattened
diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php
index 68f8ec5a8549a7f75debe41cff46be9e798108af..318197cb9968f66af79161b0b9444f236c57f8c6 100644
--- a/core/themes/bartik/templates/node.tpl.php
+++ b/core/themes/bartik/templates/node.tpl.php
@@ -42,7 +42,7 @@
* the template.
*
* Other variables:
- * - $node: Full node object. Contains data that may not be safe.
+ * - $node: Full node entity. Contains data that may not be safe.
* - $type: Node type, i.e. page, article, etc.
* - $comment_count: Number of comments attached to the node.
* - $uid: User ID of the node author.
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index bb3e18f1ee4fd2e8860860f7a7858c5786328a81..f75309314e1ae4b90e0c9aac148fa5f794aef34d 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -57,7 +57,7 @@
* - $action_links (array): Actions local to the page, such as 'Add menu' on
* the menu administration interface.
* - $feed_icons: A string of all feed icons for the current page.
- * - $node: The node object, if there is an automatically-loaded node
+ * - $node: The node entity, if there is an automatically-loaded node
* associated with the page, and the node ID is the second argument
* in the page's path (e.g. node/12345 and node/12345/revisions, but not
* comment/reply/12345).