diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 710792f..0ebfca8 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -9,6 +9,7 @@ use Drupal\Component\Uuid\Uuid; use Drupal\Core\Language\Language; +use Drupal\user\Plugin\Core\Entity\User; use IteratorAggregate; /** @@ -251,7 +252,7 @@ public function getIterator() { /** * Implements AccessibleInterface::access(). */ - public function access(\Drupal\user\User $account = NULL) { + public function access(User $account = NULL) { // TODO: Implement access() method. } diff --git a/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php b/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php index 0db4657..d759559 100644 --- a/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php +++ b/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php @@ -12,6 +12,7 @@ use Drupal\Core\TypedData\ComplexDataInterface; use Drupal\Core\TypedData\ContextAwareInterface; use Drupal\Core\TypedData\TypedDataInterface; +use Drupal\user\Plugin\Core\Entity\User; use ArrayIterator; use IteratorAggregate; use InvalidArgumentException; @@ -233,7 +234,7 @@ public function isEmpty() { /** * Implements AccessibleInterface::access(). */ - public function access(\Drupal\user\User $account = NULL) { + public function access(User $account = NULL) { // @todo implement } diff --git a/core/lib/Drupal/Core/Entity/Field/Type/Field.php b/core/lib/Drupal/Core/Entity/Field/Type/Field.php index e7a5960..634409c 100644 --- a/core/lib/Drupal/Core/Entity/Field/Type/Field.php +++ b/core/lib/Drupal/Core/Entity/Field/Type/Field.php @@ -10,7 +10,7 @@ use Drupal\Core\Entity\Field\FieldInterface; use Drupal\Core\TypedData\TypedDataInterface; use Drupal\Core\TypedData\Type\TypedData; -use Drupal\user\User; +use Drupal\user\Plugin\Core\Entity\User; use ArrayIterator; use IteratorAggregate; use InvalidArgumentException; diff --git a/core/lib/Drupal/Core/TypedData/AccessibleInterface.php b/core/lib/Drupal/Core/TypedData/AccessibleInterface.php index 669f1d7..738d517 100644 --- a/core/lib/Drupal/Core/TypedData/AccessibleInterface.php +++ b/core/lib/Drupal/Core/TypedData/AccessibleInterface.php @@ -7,6 +7,8 @@ namespace Drupal\Core\TypedData; +use Drupal\user\Plugin\Core\Entity\User; + /** * Interface for checking access. */ @@ -15,12 +17,12 @@ /** * Checks data value access. * - * @param \Drupal\user\User $account + * @param \Drupal\user\Plugin\Core\Entity\User $account * (optional) The user account to check access for. Defaults to the current * user. * * @return bool * TRUE if the given user has access; otherwise FALSE. */ - public function access(\Drupal\user\User $account = NULL); + public function access(User $account = NULL); } diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc index 27f5cae..6f772fa 100644 --- a/core/modules/book/book.admin.inc +++ b/core/modules/book/book.admin.inc @@ -96,7 +96,7 @@ function book_admin_settings_submit($form, &$form_state) { /** * Form constructor for administering a single book's hierarchy. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node of the top-level page in the book. * * @see book_menu() @@ -177,7 +177,7 @@ function book_admin_edit_submit($form, &$form_state) { /** * Builds the table portion of the form for the book administration page. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node of the top-level page in the book. * @param $form * The form that is being modified. diff --git a/core/modules/book/book.module b/core/modules/book/book.module index 0187bda..6e47f7f 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -89,7 +89,7 @@ function book_permission() { /** * Adds relevant book links to the node's links. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The book page node to add links to. * @param $view_mode * The view mode of the node. @@ -204,7 +204,7 @@ function book_menu() { * - admin/content/book/%node * - node/%node/outline * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node whose outline tab is to be viewed. * * @see book_menu() @@ -216,7 +216,7 @@ function _book_outline_access(Node $node) { /** * Access callback: Determines if the user can remove nodes from the outline. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to remove from the outline. * * @see book_menu() @@ -522,7 +522,7 @@ function _book_parent_select($book_link) { /** * Builds the common elements of the book form for the node and outline forms. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node whose form is being viewed. */ function _book_add_form_elements(&$form, &$form_state, Node $node) { @@ -626,7 +626,7 @@ function book_form_update($form, $form_state) { * outline through node addition, node editing, node deletion, or the outline * tab. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being saved, added, deleted, or moved. * * @return @@ -1289,7 +1289,7 @@ function book_export_traverse($tree, $visit_func) { /** * Generates printer-friendly HTML for a node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that will be output. * @param $children * All the rendered child nodes within the current node. diff --git a/core/modules/book/book.pages.inc b/core/modules/book/book.pages.inc index ae79318..728df74 100644 --- a/core/modules/book/book.pages.inc +++ b/core/modules/book/book.pages.inc @@ -97,7 +97,7 @@ function book_export_html($nid) { /** * Page callback: Shows the outline form for a single node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The book node for which to show the outline. * * @see book_menu() @@ -112,7 +112,7 @@ function book_outline(Node $node) { * * Allows handling of all book outline operations via the outline tab. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The book node for which to show the outline. * * @see book_outline_form_submit() @@ -201,7 +201,7 @@ function book_outline_form_submit($form, &$form_state) { /** * Form constructor to confirm removal of a node from a book. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to delete. * * @see book_remove_form_submit() diff --git a/core/modules/book/lib/Drupal/book/Tests/BookTest.php b/core/modules/book/lib/Drupal/book/Tests/BookTest.php index 5f50fe8..7db0b43 100644 --- a/core/modules/book/lib/Drupal/book/Tests/BookTest.php +++ b/core/modules/book/lib/Drupal/book/Tests/BookTest.php @@ -121,7 +121,7 @@ function testBook() { /** * Check the outline of sub-pages; previous, up, and next; and printer friendly version. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * Node to check. * @param $nodes * Nodes that should be in outline. diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc index 26e9c8b..5634fb8 100644 --- a/core/modules/comment/comment.admin.inc +++ b/core/modules/comment/comment.admin.inc @@ -272,7 +272,7 @@ function comment_confirm_delete_page($cid) { /** * Form constructor for the confirmation form for comment deletion. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment that is about to be deleted. * * @ingroup forms diff --git a/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php index 95c3e1d..7daff0e 100644 --- a/core/modules/comment/comment.api.php +++ b/core/modules/comment/comment.api.php @@ -18,10 +18,10 @@ * This hook is invoked from comment_save() before the comment is saved to the * database. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. */ -function hook_comment_presave(Drupal\comment\Comment $comment) { +function hook_comment_presave(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { // Remove leading & trailing spaces from the comment subject. $comment->subject = trim($comment->subject); } @@ -29,10 +29,10 @@ function hook_comment_presave(Drupal\comment\Comment $comment) { /** * Respond to creation of a new comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. */ -function hook_comment_insert(Drupal\comment\Comment $comment) { +function hook_comment_insert(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { // Reindex the node when comments are added. search_touch_node($comment->nid); } @@ -40,10 +40,10 @@ function hook_comment_insert(Drupal\comment\Comment $comment) { /** * Respond to updates to a comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. */ -function hook_comment_update(Drupal\comment\Comment $comment) { +function hook_comment_update(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { // Reindex the node when comments are updated. search_touch_node($comment->nid); } @@ -54,7 +54,7 @@ function hook_comment_update(Drupal\comment\Comment $comment) { * @param array $comments * An array of comment objects indexed by cid. */ -function hook_comment_load(Drupal\comment\Comment $comments) { +function hook_comment_load(\Drupal\comment\Plugin\Core\Entity\Comment $comments) { $result = db_query('SELECT cid, foo FROM {mytable} WHERE cid IN (:cids)', array(':cids' => array_keys($comments))); foreach ($result as $record) { $comments[$record->cid]->foo = $record->foo; @@ -64,7 +64,7 @@ function hook_comment_load(Drupal\comment\Comment $comments) { /** * Act on a comment that is being assembled before rendering. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * Passes in the comment the action is being performed on. * @param $view_mode * View mode, e.g. 'full', 'teaser'... @@ -73,7 +73,7 @@ function hook_comment_load(Drupal\comment\Comment $comments) { * * @see hook_entity_view() */ -function hook_comment_view(Drupal\comment\Comment $comment, $view_mode, $langcode) { +function hook_comment_view(\Drupal\comment\Plugin\Core\Entity\Comment $comment, $view_mode, $langcode) { // how old is the comment $comment->time_ago = time() - $comment->changed; } @@ -93,13 +93,13 @@ function hook_comment_view(Drupal\comment\Comment $comment, $view_mode, $langcod * * @param $build * A renderable array representing the comment. - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment being rendered. * * @see comment_view() * @see hook_entity_view_alter() */ -function hook_comment_view_alter(&$build, Drupal\comment\Comment $comment) { +function hook_comment_view_alter(&$build, \Drupal\comment\Plugin\Core\Entity\Comment $comment) { // Check for the existence of a field added by another module. if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) { // Change its weight. @@ -113,20 +113,20 @@ function hook_comment_view_alter(&$build, Drupal\comment\Comment $comment) { /** * Respond to a comment being published by a moderator. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment the action is being performed on. */ -function hook_comment_publish(Drupal\comment\Comment $comment) { +function hook_comment_publish(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { drupal_set_message(t('Comment: @subject has been published', array('@subject' => $comment->subject))); } /** * Respond to a comment being unpublished by a moderator. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment the action is being performed on. */ -function hook_comment_unpublish(Drupal\comment\Comment $comment) { +function hook_comment_unpublish(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { drupal_set_message(t('Comment: @subject has been unpublished', array('@subject' => $comment->subject))); } @@ -137,14 +137,14 @@ function hook_comment_unpublish(Drupal\comment\Comment $comment) { * field_attach_delete() is called and before the comment is actually removed * from the database. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object for the comment that is about to be deleted. * * @see hook_comment_delete() * @see comment_delete_multiple() * @see entity_delete_multiple() */ -function hook_comment_predelete(Drupal\comment\Comment $comment) { +function hook_comment_predelete(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { // Delete a record associated with the comment in a custom table. db_delete('example_comment_table') ->condition('cid', $comment->cid) @@ -158,14 +158,14 @@ function hook_comment_predelete(Drupal\comment\Comment $comment) { * field_attach_delete() has called and after the comment has been removed from * the database. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object for the comment that has been deleted. * * @see hook_comment_predelete() * @see comment_delete_multiple() * @see entity_delete_multiple() */ -function hook_comment_delete(Drupal\comment\Comment $comment) { +function hook_comment_delete(\Drupal\comment\Plugin\Core\Entity\Comment $comment) { drupal_set_message(t('Comment: @subject has been deleted', array('@subject' => $comment->subject))); } diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index c174293..aca20a3 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -527,7 +527,7 @@ function comment_get_recent($number = 10) { * Number of comments. * @param $new_replies * Number of new replies. - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The first new comment node. * * @return @@ -719,7 +719,7 @@ function comment_node_view(Node $node, $view_mode) { /** * Builds the comment-related elements for node detail pages. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity for which to build the comment-related elements. * * @return @@ -764,7 +764,7 @@ function comment_node_page_additions(Node $node) { /** * Returns a rendered form to comment the given node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity to be commented. * @param int $pid * (optional) Some comments are replies to other comments. In those cases, @@ -782,7 +782,7 @@ function comment_add(Node $node, $pid = NULL) { /** * Retrieves comments for a thread. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node whose comment(s) needs rendering. * @param $mode * The comment display mode; COMMENT_MODE_FLAT or COMMENT_MODE_THREADED. @@ -936,7 +936,7 @@ function comment_prepare_thread(&$comments) { /** * Generates an array for rendering a comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. * @param $view_mode * View mode, e.g. 'full', 'teaser'... @@ -954,9 +954,9 @@ function comment_view(Comment $comment, $view_mode = 'full', $langcode = NULL) { /** * Adds reply, edit, delete, etc. links, depending on user permissions. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node the comment is attached to. * * @return @@ -1341,7 +1341,7 @@ function comment_user_predelete($account) { * @param $op * The operation that is to be performed on the comment. Only 'edit' is * recognized now. - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. * * @return @@ -1358,7 +1358,7 @@ function comment_access($op, Comment $comment) { /** * Accepts a submission of new or changed comment content. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * A comment object. */ function comment_save(Comment $comment) { @@ -1525,7 +1525,7 @@ function comment_get_display_page($cid, $node_type) { /** * Page callback: Displays the comment editing form. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object representing the comment to be edited. * * @see comment_menu() @@ -1538,7 +1538,7 @@ function comment_edit_page(Comment $comment) { /** * Generates a comment preview. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment */ function comment_preview(Comment $comment) { global $user; @@ -1834,7 +1834,7 @@ function comment_action_info() { /** * Publishes a comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * (optional) A comment object to publish. * @param array $context * Array with components: @@ -1861,7 +1861,7 @@ function comment_publish_action(Comment $comment = NULL, $context = array()) { /** * Unpublishes a comment. * - * @param Drupal\comment\Comment|null $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment|null $comment * (optional) A comment object to unpublish. * @param array $context * Array with components: @@ -1888,7 +1888,7 @@ function comment_unpublish_action(Comment $comment = NULL, $context = array()) { /** * Unpublishes a comment if it contains certain keywords. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * Comment object to modify. * @param array $context * Array with components: @@ -1940,7 +1940,7 @@ function comment_unpublish_by_keyword_action_submit($form, $form_state) { /** * Saves a comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * * @ingroup actions */ diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc index 6263660..7e9de27 100644 --- a/core/modules/comment/comment.pages.inc +++ b/core/modules/comment/comment.pages.inc @@ -21,7 +21,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 Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\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, diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php index e8bab5d..47666cd 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php @@ -25,21 +25,21 @@ /** * An administrative user with permission to configure comment settings. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $admin_user; /** * A normal user with permission to post comments. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $web_user; /** * A test node to which comments will be posted. * - * @var Drupal\node\Node + * @var \Drupal\node\Plugin\Core\Entity\Node */ protected $node; @@ -79,7 +79,7 @@ function setUp() { /** * Posts a comment. * - * @param Drupal\node\Node|null $node + * @param \Drupal\node\Plugin\Core\Entity\Node|null $node * Node to post comment on or NULL to post to the previusly loaded page. * @param $comment * Comment body. @@ -152,7 +152,7 @@ function postComment($node, $comment, $subject = '', $contact = NULL) { /** * Checks current page for specified comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * The comment object. * @param boolean $reply * Boolean indicating whether the comment is a reply to another comment. @@ -178,7 +178,7 @@ function commentExists(Comment $comment = NULL, $reply = FALSE) { /** * Deletes a comment. * - * @param Drupal\comment\Comment $comment + * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment * Comment to delete. */ function deleteComment(Comment $comment) { diff --git a/core/modules/file/file.api.php b/core/modules/file/file.api.php index c0b0d52..a3b48bb 100644 --- a/core/modules/file/file.api.php +++ b/core/modules/file/file.api.php @@ -34,7 +34,7 @@ function hook_file_load($files) { * This hook lets modules perform additional validation on files. They're able * to report a failure by returning one or more error messages. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file entity being validated. * @return * An array of error messages. If there are no problems with the file return @@ -42,7 +42,7 @@ function hook_file_load($files) { * * @see file_validate() */ -function hook_file_validate(Drupal\file\File $file) { +function hook_file_validate(\Drupal\file\Plugin\Core\Entity\File $file) { $errors = array(); if (empty($file->filename)) { @@ -62,10 +62,10 @@ function hook_file_validate(Drupal\file\File $file) { * doesn't distinguish between files created as a result of a copy or those * created by an upload. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file entity that is about to be created or updated. */ -function hook_file_presave(Drupal\file\File $file) { +function hook_file_presave(\Drupal\file\Plugin\Core\Entity\File $file) { // Change the file timestamp to an hour prior. $file->timestamp -= 3600; } @@ -77,10 +77,10 @@ function hook_file_presave(Drupal\file\File $file) { * doesn't distinguish between files created as a result of a copy or those * created by an upload. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file that has been added. */ -function hook_file_insert(Drupal\file\File $file) { +function hook_file_insert(\Drupal\file\Plugin\Core\Entity\File $file) { // Add a message to the log, if the file is a jpg $validate = file_validate_extensions($file, 'jpg'); if (empty($validate)) { @@ -93,38 +93,38 @@ function hook_file_insert(Drupal\file\File $file) { * * This hook is called when an existing file is saved. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file that has just been updated. */ -function hook_file_update(Drupal\file\File $file) { +function hook_file_update(\Drupal\file\Plugin\Core\Entity\File $file) { } /** * Respond to a file that has been copied. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The newly copied file entity. - * @param Drupal\file\File $source + * @param \Drupal\file\Plugin\Core\Entity\File $source * The original file before the copy. * * @see file_copy() */ -function hook_file_copy(Drupal\file\File $file, Drupal\file\File $source) { +function hook_file_copy(\Drupal\file\Plugin\Core\Entity\File $file, \Drupal\file\Plugin\Core\Entity\File $source) { } /** * Respond to a file that has been moved. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The updated file entity after the move. - * @param Drupal\file\File $source + * @param \Drupal\file\Plugin\Core\Entity\File $source * The original file entity before the move. * * @see file_move() */ -function hook_file_move(Drupal\file\File $file, Drupal\file\File $source) { +function hook_file_move(\Drupal\file\Plugin\Core\Entity\File $file, \Drupal\file\Plugin\Core\Entity\File $source) { } @@ -134,14 +134,14 @@ function hook_file_move(Drupal\file\File $file, Drupal\file\File $source) { * This hook is invoked when deleting a file before the file is removed from the * filesystem and before its records are removed from the database. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file that is about to be deleted. * * @see hook_file_delete() * @see Drupal\file\FileStorageController::delete() * @see upload_file_delete() */ -function hook_file_predelete(Drupal\file\File $file) { +function hook_file_predelete(\Drupal\file\Plugin\Core\Entity\File $file) { // Delete all information associated with the file. db_delete('upload')->condition('fid', $file->fid)->execute(); } @@ -152,13 +152,13 @@ function hook_file_predelete(Drupal\file\File $file) { * This hook is invoked after the file has been removed from * the filesystem and after its records have been removed from the database. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file that has just been deleted. * * @see hook_file_predelete() * @see Drupal\file\FileStorageController::delete() */ -function hook_file_delete(Drupal\file\File $file) { +function hook_file_delete(\Drupal\file\Plugin\Core\Entity\File $file) { // Delete all information associated with the file. db_delete('upload')->condition('fid', $file->fid)->execute(); } @@ -174,7 +174,7 @@ function hook_file_delete(Drupal\file\File $file) { * The field to which the file belongs. * @param Drupal\Core\Entity\EntityInterface $entity * The entity which references the file. - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * The file entity that is being requested. * * @return @@ -184,7 +184,7 @@ function hook_file_delete(Drupal\file\File $file) { * * @see hook_field_access(). */ -function hook_file_download_access($field, Drupal\Core\Entity\EntityInterface $entity, Drupal\file\File $file) { +function hook_file_download_access($field, Drupal\Core\Entity\EntityInterface $entity, \Drupal\file\Plugin\Core\Entity\File $file) { if ($entity->entityType() == 'node') { return node_access('view', $entity); } diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 6694598..5107091 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -110,7 +110,7 @@ function file_load_multiple(array $fids = NULL) { * @param $fid * A file ID. * - * @return Drupal\file\File + * @return \Drupal\file\Plugin\Core\Entity\File * A file entity or FALSE if the file was not found. * * @see hook_file_load() @@ -145,7 +145,7 @@ function file_usage() { * temporary file, the resulting file will also be a temporary file. See * file_save_upload() for details on temporary files. * - * @param Drupal\file\File $source + * @param \Drupal\file\Plugin\Core\Entity\File $source * A file entity. * @param $destination * A string containing the destination that $source should be copied to. @@ -218,7 +218,7 @@ function file_copy(File $source, $destination = NULL, $replace = FILE_EXISTS_REN * replace the file or rename the file based on the $replace parameter. * - Adds the new file to the files database. * - * @param Drupal\file\File $source + * @param \Drupal\file\Plugin\Core\Entity\File $source * A file entity. * @param $destination * A string containing the destination that $source should be moved to. @@ -234,7 +234,7 @@ function file_copy(File $source, $destination = NULL, $replace = FILE_EXISTS_REN * unique. * - FILE_EXISTS_ERROR - Do nothing and return FALSE. * - * @return Drupal\file\File + * @return \Drupal\file\Plugin\Core\Entity\File * Resulting file entity for success, or FALSE in the event of an error. * * @see file_unmanaged_move() @@ -293,7 +293,7 @@ function file_move(File $source, $destination = NULL, $replace = FILE_EXISTS_REN * After executing the validator callbacks specified hook_file_validate() will * also be called to allow other modules to report errors about the file. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param $validators * An optional, associative array of callback functions used to validate the @@ -325,7 +325,7 @@ function file_validate(File $file, $validators = array()) { /** * Checks for files with names longer than can be stored in the database. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * * @return @@ -346,7 +346,7 @@ function file_validate_name_length(File $file) { /** * Checks that the filename ends with an allowed extension. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param $extensions * A string with a space separated list of allowed extensions. @@ -372,7 +372,7 @@ function file_validate_extensions(File $file, $extensions) { * * This check is not enforced for the user #1. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param $file_limit * An integer specifying the maximum file size in bytes. Zero indicates that @@ -406,7 +406,7 @@ function file_validate_size(File $file, $file_limit = 0, $user_limit = 0) { /** * Checks that the file is recognized by image_get_info() as an image. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * * @return @@ -431,7 +431,7 @@ function file_validate_is_image(File $file) { * Non-image files will be ignored. If a image toolkit is available the image * will be scaled to fit within the desired maximum dimensions. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. This function may resize the file affecting its size. * @param $maximum_dimensions * An optional string in the form WIDTHxHEIGHT e.g. '640x480' or '85x85'. If @@ -500,7 +500,7 @@ function file_validate_image_resolution(File $file, $maximum_dimensions = 0, $mi * unique. * - FILE_EXISTS_ERROR - Do nothing and return FALSE. * - * @return Drupal\file\File + * @return \Drupal\file\Plugin\Core\Entity\File * A file entity, or FALSE on error. * * @see file_unmanaged_save_data() @@ -548,7 +548,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM /** * Examines a file entity and returns appropriate content headers for download. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * * @return @@ -1293,7 +1293,7 @@ function theme_file_icon($variables) { /** * Creates a URL to the icon for a file entity. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param $icon_directory * (optional) A path to a directory of icons to be used for files. Defaults to @@ -1312,7 +1312,7 @@ function file_icon_url(File $file, $icon_directory = NULL) { /** * Creates a path to the icon for a file entity. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param $icon_directory * (optional) A path to a directory of icons to be used for files. Defaults to @@ -1365,7 +1365,7 @@ function file_icon_path(File $file, $icon_directory = NULL) { /** * Determines the generic icon MIME package based on a file's MIME type. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * * @return @@ -1497,7 +1497,7 @@ function file_icon_map(File $file) { /** * Retrieves a list of references to a file. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param $field * (optional) A field array to be used for this check. If given, limits the diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php index d9a248d..89d3ac4 100644 --- a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php +++ b/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php @@ -24,7 +24,7 @@ * - The User module associates an image with a user, so $type would be 'user' * and the $id would be the user's uid. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param string $module * The name of the module using the file. @@ -40,7 +40,7 @@ public function add(File $file, $module, $type, $id, $count = 1); /** * Removes a record to indicate that a module is no longer using a file. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * @param string $module * The name of the module using the file. @@ -62,7 +62,7 @@ public function delete(File $file, $module, $type = NULL, $id = NULL, $count = 1 /** * Determines where a file is used. * - * @param Drupal\file\File $file + * @param \Drupal\file\Plugin\Core\Entity\File $file * A file entity. * * @return array diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 459cbeb..1a69ec5 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -247,7 +247,7 @@ function forum_uri($forum) { /** * Checks whether a node can be used in a forum, based on its content type. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * * @return diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php index f56cfbb..aaf626c 100644 --- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php +++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php @@ -497,7 +497,7 @@ function createForumTopic($forum, $container = FALSE) { * * @param $node_user * The user who creates the node. - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being checked. * @param $admin * Boolean to indicate whether the user can 'access administration pages'. diff --git a/core/modules/image/image.api.php b/core/modules/image/image.api.php index c11347f..4b2e069 100644 --- a/core/modules/image/image.api.php +++ b/core/modules/image/image.api.php @@ -74,7 +74,7 @@ function hook_image_effect_info_alter(&$effects) { * be cleared using this hook. This hook is called whenever a style is updated, * deleted, or any effect associated with the style is update or deleted. * - * @param Drupal\image\Plugin\Core\Entity\ImageStyle $style + * @param \Drupal\image\Plugin\Core\Entity\ImageStyle $style * The image style array that is being flushed. */ function hook_image_style_flush($style) { diff --git a/core/modules/image/image.module b/core/modules/image/image.module index c763dc6..626d770 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -597,7 +597,7 @@ function image_image_style_update($style) { /** * Delete an image style. * - * @param Drupal\image\Plugin\Core\Entity\ImageStyle $style + * @param \Drupal\image\Plugin\Core\Entity\ImageStyle $style * An image style array. * @param $replacement_style_name * (optional) When deleting a style, specify a replacement style name so diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php index 113cc3d..85a8c0c 100644 --- a/core/modules/node/node.api.php +++ b/core/modules/node/node.api.php @@ -255,7 +255,7 @@ function hook_node_grants($account, $op) { * * Note: a deny all grant is not written to the database; denies are implicit. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that has just been saved. * * @return @@ -264,7 +264,7 @@ function hook_node_grants($account, $op) { * @see _node_access_write_grants() * @ingroup node_access */ -function hook_node_access_records(Drupal\node\Node $node) { +function hook_node_access_records(\Drupal\node\Plugin\Core\Entity\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) { @@ -315,7 +315,7 @@ function hook_node_access_records(Drupal\node\Node $node) { * * @param $grants * The $grants array returned by hook_node_access_records(). - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node for which the grants were acquired. * * The preferred use of this hook is in a module that bridges multiple node @@ -327,7 +327,7 @@ function hook_node_access_records(Drupal\node\Node $node) { * @see hook_node_grants_alter() * @ingroup node_access */ -function hook_node_access_records_alter(&$grants, Drupal\node\Node $node) { +function hook_node_access_records_alter(&$grants, \Drupal\node\Plugin\Core\Entity\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 @@ -458,14 +458,14 @@ function hook_node_operations() { * field_attach_delete() are called, and before the node is removed from the * node table in the database. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\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(Drupal\node\Node $node) { +function hook_node_predelete(\Drupal\node\Plugin\Core\Entity\Node $node) { db_delete('mytable') ->condition('nid', $node->nid) ->execute(); @@ -477,14 +477,14 @@ function hook_node_predelete(Drupal\node\Node $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 Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that has been deleted. * * @see hook_node_predelete() * @see node_delete_multiple() * @ingroup node_api_hooks */ -function hook_node_delete(Drupal\node\Node $node) { +function hook_node_delete(\Drupal\node\Plugin\Core\Entity\Node $node) { drupal_set_message(t('Node: @title has been deleted', array('@title' => $node->label()))); } @@ -495,12 +495,12 @@ function hook_node_delete(Drupal\node\Node $node) { * removed from the node_revision table, and before * field_attach_delete_revision() is called. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node revision (node object) that is being deleted. * * @ingroup node_api_hooks */ -function hook_node_revision_delete(Drupal\node\Node $node) { +function hook_node_revision_delete(\Drupal\node\Plugin\Core\Entity\Node $node) { db_delete('mytable') ->condition('vid', $node->vid) ->execute(); @@ -522,12 +522,12 @@ function hook_node_revision_delete(Drupal\node\Node $node) { * write/update database queries executed from this hook are also not committed * immediately. Check node_save() and db_transaction() for more info. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being created. * * @ingroup node_api_hooks */ -function hook_node_insert(Drupal\node\Node $node) { +function hook_node_insert(\Drupal\node\Plugin\Core\Entity\Node $node) { db_insert('mytable') ->fields(array( 'nid' => $node->nid, @@ -597,7 +597,7 @@ 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 Drupal\node\Node|string $node + * @param \Drupal\node\Plugin\Core\Entity\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 @@ -651,12 +651,12 @@ function hook_node_access($node, $op, $account, $langcode) { * This hook is invoked from NodeFormController::prepareEntity() after the * type-specific hook_prepare() is invoked. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is about to be shown on the add/edit form. * * @ingroup node_api_hooks */ -function hook_node_prepare(Drupal\node\Node $node) { +function hook_node_prepare(\Drupal\node\Plugin\Core\Entity\Node $node) { if (!isset($node->comment)) { $node->comment = variable_get("comment_$node->type", COMMENT_NODE_OPEN); } @@ -668,7 +668,7 @@ function hook_node_prepare(Drupal\node\Node $node) { * This hook is invoked from node_search_execute(), after node_load() * and node_view() have been called. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being displayed in a search result. * @param $langcode * Language code of result being displayed. @@ -684,7 +684,7 @@ function hook_node_prepare(Drupal\node\Node $node) { * * @ingroup node_api_hooks */ -function hook_node_search_result(Drupal\node\Node $node, $langcode) { +function hook_node_search_result(\Drupal\node\Plugin\Core\Entity\Node $node, $langcode) { $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')); } @@ -695,12 +695,12 @@ function hook_node_search_result(Drupal\node\Node $node, $langcode) { * This hook is invoked from node_save() before the node is saved to the * database. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being inserted or updated. * * @ingroup node_api_hooks */ -function hook_node_presave(Drupal\node\Node $node) { +function hook_node_presave(\Drupal\node\Plugin\Core\Entity\Node $node) { if ($node->nid && $node->moderate) { // Reset votes when node is updated: $node->score = 0; @@ -725,12 +725,12 @@ function hook_node_presave(Drupal\node\Node $node) { * write/update database queries executed from this hook are also not committed * immediately. Check node_save() and db_transaction() for more info. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being updated. * * @ingroup node_api_hooks */ -function hook_node_update(Drupal\node\Node $node) { +function hook_node_update(\Drupal\node\Plugin\Core\Entity\Node $node) { db_update('mytable') ->fields(array('extra' => $node->extra)) ->condition('nid', $node->nid) @@ -743,7 +743,7 @@ function hook_node_update(Drupal\node\Node $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 Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being indexed. * @param $langcode * Language code of the variant of the node being indexed. @@ -753,7 +753,7 @@ function hook_node_update(Drupal\node\Node $node) { * * @ingroup node_api_hooks */ -function hook_node_update_index(Drupal\node\Node $node, $langcode) { +function hook_node_update_index(\Drupal\node\Plugin\Core\Entity\Node $node, $langcode) { $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) { @@ -777,7 +777,7 @@ function hook_node_update_index(Drupal\node\Node $node, $langcode) { * hook_node_presave() instead. If it is really necessary to change * the node at the validate stage, you can use form_set_value(). * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being validated. * @param $form * The form being used to edit the node. @@ -786,7 +786,7 @@ function hook_node_update_index(Drupal\node\Node $node, $langcode) { * * @ingroup node_api_hooks */ -function hook_node_validate(Drupal\node\Node $node, $form, &$form_state) { +function hook_node_validate(\Drupal\node\Plugin\Core\Entity\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.')); @@ -805,7 +805,7 @@ function hook_node_validate(Drupal\node\Node $node, $form, &$form_state) { * properties. See hook_field_attach_submit() for customizing field-related * properties. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity being updated in response to a form submission. * @param $form * The form being used to edit the node. @@ -814,7 +814,7 @@ function hook_node_validate(Drupal\node\Node $node, $form, &$form_state) { * * @ingroup node_api_hooks */ -function hook_node_submit(Drupal\node\Node $node, $form, &$form_state) { +function hook_node_submit(\Drupal\node\Plugin\Core\Entity\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'])) { @@ -834,7 +834,7 @@ function hook_node_submit(Drupal\node\Node $node, $form, &$form_state) { * the RSS item generated for this node. * For details on how this is used, see node_feed(). * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being assembled for rendering. * @param $view_mode * The $view_mode parameter from node_view(). @@ -847,7 +847,7 @@ function hook_node_submit(Drupal\node\Node $node, $form, &$form_state) { * * @ingroup node_api_hooks */ -function hook_node_view(Drupal\node\Node $node, $view_mode, $langcode) { +function hook_node_view(\Drupal\node\Plugin\Core\Entity\Node $node, $view_mode, $langcode) { $node->content['my_additional_field'] = array( '#markup' => $additional_field, '#weight' => 10, @@ -870,7 +870,7 @@ function hook_node_view(Drupal\node\Node $node, $view_mode, $langcode) { * * @param $build * A renderable array representing the node content. - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being rendered. * * @see node_view() @@ -878,7 +878,7 @@ function hook_node_view(Drupal\node\Node $node, $view_mode, $langcode) { * * @ingroup node_api_hooks */ -function hook_node_view_alter(&$build, Drupal\node\Node $node) { +function hook_node_view_alter(&$build, \Drupal\node\Plugin\Core\Entity\Node $node) { if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) { // Change its weight. $build['an_additional_field']['#weight'] = -10; @@ -1060,12 +1060,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 Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being deleted. * * @ingroup node_api_hooks */ -function hook_delete(Drupal\node\Node $node) { +function hook_delete(\Drupal\node\Plugin\Core\Entity\Node $node) { db_delete('mytable') ->condition('nid', $node->nid) ->execute(); @@ -1080,12 +1080,12 @@ function hook_delete(Drupal\node\Node $node) { * This hook is invoked from NodeFormController::prepareEntity() before the * general hook_node_prepare() is invoked. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is about to be shown on the add/edit form. * * @ingroup node_api_hooks */ -function hook_prepare(Drupal\node\Node $node) { +function hook_prepare(\Drupal\node\Plugin\Core\Entity\Node $node) { if ($file = file_check_upload($field_name)) { $file = file_save_upload($field_name, _image_filename($file->filename, NULL, TRUE)); if ($file) { @@ -1116,7 +1116,7 @@ function hook_prepare(Drupal\node\Node $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 Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being added or edited. * @param $form_state * The form state array. @@ -1127,7 +1127,7 @@ function hook_prepare(Drupal\node\Node $node) { * * @ingroup node_api_hooks */ -function hook_form(Drupal\node\Node $node, &$form_state) { +function hook_form(\Drupal\node\Plugin\Core\Entity\Node $node, &$form_state) { $type = node_type_load($node->type); $form['title'] = array( @@ -1168,12 +1168,12 @@ function hook_form(Drupal\node\Node $node, &$form_state) { * node table in the database, before field_attach_insert() is called, and * before hook_node_insert() is invoked. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being created. * * @ingroup node_api_hooks */ -function hook_insert(Drupal\node\Node $node) { +function hook_insert(\Drupal\node\Plugin\Core\Entity\Node $node) { db_insert('mytable') ->fields(array( 'nid' => $node->nid, @@ -1226,12 +1226,12 @@ function hook_load($nodes) { * node table in the database, before field_attach_update() is called, and * before hook_node_update() is invoked. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node that is being updated. * * @ingroup node_api_hooks */ -function hook_update(Drupal\node\Node $node) { +function hook_update(\Drupal\node\Plugin\Core\Entity\Node $node) { db_update('mytable') ->fields(array('extra' => $node->extra)) ->condition('nid', $node->nid) @@ -1255,7 +1255,7 @@ function hook_update(Drupal\node\Node $node) { * have no effect. The preferred method to change a node's content is to use * hook_node_presave() instead. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node being validated. * @param $form * The form being used to edit the node. @@ -1264,7 +1264,7 @@ function hook_update(Drupal\node\Node $node) { * * @ingroup node_api_hooks */ -function hook_validate(Drupal\node\Node $node, $form, &$form_state) { +function hook_validate(\Drupal\node\Plugin\Core\Entity\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.')); @@ -1282,7 +1282,7 @@ function hook_validate(Drupal\node\Node $node, $form, &$form_state) { * so that the node type module can define a custom method for display, or * add to the default display. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to be displayed, as returned by node_load(). * @param $view_mode * View mode, e.g. 'full', 'teaser', ... @@ -1301,7 +1301,7 @@ function hook_validate(Drupal\node\Node $node, $form, &$form_state) { * * @ingroup node_api_hooks */ -function hook_view(Drupal\node\Node $node, $view_mode) { +function hook_view(\Drupal\node\Plugin\Core\Entity\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 5c11424..3482fa4 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -241,7 +241,7 @@ function node_field_display_node_alter(&$display, $context) { /** * Entity URI callback. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * * @return array @@ -301,7 +301,7 @@ function node_title_list($result, $title = NULL) { /** * Updates the 'last viewed' timestamp of the specified node for current user. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. */ function node_tag_new(Node $node) { @@ -436,7 +436,7 @@ function node_type_get_label($name) { /** * Returns the node type label for the passed node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity to return the node type's label for. * * @return string|false @@ -928,7 +928,7 @@ function node_hook($type, $hook) { /** * Invokes a node hook. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A Node entity. * @param $hook * A string containing the name of the hook. @@ -977,7 +977,7 @@ function node_load_multiple(array $nids = NULL, $reset = FALSE) { * (optional) Whether to reset the node_load_multiple() cache. Defaults to * FALSE. * - * @return Drupal\node\Node|false + * @return \Drupal\node\Plugin\Core\Entity\Node|false * A fully-populated node entity, or FALSE if the node is not found. */ function node_load($nid = NULL, $reset = FALSE) { @@ -990,7 +990,7 @@ function node_load($nid = NULL, $reset = FALSE) { * @param int $nid * The node revision id. * - * @return Drupal\node\Node|false + * @return \Drupal\node\Plugin\Core\Entity\Node|false * A fully-populated node entity, or FALSE if the node is not found. */ function node_revision_load($vid = NULL) { @@ -1000,10 +1000,10 @@ function node_revision_load($vid = NULL) { /** * Prepares a node for saving by populating the author and creation date. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node object. * - * @return Drupal\node\Node + * @return \Drupal\node\Plugin\Core\Entity\Node * An updated node object. */ function node_submit(Node $node) { @@ -1034,7 +1034,7 @@ function node_submit(Node $node) { /** * Saves changes to a node or adds a new node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\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. */ @@ -1081,7 +1081,7 @@ function node_revision_delete($revision_id) { /** * Page callback: Generates an array which displays a node detail page. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $message * (optional) A flag which sets a page title relevant to the revision being @@ -1109,7 +1109,7 @@ function node_show(Node $node, $message = FALSE) { /** * Checks whether the current page is the full page view of the passed-in node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * * @return @@ -1547,7 +1547,7 @@ function theme_node_search_admin($variables) { /** * Access callback: Checks node revision access. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to check. * @param $op * (optional) The specific operation being checked. Defaults to 'view.' @@ -1853,7 +1853,7 @@ function node_type_page_title($type) { /** * Title callback: Displays the node's title. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity. * * @return @@ -1881,7 +1881,7 @@ function node_last_changed($nid) { /** * Returns a list of all the existing revision numbers for the node passed in. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity. * * @return @@ -2319,7 +2319,7 @@ function node_feed($nids = FALSE, $channel = array()) { /** * Generates an array for rendering the given node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $view_mode * (optional) View mode, e.g., 'full', 'teaser'... Defaults to 'full.' @@ -2411,7 +2411,7 @@ function node_page_default() { /** * Page callback: Displays a single node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity. * * @return @@ -2460,7 +2460,7 @@ function node_update_index() { /** * Indexes a single node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to index. */ function _node_index_node(Node $node) { @@ -2720,7 +2720,7 @@ function node_form_system_themes_admin_form_submit($form, &$form_state) { * - "update" * - "delete" * - "create" - * @param Drupal\node\Node|string|stdClass $node + * @param \Drupal\node\Plugin\Core\Entity\Node|string|stdClass $node * The node entity on which the operation is to be performed, or the node type * object, or node type string (e.g., 'forum') for the 'create' operation. * @param $account @@ -3129,7 +3129,7 @@ function node_query_node_access_alter(AlterableInterface $query) { * via hook_node_access_records_alter() implementations, and saves the collected * and altered grants to the database. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The $node to acquire grants for. * @param $delete * (optional) Whether to delete existing node access records before inserting @@ -3157,7 +3157,7 @@ function node_access_acquire_grants(Node $node, $delete = TRUE) { * Note: Don't call this function directly from a contributed module. Call * node_access_acquire_grants() instead. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The $node being written to. All that is necessary is that it contains a * nid. * @param $grants @@ -3471,7 +3471,7 @@ function node_action_info() { /** * Sets the status of a node to 1 (published). * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $context * (optional) Array of additional information about what triggered the action. @@ -3487,7 +3487,7 @@ function node_publish_action(Node $node, $context = array()) { /** * Sets the status of a node to 0 (unpublished). * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $context * (optional) Array of additional information about what triggered the action. @@ -3503,7 +3503,7 @@ function node_unpublish_action(Node $node, $context = array()) { /** * Sets the sticky-at-top-of-list property of a node to 1. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $context * (optional) Array of additional information about what triggered the action. @@ -3519,7 +3519,7 @@ function node_make_sticky_action(Node $node, $context = array()) { /** * Sets the sticky-at-top-of-list property of a node to 0. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $context * (optional) Array of additional information about what triggered the action. @@ -3535,7 +3535,7 @@ function node_make_unsticky_action(Node $node, $context = array()) { /** * Sets the promote property of a node to 1. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $context * (optional) Array of additional information about what triggered the action. @@ -3551,7 +3551,7 @@ function node_promote_action(Node $node, $context = array()) { /** * Sets the promote property of a node to 0. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * @param $context * (optional) Array of additional information about what triggered the action. @@ -3567,7 +3567,7 @@ function node_unpromote_action(Node $node, $context = array()) { /** * Saves a node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to be saved. * * @ingroup actions @@ -3580,7 +3580,7 @@ function node_save_action(Node $node) { /** * Assigns ownership of a node to a user. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity to modify. * @param $context * Array of additional information about what triggered the action. Includes @@ -3699,7 +3699,7 @@ function node_unpublish_by_keyword_action_submit($form, $form_state) { /** * Unpublishes a node containing certain keywords. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity to modify. * @param $context * Array of additional information about what triggered the action. Includes diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index eef3d42..70ef996 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -119,7 +119,7 @@ function node_add($node_type) { /** * Generates a node preview. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node to preview. * * @return diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module index d3f8d3a..8d00d45 100644 --- a/core/modules/poll/poll.module +++ b/core/modules/poll/poll.module @@ -622,7 +622,7 @@ function poll_delete($node) { /** * Returns the content for the 'latest poll' block. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity to load. * * @see poll_view_results() diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php index f9bc3f4..157540a 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -220,7 +220,7 @@ function drupalGetNodeByTitle($title, $reset = FALSE) { * - revision: 1. (Backwards-compatible binary flag indicating whether a * new revision should be created; use 1 to specify a new revision.) * - * @return Drupal\node\Node + * @return \Drupal\node\Plugin\Core\Entity\Node * The created node entity. */ protected function drupalCreateNode(array $settings = array()) { diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php index 27f3e6a..3271590 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php @@ -34,7 +34,7 @@ class EntityFilteringThemeTest extends WebTestBase { /** * A test user. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $user; @@ -42,7 +42,7 @@ class EntityFilteringThemeTest extends WebTestBase { /** * A test node. * - * @var Drupal\node\Node + * @var \Drupal\node\Plugin\Core\Entity\Node */ protected $node; @@ -50,7 +50,7 @@ class EntityFilteringThemeTest extends WebTestBase { /** * A test taxonomy term. * - * @var Drupal\taxonomy\Term + * @var \Drupal\taxonomy\Plugin\Core\Entity\Term */ protected $term; @@ -58,7 +58,7 @@ class EntityFilteringThemeTest extends WebTestBase { /** * A test comment. * - * @var Drupal\comment\Comment + * @var \Drupal\comment\Plugin\Core\Entity\Comment */ protected $comment; diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php index 1eb6bf2..a79451d 100644 --- a/core/modules/taxonomy/taxonomy.api.php +++ b/core/modules/taxonomy/taxonomy.api.php @@ -138,10 +138,10 @@ function hook_taxonomy_term_load(array $terms) { * Modules implementing this hook can act on the term object before it is * inserted or updated. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * A taxonomy term entity. */ -function hook_taxonomy_term_presave(Drupal\taxonomy\Term $term) { +function hook_taxonomy_term_presave(\Drupal\taxonomy\Plugin\Core\Entity\Term $term) { $term->foo = 'bar'; } @@ -151,10 +151,10 @@ function hook_taxonomy_term_presave(Drupal\taxonomy\Term $term) { * Modules implementing this hook can act on the term object when saved to * the database. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * A taxonomy term entity. */ -function hook_taxonomy_term_insert(Drupal\taxonomy\Term $term) { +function hook_taxonomy_term_insert(\Drupal\taxonomy\Plugin\Core\Entity\Term $term) { if (!empty($term->synonyms)) { foreach (explode ("\n", str_replace("\r", '', $term->synonyms)) as $synonym) { if ($synonym) { @@ -174,10 +174,10 @@ function hook_taxonomy_term_insert(Drupal\taxonomy\Term $term) { * * Modules implementing this hook can act on the term object when updated. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * A taxonomy term entity. */ -function hook_taxonomy_term_update(Drupal\taxonomy\Term $term) { +function hook_taxonomy_term_update(\Drupal\taxonomy\Plugin\Core\Entity\Term $term) { hook_taxonomy_term_delete($term); if (!empty($term->synonyms)) { foreach (explode ("\n", str_replace("\r", '', $term->synonyms)) as $synonym) { @@ -200,12 +200,12 @@ function hook_taxonomy_term_update(Drupal\taxonomy\Term $term) { * field_attach_delete() is called and before the term is actually removed from * the database. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * The taxonomy term entity that is about to be deleted. * * @see taxonomy_term_delete() */ -function hook_taxonomy_term_predelete(Drupal\taxonomy\Term $term) { +function hook_taxonomy_term_predelete(\Drupal\taxonomy\Plugin\Core\Entity\Term $term) { db_delete('term_synoynm')->condition('tid', $term->tid)->execute(); } @@ -215,12 +215,12 @@ function hook_taxonomy_term_predelete(Drupal\taxonomy\Term $term) { * This hook is invoked from taxonomy_term_delete() after field_attach_delete() * has been called and after the term has been removed from the database. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * The taxonomy term entity that has been deleted. * * @see taxonomy_term_delete() */ -function hook_taxonomy_term_delete(Drupal\taxonomy\Term $term) { +function hook_taxonomy_term_delete(\Drupal\taxonomy\Plugin\Core\Entity\Term $term) { db_delete('term_synoynm')->condition('tid', $term->tid)->execute(); } @@ -263,12 +263,12 @@ function hook_taxonomy_term_view($term, $view_mode, $langcode) { * * @param $build * A renderable array representing the taxonomy term content. - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * The taxonomy term being rendered. * * @see hook_entity_view_alter() */ -function hook_taxonomy_term_view_alter(&$build, Drupal\taxonomy\Term $term) { +function hook_taxonomy_term_view_alter(&$build, \Drupal\taxonomy\Plugin\Core\Entity\Term $term) { if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) { // Change its weight. $build['an_additional_field']['#weight'] = -10; diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index c92ce64..dfbeb4b 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -491,7 +491,7 @@ function taxonomy_check_vocabulary_hierarchy(Vocabulary $vocabulary, $changed_te /** * Saves a term object to the database. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * The taxonomy term entity to be saved. * * @return @@ -526,7 +526,7 @@ function taxonomy_term_delete_multiple(array $tids) { /** * Generates an array which displays a term detail page. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * A taxonomy term object. * @param string $view_mode * View mode, e.g. 'full', 'teaser'... @@ -595,7 +595,7 @@ function template_preprocess_taxonomy_term(&$variables) { /** * Returns whether the current page is the page of the passed-in term. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * A taxonomy term entity. */ function taxonomy_term_is_page(Term $term) { @@ -952,7 +952,7 @@ function taxonomy_vocabulary_machine_name_load($name) { * @param $tid * A term's ID * - * @return Drupal\taxonomy\Term|false + * @return \Drupal\taxonomy\Plugin\Core\Entity\Term|false * A taxonomy term entity, or FALSE if the term was not found. Results are * statically cached. */ @@ -1271,7 +1271,7 @@ function taxonomy_field_formatter_prepare_view($entity_type, $entities, $field, /** * Title callback for term pages. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * A taxonomy term entity. * * @return @@ -1421,7 +1421,7 @@ function taxonomy_node_insert(Node $node) { * The index lists all terms that are related to a given node entity, and is * therefore maintained at the entity level. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity. */ function taxonomy_build_node_index($node) { @@ -1504,7 +1504,7 @@ function taxonomy_node_predelete(Node $node) { /** * Deletes taxonomy index entries for a given node. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The node entity. */ function taxonomy_delete_node_index(Node $node) { diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc index 042263c..3a9ad4d 100644 --- a/core/modules/taxonomy/taxonomy.pages.inc +++ b/core/modules/taxonomy/taxonomy.pages.inc @@ -12,7 +12,7 @@ /** * Menu callback; displays all nodes associated with a term. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * The taxonomy term entity. */ function taxonomy_term_page(Term $term) { @@ -67,7 +67,7 @@ function taxonomy_term_page(Term $term) { /** * Generate the content feed for a taxonomy term. * - * @param Drupal\taxonomy\Term $term + * @param \Drupal\taxonomy\Plugin\Core\Entity\Term $term * The taxonomy term entity. */ function taxonomy_term_feed(Term $term) { diff --git a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php index bc9094d..86b8476 100644 --- a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php +++ b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php @@ -366,7 +366,7 @@ function createPage($title, $body, $langcode = NULL) { /** * Creates a translation for a basic page in the specified language. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * The basic page to create the translation for. * @param $title * The title of a basic page in the specified language. diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc index cc94a1e..afa8c27 100644 --- a/core/modules/translation/translation.pages.inc +++ b/core/modules/translation/translation.pages.inc @@ -10,7 +10,7 @@ /** * Page callback: Displays a list of a node's translations. * - * @param Drupal\node\Node $node + * @param \Drupal\node\Plugin\Core\Entity\Node $node * A node entity. * * @return diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php index 0c3002c..b9d5228 100644 --- a/core/modules/user/user.api.php +++ b/core/modules/user/user.api.php @@ -377,13 +377,13 @@ function hook_user_view($account, $view_mode, $langcode) { * * @param $build * A renderable array representing the user. - * @param Drupal\user\User $account + * @param \Drupal\user\Plugin\Core\Entity\User $account * The user account being rendered. * * @see user_view() * @see hook_entity_view_alter() */ -function hook_user_view_alter(&$build, Drupal\user\User $account) { +function hook_user_view_alter(&$build, \Drupal\user\Plugin\Core\Entity\User $account) { // Check for the existence of a field added by another module. if (isset($build['an_additional_field'])) { // Change its weight. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php index 81ad219..a183a46 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php @@ -72,7 +72,7 @@ public function summaryTitle() { /** * Determine if the current user has access or not. * - * @param Drupal\user\User $account + * @param Drupal\user\Plugin\Core\Entity\User $account * The user who wants to access this view. * * @return TRUE diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php b/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php index 73ddfe0..ac8316a 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php +++ b/core/modules/views/lib/Drupal/views/Tests/Comment/DefaultViewRecentComments.php @@ -50,7 +50,7 @@ class DefaultViewRecentComments extends ViewTestBase { /** * Contains the node object used for comments of this test. * - * @var Drupal\node\Node + * @var \Drupal\node\Plugin\Core\Entity\Node */ public $node; diff --git a/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php b/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php index f9c4bad..6b8c412 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php @@ -17,7 +17,7 @@ class RelationshipNodeTermDataTest extends TaxonomyTestBase { /** * The vocabulary for the test. * - * @var Drupal\taxonomy\Vocabulary + * @var \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary */ protected $vocabulary; diff --git a/core/modules/views/lib/Drupal/views/Tests/Taxonomy/TaxonomyTestBase.php b/core/modules/views/lib/Drupal/views/Tests/Taxonomy/TaxonomyTestBase.php index 9c2835a..6a0ed07 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Taxonomy/TaxonomyTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/Taxonomy/TaxonomyTestBase.php @@ -31,14 +31,14 @@ /** * Stores the first term used in the different tests. * - * @var Drupal\taxonomy\Term + * @var \Drupal\taxonomy\Plugin\Core\Entity\Term */ protected $term1; /** * Stores the second term used in the different tests. * - * @var Drupal\taxonomy\Term + * @var \Drupal\taxonomy\Plugin\Core\Entity\Term */ protected $term2; @@ -118,7 +118,7 @@ protected function mockStandardInstall() { /** * Returns a new term with random properties in vocabulary $vid. * - * @return Drupal\taxonomy\Term + * @return \Drupal\taxonomy\Plugin\Core\Entity\Term * The created taxonomy term. */ protected function createTerm() { diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php index 7c92361..9abe7aa 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php @@ -15,7 +15,7 @@ class SettingsTest extends UITestBase { /** * Stores an admin user used by the different tests. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $adminUser; diff --git a/core/modules/views/lib/Drupal/views/Tests/User/AccessTestBase.php b/core/modules/views/lib/Drupal/views/Tests/User/AccessTestBase.php index 8d03700..8d34cbf 100644 --- a/core/modules/views/lib/Drupal/views/Tests/User/AccessTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/User/AccessTestBase.php @@ -15,21 +15,21 @@ /** * Contains a user object that can access all views. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $adminUser; /** * Contains a user object that has no special permissions. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $webUser; /** * Contains a user object that has the 'views_test_data test permission'. * - * @var Drupal\user\User + * @var \Drupal\user\Plugin\Core\Entity\User */ protected $normalUser; diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php index a1aec9e..3fd5b6d 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php @@ -12,6 +12,7 @@ use Drupal\views\Plugin\views\query\Sql; use Drupal\views\Plugin\Core\Entity\View; use Drupal\views\ViewStorageInterface; +use Drupal\user\Plugin\Core\Entity\User; /** * Stores UI related temporary settings. @@ -991,7 +992,7 @@ public function language() { /** * Implements \Drupal\Core\TypedData\AccessibleInterface::access(). */ - public function access(\Drupal\user\User $account = NULL) { + public function access(User $account = NULL) { return $this->__call(__FUNCTION__, func_get_args()); }