From b6ccd5e98c68a939db25f5b45eded6448d2c478a Mon Sep 17 00:00:00 2001 From: mmorris Date: Fri, 2 Oct 2015 16:27:01 -0400 Subject: [PATCH] Add assertValidTokens()->willReturn(TRUE) to a hell of a lot of mocks. --- core/lib/Drupal/Core/Cache/Cache.php | 2 +- .../Core/Cache/Context/CacheContextsManager.php | 33 ++++++++++++++++++++-- .../Plugin/DisplayVariant/BlockPageVariantTest.php | 5 ++-- .../ContentTranslationManageAccessCheckTest.php | 1 + .../Breadcrumb/ForumBreadcrumbBuilderBaseTest.php | 3 +- .../ForumListingBreadcrumbBuilderTest.php | 3 +- .../Breadcrumb/ForumNodeBreadcrumbBuilderTest.php | 3 +- .../tests/src/Unit/LanguageNegotiationUrlTest.php | 1 + .../Unit/Access/EditEntityFieldAccessCheckTest.php | 4 ++- .../Breadcrumbs/PathBasedBreadcrumbBuilderTest.php | 1 + .../tests/src/Unit/Menu/MenuLinkTreeTest.php | 1 + .../tests/src/Unit/PermissionAccessCheckTest.php | 4 ++- .../src/Unit/UserAccessControlHandlerTest.php | 4 ++- .../Drupal/Tests/Core/Access/AccessResultTest.php | 1 + .../Core/Breadcrumb/BreadcrumbManagerTest.php | 4 ++- .../Tests/Core/Cache/CacheableMetadataTest.php | 3 ++ .../Cache/Context/CacheContextsManagerTest.php | 3 +- .../Core/Entity/EntityCreateAccessCheckTest.php | 4 ++- .../Drupal/Tests/Core/Entity/EntityUnitTest.php | 2 ++ .../Menu/DefaultMenuLinkTreeManipulatorsTest.php | 5 +++- .../Tests/Core/Menu/LocalTaskManagerTest.php | 4 +++ .../Tests/Core/Render/BubbleableMetadataTest.php | 2 ++ .../Drupal/Tests/Core/Render/RendererTestBase.php | 1 + .../Tests/Core/Route/RoleAccessCheckTest.php | 4 ++- .../Drupal/Tests/Core/Routing/UrlGeneratorTest.php | 1 + 25 files changed, 77 insertions(+), 22 deletions(-) diff --git a/core/lib/Drupal/Core/Cache/Cache.php b/core/lib/Drupal/Core/Cache/Cache.php index b6ae27c..d75eaff 100644 --- a/core/lib/Drupal/Core/Cache/Cache.php +++ b/core/lib/Drupal/Core/Cache/Cache.php @@ -34,7 +34,7 @@ class Cache { */ public static function mergeContexts(array $a = [], array $b = []) { $cache_contexts = array_unique(array_merge($a, $b)); - \Drupal::service('cache_contexts_manager')->validateTokens($cache_contexts); + assert('\Drupal::service(\'cache_contexts_manager\')->assertValidTokens($cache_contexts)'); sort($cache_contexts); return $cache_contexts; } diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php index b01dc9e..fd29fa6 100644 --- a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php +++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php @@ -103,11 +103,9 @@ public function getLabels($include_calculated_cache_contexts = FALSE) { * The ContextCacheKeys object containing the converted cache keys and * cacheability metadata. * - * @throws \LogicException - * Thrown if any of the context tokens or parameters are not valid. */ public function convertTokensToKeys(array $context_tokens) { - $this->validateTokens($context_tokens); + assert('$this->assertValidTokens($context_tokens)'); $cacheable_metadata = new CacheableMetadata(); $optimized_tokens = $this->optimizeTokens($context_tokens); // Iterate over cache contexts that have been optimized away and get their @@ -299,4 +297,33 @@ public function validateTokens(array $context_tokens = []) { } } + /** + * Asserts the context tokens are valid + * + * Similar to ::validateTokens, this method returns boolean TRUE when the + * context tokens are valid, and FALSE when they are not instead of returning + * NULL when they are valid and throwing a \LogicException when they are not. + * This function should be used with the assert() statement. + * + * @param $context_tokens + * Variable to be examined - should be array of context_tokens. + * + * @return bool + * TRUE if all tokens are valid. + */ + public function assertValidTokens($context_tokens) { + if (!is_array($context_tokens)) { + return FALSE; + } + + try { + $this->validateTokens($context_tokens); + } + catch (\LogicException $e) { + return FALSE; + } + + return TRUE; + } + } diff --git a/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php b/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php index 5652533..3c5b0ba 100644 --- a/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php +++ b/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php @@ -57,9 +57,8 @@ public function setUpDisplayVariant($configuration = array(), $definition = arra ->getMock(); $container->set('cache_contexts_manager', $cache_context_manager); $cache_context_manager->expects($this->any()) - ->method('validateTokens') - ->with([]) - ->willReturn([]); + ->method('assertValidTokens') + ->willReturn(TRUE); \Drupal::setContainer($container); $this->blockRepository = $this->getMock('Drupal\block\BlockRepositoryInterface'); diff --git a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php index 0818be2..8cb5881 100644 --- a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php +++ b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php @@ -40,6 +40,7 @@ protected function setUp() { $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $this->cacheContextsManager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $this->cacheContextsManager); diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php index f690e03..3cb442a 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php @@ -27,8 +27,7 @@ public function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); - $cache_contexts_manager->expects($this->any()) - ->method('validate_tokens'); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php index 0d201ed..b591394 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php @@ -28,8 +28,7 @@ public function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); - $cache_contexts_manager->expects($this->any()) - ->method('validate_tokens'); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php index 76851fd..ba1c974 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php @@ -27,8 +27,7 @@ public function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); - $cache_contexts_manager->expects($this->any()) - ->method('validate_tokens'); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php index 34abb61..d0d946e 100644 --- a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php +++ b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php @@ -60,6 +60,7 @@ protected function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php index 26a1c86..5ac92aa 100644 --- a/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php +++ b/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php @@ -34,7 +34,9 @@ class EditEntityFieldAccessCheckTest extends UnitTestCase { protected function setUp() { $this->editAccessCheck = new EditEntityFieldAccessCheck(); - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php index bf106f6..64e61c7 100644 --- a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php +++ b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php @@ -124,6 +124,7 @@ protected function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $cache_contexts_manager->expects($this->any()) ->method('validate_tokens'); $container = new Container(); diff --git a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php index 9faa03d..ac6af14 100644 --- a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php +++ b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php @@ -47,6 +47,7 @@ protected function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php index 29b6247..7ad78ef 100644 --- a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php +++ b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php @@ -42,7 +42,9 @@ protected function setUp() { parent::setUp(); $this->container = new ContainerBuilder(); - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); $this->container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($this->container); diff --git a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php index 849cde5..26bd3a9 100644 --- a/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php +++ b/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php @@ -64,7 +64,9 @@ class UserAccessControlHandlerTest extends UnitTestCase { public function setUp() { parent::setUp(); - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php index ae5dadc..2c46a0b 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php @@ -38,6 +38,7 @@ protected function setUp() { ->disableOriginalConstructor() ->getMock(); + $this->cacheContextsManager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $this->cacheContextsManager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php index a9f301d..fd5be62 100644 --- a/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php @@ -57,7 +57,9 @@ protected function setUp() { $this->breadcrumb = new Breadcrumb(); $this->container = new ContainerBuilder(); - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); $this->container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($this->container); } diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php index 05b51aa..b73bec2 100644 --- a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php @@ -35,6 +35,8 @@ public function testMerge(CacheableMetadata $a, CacheableMetadata $b, CacheableM $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); + $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); @@ -57,6 +59,7 @@ public function testAddCacheableDependency(CacheableMetadata $a, CacheableMetada $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php index db8d7b7..6b233aa 100644 --- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php @@ -106,8 +106,7 @@ public function testConvertTokensToKeys() { /** * @covers ::convertTokensToKeys * - * @expectedException \LogicException - * @expectedExceptionMessage "non-cache-context" is not a valid cache context ID. + * @expectedException \AssertionError */ public function testInvalidContext() { $container = $this->getMockContainer(); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php index b0b4c8c..e062cc9 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php @@ -35,7 +35,9 @@ class EntityCreateAccessCheckTest extends UnitTestCase { protected function setUp() { parent::setUp(); - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php index 929ff00..3a21211 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php @@ -518,6 +518,8 @@ public function testCacheContexts() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); + $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php index 17702e7..e295bef 100644 --- a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php @@ -79,7 +79,10 @@ protected function setUp() { $this->defaultMenuTreeManipulators = new DefaultMenuLinkTreeManipulators($this->accessManager, $this->currentUser, $this->queryFactory); - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); + $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php index 20c680c..18868e4 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php @@ -488,6 +488,10 @@ protected function setupNullCacheabilityMetadataValidation() { $cache_context_manager = $this->prophesize(CacheContextsManager::class); + foreach ([NULL, ["user.permissions"], ["route"], ["route", "context.example1"], ["context.example1", "route"], ["context.example1", "route", "context.example2"], ["context.example1", "context.example2", "route"], ["context.example1", "context.example2", "route", "user.permissions"]] as $argument) { + $cache_context_manager->assertValidTokens($argument)->willReturn(TRUE); + } + $container->set('cache_contexts_manager', $cache_context_manager->reveal()); \Drupal::setContainer($container); } diff --git a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php index e695c79..72e5893 100644 --- a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php +++ b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php @@ -60,6 +60,7 @@ public function testMerge(BubbleableMetadata $a, CacheableMetadata $b, Bubbleabl $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); $container->set('renderer', $renderer); @@ -664,6 +665,7 @@ public function testAddCacheableDependency(BubbleableMetadata $a, $b, Bubbleable $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php index e903739..199d170 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php @@ -144,6 +144,7 @@ protected function setUp() { $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $this->cacheContextsManager->method('assertValidTokens')->willReturn(TRUE); $current_user_role = &$this->currentUserRole; $this->cacheContextsManager->expects($this->any()) ->method('convertTokensToKeys') diff --git a/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php index 9d0d148..6d04fb7 100644 --- a/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php @@ -145,7 +145,9 @@ public function roleAccessProvider() { * @dataProvider roleAccessProvider */ public function testRoleAccess($path, $grant_accounts, $deny_accounts) { - $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal(); + $cache_contexts_manager = $this->prophesize(CacheContextsManager::class); + $cache_contexts_manager->assertValidTokens()->willReturn(TRUE); + $cache_contexts_manager->reveal(); $container = new Container(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php index 2e04b87..6607cb5 100644 --- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php @@ -63,6 +63,7 @@ protected function setUp() { $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager') ->disableOriginalConstructor() ->getMock(); + $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE); $container = new ContainerBuilder(); $container->set('cache_contexts_manager', $cache_contexts_manager); \Drupal::setContainer($container); -- 1.8.4.2