From fd9804d886a5dfabbf5fd01dd49e73c7c3e35ad0 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 14 Jun 2013 02:18:37 +0200
Subject: [PATCH] Issue #2014215 by sdboyer: Shift render array defaults back
out onto BlockRenderController .
---
.../Plugin/Block/AggregatorCategoryBlock.php | 4 +--
.../Plugin/Block/AggregatorFeedBlock.php | 4 +--
.../Plugin/Block/CustomBlockBlock.php | 4 +--
.../block/lib/Drupal/block/BlockBase.php | 29 -------------------
.../Drupal/block/BlockRenderController.php | 20 ++++++++++++-
.../Drupal/block/Tests/BlockInterfaceTest.php | 13 +--------
.../Plugin/Block/TestBlockInstantiation.php | 2 +-
.../Plugin/Block/TestCacheBlock.php | 4 +--
.../book/Plugin/Block/BookNavigationBlock.php | 4 +--
.../Plugin/Block/RecentCommentsBlock.php | 4 +--
core/modules/forum/forum.module | 4 +--
.../forum/Plugin/Block/ActiveTopicsBlock.php | 4 +--
.../forum/Plugin/Block/NewTopicsBlock.php | 4 +--
.../language/Plugin/Block/LanguageBlock.php | 4 +--
.../Drupal/menu/Plugin/Block/MenuBlock.php | 4 +--
.../node/Plugin/Block/RecentContentBlock.php | 4 +--
.../node/Plugin/Block/SyndicateBlock.php | 4 +--
.../search/Plugin/Block/SearchBlock.php | 4 +--
.../shortcut/Plugin/Block/ShortcutsBlock.php | 4 +--
.../Plugin/Block/StatisticsPopularBlock.php | 4 +--
.../system/Plugin/Block/SystemHelpBlock.php | 4 +--
.../system/Plugin/Block/SystemMainBlock.php | 4 +--
.../system/Plugin/Block/SystemMenuBlock.php | 4 +--
.../Plugin/Block/SystemPoweredByBlock.php | 4 +--
.../user/Plugin/Block/UserLoginBlock.php | 4 +--
.../Drupal/user/Plugin/Block/UserNewBlock.php | 4 +--
.../user/Plugin/Block/UserOnlineBlock.php | 4 +--
.../Drupal/views/Plugin/Block/ViewsBlock.php | 4 +--
.../Plugin/Block/ViewsExposedFilterBlock.php | 4 +--
29 files changed, 71 insertions(+), 93 deletions(-)
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
index b9971ce1cd10..423c90387ca0 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
@@ -62,9 +62,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$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));
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
index b72936bf66d4..3cd519fbb2d3 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -62,9 +62,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
// 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()) {
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
index 01b11ba3a789..0d17fa1e9400 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
@@ -67,9 +67,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
// @todo Clean up when http://drupal.org/node/1874498 lands.
list(, $uuid) = explode(':', $this->getPluginId());
if ($block = entity_load_by_uuid('custom_block', $uuid)) {
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php
index adb80fb3f346..6efda890179a 100644
--- a/core/modules/block/lib/Drupal/block/BlockBase.php
+++ b/core/modules/block/lib/Drupal/block/BlockBase.php
@@ -224,33 +224,4 @@ public function submit($form, &$form_state) {
* @see \Drupal\block\BlockBase::submit()
*/
public function blockSubmit($form, &$form_state) {}
-
- /**
- * Implements \Drupal\block\BlockInterface::build().
- */
- public function build() {
- $build = array();
- $plugin_id = $this->getPluginId();
- if ($content = $this->blockBuild()) {
- $build = array(
- '#theme' => 'block',
- 'content' => $content,
- '#configuration' => $this->configuration,
- '#plugin_id' => $plugin_id,
- );
- $build['#configuration']['label'] = check_plain($this->configuration['label']);
- }
- list($base_id) = explode(':', $plugin_id);
- drupal_alter(array('block_view', "block_view_$base_id"), $build, $this);
- return $build;
- }
-
- /**
- * 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();
-
}
diff --git a/core/modules/block/lib/Drupal/block/BlockRenderController.php b/core/modules/block/lib/Drupal/block/BlockRenderController.php
index 12fff822840b..45a85d95a65f 100644
--- a/core/modules/block/lib/Drupal/block/BlockRenderController.php
+++ b/core/modules/block/lib/Drupal/block/BlockRenderController.php
@@ -36,7 +36,25 @@ public function view(EntityInterface $entity, $view_mode = 'full', $langcode = N
public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL) {
$build = array();
foreach ($entities as $entity_id => $entity) {
- $build[$entity_id] = $entity->getPlugin()->build();
+ $plugin = $entity->getPlugin();
+ $plugin_id = $plugin->getPluginId();
+
+ if ($content = $plugin->build()) {
+ $configuration = $plugin->getConfig();
+ $build[$entity_id] = array(
+ '#theme' => 'block',
+ 'content' => $content,
+ '#configuration' => $configuration,
+ '#plugin_id' => $plugin_id,
+ );
+ $build[$entity_id]['#configuration']['label'] = check_plain($configuration['label']);
+ }
+ else {
+ $build[$entity_id] = array();
+ }
+
+ list($base_id) = explode(':', $plugin_id);
+ drupal_alter(array('block_view', "block_view_$base_id"), $build[$entity_id], $plugin);
// @todo Remove after fixing http://drupal.org/node/1989568.
$build[$entity_id]['#block'] = $entity;
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
index 58ff0c2d4fe8..e71a14602c11 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
@@ -92,18 +92,7 @@ public function testBlockInterface() {
$this->assertIdentical($display_block->form(array(), $form_state), $expected_form, 'Only the expected form elements were present.');
$expected_build = array(
- '#theme' => 'block',
- 'content' => array(
- '#children' => 'My custom display message.',
- ),
- '#configuration' => array(
- 'label' => 'Custom Display Message',
- 'display_message' => 'My custom display message.',
- 'module' => 'block_test',
- 'label_display' => BLOCK_LABEL_VISIBLE,
- 'cache' => DRUPAL_NO_CACHE,
- ),
- '#plugin_id' => 'test_block_instantiation',
+ '#children' => 'My custom display message.',
);
// Ensure the build array is proper.
$this->assertIdentical($display_block->build(), $expected_build, 'The plugin returned the appropriate build array.');
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
index ba45a4e3dbd7..4c286383aa82 100644
--- a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
+++ b/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
@@ -60,7 +60,7 @@ public function blockSubmit($form, &$form_state) {
/**
* {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
'#children' => $this->configuration['display_message'],
);
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
index 1bde917bc201..c83d668079fa 100644
--- a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
+++ b/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
@@ -34,9 +34,9 @@ public function settings() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
'#children' => \Drupal::state()->get('block_test.content'),
);
diff --git a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
index 7461aa7ed4f7..fd48f7d23529 100644
--- a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
+++ b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
@@ -59,9 +59,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$current_bid = 0;
if ($node = menu_get_object()) {
$current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php b/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
index 387f7ceaed36..cf442db9f34f 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
@@ -59,9 +59,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
'#theme' => 'comment_block',
'#number' => $this->configuration['block_count'],
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index c5af0f4d63e3..c32816c34da6 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -652,8 +652,8 @@ function forum_form_node_form_alter(&$form, &$form_state, $form_id) {
*
* This function can be used as a #pre_render callback.
*
- * @see \Drupal\forum\Plugin\block\block\NewTopicsBlock::blockBuild()
- * @see \Drupal\forum\Plugin\block\block\ActiveTopicsBlock::blockBuild()
+ * @see \Drupal\forum\Plugin\block\block\NewTopicsBlock::build()
+ * @see \Drupal\forum\Plugin\block\block\ActiveTopicsBlock::build()
*/
function forum_block_view_pre_render($elements) {
$result = $elements['#query']->execute();
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
index b522d65924c4..176fa1429e93 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
@@ -22,9 +22,9 @@
class ActiveTopicsBlock extends ForumBlockBase {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$query = db_select('forum_index', 'f')
->fields('f')
->addTag('node_access')
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
index 4e854824b4c7..02f46507d49a 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
@@ -22,9 +22,9 @@
class NewTopicsBlock extends ForumBlockBase {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$query = db_select('forum_index', 'f')
->fields('f')
->addTag('node_access')
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php b/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
index 4ab3bfd444c7..95a9d125e2cd 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
@@ -31,9 +31,9 @@ function access() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$build = array();
$path = drupal_is_front_page() ? '<front>' : current_path();
list($plugin_id, $type) = explode(':', $this->getPluginId());
diff --git a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php b/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
index 86dcd07f3f23..0e837342e39a 100644
--- a/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
+++ b/core/modules/menu/lib/Drupal/menu/Plugin/Block/MenuBlock.php
@@ -24,9 +24,9 @@
class MenuBlock extends SystemMenuBlock {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
list($plugin, $menu) = explode(':', $this->getPluginId());
return menu_tree($menu);
}
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
index 3712bff03c9c..81441610dadd 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
@@ -59,9 +59,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
if ($nodes = node_get_recent($this->configuration['block_count'])) {
return array(
'#theme' => 'node_recent_block',
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
index 56b3a19591b2..1440a48efee3 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
@@ -39,9 +39,9 @@ public function access() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
'#theme' => 'feed_icon',
'#url' => 'rss.xml',
diff --git a/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php b/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
index 1afbfae06f8e..00f5b6003815 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
@@ -30,9 +30,9 @@ public function access() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(drupal_get_form('search_block_form'));
}
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
index ff89f5020c69..52969713bfe8 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
@@ -23,9 +23,9 @@
class ShortcutsBlock extends BlockBase {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
shortcut_renderable_links(shortcut_current_displayed_set()),
);
diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
index 6eebb8376b7e..d11412ece44f 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
@@ -116,9 +116,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$content = array();
if ($this->day_list) {
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
index a370374789b5..c19a57560a8b 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
@@ -38,9 +38,9 @@ public function access() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
'#children' => $this->help,
);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
index db1865172574..997d5637cfa3 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
@@ -23,9 +23,9 @@
class SystemMainBlock extends BlockBase {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
drupal_set_page_content()
);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
index 847249e0fbf8..8e7879e36309 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
@@ -33,9 +33,9 @@ public function access() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
list($plugin, $derivative) = explode(':', $this->getPluginId());
// Derivatives are prefixed with 'menu-'.
$menu = substr($derivative, 5);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
index 3969710babdf..7edd34bad1a0 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
@@ -23,9 +23,9 @@
class SystemPoweredByBlock extends BlockBase {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
return array(
'#children' => theme('system_powered_by'),
);
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
index dd890bdf1713..0c8aa2a4e10b 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
@@ -30,9 +30,9 @@ public function access() {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$form = drupal_get_form('user_login_form');
unset($form['name']['#attributes']['autofocus']);
unset($form['name']['#description']);
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
index 41c2a437e330..847512acf350 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
@@ -62,9 +62,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
// Retrieve a list of new users who have accessed the site successfully.
$items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, $this->configuration['whois_new_count'])->fetchAll();
$build = array(
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
index fbae351f55cc..f2452c9d58e6 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
@@ -76,9 +76,9 @@ public function blockSubmit($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
// Count users active within the defined period.
$interval = REQUEST_TIME - $this->configuration['seconds_online'];
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index 5b82a7bc4408..e9af634ef66a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -69,9 +69,9 @@ public function form($form, &$form_state) {
}
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
if ($output = $this->view->executeDisplay($this->displayID)) {
$output = $this->view->executeDisplay($this->displayID);
// Set the label to the title configured in the view.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
index 21d3578f53cb..577caa55f6d6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
@@ -23,9 +23,9 @@
class ViewsExposedFilterBlock extends ViewsBlock {
/**
- * Implements \Drupal\block\BlockBase::blockBuild().
+ * {@inheritdoc}
*/
- protected function blockBuild() {
+ public function build() {
$output = $this->view->display_handler->viewExposedFormBlocks();
// Before returning the block output, convert it to a renderable array with
// contextual links.
--
GitLab