Commit cb566fab authored by alexpott's avatar alexpott

Issue #2198339 by longwave, damiankloip: Remove cache.inc.

parent 31db6c31
......@@ -1797,7 +1797,6 @@ function _drupal_bootstrap_kernel() {
function _drupal_bootstrap_page_cache() {
global $user;
require_once __DIR__ . '/cache.inc';
require_once __DIR__ . '/database.inc';
// Check for a cache mode force from settings.php.
if (settings()->get('page_cache_without_database')) {
......
<?php
/**
* @file
* Functions and interfaces for cache handling.
*/
use Drupal\Core\Cache\Cache;
/**
* Instantiates and statically caches the correct class for a cache bin.
*
* By default, this returns an instance of the Drupal\Core\Cache\DatabaseBackend
* class.
*
* Classes implementing Drupal\Core\Cache\CacheBackendInterface can register
* themselves both as a default implementation and for specific bins.
*
* @param $bin
* The cache bin for which the cache object should be returned, defaults to
* 'cache'.
*
* @return \Drupal\Core\Cache\CacheBackendInterface
* The cache object associated with the specified bin.
*
* @see \Drupal\Core\Cache\CacheBackendInterface
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal::cache().
*/
function cache($bin = 'cache') {
return \Drupal::cache($bin);
}
/**
* Marks cache items from all bins with any of the specified tags as invalid.
*
* Many sites have more than one active cache backend, and each backend my use
* a different strategy for storing tags against cache items, and invalidating
* cache items associated with a given tag.
*
* When invalidating a given list of tags, we iterate over each cache backend,
* and call invalidateTags() on each.
*
* @param array $tags
* The list of tags to invalidate cache items for.
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Cache\Cache::invalidateTags().
*/
function cache_invalidate_tags(array $tags) {
Cache::invalidateTags($tags);
}
......@@ -2760,7 +2760,7 @@ function drupal_add_library($module, $name, $every_page = NULL) {
function drupal_get_library($extension, $name = NULL) {
$libraries = &drupal_static(__FUNCTION__, array());
if (!isset($libraries[$extension]) && ($cache = cache()->get('library:info:' . $extension))) {
if (!isset($libraries[$extension]) && ($cache = \Drupal::cache()->get('library:info:' . $extension))) {
$libraries[$extension] = $cache->data;
}
......@@ -2900,7 +2900,7 @@ function drupal_get_library($extension, $name = NULL) {
}
}
}
cache()->set('library:info:' . $extension, $libraries[$extension], Cache::PERMANENT, array(
\Drupal::cache()->set('library:info:' . $extension, $libraries[$extension], Cache::PERMANENT, array(
'extension' => array(TRUE, $extension),
'library_info' => array(TRUE),
));
......
......@@ -296,7 +296,6 @@ function install_begin_request(&$install_state) {
require_once __DIR__ . '/install.inc';
require_once __DIR__ . '/schema.inc';
require_once __DIR__ . '/../../' . settings()->get('path_inc', 'core/includes/path.inc');
require_once __DIR__ . '/cache.inc';
require_once __DIR__ . '/database.inc';
require_once __DIR__ . '/form.inc';
require_once __DIR__ . '/batch.inc';
......
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