core/lib/Drupal/Core/Block/BlockBase.php | 7 ------- core/lib/Drupal/Core/Cache/CacheableInterface.php | 8 -------- core/lib/Drupal/Core/EventSubscriber/HtmlViewSubscriber.php | 3 --- core/lib/Drupal/Core/Page/HtmlFragment.php | 8 -------- core/modules/block/src/BlockViewBuilder.php | 1 - 5 files changed, 27 deletions(-) diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php index 11890c8..a07e999 100644 --- a/core/lib/Drupal/Core/Block/BlockBase.php +++ b/core/lib/Drupal/Core/Block/BlockBase.php @@ -481,13 +481,6 @@ public function getCacheTags() { /** * {@inheritdoc} */ - public function getCacheBin() { - return 'render'; - } - - /** - * {@inheritdoc} - */ public function getCacheMaxAge() { return (int)$this->configuration['cache']['max_age']; } diff --git a/core/lib/Drupal/Core/Cache/CacheableInterface.php b/core/lib/Drupal/Core/Cache/CacheableInterface.php index 2a59467..110d00b 100644 --- a/core/lib/Drupal/Core/Cache/CacheableInterface.php +++ b/core/lib/Drupal/Core/Cache/CacheableInterface.php @@ -30,14 +30,6 @@ public function getCacheKeys(); public function getCacheTags(); /** - * The bin to use for this potentially cacheable object. - * - * @return string - * The name of the cache bin to use. - */ - public function getCacheBin(); - - /** * The maximum age for which this object may be cached. * * @return int diff --git a/core/lib/Drupal/Core/EventSubscriber/HtmlViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/HtmlViewSubscriber.php index 6a854d6..80c6e5a 100644 --- a/core/lib/Drupal/Core/EventSubscriber/HtmlViewSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/HtmlViewSubscriber.php @@ -82,9 +82,6 @@ public function onHtmlPage(GetResponseForControllerResultEvent $event) { if ($keys = $page->getCacheKeys()) { $response->headers->set('cache_keys', serialize($keys)); } - if ($bin = $page->getCacheBin()) { - $response->headers->set('cache_bin', $bin); - } if ($max_age = $page->getCacheMaxAge()) { $response->headers->set('cache_max_age', $max_age); } diff --git a/core/lib/Drupal/Core/Page/HtmlFragment.php b/core/lib/Drupal/Core/Page/HtmlFragment.php index b3c55d8..a4e0e29 100644 --- a/core/lib/Drupal/Core/Page/HtmlFragment.php +++ b/core/lib/Drupal/Core/Page/HtmlFragment.php @@ -65,7 +65,6 @@ public function __construct($content = '', array $cache_info = array()) { $this->cache = $cache_info + array( 'keys' => array(), 'tags' => array(), - 'bin' => NULL, 'max_age' => 0, 'is_cacheable' => TRUE, ); @@ -216,13 +215,6 @@ public function getCacheTags() { /** * {@inheritdoc} */ - public function getCacheBin() { - return $this->cache['bin']; - } - - /** - * {@inheritdoc} - */ public function getCacheMaxAge() { return $this->cache['max_age']; } diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php index f35bb71..d92898b 100644 --- a/core/modules/block/src/BlockViewBuilder.php +++ b/core/modules/block/src/BlockViewBuilder.php @@ -93,7 +93,6 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la $max_age = $plugin->getCacheMaxAge(); $build[$entity_id]['#cache'] += array( 'keys' => array_merge($default_cache_keys, $plugin->getCacheKeys()), - 'bin' => $plugin->getCacheBin(), 'expire' => ($max_age === Cache::PERMANENT) ? Cache::PERMANENT : REQUEST_TIME + $max_age, ); }