diff --git a/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php b/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php index 202a65c..90eef28 100644 --- a/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php +++ b/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php @@ -53,7 +53,7 @@ public function __construct(Settings $settings = NULL, $consistent_service_name } // Default the fast backend to APCu if it's available. - if (!isset($fast_service_name) && function_exists('apc_fetch')) { + if (FALSE && !isset($fast_service_name) && function_exists('apc_fetch')) { $fast_service_name = 'cache.backend.apcu'; } diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index 6708fbe..e6bada8 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -184,8 +184,8 @@ public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array * Actually set the cache. */ protected function doSet($cid, $data, $expire, $tags) { - $deleted_tags = &drupal_static('Drupal\Core\Cache\DatabaseBackend::deletedTags', array()); - $invalidated_tags = &drupal_static('Drupal\Core\Cache\DatabaseBackend::invalidatedTags', array()); + $deleted_tags = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::deletedTags', array()); + $invalidated_tags = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::invalidatedTags', array()); // Remove tags that were already deleted or invalidated during this request // from the static caches so that another deletion or invalidation can // occur. @@ -225,8 +225,8 @@ protected function doSet($cid, $data, $expire, $tags) { * {@inheritdoc} */ public function setMultiple(array $items) { - $deleted_tags = &drupal_static('Drupal\Core\Cache\DatabaseBackend::deletedTags', array()); - $invalidated_tags = &drupal_static('Drupal\Core\Cache\DatabaseBackend::invalidatedTags', array()); + $deleted_tags = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::deletedTags', array()); + $invalidated_tags = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::invalidatedTags', array()); // Use a transaction so that the database can write the changes in a single // commit. @@ -420,7 +420,7 @@ public function garbageCollection() { * Sum of all invalidations. */ protected function checksumTags(array $tags) { - $tag_cache = &drupal_static('Drupal\Core\Cache\CacheBackendInterface::tagCache', array()); + $tag_cache = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::tagCache', array()); $checksum = array( 'invalidations' => 0, diff --git a/core/lib/Drupal/Core/Cache/DatabaseCacheTagStorage.php b/core/lib/Drupal/Core/Cache/DatabaseCacheTagStorage.php index 28eba4f..0a9259c 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseCacheTagStorage.php +++ b/core/lib/Drupal/Core/Cache/DatabaseCacheTagStorage.php @@ -39,8 +39,8 @@ public function __construct(Connection $connection) { */ public function invalidateTags(array $tags) { try { - $tag_cache = &drupal_static('Drupal\Core\Cache\CacheTagStorage::tagCache', array()); - $invalidated_tags = &drupal_static('Drupal\Core\Cache\CacheTagStorage::invalidatedTags', array()); + $tag_cache = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::tagCache', array()); + $invalidated_tags = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::invalidatedTags', array()); foreach ($tags as $tag) { // Only invalidate tags once per request unless they are written again. if (isset($invalidated_tags[$tag])) { @@ -67,8 +67,8 @@ public function invalidateTags(array $tags) { * The list of tags for which to store deletions. */ public function deleteTags(array $tags) { - $tag_cache = &drupal_static('Drupal\Core\Cache\CacheTagStorage::tagCache', array()); - $deleted_tags = &drupal_static('Drupal\Core\Cache\CacheTagStorage::deletedTags', array()); + $tag_cache = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::tagCache', array()); + $deleted_tags = &drupal_static('Drupal\Core\Cache\DatabaseCacheTagStorage::deletedTags', array()); foreach ($tags as $tag) { // Only delete tags once per request unless they are written again. if (isset($deleted_tags[$tag])) { diff --git a/core/lib/Drupal/Core/Cache/NullCacheTagHandler.php b/core/lib/Drupal/Core/Cache/NullCacheTagHandler.php index 139884d..76b4c41 100644 --- a/core/lib/Drupal/Core/Cache/NullCacheTagHandler.php +++ b/core/lib/Drupal/Core/Cache/NullCacheTagHandler.php @@ -19,9 +19,9 @@ class NullCacheTagHandler implements CacheTagHandlerInterface { */ protected $invalidators; - public function invalidateTags($tags) {} + public function invalidateTags(array $tags) {} - public function deleteTags($tags) {} + public function deleteTags(array $tags) {} public function addHandler(CacheTagInvalidationInterface $service) { $this->invalidators[] = $service;