Commit 4bd133d3 authored by webchick's avatar webchick

Issue #2339373 by Wim Leers, effulgentsia: Remove getCacheBin() from CacheableInterface.

parent b79faf63
......@@ -486,13 +486,6 @@ public function getCacheTags() {
return array('block_plugin' => array($block_plugin_cache_tag));
}
/**
* {@inheritdoc}
*/
public function getCacheBin() {
return 'render';
}
/**
* {@inheritdoc}
*/
......
......@@ -35,14 +35,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.
*
......
......@@ -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);
}
......
......@@ -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,
);
......@@ -213,13 +212,6 @@ public function getCacheTags() {
return $this->cache['tags'];
}
/**
* {@inheritdoc}
*/
public function getCacheBin() {
return $this->cache['bin'];
}
/**
* {@inheritdoc}
*/
......
......@@ -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,
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment