diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php index f1e4fb1..7cacda5 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php @@ -77,7 +77,7 @@ public function setUp() { $this->drupalCreateNode(array('type' => 'article', 'promote' => NODE_PROMOTED,)); // Create article comment. - $this->articleComment = $this->saveComment($this->article->id(), $this->webUser->id(), NULL, 0, 'comment_node_article'); + $this->articleComment = $this->saveComment($this->article->id(), $this->webUser->id(), NULL, 0); // Create page. $this->page = $this->drupalCreateNode(array('type' => 'page')); @@ -442,18 +442,17 @@ function _testNodeCommentProperties($graph) { * array of values to set contact info. * @param int $pid * Comment id of the parent comment in a thread. - * @param string $bundle - * The bundle of the comment. * * @return \Drupal\comment\Plugin\Core\Entity\Comment * The saved comment. */ - function saveComment($nid, $uid, $contact = NULL, $pid = 0, $bundle = '') { + function saveComment($nid, $uid, $contact = NULL, $pid = 0) { $values = array( - 'nid' => $nid, + 'entity_id' => $nid, + 'entity_type' => 'node', + 'field_name' => 'comment', 'uid' => $uid, 'pid' => $pid, - 'node_type' => $bundle, 'subject' => $this->randomName(), 'comment_body' => $this->randomName(), 'status' => 1, diff --git a/core/profiles/standard/config/rdf.mapping.comment.comment_node_article.yml b/core/profiles/standard/config/rdf.mapping.comment.comment.yml similarity index 93% rename from core/profiles/standard/config/rdf.mapping.comment.comment_node_article.yml rename to core/profiles/standard/config/rdf.mapping.comment.comment.yml index eb7d2f0..9969cd5 100644 --- a/core/profiles/standard/config/rdf.mapping.comment.comment_node_article.yml +++ b/core/profiles/standard/config/rdf.mapping.comment.comment.yml @@ -1,4 +1,4 @@ -id: comment.comment_node_article +id: comment.comment targetEntityType: comment bundle: comment types: diff --git a/core/profiles/standard/config/rdf.mapping.comment.comment_node_page.yml b/core/profiles/standard/config/rdf.mapping.comment.comment_node_page.yml deleted file mode 100644 index d36438f..0000000 --- a/core/profiles/standard/config/rdf.mapping.comment.comment_node_page.yml +++ /dev/null @@ -1,24 +0,0 @@ -id: comment.comment_node_page -targetEntityType: comment -bundle: comment_node_page -types: - - 'schema:Comment' -fieldMappings: - subject: - properties: - - 'schema:name' - created: - properties: - - 'schema:dateCreated' - datatype_callback: 'date_iso8601' - changed: - properties: - - 'schema:dateModified' - datatype_callback: 'date_iso8601' - comment_body: - properties: - - 'schema:text' - uid: - properties: - - 'schema:author' - mapping_type: 'rel'