diff -u b/core/lib/Drupal/Core/Cache/Cache.php b/core/lib/Drupal/Core/Cache/Cache.php --- b/core/lib/Drupal/Core/Cache/Cache.php +++ b/core/lib/Drupal/Core/Cache/Cache.php @@ -73,7 +73,7 @@ * @param int $a * Max age value to find. * @param int $b - * Max age value to find.. + * Max age value to find. * * @return int * The minimum max-age value. diff -u b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php --- b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php +++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php @@ -382,8 +382,4 @@ $this->getAdditionalCacheTagsForEntityListing($this->entity) ); - $nonempty_entity_listing_cache_tags = Cache::mergeTags( - $nonempty_entity_listing_cache_tags, - $page_cache_tags - ); $this->pass("Test referencing entity.", 'Debug'); diff -u b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php --- b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php +++ b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php @@ -201,7 +201,10 @@ $entity->save(); } - $new_entities_cache_tags = Cache::mergeTags($entities[1]->getCacheTags(), $entities[2]->getCacheTags(), $entities[3]->getCacheTags(), $entities[4]->getCacheTags(), $entities[5]->getCacheTags()); + $new_entities_cache_tags = Cache::mergeTags($entities[1]->getCacheTags(), $entities[2]->getCacheTags()); + $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[3]->getCacheTags()); + $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[4]->getCacheTags()); + $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[5]->getCacheTags()); $result_tags_page_1 = Cache::mergeTags($base_tags, $new_entities_cache_tags); $render_tags_page_1 = Cache::mergeTags($base_render_tags, $new_entities_cache_tags); $render_tags_page_1 = Cache::mergeTags($render_tags_page_1, ['entity_test_view']);