Issue #1969276 by effulgentsia, tim.plunkett, EclipseGc: Refactor block...

Issue #1969276 by effulgentsia, tim.plunkett, EclipseGc: Refactor block plugins to make room for a BlockBase::build() implementation.

core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php

@@ -62,9 +62,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     $id = $this->getPluginId();
     if ($category = db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchObject()) {
       $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = :cid ORDER BY i.timestamp DESC, i.iid DESC', 0, $this->configuration['block_count'], array(':cid' => $category->cid));

core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorFeedBlock.php

@@ -62,9 +62,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     // Plugin IDs look something like this: aggregator_feed_block:1.
     list(, $id) = explode(':', $this->getPluginId());
     if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) {

core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php

@@ -73,9 +73,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     // @todo Clean up when http://drupal.org/node/1874498 lands.
     list(, $uuid) = explode(':', $this->getPluginId());
     if ($block = entity_load_by_uuid('custom_block', $uuid)) {

core/modules/block/lib/Drupal/block/BlockBase.php

@@ -496,4 +496,21 @@ public function submit($form, &$form_state) {
    */
   public function blockSubmit($form, &$form_state) {}
 
+  /**
+   * Implements \Drupal\block\BlockInterface::build().
+   */
+  public function build() {
+    // @todo Move block rendering code common to all blocks from
+    //   BlockRenderController to here: http://drupal.org/node/1927608.
+    return $this->blockBuild();
+  }
+
+  /**
+   * Adds block-type-specific render handling for the block plugin.
+   *
+   * @return array
+   *   A renderable array representing the content of this block.
+   */
+  abstract protected function blockBuild();
+
 }

core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestCacheBlock.php

@@ -34,9 +34,9 @@ public function settings() {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       '#children' => state()->get('block_test.content'),
     );

core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php

@@ -59,9 +59,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     $current_bid = 0;
     if ($node = menu_get_object()) {
       $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];

core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentCommentsBlock.php

@@ -59,9 +59,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       '#theme' => 'comment_block',
       '#number' => $this->configuration['block_count'],

core/modules/forum/lib/Drupal/forum/Plugin/block/block/ActiveTopicsBlock.php

@@ -22,9 +22,9 @@
 class ActiveTopicsBlock extends ForumBlockBase {
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     $query = db_select('forum_index', 'f')
       ->fields('f')
       ->addTag('node_access')

core/modules/forum/lib/Drupal/forum/Plugin/block/block/NewTopicsBlock.php

@@ -22,9 +22,9 @@
 class NewTopicsBlock extends ForumBlockBase {
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     $query = db_select('forum_index', 'f')
       ->fields('f')
       ->addTag('node_access')

core/modules/language/lib/Drupal/language/Plugin/block/block/LanguageBlock.php

@@ -31,9 +31,9 @@ function blockAccess() {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     $build = array();
     $path = drupal_is_front_page() ? '<front>' : current_path();
     list($plugin_id, $type) = explode(':', $this->getPluginId());

core/modules/menu/lib/Drupal/menu/Plugin/block/block/MenuBlock.php

@@ -24,9 +24,9 @@
 class MenuBlock extends SystemMenuBlock {
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     list($plugin, $menu) = explode(':', $this->getPluginId());
     return menu_tree($menu);
   }

core/modules/node/lib/Drupal/node/Plugin/block/block/RecentContentBlock.php

@@ -59,9 +59,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     if ($nodes = node_get_recent($this->configuration['block_count'])) {
       return array(
         '#theme' => 'node_recent_block',

core/modules/node/lib/Drupal/node/Plugin/block/block/SyndicateBlock.php

@@ -39,9 +39,9 @@ public function blockAccess() {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       '#theme' => 'feed_icon',
       '#url' => 'rss.xml',

core/modules/search/lib/Drupal/search/Plugin/block/block/SearchBlock.php

@@ -30,9 +30,9 @@ public function blockAccess() {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(drupal_get_form('search_block_form'));
   }
 

core/modules/shortcut/lib/Drupal/shortcut/Plugin/block/block/ShortcutsBlock.php

@@ -23,9 +23,9 @@
 class ShortcutsBlock extends BlockBase {
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       shortcut_renderable_links(shortcut_current_displayed_set()),
     );

core/modules/statistics/lib/Drupal/statistics/Plugin/block/block/StatisticsPopularBlock.php

@@ -116,9 +116,9 @@ public function blockSubmit($form, &$form_state) {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     $content = array();
 
     if ($this->day_list) {

core/modules/system/lib/Drupal/system/Plugin/block/block/SystemHelpBlock.php

@@ -38,9 +38,9 @@ public function blockAccess() {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       '#children' => $this->help,
     );

core/modules/system/lib/Drupal/system/Plugin/block/block/SystemMainBlock.php

@@ -23,9 +23,9 @@
 class SystemMainBlock extends BlockBase {
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       drupal_set_page_content()
     );

core/modules/system/lib/Drupal/system/Plugin/block/block/SystemMenuBlock.php

@@ -33,9 +33,9 @@ public function blockAccess() {
   }
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     list($plugin, $derivative) = explode(':', $this->getPluginId());
     // Derivatives are prefixed with 'menu-'.
     $menu = substr($derivative, 5);

core/modules/system/lib/Drupal/system/Plugin/block/block/SystemPoweredByBlock.php

@@ -23,9 +23,9 @@
 class SystemPoweredByBlock extends BlockBase {
 
   /**
-   * Implements \Drupal\block\BlockBase::build().
+   * Implements \Drupal\block\BlockBase::blockBuild().
    */
-  public function build() {
+  protected function blockBuild() {
     return array(
       '#children' => theme('system_powered_by'),
     );