From dd14f70e914a01d50dd9129002a3c265d02b39e5 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 7 Jul 2014 13:31:13 +0100
Subject: [PATCH] Issue #2283049 by olli: Remove obsolete
 NodeController::page() method.

---
 .../node/src/Controller/NodeController.php    | 51 +------------------
 .../src/Controller/NodeViewController.php     | 14 ++---
 2 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index 812a3f8e9ff..4f2dfbf14ba 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -10,7 +10,6 @@ namespace Drupal\node\Controller;
 use Drupal\Component\Utility\String;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Database\Connection;
 use Drupal\Core\Datetime\Date;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\node\NodeTypeInterface;
@@ -22,13 +21,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class NodeController extends ControllerBase implements ContainerInjectionInterface {
 
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
   /**
    * The date service.
    *
@@ -39,21 +31,18 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
   /**
    * Constructs a NodeController object.
    *
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
    * @param \Drupal\Core\Datetime\Date $date
    *   The date service.
    */
-  public function __construct(Connection $database, Date $date) {
+  public function __construct(Date $date) {
     $this->date = $date;
-    $this->database = $database;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('database'), $container->get('date'));
+    return new static($container->get('date'));
   }
 
 
@@ -237,42 +226,6 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
     return $build;
   }
 
-  /**
-   * Displays a node.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node we are displaying.
-   *
-   * @return array
-   *   An array suitable for drupal_render().
-   */
-  public function page(NodeInterface $node) {
-    $build = $this->buildPage($node);
-
-    foreach ($node->uriRelationships() as $rel) {
-      $uri = $node->urlInfo($rel);
-      // Set the node path as the canonical URL to prevent duplicate content.
-      $build['#attached']['drupal_add_html_head_link'][] = array(
-        array(
-        'rel' => $rel,
-        'href' => $node->url($rel),
-        )
-        , TRUE);
-
-      if ($rel == 'canonical') {
-        // Set the non-aliased canonical path as a default shortlink.
-        $build['#attached']['drupal_add_html_head_link'][] = array(
-          array(
-            'rel' => 'shortlink',
-            'href' => $node->url($rel, array('alias' => TRUE)),
-          )
-        , TRUE);
-      }
-    }
-
-    return $build;
-  }
-
   /**
    * The _title_callback for the node.add route.
    *
diff --git a/core/modules/node/src/Controller/NodeViewController.php b/core/modules/node/src/Controller/NodeViewController.php
index afdb085c56c..84559a5c930 100644
--- a/core/modules/node/src/Controller/NodeViewController.php
+++ b/core/modules/node/src/Controller/NodeViewController.php
@@ -29,10 +29,11 @@ class NodeViewController extends EntityViewController {
       // Set the node path as the canonical URL to prevent duplicate content.
       $build['#attached']['drupal_add_html_head_link'][] = array(
         array(
-        'rel' => $rel,
-        'href' => $node->url($rel),
-        )
-        , TRUE);
+          'rel' => $rel,
+          'href' => $node->url($rel),
+        ),
+        TRUE,
+      );
 
       if ($rel == 'canonical') {
         // Set the non-aliased canonical path as a default shortlink.
@@ -40,8 +41,9 @@ class NodeViewController extends EntityViewController {
           array(
             'rel' => 'shortlink',
             'href' => $node->url($rel, array('alias' => TRUE)),
-          )
-        , TRUE);
+          ),
+          TRUE,
+        );
       }
     }