8 files changed, 9 insertions, 10 deletions
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'),
     ];