diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php index b8a7999..0b81fe1 100644 --- a/core/lib/Drupal/Core/Block/BlockBase.php +++ b/core/lib/Drupal/Core/Block/BlockBase.php @@ -122,17 +122,8 @@ public function calculateDependencies() { * {@inheritdoc} */ public function access(AccountInterface $account, $return_as_object = FALSE) { - // @todo Remove self::blockAccess() and force individual plugins to return - // their own AccessResult logic. Until that is done in - // https://www.drupal.org/node/2375689 the access will be set uncacheable. - if ($this->blockAccess($account)) { - $access = AccessResult::allowed(); - } - else { - $access = AccessResult::forbidden(); - } + $access = $this->blockAccess($account); - $access->setCacheable(FALSE); return $return_as_object ? $access : $access->isAllowed(); } @@ -142,15 +133,12 @@ public function access(AccountInterface $account, $return_as_object = FALSE) { * @param \Drupal\Core\Session\AccountInterface $account * The user session for which to check access. * - * @return bool - * TRUE if the block should be shown, or FALSE otherwise. + * @return \Drupal\Core\Access\AccessResult + * Returns the access result. * * @see self::access() */ - protected function blockAccess(AccountInterface $account) { - // By default, the block is visible. - return TRUE; - } + abstract protected function blockAccess(AccountInterface $account); /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Block/Plugin/Block/Broken.php b/core/lib/Drupal/Core/Block/Plugin/Block/Broken.php index df61f3b..05ae5a2 100644 --- a/core/lib/Drupal/Core/Block/Plugin/Block/Broken.php +++ b/core/lib/Drupal/Core/Block/Plugin/Block/Broken.php @@ -7,8 +7,10 @@ namespace Drupal\Core\Block\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Session\AccountInterface; /** * Defines a fallback plugin for missing block plugins. @@ -31,6 +33,13 @@ public function build() { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function blockForm($form, FormStateInterface $form_state) { return $this->brokenMessage(); } diff --git a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php index 539e349..250ef93 100644 --- a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php +++ b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php @@ -9,6 +9,7 @@ use Drupal\aggregator\FeedStorageInterface; use Drupal\aggregator\ItemStorageInterface; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Cache\Cache; use Drupal\Core\Entity\Query\QueryInterface; @@ -106,12 +107,13 @@ public function defaultConfiguration() { ); } + /** * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { // Only grant access to users with the 'access news feeds' permission. - return $account->hasPermission('access news feeds'); + AccessResult::allowedIfHasPermission($account, 'access news feeds'); } /** diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php index b3ed511..d8d6e5b 100644 --- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php +++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php @@ -7,6 +7,7 @@ namespace Drupal\block_test\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Session\AccountInterface; @@ -61,7 +62,7 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $this->state->get('test_block_access', FALSE); + return $this->state->get('test_block_access', FALSE) ? AccessResult::allowed() : AccessResult::forbidden(); } /** diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php index e9b4144..9ca1503 100644 --- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php +++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php @@ -7,6 +7,7 @@ namespace Drupal\block_test\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; @@ -34,7 +35,7 @@ public function defaultConfiguration() { * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $account->hasPermission('access content'); + return AccessResult::allowedIfHasPermission($account, 'access content'); } /** diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php index 815f3a4..1c6baa3 100644 --- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php +++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php @@ -7,7 +7,9 @@ namespace Drupal\block_test\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; +use Drupal\Core\Session\AccountInterface; /** * Provides a block to test caching. @@ -22,6 +24,13 @@ class TestCacheBlock extends BlockBase { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { $content = \Drupal::state()->get('block_test.content'); diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php index 56b127b..99c372d 100644 --- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php +++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php @@ -7,7 +7,9 @@ namespace Drupal\block_test\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; +use Drupal\Core\Session\AccountInterface; /** * Provides a context-aware block. @@ -33,4 +35,11 @@ public function build() { ); } + /** + * {@inheritdoc} + */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + } diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php index 49925dc..cad62af 100644 --- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php +++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php @@ -7,7 +7,9 @@ namespace Drupal\block_test\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; +use Drupal\Core\Session\AccountInterface; /** * Provides a block to test HTML. @@ -22,6 +24,13 @@ class TestHtmlBlock extends BlockBase { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { return array( '#attributes' => \Drupal::state()->get('block_test.attributes'), diff --git a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php index e59eefd..a00dc86 100644 --- a/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php +++ b/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php @@ -136,6 +136,25 @@ public function blockSubmit($form, FormStateInterface $form_state) { } /** + * Indicates whether the block should be shown. + * + * @param \Drupal\Core\Session\AccountInterface $account + * The user session for which to check access. + * + * @return \Drupal\Core\Access\AccessResult + * Returns the access result. + * + * @see self::access() + */ + protected function blockAccess(AccountInterface $account) { + $uuid = $this->getDerivativeId(); + if ($block = $this->entityManager->loadEntityByUuid('block_content', $uuid)) { + return $this->entityManager->getAccessControlHandler('block_content') + ->access($block, 'view'); + } + } + + /** * {@inheritdoc} */ public function build() { diff --git a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php index 4ce4c3f..2d07bfd 100644 --- a/core/modules/book/src/Plugin/Block/BookNavigationBlock.php +++ b/core/modules/book/src/Plugin/Block/BookNavigationBlock.php @@ -7,10 +7,13 @@ namespace Drupal\book\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\book\BookManagerInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; +use Drupal\Core\Session\AccountInterface; +use Drupal\node\Plugin\views\filter\Access; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RequestStack; use Drupal\Core\Entity\EntityStorageInterface; @@ -123,6 +126,13 @@ public function blockSubmit($form, FormStateInterface $form_state) { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { $current_bid = 0; diff --git a/core/modules/forum/src/Plugin/Block/ForumBlockBase.php b/core/modules/forum/src/Plugin/Block/ForumBlockBase.php index e5937ce..b472785 100644 --- a/core/modules/forum/src/Plugin/Block/ForumBlockBase.php +++ b/core/modules/forum/src/Plugin/Block/ForumBlockBase.php @@ -7,6 +7,7 @@ namespace Drupal\forum\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; @@ -59,7 +60,7 @@ public function defaultConfiguration() { * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $account->hasPermission('access content'); + return AccessResult::allowedIfHasPermission($account, 'access content'); } /** diff --git a/core/modules/help/src/Plugin/Block/HelpBlock.php b/core/modules/help/src/Plugin/Block/HelpBlock.php index 7038c9d..7a02496 100644 --- a/core/modules/help/src/Plugin/Block/HelpBlock.php +++ b/core/modules/help/src/Plugin/Block/HelpBlock.php @@ -7,6 +7,7 @@ namespace Drupal\help\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; @@ -96,7 +97,12 @@ public static function create(ContainerInterface $container, array $configuratio */ protected function blockAccess(AccountInterface $account) { $this->help = $this->getActiveHelp($this->request); - return (bool) $this->help; + if ($this->help) { + return AccessResult::allowed(); + } + else { + return AccessResult::forbidden(); + } } /** diff --git a/core/modules/language/src/Plugin/Block/LanguageBlock.php b/core/modules/language/src/Plugin/Block/LanguageBlock.php index e86f263..d9e13d3 100644 --- a/core/modules/language/src/Plugin/Block/LanguageBlock.php +++ b/core/modules/language/src/Plugin/Block/LanguageBlock.php @@ -7,6 +7,7 @@ namespace Drupal\language\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Path\PathMatcherInterface; use Drupal\Core\Session\AccountInterface; @@ -80,7 +81,7 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $this->languageManager->isMultilingual(); + return $this->languageManager->isMultilingual() ? AccessResult::allowed() : AccessResult::forbidden(); } /** diff --git a/core/modules/node/src/Plugin/Block/SyndicateBlock.php b/core/modules/node/src/Plugin/Block/SyndicateBlock.php index 436a570..00d2f85 100644 --- a/core/modules/node/src/Plugin/Block/SyndicateBlock.php +++ b/core/modules/node/src/Plugin/Block/SyndicateBlock.php @@ -7,6 +7,7 @@ namespace Drupal\node\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; @@ -35,7 +36,7 @@ public function defaultConfiguration() { * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $account->hasPermission('access content'); + return AccessResult::allowedIfHasPermission($account, 'access content'); } /** diff --git a/core/modules/search/src/Plugin/Block/SearchBlock.php b/core/modules/search/src/Plugin/Block/SearchBlock.php index 369aad6..9559291 100644 --- a/core/modules/search/src/Plugin/Block/SearchBlock.php +++ b/core/modules/search/src/Plugin/Block/SearchBlock.php @@ -7,10 +7,10 @@ namespace Drupal\search\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Block\BlockBase; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\Request; /** * Provides a 'Search form' block. @@ -27,7 +27,7 @@ class SearchBlock extends BlockBase { * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $account->hasPermission('search content'); + return AccessResult::allowedIfHasPermission($account, 'search content'); } /** diff --git a/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php b/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php index 9396f82..379d74d 100644 --- a/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php +++ b/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php @@ -7,6 +7,7 @@ namespace Drupal\shortcut\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Session\AccountInterface; @@ -34,7 +35,7 @@ public function build() { * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $account->hasPermission('access shortcuts'); + return AccessResult::allowedIfHasPermission($account, 'access shortcuts'); } } diff --git a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php index e8c2fbb..3c7d4e1 100644 --- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php +++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php @@ -7,6 +7,7 @@ namespace Drupal\statistics\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountInterface; @@ -57,22 +58,23 @@ public function defaultConfiguration() { * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { + $access = AccessResult::allowedIfHasPermission($account, 'access content'); if ($account->hasPermission('access content')) { $daytop = $this->configuration['top_day_num']; if (!$daytop || !($result = statistics_title_list('daycount', $daytop)) || !($this->day_list = node_title_list($result, $this->t("Today's:")))) { - return FALSE; + return $access->forbidden(); } $alltimetop = $this->configuration['top_all_num']; if (!$alltimetop || !($result = statistics_title_list('totalcount', $alltimetop)) || !($this->all_time_list = node_title_list($result, $this->t('All time:')))) { - return FALSE; + return $access->forbidden(); } $lasttop = $this->configuration['top_last_num']; if (!$lasttop || !($result = statistics_title_list('timestamp', $lasttop)) || !($this->last_list = node_title_list($result, $this->t('Last viewed:')))) { - return FALSE; + return $access->forbidden(); } - return TRUE; + return $access; } - return FALSE; + return AccessResult::forbidden(); } /** diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php index 44650dd..173fbda 100644 --- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php @@ -7,12 +7,14 @@ namespace Drupal\system\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Cache\Cache; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Component\Utility\Xss; +use Drupal\Core\Session\AccountInterface; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -161,6 +163,13 @@ public function blockSubmit($form, FormStateInterface $form_state) { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { $build = array(); $site_config = $this->configFactory->get('system.site'); diff --git a/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php index e822a72..fd52a02 100644 --- a/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemBreadcrumbBlock.php @@ -7,10 +7,12 @@ namespace Drupal\system\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Session\AccountInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -73,6 +75,13 @@ public static function create(ContainerInterface $container, array $configuratio /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { $breadcrumb = $this->breadcrumbManager->build($this->routeMatch); if (!empty($breadcrumb)) { diff --git a/core/modules/system/src/Plugin/Block/SystemMainBlock.php b/core/modules/system/src/Plugin/Block/SystemMainBlock.php index 0e744db..8ec7b8e 100644 --- a/core/modules/system/src/Plugin/Block/SystemMainBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemMainBlock.php @@ -7,9 +7,11 @@ namespace Drupal\system\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Block\MainContentBlockPluginInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Session\AccountInterface; /** * Provides a 'Main page content' block. @@ -38,6 +40,13 @@ public function setMainContent(array $main_content) { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { return $this->mainContent; } diff --git a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php index c07fba2..f35a445 100644 --- a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php @@ -7,12 +7,14 @@ namespace Drupal\system\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Cache\Cache; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Menu\MenuActiveTrailInterface; use Drupal\Core\Menu\MenuLinkTreeInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; +use Drupal\Core\Session\AccountInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -136,6 +138,13 @@ public function blockSubmit($form, FormStateInterface $form_state) { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function build() { $menu_name = $this->getDerivativeId(); $parameters = $this->menuTree->getCurrentRouteMenuTreeParameters($menu_name); diff --git a/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php b/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php index b724780..595dc77 100644 --- a/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php @@ -7,10 +7,13 @@ namespace Drupal\system\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Block\MessagesBlockPluginInterface; use Drupal\Core\Cache\Cache; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Session\AccountInterface; +use Drupal\node\Plugin\views\filter\Access; /** * Provides a block to display the messages. @@ -43,6 +46,13 @@ public function build() { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); diff --git a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php index 25e244d..a001416 100644 --- a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php @@ -7,9 +7,11 @@ namespace Drupal\system\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Cache\Cache; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Session\AccountInterface; /** * Provides a 'Powered by Drupal' block. @@ -31,6 +33,13 @@ public function build() { /** * {@inheritdoc} */ + protected function blockAccess(AccountInterface $account) { + return AccessResult::allowed(); + } + + /** + * {@inheritdoc} + */ public function buildConfigurationForm(array $form, FormStateInterface $form_state) { $form = parent::buildConfigurationForm($form, $form_state); diff --git a/core/modules/system/tests/modules/form_test/src/Plugin/Block/RedirectFormBlock.php b/core/modules/system/tests/modules/form_test/src/Plugin/Block/RedirectFormBlock.php index 4a04599..94c045a 100644 --- a/core/modules/system/tests/modules/form_test/src/Plugin/Block/RedirectFormBlock.php +++ b/core/modules/system/tests/modules/form_test/src/Plugin/Block/RedirectFormBlock.php @@ -7,6 +7,7 @@ namespace Drupal\form_test\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormBuilderInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; @@ -67,7 +68,7 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return TRUE; + return AccessResult::allowed(); } /** diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php index 8fc92f0..73c059a 100644 --- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php +++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php @@ -7,6 +7,7 @@ namespace Drupal\user\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Routing\UrlGeneratorTrait; @@ -74,7 +75,11 @@ public static function create(ContainerInterface $container, array $configuratio */ protected function blockAccess(AccountInterface $account) { $route_name = $this->routeMatch->getRouteName(); - return ($account->isAnonymous() && !in_array($route_name, array('user.register', 'user.login', 'user.logout'))); + if ($account->isAnonymous() && !in_array($route_name, array('user.register', 'user.login', 'user.logout'))) { + // @todo Shouldn't this also add cache contexts per route? + return AccessResult::allowed()->cachePerRole(); + } + return AccessResult::forbidden(); } /** diff --git a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php index 953dfae..b87711f 100644 --- a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php +++ b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php @@ -7,6 +7,7 @@ namespace Drupal\views\Plugin\Block; +use Drupal\Core\Access\AccessResult; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; @@ -93,7 +94,13 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ protected function blockAccess(AccountInterface $account) { - return $this->view->access($this->displayID); + if ($this->view->access($this->displayID)) { + $access = AccessResult::allowed(); + } + else { + $access = AccessResult::forbidden(); + } + return $access; } /**