summaryrefslogtreecommitdiffstatshomepage
path: root/core/modules/node
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules/node')
-rw-r--r--core/modules/node/node.module7
-rw-r--r--core/modules/node/src/Form/NodeForm.php4
-rw-r--r--core/modules/node/src/Form/NodeRevisionRevertForm.php2
-rw-r--r--core/modules/node/src/Hook/NodeHooks1.php2
-rw-r--r--core/modules/node/src/Hook/NodeTokensHooks.php2
-rw-r--r--core/modules/node/src/Hook/NodeViewsHooks.php2
-rw-r--r--core/modules/node/src/NodeListBuilder.php2
-rw-r--r--core/modules/node/src/NodeTranslationHandler.php3
-rw-r--r--core/modules/node/src/Plugin/views/wizard/Node.php2
-rw-r--r--core/modules/node/tests/modules/node_test/src/Hook/NodeTestHooks.php2
-rw-r--r--core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php2
-rw-r--r--core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php2
-rw-r--r--core/modules/node/tests/src/Functional/NodeTranslationUITest.php2
-rw-r--r--core/modules/node/tests/src/Functional/NodeTypeTest.php4
-rw-r--r--core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php8
-rw-r--r--core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php2
16 files changed, 24 insertions, 24 deletions
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 6841f24b96b..c99569a1c67 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -109,10 +109,11 @@ function node_type_get_names() {
* @return string|false
* The node type label or FALSE if the node type is not found.
*
- * @todo Add this as generic helper method for config entities representing
- * entity bundles.
+ * @deprecated in drupal:11.3.0 and is removed from drupal:13.0.0. Use $node->getBundleEntity()->label() instead.
+ * @see https://www.drupal.org/node/3533301
*/
function node_get_type_label(NodeInterface $node) {
+ @trigger_error(__FUNCTION__ . '() is deprecated in drupal:11.3.0 and is removed from drupal:13.0.0. Use $node->getBundleEntity()->label(). See https://www.drupal.org/node/3533301', E_USER_DEPRECATED);
$type = NodeType::load($node->bundle());
return $type ? $type->label() : FALSE;
}
@@ -558,7 +559,7 @@ function node_access_rebuild($batch_mode = FALSE): void {
}
}
else {
- // Try to allocate enough time to rebuild node grants
+ // Try to allocate enough time to rebuild node grants.
Environment::setTimeLimit(240);
// Rebuild newest nodes first so that recent content becomes available
diff --git a/core/modules/node/src/Form/NodeForm.php b/core/modules/node/src/Form/NodeForm.php
index 295e9ab78ce..5498c94c497 100644
--- a/core/modules/node/src/Form/NodeForm.php
+++ b/core/modules/node/src/Form/NodeForm.php
@@ -125,7 +125,7 @@ class NodeForm extends ContentEntityForm {
if ($this->operation == 'edit') {
$form['#title'] = $this->t('<em>Edit @type</em> @title', [
- '@type' => node_get_type_label($node),
+ '@type' => $node->getBundleEntity()->label(),
'@title' => $node->label(),
]);
}
@@ -284,7 +284,7 @@ class NodeForm extends ContentEntityForm {
$node->save();
$node_link = $node->toLink($this->t('View'))->toString();
$context = ['@type' => $node->getType(), '%title' => $node->label(), 'link' => $node_link];
- $t_args = ['@type' => node_get_type_label($node), '%title' => $node->access('view') ? $node->toLink()->toString() : $node->label()];
+ $t_args = ['@type' => $node->getBundleEntity()->label(), '%title' => $node->access('view') ? $node->toLink()->toString() : $node->label()];
if ($insert) {
$this->logger('content')->info('@type: added %title.', $context);
diff --git a/core/modules/node/src/Form/NodeRevisionRevertForm.php b/core/modules/node/src/Form/NodeRevisionRevertForm.php
index ffb58fb71fb..a1e04e2942d 100644
--- a/core/modules/node/src/Form/NodeRevisionRevertForm.php
+++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php
@@ -136,7 +136,7 @@ class NodeRevisionRevertForm extends ConfirmFormBase {
$this->logger('content')->info('@type: reverted %title revision %revision.', ['@type' => $this->revision->bundle(), '%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
$this->messenger()
->addStatus($this->t('@type %title has been reverted to the revision from %revision-date.', [
- '@type' => node_get_type_label($this->revision),
+ '@type' => $this->revision->getBundleEntity()->label(),
'%title' => $this->revision->label(),
'%revision-date' => $this->dateFormatter->format($original_revision_timestamp),
]));
diff --git a/core/modules/node/src/Hook/NodeHooks1.php b/core/modules/node/src/Hook/NodeHooks1.php
index d2dbf545c3c..e103717fb61 100644
--- a/core/modules/node/src/Hook/NodeHooks1.php
+++ b/core/modules/node/src/Hook/NodeHooks1.php
@@ -219,7 +219,7 @@ class NodeHooks1 {
$ranking = [
'relevance' => [
'title' => $this->t('Keyword relevance'),
- // Average relevance values hover around 0.15
+ // Average relevance values hover around 0.15.
'score' => 'i.relevance',
],
'sticky' => [
diff --git a/core/modules/node/src/Hook/NodeTokensHooks.php b/core/modules/node/src/Hook/NodeTokensHooks.php
index 3d7f0b0adf4..a7a90347313 100644
--- a/core/modules/node/src/Hook/NodeTokensHooks.php
+++ b/core/modules/node/src/Hook/NodeTokensHooks.php
@@ -109,7 +109,7 @@ class NodeTokensHooks {
break;
case 'type-name':
- $type_name = node_get_type_label($node);
+ $type_name = $node->getBundleEntity()->label();
$replacements[$original] = $type_name;
break;
diff --git a/core/modules/node/src/Hook/NodeViewsHooks.php b/core/modules/node/src/Hook/NodeViewsHooks.php
index 477784c153d..8729f547c17 100644
--- a/core/modules/node/src/Hook/NodeViewsHooks.php
+++ b/core/modules/node/src/Hook/NodeViewsHooks.php
@@ -26,7 +26,7 @@ class NodeViewsHooks {
if ($view->storage->get('base_table') == 'node') {
foreach ($view->displayHandlers as $display) {
if (!$display->isDefaulted('access') || !$display->isDefaulted('filters')) {
- // Check for no access control
+ // Check for no access control.
$access = $display->getOption('access');
if (empty($access['type']) || $access['type'] == 'none') {
$anonymous_role = Role::load(RoleInterface::ANONYMOUS_ID);
diff --git a/core/modules/node/src/NodeListBuilder.php b/core/modules/node/src/NodeListBuilder.php
index 0fa80dee411..2b356eb2b34 100644
--- a/core/modules/node/src/NodeListBuilder.php
+++ b/core/modules/node/src/NodeListBuilder.php
@@ -95,7 +95,7 @@ class NodeListBuilder extends EntityListBuilder {
'#title' => $entity->label(),
'#url' => $entity->toUrl(),
];
- $row['type'] = node_get_type_label($entity);
+ $row['type'] = $entity->getBundleEntity()->label();
$row['author']['data'] = [
'#theme' => 'username',
'#account' => $entity->getOwner(),
diff --git a/core/modules/node/src/NodeTranslationHandler.php b/core/modules/node/src/NodeTranslationHandler.php
index 6c802440f37..88a3680a572 100644
--- a/core/modules/node/src/NodeTranslationHandler.php
+++ b/core/modules/node/src/NodeTranslationHandler.php
@@ -50,8 +50,7 @@ class NodeTranslationHandler extends ContentTranslationHandler {
* {@inheritdoc}
*/
protected function entityFormTitle(EntityInterface $entity) {
- $type_name = node_get_type_label($entity);
- return $this->t('<em>Edit @type</em> @title', ['@type' => $type_name, '@title' => $entity->label()]);
+ return $this->t('<em>Edit @type</em> @title', ['@type' => $entity->getBundleEntity()->label(), '@title' => $entity->label()]);
}
/**
diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index d66fa956f9a..bef4ddc8da5 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -92,7 +92,7 @@ class Node extends WizardPluginBase {
* {@inheritdoc}
*/
public function getAvailableSorts() {
- // You can't execute functions in properties, so override the method
+ // You can't execute functions in properties, so override the method.
return [
'node_field_data-title:ASC' => $this->t('Title'),
];
diff --git a/core/modules/node/tests/modules/node_test/src/Hook/NodeTestHooks.php b/core/modules/node/tests/modules/node_test/src/Hook/NodeTestHooks.php
index 201e781d196..11753f8ca2f 100644
--- a/core/modules/node/tests/modules/node_test/src/Hook/NodeTestHooks.php
+++ b/core/modules/node/tests/modules/node_test/src/Hook/NodeTestHooks.php
@@ -130,7 +130,7 @@ class NodeTestHooks {
#[Hook('node_presave')]
public function nodePresave(NodeInterface $node): void {
if ($node->getTitle() == 'testing_node_presave') {
- // Sun, 19 Nov 1978 05:00:00 GMT
+ // Sun, 19 Nov 1978 05:00:00 GMT.
$node->setCreatedTime(280299600);
// Drupal 1.0 release.
$node->changed = 979534800;
diff --git a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index 2e584f3b826..9eba7e9614d 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -128,7 +128,7 @@ class NodeAccessBaseTableTest extends NodeTestBase {
$num_simple_users = 2;
$simple_users = [];
- // Nodes keyed by uid and nid: $nodes[$uid][$nid] = $is_private;
+ // Nodes keyed by uid and nid: "$nodes[$uid][$nid] = $is_private".
$this->nodesByUser = [];
// Titles keyed by nid.
$titles = [];
diff --git a/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php b/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
index 27385e9666b..e67b27d4c3f 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
@@ -171,7 +171,7 @@ class NodeAccessGrantsCacheContextTest extends NodeTestBase {
3 => 'view.all',
]);
- // Uninstall the node_access_test module
+ // Uninstall the node_access_test module.
$this->container->get('module_installer')->uninstall(['node_access_test']);
drupal_static_reset('node_access_view_all_nodes');
$this->assertUserCacheContext([
diff --git a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index ac1e8664bad..42c4df88d3a 100644
--- a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -479,7 +479,7 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
->getStorage($this->entityTypeId);
$entity = $storage->load($this->entityId);
$languages = $this->container->get('language_manager')->getLanguages();
- $type_name = node_get_type_label($entity);
+ $type_name = $entity->getBundleEntity()->label();
foreach ($this->langcodes as $langcode) {
// We only want to test the title for non-english translations.
diff --git a/core/modules/node/tests/src/Functional/NodeTypeTest.php b/core/modules/node/tests/src/Functional/NodeTypeTest.php
index 4169d88f492..d26e4cef58d 100644
--- a/core/modules/node/tests/src/Functional/NodeTypeTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeTest.php
@@ -147,7 +147,7 @@ class NodeTypeTest extends NodeTestBase {
$assert->pageTextContains('Foo');
$assert->pageTextContains('Body');
- // Change the name through the API
+ // Change the name through the API.
/** @var \Drupal\node\NodeTypeInterface $node_type */
$node_type = NodeType::load('page');
$node_type->set('name', 'NewBar');
@@ -277,7 +277,7 @@ class NodeTypeTest extends NodeTestBase {
$this->drupalGet('admin/structure/types/manage/page/delete');
$this->submitForm([], 'Delete');
- // Navigate to content type administration screen
+ // Navigate to content type administration screen.
$this->drupalGet('admin/structure/types');
$this->assertSession()->pageTextContains("No content types available. Add content type.");
$this->assertSession()->linkExists("Add content type");
diff --git a/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php b/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php
index e7f060fe3d4..59c33a921e7 100644
--- a/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php
+++ b/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php
@@ -53,16 +53,16 @@ class NodeFieldTokensTest extends NodeTestBase {
$this->drupalGet('test_node_tokens');
- // Body: {{ body }}<br />
+ // Body: "{{ body }}<br />".
$this->assertSession()->responseContains("Body: <p>$body</p>");
- // Raw value: {{ body__value }}<br />
+ // Raw value: "{{ body__value }}<br />".
$this->assertSession()->responseContains("Raw value: $body");
- // Raw summary: {{ body__summary }}<br />
+ // Raw summary: "{{ body__summary }}<br />".
$this->assertSession()->responseContains("Raw summary: $summary");
- // Raw format: {{ body__format }}<br />
+ // Raw format: "{{ body__format }}<br />".
$this->assertSession()->responseContains("Raw format: plain_text");
}
diff --git a/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
index cfad6986f1e..b69ca50f1be 100644
--- a/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
+++ b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
@@ -82,7 +82,7 @@ class NodeFieldAccessTest extends EntityKernelTestBase {
// An unprivileged user.
$page_unrelated_user = $this->createUser(['access content']);
- // List of all users
+ // List of all users.
$test_users = [
$content_admin_user,
$page_creator_user,