core/modules/block/src/Tests/BlockTest.php | 4 ++-- core/modules/page_cache/page_cache.services.yml | 9 ++++++++- core/modules/page_cache/src/Tests/PageCacheTest.php | 8 ++++---- .../src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php | 2 +- core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php | 2 +- .../system/tests/src/Functional/Cache/PageCacheTagsTestBase.php | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php index 5910d47..f10cbf8 100644 --- a/core/modules/block/src/Tests/BlockTest.php +++ b/core/modules/block/src/Tests/BlockTest.php @@ -379,7 +379,7 @@ public function testBlockCacheTags() { $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); $cid_parts = [\Drupal::url('', [], ['absolute' => TRUE]), 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); $expected_cache_tags = [ 'config:block_list', 'block_view', @@ -420,7 +420,7 @@ public function testBlockCacheTags() { $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); $cid_parts = [\Drupal::url('', [], ['absolute' => TRUE]), 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); $expected_cache_tags = [ 'config:block_list', 'block_view', diff --git a/core/modules/page_cache/page_cache.services.yml b/core/modules/page_cache/page_cache.services.yml index 6563a01..17d4266 100644 --- a/core/modules/page_cache/page_cache.services.yml +++ b/core/modules/page_cache/page_cache.services.yml @@ -1,6 +1,13 @@ services: http_middleware.page_cache: class: Drupal\page_cache\StackMiddleware\PageCache - arguments: ['@cache.render', '@page_cache_request_policy', '@page_cache_response_policy'] + arguments: ['@cache.page_cache', '@page_cache_request_policy', '@page_cache_response_policy'] tags: - { name: http_middleware, priority: 200, responder: true } + + cache.page_cache: + class: Drupal\Core\Cache\CacheBackendInterface + tags: + - { name: cache.bin } + factory: cache_factory:get + arguments: [page_cache] diff --git a/core/modules/page_cache/src/Tests/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php index 3ef1f58..fc66017 100644 --- a/core/modules/page_cache/src/Tests/PageCacheTest.php +++ b/core/modules/page_cache/src/Tests/PageCacheTest.php @@ -59,7 +59,7 @@ public function testPageCacheTags() { $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); $cid_parts = [\Drupal::url('system_test.cache_tags_page', [], ['absolute' => TRUE]), 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); sort($cache_entry->tags); $expected_tags = [ 'config:user.role.anonymous', @@ -91,7 +91,7 @@ public function testPageCacheTagsIndependentFromCacheabilityHeaders() { $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT'); $cid_parts = [\Drupal::url('system_test.cache_tags_page', [], ['absolute' => TRUE]), 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); sort($cache_entry->tags); $expected_tags = [ 'config:user.role.anonymous', @@ -156,7 +156,7 @@ public function testQueryParameterFormatRequests() { // Clear the page cache. After that request a HAL request, followed by an // ordinary HTML one. - \Drupal::cache('render')->deleteAll(); + \Drupal::cache('page_cache')->deleteAll(); $this->drupalGet($node_url_with_hal_json_format); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS'); $this->assertEqual($this->drupalGetHeader('Content-Type'), 'application/hal+json'); @@ -375,7 +375,7 @@ public function testPageCacheAnonymous403404() { $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS'); // Ensure the 'expire' field on the cache entry uses cache_ttl_4xx. - $cache_item = \Drupal::service('cache.render')->get($this->getUrl() . ':html'); + $cache_item = \Drupal::service('cache.page_cache')->get($this->getUrl() . ':html'); $difference = $cache_item->expire - (int) $cache_item->created; // Given that a second might have passed we cannot be sure that // $difference will exactly equal the default cache_ttl_4xx setting. diff --git a/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php b/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php index 6bea791..516992b 100644 --- a/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php +++ b/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php @@ -91,7 +91,7 @@ protected function assertPageCacheContextsAndTags(Url $url, array $expected_cont // Assert page cache item + expected cache tags. $cid_parts = [$url->setAbsolute()->toString(), 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); sort($cache_entry->tags); $this->assertEqual($cache_entry->tags, $expected_tags); $this->debugCacheTags($cache_entry->tags, $expected_tags); diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php index 582a2f4..b9b656d 100644 --- a/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php +++ b/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php @@ -54,7 +54,7 @@ protected function verifyPageCache(Url $url, $hit_or_miss, $tags = FALSE) { $absolute_url = $url->setAbsolute()->toString(); $cid_parts = [$absolute_url, 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); sort($cache_entry->tags); $tags = array_unique($tags); sort($tags); diff --git a/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php b/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php index 39a514f..c757229 100644 --- a/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php +++ b/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php @@ -51,7 +51,7 @@ protected function verifyPageCache(Url $url, $hit_or_miss, $tags = FALSE) { $absolute_url = $url->setAbsolute()->toString(); $cid_parts = [$absolute_url, 'html']; $cid = implode(':', $cid_parts); - $cache_entry = \Drupal::cache('render')->get($cid); + $cache_entry = \Drupal::cache('page_cache')->get($cid); sort($cache_entry->tags); $tags = array_unique($tags); sort($tags);